Merge branch 'master' of http://www.jiyou-tech.com:3000/chenming/496_dongfengqichen_wxsmall

496_dongfengqichen/app.js

@@ -183,7 +183,7 @@ App({
         wx.setStorageSync('userInfoData', {
           avatarUrl: avatarUrl,
           nickName: nickName,
-          userLevel:0
+          userLevel:1
         })
       }
      }, this, "POST")

496_dongfengqichen/pages/everyday/everyday.js

@@ -80,10 +80,23 @@ Page({
   /**
    * 星探任务
    */
-  goScout(){
-    wx.navigateTo({
-      url: '../scout/scout'
-    })
+  goScout() {
+    app.wxRequest(app.globalData.urlRoot + "userInfo/getCertificationInfo", {}, res => {
+      if (res.code == 200) {
+        app.globalData.certificationState = res.data.certificationState;
+        wx.navigateTo({
+          url: '/pages/scout/scout'
+        })
+      } else if (res.code == -307) {
+        wx.navigateTo({
+          url: '/pages/mobileVerification/mobileVerification'
+        })
+      } else if (res.code == -308) {
+        wx.navigateTo({
+          url: '/pages/scout/register/register'
+        })
+      }
+    }, this);
   },
 
   /**

496_dongfengqichen/pages/myCenter/myCenter.js

@@ -36,7 +36,7 @@ Page({
     userData:{
       avatarUrl: null,
       nickName: null,
-      userLevel: 0
+      userLevel: 1
     },
     descFrameShow:false,//是否显示奖品详情
     ruleShow: false,//是否显示星探等级规则
@@ -95,6 +95,7 @@ Page({
       this.data.userData.nickName = app.globalData.userInfoData.nickName;
       this.data.userData.userLevel = app.globalData.userInfoData.userLevel;
       this.setData({
+        isLogin: true,
         userData: this.data.userData
       })
     }
@@ -395,9 +396,13 @@ Page({
             wx.setStorageSync('userInfoData', app.globalData.userInfoData);
           }
           this.setData({
-            userData: this.data.userData,
-            isLogin: true
+            userData: this.data.userData
           })
+          if (!app.globalData.userInfoData){
+            this.setData({
+              isLogin: true
+            })
+          }
         }
       }
     },this)