Przeglądaj źródła

Merge branch 'zhongqi-delivery' of http://git.huaml.com/zhh/front-end into zhongqi-delivery

shish 7 miesięcy temu
rodzic
commit
be3bc341f9

+ 14 - 7
ghsApp/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>
@@ -168,9 +168,6 @@ export default {
             address: ''
         },
         deliveryList: [],
-        //     { name: '闪送', price: '19.00', type: '两轮' },
-        //     { name: '达达秒送', price: '11.30', type: '团送' },
-        // ],
         weight: 1,
         pickupTime: {
             label: '立即取件',
@@ -220,8 +217,6 @@ export default {
     // 从路由参数获取订单ID,可用于后续加载真实数据
     if (options && options.orderId) {
       this.orderId = options.orderId;
-      this.loadOrderData();
-      this.handleLoadDelivery();
     }
 
 		//返回订单列表页不需要刷新
@@ -230,6 +225,10 @@ export default {
 		prevPage.$vm.fromDetail = {status:1}
 
   },
+  onShow() {
+    this.loadOrderData();
+    this.handleLoadDelivery();
+  },
   created() {
       if (this.deliveryList.length > 0 && !this.selectedDelivery) {
           this.selectedDelivery = this.deliveryList[0].name;
@@ -282,7 +281,15 @@ export default {
   },
   methods: {
     init() {},
+    changeAddress(type) {
+      if(type == 'receive') {
+        uni.navigateTo({url: '/pagesOrder/modify?id='+this.orderId})
+      }
 
+      if(type == 'send') {
+        uni.navigateTo({url: '/admin/shop/add?id='+this.getLoginInfo.shopId})
+      }
+    },
     // 清空运力列表
     clearDeliveryList() {
       this.deliveryList = [];

+ 1 - 1
ghsApp/src/pagesOrder/detail.vue

@@ -1587,7 +1587,7 @@ export default {
 
 <style lang="scss" scoped>
 .info-content_box {
-	padding: 0 20upx 100upx;
+	padding: 1rpx 20rpx 100rpx;
 
 	.order-msg-blo {
 		.msg-list {