Commit c525464a07a15f728a0089171dabfa3e184e3713

Authored by 后端研发-倪永富
1 parent fac5922e

注册绑定的修改, 我的评价的修改, 我的订单列表的修改

pages/getphone/getphone.js
@@ -17,6 +17,7 @@ Page({ @@ -17,6 +17,7 @@ Page({
17 var openid = getApp().globalData.openid; 17 var openid = getApp().globalData.openid;
18 18
19 if (openid == "" || openid == null) { 19 if (openid == "" || openid == null) {
  20 +
20 if (getApp().globalData.userInfo) 21 if (getApp().globalData.userInfo)
21 openid = getApp().globalData.userInfo.weapp_openid; 22 openid = getApp().globalData.userInfo.weapp_openid;
22 } 23 }
pages/user/comment/comment.js
@@ -91,8 +91,10 @@ Page({ @@ -91,8 +91,10 @@ Page({
91 91
92 if(!com_data) com_data=rs_data; 92 if(!com_data) com_data=rs_data;
93 else com_data= com_data.concat(rs_data); 93 else com_data= com_data.concat(rs_data);
94 - th.setData({ comments: com_data, isloaded: 1, }) 94 + th.setData({ comments: com_data })
95 } 95 }
  96 +
  97 + th.setData({isloaded: 1,})
96 }, 98 },
97 99
98 onReachBottom: function() { 100 onReachBottom: function() {
pages/user/order_list/order_list.wxml
@@ -24,10 +24,10 @@ @@ -24,10 +24,10 @@
24 <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">待收货</view> 24 <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">待收货</view>
25 <view wx:if="{{(item.order_status==2)}}">待评价</view> 25 <view wx:if="{{(item.order_status==2)}}">待评价</view>
26 <view wx:if="{{item.order_status==4}}">已评价</view> 26 <view wx:if="{{item.order_status==4}}">已评价</view>
27 - <view wx:if="{{item.order_status==3}}">已取消</view> 27 + <view wx:if="{{item.order_status==3 && item.pt_status!=6}}">已取消</view>
28 <view wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">待支付尾款</view> 28 <view wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">待支付尾款</view>
29 <view wx:if="{{item.order_status==6}}">退款成功</view> 29 <view wx:if="{{item.order_status==6}}">退款成功</view>
30 - <view wx:if="{{item.pt_status==6}}">支付尾款失败</view> 30 + <view wx:if="{{item.pt_status==6}}"><text style="font-size: 26rpx;">支付尾款失败</text></view>
31 </block> 31 </block>
32 <block wx:else>退款中</block> 32 <block wx:else>退款中</block>
33 <view class="flex" wx:if="{{(item.order_status==0&&item.pay_status==0)}}"> 33 <view class="flex" wx:if="{{(item.order_status==0&&item.pay_status==0)}}">