From c525464a07a15f728a0089171dabfa3e184e3713 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@yolipai.com>
Date: Sat, 16 Nov 2019 16:17:47 +0800
Subject: [PATCH] 注册绑定的修改， 我的评价的修改， 我的订单列表的修改

---
 pages/getphone/getphone.js            | 1 +
 pages/user/comment/comment.js         | 4 +++-
 pages/user/order_list/order_list.wxml | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pages/getphone/getphone.js b/pages/getphone/getphone.js
index b3e2ff5..76a4154 100644
--- a/pages/getphone/getphone.js
+++ b/pages/getphone/getphone.js
@@ -17,6 +17,7 @@ Page({
     var openid = getApp().globalData.openid;
        
     if (openid == "" || openid == null) {
+		
       if (getApp().globalData.userInfo)
           openid = getApp().globalData.userInfo.weapp_openid;
     }
diff --git a/pages/user/comment/comment.js b/pages/user/comment/comment.js
index daef162..cb15337 100644
--- a/pages/user/comment/comment.js
+++ b/pages/user/comment/comment.js
@@ -91,8 +91,10 @@ Page({
 
             if(!com_data) com_data=rs_data;
             else com_data=  com_data.concat(rs_data);
-            th.setData({ comments: com_data,  isloaded: 1, })
+            th.setData({ comments: com_data })		
         }
+		
+		th.setData({isloaded: 1,})
     },
 
   onReachBottom: function() {
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index 8cc723c..5b6d399 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -24,10 +24,10 @@
         <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">待收货</view>
         <view wx:if="{{(item.order_status==2)}}">待评价</view>
         <view wx:if="{{item.order_status==4}}">已评价</view>
-        <view wx:if="{{item.order_status==3}}">已取消</view>
+        <view wx:if="{{item.order_status==3 && item.pt_status!=6}}">已取消</view>
         <view wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">待支付尾款</view>
         <view wx:if="{{item.order_status==6}}">退款成功</view>
-        <view wx:if="{{item.pt_status==6}}">支付尾款失败</view>
+        <view wx:if="{{item.pt_status==6}}"><text style="font-size: 26rpx;">支付尾款失败</text></view>
       </block>
       <block wx:else>退款中</block>
       <view class="flex" wx:if="{{(item.order_status==0&&item.pay_status==0)}}">
--
libgit2 0.21.4