From 1e416312bf77006cffa23d1e680bc85b28ea867f Mon Sep 17 00:00:00 2001
From: F5VT98DI7XY4X12\Administrator <765199919@qq.com>
Date: Wed, 4 Sep 2019 23:39:10 +0800
Subject: [PATCH] 物流的正确显示

---
 pages/user/express/express.js   |  4 ++--
 pages/user/express/express.wxml | 15 ++++++++++-----
 pages/user/express/express.wxss |  3 ++-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/pages/user/express/express.js b/pages/user/express/express.js
index b3aed38..9b057a8 100644
--- a/pages/user/express/express.js
+++ b/pages/user/express/express.js
@@ -27,9 +27,9 @@ Page({
         wx.request({
             url: this.data.url + "/api/weshop/order/wuliu/" + this.data.delivery.shipping_code + "/" + this.data.delivery.invoice_no,                 success: function(e) {
                 
-              console.log("success", e.data.data.data);
+              console.log("success", e.data.data);
                 s.setData({
-                    express: e.data.data,
+                  express: e.data.data,
                 });
             },
             fail: function(s) {
diff --git a/pages/user/express/express.wxml b/pages/user/express/express.wxml
index a77365a..cfca05c 100644
--- a/pages/user/express/express.wxml
+++ b/pages/user/express/express.wxml
@@ -10,13 +10,18 @@
 </view>
 <view class="apply-state">
     <view class="state-item">
-        <view class="item-wrap" wx:if="{{express.status!='200'}}">
-            <view class="state-title">{{express.message}}</view>
+        <view class="item-wrap">
+
+
+            <view wx:if="{{express.State==2}}" class="state-title">在途中</view>
+            <view wx:if="{{express.State==3}}" class="state-title">已签收</view>
+            <view wx:if="{{express.State==4}}" class="state-title">问题件</view>
             <view class="state-time">{{'    '}}</view>
         </view>
-        <view class="item-wrap" wx:for="{{express.data}}" wx:key="{{index}}">
-            <view class="state-title">{{item.context}}</view>
-            <view class="state-time">{{item.time}}</view>
+
+        <view class="item-wrap" wx:for="{{express.Traces}}" wx:key="{{index}}">
+            <view class="state-title">{{item.AcceptStation}}</view>
+            <view class="state-time">{{item.AcceptTime}}</view>
         </view>
     </view>
 </view>
diff --git a/pages/user/express/express.wxss b/pages/user/express/express.wxss
index 80720f1..b2018f7 100644
--- a/pages/user/express/express.wxss
+++ b/pages/user/express/express.wxss
@@ -27,7 +27,7 @@
 
 .state-item {
     border-left: 1px solid #ccc;
-    padding-left: 40rpx;
+    padding:0 40rpx;
 }
 
 .item-wrap {
@@ -57,4 +57,5 @@
     font-weight: bold;
     color: #666;
     padding-bottom: 20rpx;
+    line-height: 40rpx
 }
\ No newline at end of file
--
libgit2 0.21.4