From 20d25ed34f39fdf1970175fa3e6b6fbb38b8c6a3 Mon Sep 17 00:00:00 2001
From: F5VT98DI7XY4X12\Administrator <765199919@qq.com>
Date: Thu, 5 Sep 2019 10:07:29 +0800
Subject: [PATCH] 物流，会员中心首页，订单详情，订单列表，权益中心的样式

---
 pages/user/express/express.js           |  5 +++--
 pages/user/express/express.wxml         | 18 ++++++++++++------
 pages/user/index/index.wxss             |  6 ++++--
 pages/user/order_detail/order_detail.js |  2 +-
 pages/user/order_list/order_list.js     |  2 +-
 pages/user/userqy/userqy.wxml           |  2 +-
 pages/user/userqy/userqy.wxss           |  2 +-
 7 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/pages/user/express/express.js b/pages/user/express/express.js
index 9b057a8..8a04054 100644
--- a/pages/user/express/express.js
+++ b/pages/user/express/express.js
@@ -6,6 +6,7 @@ Page({
         resourceUrl: e.globalData.setting.imghost,
         delivery: null,
         express: null,
+        re_arr:null,//反转后的数组
         error: "快递信息异常"
     },
     onLoad: function(e) {
@@ -27,9 +28,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);
+               var re_arr = e.data.data.Traces.reverse();
                 s.setData({
-                  express: e.data.data,
+                  express: e.data.data, re_arr: re_arr,
                 });
             },
             fail: function(s) {
diff --git a/pages/user/express/express.wxml b/pages/user/express/express.wxml
index cfca05c..8015e35 100644
--- a/pages/user/express/express.wxml
+++ b/pages/user/express/express.wxml
@@ -4,22 +4,28 @@
         <view class="logistics-cont">{{delivery.invoice_no}}</view>
     </view>
     <view class="logistics-num">
-        <view class="logistics-title">国内承运人 : </view>
+        <view class="logistics-title">承运公司 : </view>
         <view class="logistics-cont">{{delivery.shipping_name}}</view>
     </view>
+   
+     <view class="logistics-num">
+        <view  class="logistics-title">物流状态 : </view>
+        <view  wx:if="{{express.State==2}}" class="logistics-cont">在途中</view>
+        <view  wx:if="{{express.State==3}}" class="logistics-cont">已签收</view>
+        <view  wx:if="{{express.State==4}}" class="logistics-cont">问题件</view>
+    </view>
+
 </view>
 <view class="apply-state">
     <view class="state-item">
-        <view class="item-wrap">
-
-
+        <!-- <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> -->
 
-        <view class="item-wrap" wx:for="{{express.Traces}}" wx:key="{{index}}">
+        <view class="item-wrap" wx:for="{{re_arr}}" wx:key="{{index}}">
             <view class="state-title">{{item.AcceptStation}}</view>
             <view class="state-time">{{item.AcceptTime}}</view>
         </view>
diff --git a/pages/user/index/index.wxss b/pages/user/index/index.wxss
index 36ef8b2..f1e49eb 100644
--- a/pages/user/index/index.wxss
+++ b/pages/user/index/index.wxss
@@ -42,9 +42,9 @@
 }
 .xc-uesr-name{
 	color: #fff;
-	font-size: 35rpx;
+	font-size: 32rpx;
 	margin-top:17rpx;
-    margin-left:20rpx;
+  margin-left:20rpx;
 
 }
 .xc-user-grade{
@@ -525,6 +525,8 @@ border-radius:20rpx;
 background:#ffbdce;
 padding-left: 16rpx;
 padding-right: 16rpx;padding-bottom: 3rpx;
+margin-right: 5rpx;
+
 }
 
 .hvip{display: inline-block; font-size: 20rpx; height: 40rpx;line-height: 40rpx; color:#e7bf77; background: #383838; padding: 0 15rpx; border-radius:20rpx; vertical-align: middle }
diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index 30f0417..d840150 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -137,7 +137,7 @@ Page({
         var t = this, o = this.data.order.order_id,order=this.data.order;
         var is_zsorder=order.is_zsorder;
         wx.showModal({
-            title: "是否确定收货",
+            title: "是否确认收货?",
             success: function(e) {
               e.confirm && r.put("/api/weshop/order/updatebyId", {
                     data: {
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index e2763f6..88f202a 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -234,7 +234,7 @@ Page({
         console.log(is_zsorder);
 
         wx.showModal({
-            title: "是否确定收货",
+            title: "是否确认收货?",
             success: function(t) {
               t.confirm && rq.put("/api/weshop/order/updatebyId", {
                     data: {
diff --git a/pages/user/userqy/userqy.wxml b/pages/user/userqy/userqy.wxml
index 8419f4e..78ca589 100644
--- a/pages/user/userqy/userqy.wxml
+++ b/pages/user/userqy/userqy.wxml
@@ -40,7 +40,7 @@
                         [{{item.GradeName}}]365天累计成长值≥{{item.BuyGradeSum }}可保级
                     </block>
                 </view>
-                <view class=" abs white discounts four-level-word" wx:if="{{gradeId==item.Id}}">会员将在{{filter.replace_time(gradeEndDate)}}到期，<text wx:if="{{need_money>0}}">365天累计成长值≥{{need_money}}可升级[{{ backClass[index+1].GradeName}}]</text><text wx:else >[{{item.GradeName}}]365天累计成长值≥{{item.BuyGradeSum}}可保级</text>
+                <view class=" abs white discounts four-level-word" wx:if="{{gradeId==item.Id}}">会员将在{{filter.replace_time2(gradeEndDate)}}到期，<text wx:if="{{need_money>0}}">365天累计成长值≥{{need_money}}可升级[{{ backClass[index+1].GradeName}}]</text><text wx:else >[{{item.GradeName}}]365天累计成长值≥{{item.BuyGradeSum}}可保级</text>
                 </view>
                 <view class=" abs white discounts four-level-word" wx:if="{{gradeId!=item.Id && cz_val>item.BuyGradeSum }}">
                     [{{item.GradeName}}]365天累计成长值≥{{backClass[index+1].BuyGradeSum }}可升级[{{ backClass[index+1].GradeName}}]
diff --git a/pages/user/userqy/userqy.wxss b/pages/user/userqy/userqy.wxss
index 22763a1..ac250b8 100644
--- a/pages/user/userqy/userqy.wxss
+++ b/pages/user/userqy/userqy.wxss
@@ -177,7 +177,7 @@ margin-top:60rpx;
 .li .discounts{
   top:115rpx;
   left: 36rpx;
-  width: 435rpx;
+  width: 440rpx;
 }
  .li .money{
     left: 41rpx;
--
libgit2 0.21.4