From ce428b7ff837a77e3ead76feadc51f38aa25af03 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Sat, 14 Sep 2024 17:08:46 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A=E3=80=90=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=BE=85=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E5=92=8C=E5=BE=85=E8=AF=84=E4=BB=B7=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E5=A2=9E=E5=8A=A0=E7=89=A9=E6=B5=81=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=98=BE=E7=A4=BA=EF=BC=88=E8=93=9D=E6=B9=96=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C=E5=9B=BE=E5=B7=B2=E6=9B=B4=E6=96=B0=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/MyOrder/index.vue      |  4 ++--
 pages/order/OrderDetails/index.vue | 37 ++++++++++++++++++++++++++----
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index fe1e682..b0df1c1 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -253,7 +253,7 @@ export default {
     passkeyborad
   },
   computed: mapGetters(["userInfo"]),
-  onShow: function () {
+  onShow() {
     this.type = this.type || parseInt(this.$yroute.query.type) || 0;
     this.changeType(this.type);
     this.getOrderData();
@@ -262,7 +262,7 @@ export default {
       this.addressId = res.id
     })
   },
-  onHide: function () {
+  onHide() {
     this.orderList = [];
     this.page = 1;
     this.limit = 20;
diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue
index 610d94f..b5dabe4 100644
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@@ -27,7 +27,7 @@
     </view>
 
     <!-- <view class="reject-reason" v-if="orderInfo._status._type==-3 && orderInfo.refundRejectReason">驳回原因：{{ orderInfo.refundRejectReason }}</view> -->
-    <view class="v12-radius-20 v12-white v12-pa-3 v12-mt-4" v-if="orderInfo._status._type == 3 || (orderInfo._status._type == 2 && orderInfo.isTickets!==1)">
+    <view @click="goLogistics(orderInfo)" class="v12-radius-20 v12-white v12-pa-3 v12-mt-4" v-if="orderInfo._status._type == 3 || (orderInfo._status._type == 2 && orderInfo.isTickets!==1)">
       <view >
         <text class="v12-secondary-dark-text v12-font-28">{{ orderInfo.deliveryName }}：{{ orderInfo.deliveryId }}</text>
         <text class="v12-font-22 v12-px-2 v12-py-1 v12-ml-1 v12-primary-text v12-primary-border v12-radius-40" @click="copyClipboard(orderInfo.orderId)">
@@ -39,7 +39,7 @@
           <view class="v12-align-center v12-mr-2">
             <image class="logo" :src="webUrl+'/orderIcon/car.png'" mode="" style="margin-right:0; width: 32rpx; height:32rpx"/>
           </view>
-          <view class="v12-font-28">{{ orderInfo.deliverySn }}</view>
+          <view class="v12-font-28">{{ logistics.reason }}</view>
         </view>
         <view>
           <uni-icons type="right" size="20" color="#707070"></uni-icons>
@@ -421,7 +421,7 @@
 <script>
 import passkeyborad from '@/components/yzc-paykeyboard/yzc-paykeyboard'
 import OrderGoods from "@/components/OrderGoods";
-import {orderDetail, orderDelay, aginConfirm} from "@/api/order";
+import {orderDetail, orderDelay, aginConfirm, express} from "@/api/order";
 import Payment from "@/components/Payment";
 import DataFormat from "@/components/DataFormat";
 import {copyClipboard} from "@/utils";
@@ -476,7 +476,8 @@ export default {
       mapShow: false,
       payPassword: null,
       webUrl: this.$VUE_APP_RESOURCES_URL,
-      pageKeyId: Object.freeze('userOrderInfo')
+      pageKeyId: Object.freeze('userOrderInfo'),
+      logistics: {}
     };
   },
   computed: {
@@ -492,9 +493,37 @@ export default {
   // inject: ["app"],
   mounted: function () {
     this.id = this.$yroute.query.id;
+    this.getExpressInfo()
   },
   methods: {
     copyClipboard,
+    getExpressInfo() {
+      let params = {
+        orderCode: this.orderInfo.id,
+        shipperCode: this.orderInfo.deliverySn,
+        logisticCode: this.orderInfo.deliveryId
+      };
+      express(params)
+        .then(res => {
+          this.logistics = res.data
+        })
+        .catch(err => {
+          uni.showToast({
+            title:
+              err.msg || err.response.data.msg || err.response.data.message,
+            icon: "none",
+            duration: 2000
+          });
+        });
+    },
+    goLogistics(order) {
+      this.$yrouter.push({
+        path: "/pages/order/Logistics/index",
+        query: {
+          id: order.orderId
+        }
+      });
+    },
     buyAgin() {
       const params = {
         orderId: this.orderInfo.orderId