Просмотр исходного кода

1.花掌柜--发跑腿时,支持修改门店地址或修改订单地址 2.去除微信端报:Now you can provide attr `wx:key` for a `wx:for` to improve performance.

shizhongqi 7 месяцев назад
Родитель
Сommit
e8e6b0aa21

+ 16 - 4
hdApp/src/admin/delivery/allDelivery.vue

@@ -3,7 +3,7 @@
 
     <!-- 地址选择区 -->
     <view class="address-section">
-      <view class="address-item address-send">
+      <view class="address-item address-send" @click="changeAddress('send')">
         <view class="address-label">
           <view class="label-text" style="color: #1abc9c">发</view>
         </view>
@@ -16,7 +16,7 @@
         </view>
       </view>
 
-      <view class="address-item address-receive">
+      <view class="address-item address-receive" @click="changeAddress('receive')">
         <view class="address-label">
           <view class="label-text" style="color: #e74c3c">收</view>
         </view>
@@ -217,8 +217,6 @@ export default {
     // 从路由参数获取订单ID,可用于后续加载真实数据
     if (options && options.orderId) {
       this.orderId = options.orderId;
-      this.loadOrderData();
-      this.handleLoadDelivery();
     }
 
     //返回订单列表页时不需要刷新
@@ -227,6 +225,10 @@ export default {
     prevPage.$vm.refreshPage = 0
 
   },
+  onShow() {
+    this.loadOrderData();
+    this.handleLoadDelivery();
+  },
   created() {
       if (this.deliveryList.length > 0 && !this.selectedDelivery) {
           this.selectedDelivery = this.deliveryList[0].name;
@@ -280,6 +282,16 @@ export default {
   methods: {
     init() {},
 
+    // 修改发货与收货地址
+    changeAddress(type) {
+      if(type == 'receive') {
+        uni.navigateTo({url: '/admin/order/modify?id='+this.orderId})
+      }
+
+      if(type == 'send') {
+        uni.navigateTo({url: '/admin/shop/add?id='+this.getLoginInfo.shopId})
+      }
+    },
     // 清空运力列表
     clearDeliveryList() {
       this.deliveryList = [];

+ 1 - 1
hdApp/src/admin/ll/eventDetail.vue

@@ -24,7 +24,7 @@
 				<view class="order-info_box">
 					<view>失信证据:</view>
 					<view>
-						<image :src="item" v-for="(item, index) in eventInfo.proveSmall" mode="widthFix" 
+						<image :src="item" v-for="(item, index) in eventInfo.proveSmall" :key="index" mode="widthFix" 
 						style="width:90upx;height:90upx;display:inline-block;float:right;margin-left:10upx;" @click="showImg(index)"></image>
 					</view>
 				</view>

+ 2 - 2
hdApp/src/admin/order/detail.vue

@@ -47,7 +47,7 @@
           <view class="goods-list" v-if="!$util.isEmpty(orderInfo.goodsInfoList)">
             <detailGoods 
               v-for="(item, index) in orderInfo.goodsInfoList" 
-              :key="`goods-${index}`" 
+              :key="index" 
               :info="item">
             </detailGoods>
           </view>
@@ -56,7 +56,7 @@
           <view class="items-list" v-if="!$util.isEmpty(orderInfo.itemInfoList)">
             <detailItem 
               v-for="(item, index) in orderInfo.itemInfoList" 
-              :key="`item-${index}`" 
+              :key="index" 
               :info="item">
             </detailItem>
           </view>