物流信息

pages/my/my_order/my_order.js

@@ -163,19 +163,19 @@ Page({
     })
   },
   viewLogisticsDetails(e) {
-    const { logisticsNum } = e.currentTarget.dataset
+    const { logisticsNum, logisticsName } = e.currentTarget.dataset
     wx.navigateTo({
-      url: `/pages/logistics_details/logistics_details`,
+      url: `/pages/logistics_details/logistics_details?logisticsNum=${logisticsNum}&logisticsName=${logisticsName}`,
     })
   },
 
   updateAddress(e) {
-    const { addressId, id: orderId } = e.currentTarget.dataset
+    const { id: orderId, orderAddress } = e.currentTarget.dataset
     this.setData({
       currentOrder: orderId
     })
     wx.navigateTo({
-      url: '/pages/my/my_address/my_address?orderAddress=true&addressId=' + addressId,
+      url: '/pages/my/my_address/my_address?orderAddress=true&updateAddress=true' + "&oriAddr=" + orderAddress,
     })
   },
   //查看进度
@@ -383,9 +383,18 @@ Page({
         addressId, orderId: currentOrder
       },
       success: (result) => {
-        wx.showToast({
-          title: result.data.message,
-        })
+        setTimeout(() => {
+          if (result.data.code == 1) {
+            wx.showToast({
+              title: result.data.message,
+            })
+          } else {
+            wx.showToast({
+              title: "服务器内部错误",
+              icon: "error"
+            })
+          }
+        }, 1500);
       }
     })
   },

pages/my/my_order/my_order.wxml

@@ -75,7 +75,7 @@
       您需要在<text style="color:#ee7b1e;">{{item.timeStr}}</text>内处理
     </view>
     <view class="btn display_J_E">
-      <view class="btn1" wx:if="{{item.status==3}}" data-item='{{item}}' data-logistics-num='{{item.logisticsNum}}' catchtap="viewLogisticsDetails">物流查询</view>
+      <view class="btn1" wx:if="{{item.status==3}}" data-item='{{item}}' data-logistics-num='{{item.logisticsNum}}' data-logistics-name="{{item.logisticsName}}" catchtap="viewLogisticsDetails">物流查询</view>
       <view class="btn1 btn2" wx:if="{{item.status==3}}" data-id='{{item.id}}' catchtap="confirm">确认收货</view>
       <view class="btn1" wx:if="{{item.status==1}}">立即支付</view>
       <view class="btn1" wx:if="{{item.status==4||item.status==5}}" catchtap="del" data-id='{{item.id}}' data-index="{{index}}">删除订单</view>
@@ -97,7 +97,7 @@
     </view>
     <!-- wx:if="{{item.status==2}}" -->
     <view class="btn display_J_E" style="margin-top: 24rpx;">
-      <view class="btn1 btn2" data-id='{{item.id}}' data-address-id="{{item.addressId}}" catchtap="updateAddress">
+      <view class="btn1 btn2" data-id='{{item.id}}' data-address-id="{{item.addressId}}" data-order-address="{{item.orderAddress}}" catchtap="updateAddress">
         修改地址</view>
     </view>
   </view>