Merge branch 'master' of http://106.52.242.177:3000/askqvn/crm-app

pages/orderDetailRefactored/components/PageThree.vue

@@ -54,7 +54,7 @@
       <view class="detail-image-section">
         <view class="detail-image-header">
           <text class="detail-image-title">高清实物图（拖拽排序）</text>
-          <u-button type="primary" v-if="displayImages.length > 0" shape="circle" plain text="核价" size="small" @click="handlePricing"></u-button>
+          <u-button type="primary" shape="circle" plain text="核价" size="small" class="pricing-btn" @click="handlePricing"></u-button>
         </view>
         <view class="detail-image-content">
           <view class="detail-image-list">
@@ -83,7 +83,12 @@
       <view class="payment-section">
         <view class="payment-total-container">
           <text class="payment-label">支付总额</text>
-          <u-input v-model="paymentAmount" class="payment-amount" type="number" decimal="2" prefix="￥" />
+          <view class="payment-amount-wrap">
+            <u-input v-model="paymentAmount" class="payment-amount" type="number" decimal="2" prefix="￥" />
+          </view>
+          <view class="pay-now-btn-wrap">
+          <u-button type="primary" shape="circle" plain text="立即支付" size="small" @click="handlePayNowClick"></u-button>
+        </view>
         </view>
         <view class="payment-buttons-row">
           <view class="payment-button" @click="handleUnpaidClick">
@@ -95,9 +100,6 @@
             <text class="button-text">待跟进</text>
           </view>
         </view>
-        <view class="pay-now-button" @click="handlePayNowClick">
-          <text class="button-text">立即支付</text>
-        </view>
       </view>
     </view>
 
@@ -839,6 +841,7 @@ export default {
   grid-template-columns: 1fr auto;
   margin-bottom: 20rpx;
   padding-bottom: 20rpx;
+  padding-right: 100rpx; /* 右侧留空，避免被固定页面导航遮挡，使整行（含核价按钮）左移 */
   border-bottom: 1rpx solid map-get($colors, border);
 }
 
@@ -945,16 +948,43 @@ export default {
   font-size: 36rpx;
   font-weight: 700;
   min-width: 140rpx;
+  flex-shrink: 0;
+}
+
+.payment-amount-wrap {
+  flex: 1;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  min-width: 0;
 }
 
-.payment-amount {
+.payment-amount-wrap .payment-amount {
   font-size: 48rpx;
   font-weight: 600;
   color: #f53f3f;
-  width: auto;
-  min-width: 150rpx;
+  width: 100%;
+  max-width: 240rpx;
   border: none;
-  text-align: right !important;
+  text-align: center;
+}
+
+/* 让 u-input 内部输入框文字居中 */
+.payment-amount-wrap :deep(.u-input__content__field-wrapper__field),
+.payment-amount-wrap :deep(input) {
+  text-align: center !important;
+}
+
+.pay-now-btn-wrap {
+  flex-shrink: 0;
+  display: inline-flex;
+}
+
+.payment-total-container .pay-now-btn-wrap .u-button,
+.payment-total-container .pay-now-btn-wrap .u-btn {
+  width: auto !important;
+  min-width: 0 !important;
+  flex: none !important;
 }
 
 .payment-buttons-row {
@@ -977,20 +1007,6 @@ export default {
   gap: 12rpx;
 }
 
-.pay-now-button {
-  width: 100%;
-  border-radius: 12rpx;
-  padding: 32rpx 0;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  background-color: #108cff;
-  color: #fff;
-  cursor: pointer;
-  box-shadow: 0 4rpx 12rpx rgba(16, 140, 255, 0.2);
-}
-
 .button-text {
   font-size: 28rpx;
   font-weight: 500;

pages/orderDetailRefactored/components/PageTwo.vue

@@ -114,15 +114,18 @@
           </view>
           <view class="number-box-container">
             <view class="price-input-box">
-              <text class="price-label">核准价￥</text>
-              <input 
-                type="number" 
-                v-model="approvedPrice" 
-                class="price-input" 
-                placeholder="0" 
-                min="0"
-                @input="onPriceInput" 
-              />
+              <text class="price-label">核准价</text>
+              <view class="price-value-wrap">
+                <text class="yuan-prefix">￥</text>
+                <input 
+                  type="number" 
+                  v-model="approvedPrice" 
+                  class="price-input" 
+                  placeholder="0" 
+                  min="0"
+                  @input="onPriceInput" 
+                />
+              </view>
             </view>
           </view>
           <view class="quick-actions bottom-actions">
@@ -607,6 +610,7 @@ export default {
 
 .price-section {
   padding: 20rpx;
+  padding-right: 20rpx; /* 整体往左挪，避免被右侧固定导航遮挡 */
 }
 
 .price-picker-container {
@@ -670,15 +674,30 @@ export default {
   min-width: 120rpx;
 }
 
+.price-value-wrap {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  min-width: 0;
+}
+
+.yuan-prefix {
+  font-size: 48rpx;
+  font-weight: 600;
+  margin-right: 8rpx;
+  flex-shrink: 0;
+}
+
 .price-input {
-  width: 100%;
+  flex: 1;
+  min-width: 0;
   border: none;
   outline: none;
   background-color: transparent;
-  text-align: right;
+  text-align: left;
   font-size: 48rpx;
   font-weight: 600;
-  padding: 0 10rpx;
+  padding: 0 10rpx 0 0;
 }
 
 .detail-image-card {