From 453a999bc6a1712b9267baaa8492807ed406d24b Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Sun, 6 Jan 2019 18:48:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/appmini/old/wechat/pages/cart/cart.js   | 4 ++--
 public/appmini/old/wechat/pages/cart/cart.wxml | 8 ++++----
 public/appmini/old/wechat/pages/cart/cart.wxss | 6 ++++--
 public/appmini/old/wechat/pages/user/user.js   | 1 +
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/public/appmini/old/wechat/pages/cart/cart.js b/public/appmini/old/wechat/pages/cart/cart.js
index 64d6862f8..2cae0978b 100755
--- a/public/appmini/old/wechat/pages/cart/cart.js
+++ b/public/appmini/old/wechat/pages/cart/cart.js
@@ -33,7 +33,7 @@ Page({
             });
           } else {
             this.setData({
-              data_list_loding_status: 2,
+              data_list_loding_status: 0,
               data_bottom_line_status: false,
               data_list_loding_msg: '请先' + msg,
             });
@@ -72,7 +72,7 @@ Page({
             data_list: data,
             data_list_loding_status: data.length == 0 ? 0 : 3,
             data_bottom_line_status: true,
-            data_list_loding_msg: '',
+            data_list_loding_msg: '购物车空空如也',
           });
         } else {
           this.setData({
diff --git a/public/appmini/old/wechat/pages/cart/cart.wxml b/public/appmini/old/wechat/pages/cart/cart.wxml
index 74caee2b5..4abdcffa5 100755
--- a/public/appmini/old/wechat/pages/cart/cart.wxml
+++ b/public/appmini/old/wechat/pages/cart/cart.wxml
@@ -58,10 +58,10 @@
 <!-- 空购物车 -->
 <view wx:if="{{data_list.length == 0 && data_list_loding_status == 0}}" class="no-data-box tc">
   <image src="/images/default-cart-empty.png" mode="widthFix" />
-  <view class="no-data-tips">购物车空空如也</view>
-  <button type="default" class="my-btn-default" hover-class="none">
-    <navigator url="/pages/index/index" open-type="switchTab" hover-class="none">去逛逛</navigator>
-  </button>
+  <view class="no-data-tips">{{data_list_loding_msg || '购物车空空如也'}}</view>
+  <navigator url="/pages/index/index" open-type="switchTab"  hover-class="none">
+    <button type="default" class="my-btn-default" hover-class="none">去逛逛</button>
+  </navigator>
 </view>
 
 <view wx:if="{{data_list.length == 0 && data_list_loding_status != 0}}">
diff --git a/public/appmini/old/wechat/pages/cart/cart.wxss b/public/appmini/old/wechat/pages/cart/cart.wxss
index cc8827678..e10d68fe2 100755
--- a/public/appmini/old/wechat/pages/cart/cart.wxss
+++ b/public/appmini/old/wechat/pages/cart/cart.wxss
@@ -83,9 +83,11 @@
     font-size: 28rpx;
     color: #a6a6a6;
 }
-.no-data-box button {
-  margin: 0 auto;
+.no-data-box navigator {
   width: 220rpx;
+  margin: 0 auto;
+}
+.no-data-box button {
   height: 60rpx;
   line-height: 60rpx;
   font-size: 28rpx;
diff --git a/public/appmini/old/wechat/pages/user/user.js b/public/appmini/old/wechat/pages/user/user.js
index c26eb3dbf..64936fcc5 100755
--- a/public/appmini/old/wechat/pages/user/user.js
+++ b/public/appmini/old/wechat/pages/user/user.js
@@ -72,6 +72,7 @@ Page({
             avatar: user.avatar || app.data.default_user_head_src,
             nickname: user.nickname,
           });
+          wx.stopPullDownRefresh();
         },
       });
     } else {
-- 
GitLab