From 6e92e7162c58cfc1f41811f73d527a813a446394 Mon Sep 17 00:00:00 2001
From: sin <2943460818@qq.com>
Date: Sat, 27 Apr 2019 16:31:07 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E7=94=B3=E8=AF=B7=E9=80=80=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 和物流
---
 mobile-web/src/api/order.js                   | 14 +++-
 mobile-web/src/config/router.js               |  2 +-
 mobile-web/src/page/user/aftersale/detail.vue | 55 ++++++++++++----
 mobile-web/src/page/user/aftersale/track.vue  | 64 ++++++++++++-------
 mobile-web/src/page/user/order/info.vue       |  2 +-
 mobile-web/src/page/user/order/logistics.vue  |  4 +-
 6 files changed, 99 insertions(+), 42 deletions(-)

diff --git a/mobile-web/src/api/order.js b/mobile-web/src/api/order.js
index 0ae3e2427..1f5c07918 100644
--- a/mobile-web/src/api/order.js
+++ b/mobile-web/src/api/order.js
@@ -133,9 +133,9 @@ export function getCartCalcSkuPrice(skuId) {
 
 // 物流信息
 
-export function getLogisticsInfo(params) {
+export function getOrderLogisticsInfo(params) {
   return request({
-    url: '/order-api/users/order_logistics/logistics_info',
+    url: '/order-api/users/order_logistics/info_order',
     method: 'get',
     params: {
       ...params,
@@ -143,6 +143,16 @@ export function getLogisticsInfo(params) {
   });
 }
 
+export function getLogisticsInfo(logisticsId) {
+  return request({
+    url: '/order-api/users/order_logistics/info',
+    method: 'GET',
+    params: {
+      logisticsId,
+    },
+  });
+}
+
 
 // 退货信息
 
diff --git a/mobile-web/src/config/router.js b/mobile-web/src/config/router.js
index 381d4f407..5067fc8c0 100644
--- a/mobile-web/src/config/router.js
+++ b/mobile-web/src/config/router.js
@@ -147,7 +147,7 @@ const routes = [
     }
   },
   {
-    path: '/user/aftersale/track/:id',
+    path: '/user/aftersale/track/:id/:serviceNumber',
     component: () => import('../page/user/aftersale/track'),
     meta: {
       title: '进度详情'
diff --git a/mobile-web/src/page/user/aftersale/detail.vue b/mobile-web/src/page/user/aftersale/detail.vue
index d4a5ea46c..7019f18f0 100644
--- a/mobile-web/src/page/user/aftersale/detail.vue
+++ b/mobile-web/src/page/user/aftersale/detail.vue
@@ -1,16 +1,32 @@
 <template>
   <div>
     <headerNav title="服务单详情"/>
-    <van-steps :active="active">
-      <van-step>提交申请</van-step>
-      <van-step>客服审核</van-step>
-      <van-step>客户确认</van-step>
-      <van-step>仓库收货</van-step>
-      <van-step>完成</van-step>
-    </van-steps>
 
-    <van-cell class="logistics" to="/user/aftersale/track/1" title="您的服务单435703816的商品已收到"
-              label="2018-08-31 21:04:03" is-link/>
+    <div v-if="serviceType === 1">
+      <van-steps :active="active">
+        <van-step>提交申请</van-step>
+        <van-step>客服审核</van-step>
+        <van-step>客户确认</van-step>
+        <van-step>仓库收货</van-step>
+        <van-step>完成</van-step>
+
+      </van-steps>
+
+      <van-cell class="logistics"
+                :to="`/user/aftersale/track/${lastLogisticsInfo.id}/${serviceNumber}`"
+                :title="lastLogisticsDetail.logisticsInformation"
+                :label="lastLogisticsDetail.logisticsTimeText" is-link/>
+    </div>
+
+    <div v-if="serviceType === 2">
+      <van-steps v-if="serviceType === 2" :active="active">
+        <van-step>提交申请</van-step>
+        <van-step>客服审核</van-step>
+        <van-step>客户确认</van-step>
+        <van-step>仓库收货</van-step>
+        <van-step>完成</van-step>
+      </van-steps>
+    </div>
 
     <div style="height:15px;"></div>
     <div v-for="(product,i) in products" :key="i">
@@ -21,7 +37,8 @@
     <van-cell-group>
       <van-cell title="服务单号" :value="serviceNumber"/>
       <van-cell title="申请时间" :value="applyTime"/>
-      <van-cell title="服务类型" :value="serviceType"/>
+      <van-cell title="服务类型" :value="serviceTypeText"/>
+      <van-cell title="退款金额" :value="refundPrice / 100"/>
     </van-cell-group>
     <div style="height:15px;"></div>
 
@@ -45,6 +62,10 @@
         serviceNumber: -1,
         applyTime: '-1',
         serviceType: '',
+        serviceTypeText: '',
+        refundPrice: 0,
+        lastLogisticsInfo: {},
+        lastLogisticsDetail: {},
         products: [
           {
             imageURL: 'https://pop.nosdn.127.net/19e33c9b-6c22-4a4b-96da-1cb7afb32712',
@@ -59,10 +80,20 @@
       const { orderId } = this.$route.params;
       getOrderReturnInfo(orderId).then(res => {
         console.log('getOrderReturnInfo success', res)
-        const { returnInfo, orderItems } = res;
-        this.serviceType = returnInfo.serviceTypeText
+        const { returnInfo, orderItems, lastLogisticsInfo } = res;
+        this.lastLogisticsInfo = lastLogisticsInfo
+        if (lastLogisticsInfo && lastLogisticsInfo.lastLogisticsDetail) {
+          const lastLogisticsDetail = lastLogisticsInfo.lastLogisticsDetail;
+          this.lastLogisticsDetail = {
+            ...lastLogisticsDetail,
+            logisticsTimeText: moment(lastLogisticsDetail.logisticsTime).format("YYYY-MM-DD HH:mm"),
+          }
+        }
+        this.serviceType = returnInfo.serviceType
+        this.serviceTypeText = returnInfo.serviceTypeText
         this.serviceNumber = returnInfo.serviceNumber
         this.applyTime = moment(returnInfo.createTime).format("YYYY-MM-DD HH:mm")
+        this.refundPrice = returnInfo.refundPrice
         this.products = orderItems.map(item => {
           return {
             ...item,
diff --git a/mobile-web/src/page/user/aftersale/track.vue b/mobile-web/src/page/user/aftersale/track.vue
index c6d12b0e7..b9719176b 100644
--- a/mobile-web/src/page/user/aftersale/track.vue
+++ b/mobile-web/src/page/user/aftersale/track.vue
@@ -1,32 +1,48 @@
 <template>
-    <div  style="background: #f7f7f7;">
-        <headerNav title="进度详情"/>
-        
-        <van-cell-group>
-            <van-cell title="服务单号" value="18081609422771742" />
-        </van-cell-group>
-        <van-steps direction="vertical" :active="0" active-color="#f60" style="margin-top: 15px;">
-            <van-step>
-                <h3>您的服务单435703816的商品已收到</h3>
-                <p>2016-07-12 12:40</p>
-            </van-step>
-            <van-step>
-                <h3>【城市】物流状态2</h3>
-                <p>2016-07-11 10:00</p>
-            </van-step>
-            <van-step>
-                <h3>快件已发货</h3>
-                <p>2016-07-10 09:30</p>
-            </van-step>
-        </van-steps>
-        
-    </div>
+  <div style="background: #f7f7f7;">
+    <headerNav title="进度详情"/>
+
+    <van-cell-group>
+      <van-cell title="服务单号" :value="serviceNumber"/>
+    </van-cell-group>
+    <van-steps direction="vertical" :active="0" active-color="#f60" style="margin-top: 15px;">
+      <van-step v-for="(item, itemIndex) in details" :key="detailIndex">
+        <h3>{{item.logisticsInformation}}</h3>
+        <p>{{item.logisticsTimeText}}</p>
+      </van-step>
+    </van-steps>
+
+  </div>
 </template>
 
 <script>
-export default {
 
-}
+  import moment from 'moment';
+  import { getLogisticsInfo } from '../../../api/order';
+
+  export default {
+    data() {
+      return {
+        serviceNumber: '',
+        details: [],
+      }
+    },
+    mounted() {
+      console.log(this.$route.params)
+      const { id, serviceNumber } = this.$route.params;
+      this.serviceNumber = serviceNumber
+      getLogisticsInfo(id).then(res => {
+        const { details } = res;
+
+        this.details = details.map(item => {
+          return {
+            ...item,
+            logisticsTimeText: moment(item.logisticsTime).format("YYYY-MM-DD HH:mm")
+          }
+        })
+      })
+    },
+  }
 </script>
 
 <style>
diff --git a/mobile-web/src/page/user/order/info.vue b/mobile-web/src/page/user/order/info.vue
index 7ed47baa6..bd2a5fe6c 100644
--- a/mobile-web/src/page/user/order/info.vue
+++ b/mobile-web/src/page/user/order/info.vue
@@ -8,7 +8,7 @@
     </van-steps>
     <van-cell v-if="orderInfo.status >= 2 "
               class="logistics"
-              to="/user/order/logistics/1"
+              :to="`/user/order/logistics/${orderInfo.id}`"
               :title="latestLogisticsDetail.logisticsInformation"
               :label="latestLogisticsDetail.logisticsTimeText"
               icon="logistics"
diff --git a/mobile-web/src/page/user/order/logistics.vue b/mobile-web/src/page/user/order/logistics.vue
index 3b6e0650a..6add9d966 100644
--- a/mobile-web/src/page/user/order/logistics.vue
+++ b/mobile-web/src/page/user/order/logistics.vue
@@ -24,7 +24,7 @@
 </template>
 
 <script>
-  import { getLogisticsInfo } from '../../../api/order';
+  import { getOrderLogisticsInfo } from '../../../api/order';
 
   export default {
     data() {
@@ -36,7 +36,7 @@
     },
     mounted() {
       const { id } = this.$route.params;
-      getLogisticsInfo({
+      getOrderLogisticsInfo({
         orderId: id,
       }).then(res => {
         const { orderId, orderNo, logistics } = res;