From 1a1577819cc1c4f381c2d900c216a6ec2c162b9c Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Thu, 24 Jan 2019 10:33:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../old/alipay/pages/goods-category/goods-category.axml    | 2 +-
 public/appmini/old/alipay/pages/user/user.js               | 7 ++++---
 .../old/weixin/pages/goods-category/goods-category.wxml    | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/public/appmini/old/alipay/pages/goods-category/goods-category.axml b/public/appmini/old/alipay/pages/goods-category/goods-category.axml
index 8bdf088e2..7def3b54e 100755
--- a/public/appmini/old/alipay/pages/goods-category/goods-category.axml
+++ b/public/appmini/old/alipay/pages/goods-category/goods-category.axml
@@ -12,7 +12,7 @@
       <view class="content">
         <block a:if="{{item.items.length > 0}}">
           <view a:for="{{item.items}}" a:for-item="v" class="content-items" data-value="{{v.id}}" onTap="category_event">
-            <image a:if="{{v.icon != null}}" src="{{v.icon}}" mode="aspectFit" class="icon" />
+            <image a:if="{{(v.icon || null) != null}}" src="{{v.icon}}" mode="aspectFit" class="icon" />
             <view class="text single-text">{{v.name}}</view>
           </view>
         </block>
diff --git a/public/appmini/old/alipay/pages/user/user.js b/public/appmini/old/alipay/pages/user/user.js
index 6b0fb1c58..2e7e42925 100755
--- a/public/appmini/old/alipay/pages/user/user.js
+++ b/public/appmini/old/alipay/pages/user/user.js
@@ -56,10 +56,11 @@ Page({
       self = this;
     if (user != false) {
       // 用户未绑定用户则转到登录页面
+      var msg = (user == false) ? '授权用户信息' : '绑定手机号码';
       if ((user.mobile || null) == null) {
         my.confirm({
           title: '温馨提示',
-          content: '绑定手机号码',
+          content: msg,
           confirmButtonText: '确认',
           cancelButtonText: '暂不',
           success: (result) => {
@@ -70,9 +71,9 @@ Page({
             }
             self.setData({
               avatar: user.avatar || app.data.default_user_head_src,
-              nickname: user.nickname,
+              nickname: user.nickname || '',
             });
-            self.get_data();
+            my.stopPullDownRefresh();
           },
         });
       } else {
diff --git a/public/appmini/old/weixin/pages/goods-category/goods-category.wxml b/public/appmini/old/weixin/pages/goods-category/goods-category.wxml
index f55960e21..e982c592e 100755
--- a/public/appmini/old/weixin/pages/goods-category/goods-category.wxml
+++ b/public/appmini/old/weixin/pages/goods-category/goods-category.wxml
@@ -9,7 +9,7 @@
   <block wx:if="{{data_content.length > 0}}">
     <block wx:for="{{data_content}}" wx:key="keys" wx:for-item="v">
       <view class="content-items" data-value="{{v.id}}" bindtap="category_event">
-        <image wx:if="{{v.icon != null}}" src="{{v.icon}}" mode="aspectFit" class="icon" />
+        <image wx:if="{{(v.icon || null) != null}}" src="{{v.icon}}" mode="aspectFit" class="icon" />
         <view class="text single-text">{{v.name}}</view>
       </view>
     </block>
-- 
GitLab