Merge branch 'feature-zyw-sc' into 'dev_7.1.0'

Feature zyw sc

See merge request !93

src/pages/logistics/logistics.js

 // pages/logistics/logistics.js
-Page({
+const app = getApp()
+const wxService = require('../../utils/wxService')
+const utils = require('../../utils/util')
+const envInfo = require('../../config/index').envInfo
+
+wxService.page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    logisData:[
-      {
-        name:'1111'
-      },
-      {
-        name: '2222'
-      },
-      {
-        name: '3333'
-      },
-      {
-        name: '4444'
-      }
-    ]
+    logisData:[]
   },
 
   /**
@@ -32,13 +24,33 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    const { code } = this.options
+    const { code, logisticsNo} = this.options
     console.log('-----code----', code)
+    this.getLogisticsInfo(code, logisticsNo)
   },
 
   // 获取物流信息
-  getLogisticsInfo(){
-    
+  getLogisticsInfo(code,num){
+    wxService.get(`/sale/logistics/getLogisticsDetail?companyCode=${code}&logisticsNo=${num}`).then(res => {
+      if (!res) return false
+      const { result, data } = res.data
+      if (result == 0) {
+        console.log(data.list)
+        for (var i in data.list){
+          if (data.list[i].datetime){
+            data.list[i].date = data.list[i].datetime.substring(0,10)
+            data.list[i].time = data.list[i].datetime.substring(0, 10)
+          }
+        }
+        this.setData({
+          logisData: data
+        })
+        
+        
+      }
+
+    }).finally(() => {
+    })
   },
 
   copy(e) {

src/pages/logistics/logistics.wxml

@@ -4,15 +4,15 @@
   <view class="header-wrap">
     <image class="header-bg" src="/assets/imgs/7_1_0/logistics-bg.jpg"></image>
     <view class="logistics-status">
-      <view class="status">物流公司：</view>
-      <view class="desc">物流单号：4654657</view>
+      <view class="status">物流公司：{{logisData.company}}</view>
+      <view class="desc">物流单号：{{logisData.no}}</view>
       <view class="copy" bindtap="copy" data-content="89687687687687786">复制</view>
     </view>
   </view>
 
    <!-- 物流时间轴 -->
   <view class='expressRecord'>
-    <view class='expressRecord-single-close' wx:for="{{logisData}}" wx:key="{{index}}">
+    <view class='expressRecord-single-close' wx:for="{{logisData.list}}" wx:key="{{index}}">
       <view class='expressRecord-single-noReach-online-top-close'>
         <view class="online-top-close {{index ==0 ? 'online-top-closing' : ''}}" ></view>
         <view class="dot-icon">
@@ -36,20 +36,20 @@
           <image class="dot-icon-closing" src="/assets/imgs/7_1_0/trade-success.png"></image>
         </view>
         <view class='dot-close' wx:if="{{false}}"></view>
-        <view class="online-bottom {{index == logisData.length-1 ? 'online-top-closing' : ''}}" ></view>
+        <view class="online-bottom {{index == logisData.list.length-1 ? 'online-top-closing' : ''}}" ></view>
       </view>
 
       <view class='expressRecord-text'>
-        <view class='expressRecord-status'>111</view>
-        <view class='expressRecord-status-address'>武汉转运中心公司 已收入</view>
+        <view class='expressRecord-status'>{{item.remark}}</view>
+        <!-- <view class='expressRecord-status-address'>{{}}</view> -->
       </view>
 
       <view class='expressRecord-date'>
         <view class='expressRecord-date-text'>
-          {{item.name}}
+          {{item.time}}
         </view>
         <view class='expressRecord-date-time'>
-          20:37
+          {{item.date}}
         </view>
       </view>
     </view>

src/pages/logistics/logistics.wxss

@@ -230,7 +230,7 @@ page{
   height: 100%;
   /* top: 0;
   bottom: 0; */
-  left: 20rpx;
+  left: -23rpx;
   display: flex;
   align-items: center;
   justify-content: center;

src/pages/order/order.wxml

@@ -140,10 +140,14 @@
 							<button class="btn btn-sm btn-primary btn-outline" data-id="{{item.id}}" bindtap="handelToPay">立即支付</button>
 						</view>
 						<view class="order-status" wx-if="{{item.status == 'P'}}">
-							<button class="btn btn-sm btn-default" data-id="{{item.id}}">查看物流</button>
+              <navigator url="/pages/logistics/logistics?code={{item.logistic.supplierCode}}&logisticsNo={{item.logistic.code}}" hover-class="none">
+            	  <button class="btn btn-sm btn-default" data-id="{{item.id}}">查看物流</button>
+              </navigator>
 						</view>
 						<view class="order-status" wx-if="{{item.status == 'D'}}">
-							<button class="btn btn-sm btn-default" data-id="{{item.id}}">查看物流</button>
+              <navigator url="/pages/logistics/logistics?code={{item.logistic.supplierCode}}&logisticsNo={{item.logistic.code}}" hover-class="none">
+            	 <button class="btn btn-sm btn-default" data-id="{{item.id}}">查看物流</button>
+              </navigator>
 							<button class="btn btn-sm btn-primary btn-outline" data-id="{{item.id}}" bindtap="handelConfirmReceipt">确认收货</button>
 						</view>
 						<view class="order-status" wx-if="{{item.status == 'R'}}" />

src/pages/orderDetail/orderDetail.wxml

 <view class="page-order-detail">
 	<view class="header-wrap" style="background-image:url('/assets/imgs/7_1_0/rf_bgc.jpg')">
 		<view class="refund-status">
-			<view class="look-logistics">
-				<navigator url="/pages/logistics/logistics?code={{detail.logistic.supplierCode}}" hover-class="none">
+			<view class="look-logistics" wx-if="{{detail.status == 'D'}}">
+				<navigator url="/pages/logistics/logistics?code={{detail.logistic.supplierCode}}&logisticsNo={{detail.logistic.code}}" hover-class="none">
 					<button class="btn btn-primary btn-outline">查看物流</button>
 				</navigator>
 			</view>