From e1b8cd894e50103ebd54e4287eb710ce238cefd9 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Sun, 15 Mar 2020 23:20:22 +0800
Subject: [PATCH] =?UTF-8?q?yshop=E5=90=8E=E5=8F=B0=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=BA=86=E7=89=A9=E6=B5=81=E5=BF=AB=E9=80=92=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/yxStoreOrder.js         |  9 +++++++
 src/views/shop/order/detail.vue | 43 ++++++++++++++++++++++++++++++---
 src/views/shop/order/index.vue  |  2 ++
 3 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/src/api/yxStoreOrder.js b/src/api/yxStoreOrder.js
index bdd9775..67804fc 100644
--- a/src/api/yxStoreOrder.js
+++ b/src/api/yxStoreOrder.js
@@ -62,3 +62,12 @@ export function get() {
     method: 'get'
   })
 }
+
+export function express(data) {
+  return request({
+    url: 'api/yxStoreOrder/express',
+    method: 'post',
+    data
+  })
+}
+
diff --git a/src/views/shop/order/detail.vue b/src/views/shop/order/detail.vue
index 4375aa8..ac7d7fc 100644
--- a/src/views/shop/order/detail.vue
+++ b/src/views/shop/order/detail.vue
@@ -36,6 +36,24 @@
       </div>
       <div class="text item">快递公司:{{ form.deliveryName }}</div>
       <div class="text item">快递单号:{{ form.deliveryId }}</div>
+
+      <div><el-button :loading="loading" type="primary" @click="express">查看物流</el-button></div>
+      <div style="margin-top: 20px">
+      <el-timeline v-if="this.form.deliveryId && expressInfo.length > 0">
+        <el-timeline-item
+          v-for="(obj, index) in expressInfo"
+          :key="index"
+          :timestamp="obj.acceptTime"
+          >
+          {{obj.acceptStation}}
+        </el-timeline-item>
+      </el-timeline>
+      <el-timeline :reverse="false" v-else>
+        <el-timeline-item>
+          暂无物流信息
+        </el-timeline-item>
+      </el-timeline>
+      </div>
     </el-card>
     <el-card>
       <div slot="header">
@@ -47,7 +65,7 @@
 </template>
 
 <script>
-import { add, edit } from '@/api/yxStoreOrder'
+import { add, edit, express } from '@/api/yxStoreOrder'
 import { parseTime } from '@/utils/index'
 export default {
   props: {
@@ -58,7 +76,7 @@ export default {
   },
   data() {
     return {
-      loading: false, dialog: false,
+      loading: false, dialog: false, expressInfo: [],
       form: {
         id: '',
         orderId: '',
@@ -89,6 +107,7 @@ export default {
         refundReason: '',
         refundPrice: '',
         deliveryName: '',
+        deliverySn: '',
         deliveryType: '',
         deliveryId: '',
         gainIntegral: '',
@@ -122,7 +141,25 @@ export default {
   methods: {
     parseTime,
     cancel() {
-      this.resetForm()
+      this.dialog = false
+    },
+    express() {
+      let params ={
+        "orderCode": this.form.id,
+        "shipperCode": this.form.deliverySn,
+        "logisticCode": this.form.deliveryId
+      }
+
+      express(params).then(res=>{
+
+        console.log(res)
+        this.expressInfo = res.Traces
+
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+
     },
     doSubmit() {
       this.loading = true
diff --git a/src/views/shop/order/index.vue b/src/views/shop/order/index.vue
index 2461759..4c6a9c5 100644
--- a/src/views/shop/order/index.vue
+++ b/src/views/shop/order/index.vue
@@ -307,6 +307,7 @@ export default {
         refundReason: data.refundReason,
         refundPrice: data.refundPrice,
         deliveryName: data.deliveryName,
+        deliverySn: data.deliverySn,
         deliveryType: data.deliveryType,
         deliveryId: data.deliveryId,
         gainIntegral: data.gainIntegral,
@@ -541,6 +542,7 @@ export default {
         refundReason: data.refundReason,
         refundPrice: data.refundPrice,
         deliveryName: data.deliveryName,
+        deliverySn: data.deliverySn,
         deliveryType: data.deliveryType,
         deliveryId: data.deliveryId,
         gainIntegral: data.gainIntegral,