shish 11 месяцев назад
Родитель
Сommit
60daaf593c
2 измененных файлов с 50 добавлено и 27 удалено
  1. 44 27
      hdApp/src/admin/express/create.vue
  2. 6 0
      hdApp/src/admin/order/modify.vue

+ 44 - 27
hdApp/src/admin/express/create.vue

@@ -3,14 +3,38 @@
     <view class="express-form-container">
       <!-- 订单信息显示 -->
       <view class="order-info-section" v-if="orderInfo">
-        <view class="section-title">订单信息</view>
+        <view class="section-title">
+          订单信息
+          <button class="admin-button-com mini-btn" @click="goToModifyPage" style="float: right;">修改</button>
+        </view>
+        <view class="info-item">
+          <text class="label">下单客户:</text>
+          <text class="value">{{ orderInfo.customName }}</text>
+        </view>
+        <view class="info-item">
+          <text class="label">下单手机:</text>
+          <text class="value">{{ orderInfo.bookMobile }}</text>
+        </view>
         <view class="info-item">
           <text class="label">订单编号:</text>
           <text class="value">{{ orderInfo.orderSn }}</text>
         </view>
         <view class="info-item">
-          <text class="label">客户姓名:</text>
-          <text class="value">{{ orderInfo.customName }}</text>
+          <text class="label">收货姓名:</text>
+          <text class="value">{{ expressForm.user_name }}</text>
+        </view>
+        <view class="info-item">
+          <text class="label">手机号码:</text>
+          <text class="value">{{ expressForm.user_phone }}</text>
+        </view>
+        <view class="info-item">
+          <text class="label">详细地址:</text>
+          <view class="value-container">
+            <text class="value">{{orderInfo.dist}}{{orderInfo.address}}{{orderInfo.floor}}</text>
+            <view v-if="orderInfo.fullAddress!=orderInfo.showAddress && orderInfo.showAddress!=''" class="secondary-address">
+              <text style="color:#a7a0a0;">{{ orderInfo.showAddress }}</text>
+            </view>
+          </view>
         </view>
       </view>
 
@@ -27,26 +51,6 @@
         </view>
       </view>
 
-      <!-- 收货信息 -->
-      <view class="form-section">
-        <view class="section-header">
-          <view class="title">收货信息</view>
-          <button v-if="!expressForm.user_name || !expressForm.user_phone" class="admin-button-com mini-btn" @click="goToModifyPage">修改</button>
-        </view>
-        <view class="form-item required">
-          <text class="item-label">收货人</text>
-          <input class="item-input" v-model="expressForm.user_name" disabled />
-        </view>
-        <view class="form-item required">
-          <text class="item-label">手机号</text>
-          <input class="item-input" v-model="expressForm.user_phone" disabled />
-        </view>
-        <view class="form-item required">
-          <text class="item-label">详细地址</text>
-          <textarea class="item-textarea" v-model="expressForm.user_address" disabled />
-        </view>
-      </view>
-
       <!-- 配送费用显示 -->
       <view class="form-section" v-if="deliveryFee">
         <view class="fee-display">
@@ -69,7 +73,7 @@
           {{ isQuerying ? '查询中...' : '查询运费' }}
         </button>
         <button class="express-button submit-button" @click="submitExpress" :disabled="isSubmitting">
-          {{ isSubmitting ? '提交中...' : '提交配送' }}
+          {{ isSubmitting ? '提交中...' : '提交' }}
         </button>
       </view>
     </view>
@@ -109,7 +113,8 @@ export default {
       deliveryFee: 0,
       // 状态控制
       isQuerying: false,
-      isSubmitting: false
+      isSubmitting: false,
+      refreshPage:0
     }
   },
   onLoad(options) {
@@ -127,6 +132,12 @@ export default {
         this.getOrderDetail()
       }, 100)
     }
+
+    if(this.refreshPage == 1){
+      this.getOrderDetail()
+      this.refreshPage = 0
+    }
+
   },
   methods: {
     init(){},
@@ -321,9 +332,15 @@ export default {
       font-size: 28upx;
     }
 
-    .value {
+    .value-container {
       flex: 1;
-      color: #333;
+    }
+    .value {
+      color: black;
+      font-size: 28upx;
+    }
+    .secondary-address {
+      margin-top: 10upx;
       font-size: 28upx;
     }
   }

+ 6 - 0
hdApp/src/admin/order/modify.vue

@@ -48,6 +48,12 @@ export default {
     getHasMap().then(res => {
       this.hasMap = (res.data && res.data.hasMap) ? res.data.hasMap : 0
     })
+
+    //返回上一页时刷新
+		let pages = getCurrentPages();
+		let prevPage = pages[ pages.length - 2 ];
+		prevPage.$vm.refreshPage = 1
+
   },
   computed: {
     ...mapGetters(["getLoginInfo"])