修改bug

bothyan · Jul 27, 2018 · 535bb3e · 535bb3e
1 parent fe0895b
commit 535bb3e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/xfz/pages/index/chooseMerchant.js b/xfz/pages/index/chooseMerchant.js
@@ -7,9 +7,9 @@ Page({
     //mlist:[]
   },
   onLoad: function (options) {
-    var scene = decodeURIComponent(options.scene) 
+    var scene = decodeURIComponent(options.scene || "ef970d799cc26cae5e8fdae6904ef991") 
     var that = this;
-    if(options.scene){
+    if(scene){
         app.globalData.scene = scene;
         wx.navigateTo({
           url: '../my/my'

diff --git a/xfz/pages/my/my.js b/xfz/pages/my/my.js
@@ -11,7 +11,7 @@ Page({
     canIUse: wx.canIUse('button.open-type.getUserInfo')
   },
   onShow:function(data){
-    console.log(data);
+
   },
   onLoad: function (options) {
     wx.showLoading({
@@ -20,14 +20,15 @@ Page({
     var that = this;
     if(app.globalData.scene){
       app.login(function(res){
+        console.log(res);
         app.globalData.logingData = res
-        if(app.globalData.logingData.nickName){ //有值，非第一次
+        if(!res.needOpenCard){ //有值，非第一次
           that.setData({
             userInfo: app.globalData.logingData
           })
           wx.hideLoading()
-        }else{ //null 第一次登录 
-          that.loginBackUseInfo();
+        }else{ //需要开卡
+          //that.loginBackUseInfo();
         }      
         that.balance();      
       });
@@ -38,7 +39,7 @@ Page({
         })
         wx.hideLoading()
       }else{
-        that.loginBackUseInfo();
+        //that.loginBackUseInfo();
       }
       that.balance();
     }