Merge branch 'master' of http://gitlab.jiucaiyun.cn/sph/SH_OrderLifeCycleU

src/views/myOrder/detail/logisticsDetail.vue

@@ -134,6 +134,7 @@ export default {
           this.driveLine.endPoint.longitude = parseFloat(this.shippingInfo.longitude)
           this.driveLine.endPoint.latitude = parseFloat(this.shippingInfo.latitude)
 
+          console.log('--->', this.orderInfo.orderStatusCode)
           if (this.orderInfo.orderStatusCode > 300) {
             this.sendType = this.orderInfo.orderStatusCode === '310'
             this.getGpsPoint()

src/views/myOrder/detail/orderDetail.vue

@@ -276,7 +276,7 @@ export default {
         'pageSize': 20,
         'shippingAdress': '',
         'sort': '',
-        'sourceDb': 'SHYY',
+        'sourceDb': this.orderItem.sourceDb,
         'sourceOrderNo': '',
         'sourceSystem': '',
         'startDate': '',
@@ -306,6 +306,8 @@ export default {
           })
           // 最多显示3条数据
           this.detailData.goodsInfos = this.detailData.goodsInfos.slice(0, 3)
+          // 刷新传参中的订单状态
+          this.orderItem.orderStatusCode = this.detailData.orderStatusCode
         } else {
           console.log('订单详情', '请求失败')
           if (res.code === 500) {
@@ -370,7 +372,7 @@ export default {
         'pageNum': 1,
         'pageSize': 3,
         'sort': '',
-        'sourceDb': 'SHYY', // this.$route.query.sourceDb,
+        'sourceDb': this.$route.query.sourceDb,
         'startDate': '',
         'supplierId': []
       }