Commit 20d25ed34f39fdf1970175fa3e6b6fbb38b8c6a3
1 parent
1e416312
物流，会员中心首页，订单详情，订单列表，权益中心的样式
Showing
7 changed files
with
23 additions
and
14 deletions
pages/user/express/express.js
| ... | ... | @@ -6,6 +6,7 @@ Page({ |
| 6 | 6 | resourceUrl: e.globalData.setting.imghost, |
| 7 | 7 | delivery: null, |
| 8 | 8 | express: null, |
| 9 | + re_arr:null,//反转后的数组 | |
| 9 | 10 | error: "快递信息异常" |
| 10 | 11 | }, |
| 11 | 12 | onLoad: function(e) { |
| ... | ... | @@ -27,9 +28,9 @@ Page({ |
| 27 | 28 | wx.request({ |
| 28 | 29 | url: this.data.url + "/api/weshop/order/wuliu/" + this.data.delivery.shipping_code + "/" + this.data.delivery.invoice_no, success: function(e) { |
| 29 | 30 | |
| 30 | - console.log("success", e.data.data); | |
| 31 | + var re_arr = e.data.data.Traces.reverse(); | |
| 31 | 32 | s.setData({ |
| 32 | - express: e.data.data, | |
| 33 | + express: e.data.data, re_arr: re_arr, | |
| 33 | 34 | }); |
| 34 | 35 | }, |
| 35 | 36 | fail: function(s) { | ... | ... |
pages/user/express/express.wxml
| ... | ... | @@ -4,22 +4,28 @@ |
| 4 | 4 | <view class="logistics-cont">{{delivery.invoice_no}}</view> |
| 5 | 5 | </view> |
| 6 | 6 | <view class="logistics-num"> |
| 7 | - <view class="logistics-title">国内承运人 : </view> | |
| 7 | + <view class="logistics-title">承运公司 : </view> | |
| 8 | 8 | <view class="logistics-cont">{{delivery.shipping_name}}</view> |
| 9 | 9 | </view> |
| 10 | + | |
| 11 | + <view class="logistics-num"> | |
| 12 | + <view class="logistics-title">物流状态 : </view> | |
| 13 | + <view wx:if="{{express.State==2}}" class="logistics-cont">在途中</view> | |
| 14 | + <view wx:if="{{express.State==3}}" class="logistics-cont">已签收</view> | |
| 15 | + <view wx:if="{{express.State==4}}" class="logistics-cont">问题件</view> | |
| 16 | + </view> | |
| 17 | + | |
| 10 | 18 | </view> |
| 11 | 19 | <view class="apply-state"> |
| 12 | 20 | <view class="state-item"> |
| 13 | - <view class="item-wrap"> | |
| 14 | - | |
| 15 | - | |
| 21 | + <!-- <view class="item-wrap"> | |
| 16 | 22 | <view wx:if="{{express.State==2}}" class="state-title">在途中</view> |
| 17 | 23 | <view wx:if="{{express.State==3}}" class="state-title">已签收</view> |
| 18 | 24 | <view wx:if="{{express.State==4}}" class="state-title">问题件</view> |
| 19 | 25 | <view class="state-time">{{' '}}</view> |
| 20 | - </view> | |
| 26 | + </view> --> | |
| 21 | 27 | |
| 22 | - <view class="item-wrap" wx:for="{{express.Traces}}" wx:key="{{index}}"> | |
| 28 | + <view class="item-wrap" wx:for="{{re_arr}}" wx:key="{{index}}"> | |
| 23 | 29 | <view class="state-title">{{item.AcceptStation}}</view> |
| 24 | 30 | <view class="state-time">{{item.AcceptTime}}</view> |
| 25 | 31 | </view> | ... | ... |
pages/user/index/index.wxss
| ... | ... | @@ -42,9 +42,9 @@ |
| 42 | 42 | } |
| 43 | 43 | .xc-uesr-name{ |
| 44 | 44 | color: #fff; |
| 45 | - font-size: 35rpx; | |
| 45 | + font-size: 32rpx; | |
| 46 | 46 | margin-top:17rpx; |
| 47 | - margin-left:20rpx; | |
| 47 | + margin-left:20rpx; | |
| 48 | 48 | |
| 49 | 49 | } |
| 50 | 50 | .xc-user-grade{ |
| ... | ... | @@ -525,6 +525,8 @@ border-radius:20rpx; |
| 525 | 525 | background:#ffbdce; |
| 526 | 526 | padding-left: 16rpx; |
| 527 | 527 | padding-right: 16rpx;padding-bottom: 3rpx; |
| 528 | +margin-right: 5rpx; | |
| 529 | + | |
| 528 | 530 | } |
| 529 | 531 | |
| 530 | 532 | .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 } | ... | ... |
pages/user/order_detail/order_detail.js
| ... | ... | @@ -137,7 +137,7 @@ Page({ |
| 137 | 137 | var t = this, o = this.data.order.order_id,order=this.data.order; |
| 138 | 138 | var is_zsorder=order.is_zsorder; |
| 139 | 139 | wx.showModal({ |
| 140 | - title: "是否确定收货", | |
| 140 | + title: "是否确认收货?", | |
| 141 | 141 | success: function(e) { |
| 142 | 142 | e.confirm && r.put("/api/weshop/order/updatebyId", { |
| 143 | 143 | data: { | ... | ... |
pages/user/order_list/order_list.js
pages/user/userqy/userqy.wxml
| ... | ... | @@ -40,7 +40,7 @@ |
| 40 | 40 | [{{item.GradeName}}]365天累计成长值≥{{item.BuyGradeSum }}可保级 |
| 41 | 41 | </block> |
| 42 | 42 | </view> |
| 43 | - <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> | |
| 43 | + <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> | |
| 44 | 44 | </view> |
| 45 | 45 | <view class=" abs white discounts four-level-word" wx:if="{{gradeId!=item.Id && cz_val>item.BuyGradeSum }}"> |
| 46 | 46 | [{{item.GradeName}}]365天累计成长值≥{{backClass[index+1].BuyGradeSum }}可升级[{{ backClass[index+1].GradeName}}] | ... | ... |