From b92961efb993f939b64be5a41813714249e8690e Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@yolipai.com>
Date: Tue, 19 Nov 2019 16:43:23 +0800
Subject: [PATCH] 绑定会员的bug修复

---
 pages/getphone/getphone.js   |  6 +++++-
 pages/getphone/getphone.wxml |  1 +
 pages/getphone/getphone.wxss | 11 ++++++++++-
 pages/user/index/index.js    | 11 +++--------
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/pages/getphone/getphone.js b/pages/getphone/getphone.js
index 76a4154..9a6e927 100644
--- a/pages/getphone/getphone.js
+++ b/pages/getphone/getphone.js
@@ -121,7 +121,11 @@ Page({
          return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1;
        }
      });
-   }
+   },
+  
+  cancle_bind: function () {
+    getApp().goto('/pages/user/index/index');
+  }
 
 
 
diff --git a/pages/getphone/getphone.wxml b/pages/getphone/getphone.wxml
index 1a88036..8f80327 100644
--- a/pages/getphone/getphone.wxml
+++ b/pages/getphone/getphone.wxml
@@ -4,5 +4,6 @@
      <view class="title">{{store.store_name}}</view>
      <view>{{store.store_desc}}</view>
      <button class="btn"  open-type="getPhoneNumber" bindgetphonenumber="getphone">绑定会员</button>
+     <text class="btn2" bindtap="cancle_bind">暂不绑定</text>
   </view>
 </view>
\ No newline at end of file
diff --git a/pages/getphone/getphone.wxss b/pages/getphone/getphone.wxss
index 87f8b45..3756909 100644
--- a/pages/getphone/getphone.wxss
+++ b/pages/getphone/getphone.wxss
@@ -26,6 +26,15 @@
     background: #fc661f;
     color:#fff;
     font-size: 32rpx;
-    margin-top: 300rpx;
+    margin-top: 100rpx;
     border-radius: 5rpx;   
+}
+.all_page .btn2{
+    height: 80rpx;
+    line-height: 80rpx;
+    width: 580rpx;  
+    color:#999;
+    font-size: 32rpx;
+    border-radius: 5rpx;   
+     margin-top: 10rpx;
 }
\ No newline at end of file
diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index af607f1..90dd9c2 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -38,26 +38,21 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) { 	  
-    //--先判断会员状态--
-     var user_info = getApp().globalData.userInfo;
-     if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {		 
-		  getApp().globalData.use_id=0;
-         //wx.navigateTo({ url: '/pages/getphone/getphone'})
-         //return false;
-     }	
+    
   },
 
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
+ 
     var stoid = app_d.setting.stoid;
     var s = this,th=s,need_money=0,cur_g_num=0;
     getApp().get_isbuy(th.setappdata);
     if(getApp().globalData.user_id)  getApp().requestCardNum();
     /*------会员登录------*/
     app.getUserFir(async function(e){
-      if(e!=undefined && e!=null){
+      if(e!=undefined && e!=null && e.mobile){
         s.setData({
           userInfo: e
         });
--
libgit2 0.21.4