登录缓存清除和退出登录代码调整优化

pages/agent/index.js

@@ -23,6 +23,7 @@ Page({
     sex_index: 0,
     imgServerUrl: imgServerUrl,
     canIUse: wx.canIUse('button.open-type.getUserInfo'),
+    isLogin: false
   },
 
   /**
@@ -43,22 +44,18 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function() {
-    if (app.globalData.userInfo) {
-      console.log('有info===', app.globalData)
-    } else if (this.data.canIUse) {
-      // 由于 getUserInfo 是网络请求，可能会在 Page.onLoad 之后才返回
-      // 所以此处加入 callback 以防止这种情况
-      app.userInfoReadyCallback = res => {
-        console.log('userInfoReadyCallback===', res.userInfo)
-        app.globalData.userInfo = res.userInfo;
-      }
-    } else {
-      // 在没有 open-type=getUserInfo 版本的兼容处理
-      wx.getUserInfo({
-        success: res => {
-          app.globalData.userInfo = res.userInfo
-          console.log('兼容处理===', app.globalData)
-        }
+    //获取用户user_id和member_id,判断是否处于登录态
+    var userId = wx.getStorageSync("user_id");
+    var userToken = wx.getStorageSync("user_token");
+    var memberId = wx.getStorageSync("member_id");
+    var isLogin = false;
+    if (userId && memberId) {
+      isLogin = true;
+      app.globalData.userId = userId;
+      app.globalData.userToken = userToken;
+      app.globalData.memberId = memberId;
+      this.setData({
+        isLogin: isLogin
       })
     }
   },
@@ -135,6 +132,12 @@ Page({
     })
   },
   submit() {
+    if (!this.data.isLogin) {
+      wx.navigateTo({
+        url: '/pages/login/login',
+      })
+      return;
+    }
     var name = this.data.name;
     var contact = this.data.contact;
     var sex = this.data.sex_index;
@@ -163,6 +166,7 @@ Page({
           let paramsObj = {
             user_id: app.globalData.userId,
             user_token: app.globalData.userToken,
+            member_id: app.globalData.memberId,
             name: name,
             phone: contact,
             gender: sex,

pages/mine/index.js

@@ -30,27 +30,12 @@ Page({
     approveStatus: 0,
   },
   onLoad: function(options) {
-    //获取用户user_id和member_id,判断是否处于登录态
-    var userId = wx.getStorageSync("user_id");
-    var userToken = wx.getStorageSync("user_token");
-    var memberId = wx.getStorageSync("member_id");
-    var isLogin = false;
-    if (userId && memberId) {
-      isLogin = true;
-    } else {
-      wx.navigateTo({
-        url: '/pages/login/login',
-      })
-    }
     this.setData({
       phone: updataStorageData("phone"),
-      isLogin: isLogin,
-      userId: userId,
-      memberId: memberId,
-      userToken: userToken
     })
   },
   onShow: function() {
+    //获取用户user_id和member_id,判断是否处于登录态
     var userId = wx.getStorageSync("user_id");
     var userToken = wx.getStorageSync("user_token");
     var memberId = wx.getStorageSync("member_id");
@@ -58,23 +43,20 @@ Page({
     var isLogin = false;
     if (userId && memberId) {
       isLogin = true;
-      this.setData({
-        isLogin: isLogin,
-        userId: userId,
-        memberId: memberId,
-        userToken: userToken
-      })
-      if (userInfo) {
-        console.log('有info===', userInfo)
-        this.setData({
-          userInfo: userInfo
-        })
-        this.start();
-      }
+      //必传参数放于app全局变量内
       app.globalData.userId = userId;
       app.globalData.userToken = userToken;
       app.globalData.memberId = memberId;
+      if (userInfo) {
+        app.globalData.userInfo = userInfo;
+        console.log('有info===', userInfo)
+      }
+      this.start();
     }
+    this.setData({
+      isLogin: isLogin,
+      userInfo: userInfo
+    })
   },
   start() {
     this.fetchData();
@@ -83,9 +65,9 @@ Page({
   //获取用户简历详情
   getUserResume() {
     let paramsObj = {
-      user_id: this.data.userId,
-      user_token: this.data.userToken,
-      member_id: this.data.memberId
+      user_id: app.globalData.userId,
+      user_token: app.globalData.userToken,
+      member_id: app.globalData.memberId
     }
     Object.assign(paramsObj);
     getResume(paramsObj).then(data => {
@@ -111,9 +93,9 @@ Page({
   //获取用户认证状态
   fetchData() {
     let paramsObj = {
-      user_id: this.data.userId,
-      user_token: this.data.userToken,
-      member_id: this.data.memberId
+      user_id: app.globalData.userId,
+      user_token: app.globalData.userToken,
+      member_id: app.globalData.memberId
     }
     Object.assign(paramsObj);
     getCenterInfo(paramsObj).then(data => {

pages/mine/index.wxml

@@ -58,24 +58,41 @@
 </view>
 
 <view class='jianli' bindtap='tojianli'>
-  <view class='jltb'>
-    <image src='{{imgServerUrl}}/images/happyjob/jianli.png'></image>
-    <view class='wenzi'>
-      <text class='wenzi1' wx:if="{{approveStatus==3}}">{{userResume.realName}}的简历</text>
-      <text class='wenzi1' wx:if="{{approveStatus!=3}}">简历</text>
-      <text class='wenzi2' wx:if="{{percent==100}}">100%完成度!点击可以继续改唷</text>
-      <text class='wenzi2' wx:if="{{percent!=100}}">只要简历多写点，高薪工作早出现</text>
+  <block wx:if="{{isLogin}}">
+    <view class='jltb'>
+      <image src='{{imgServerUrl}}/images/happyjob/jianli.png'></image>
+      <view class='wenzi'>
+        <text class='wenzi1' wx:if="{{approveStatus==3}}">{{userResume.realName}}的简历</text>
+        <text class='wenzi1' wx:if="{{approveStatus!=3}}">简历</text>
+        <text class='wenzi2' wx:if="{{percent==100}}">100%完成度!点击可以继续改唷</text>
+        <text class='wenzi2' wx:if="{{percent!=100}}">只要简历多写点，高薪工作早出现</text>
+      </view>
     </view>
-  </view>
-
-  <view class='percent'>
-    <view class='full' wx:if="{{percent==100}}">{{percent}}%</view>
-    <view class='unfull' wx:if="{{percent!=100}}">{{percent}}%</view>
-    <view class='nows' wx:if="{{percent!=100}}">
-      <image src='{{imgServerUrl}}/images/happyjob/edit.png'></image>
-      <text class='unwz'>继续完善</text>
+    <view class='percent'>
+      <view class='full' wx:if="{{percent==100}}">{{percent}}%</view>
+      <view class='unfull' wx:if="{{percent!=100}}">{{percent}}%</view>
+      <view class='nows' wx:if="{{percent!=100}}">
+        <image src='{{imgServerUrl}}/images/happyjob/edit.png'></image>
+        <text class='unwz'>继续完善</text>
+      </view>
     </view>
-  </view>
+  </block>
+  <block wx:else>
+    <view class='jltb'>
+      <image src='{{imgServerUrl}}/images/happyjob/jianli.png'></image>
+      <view class='wenzi'>
+        <text class='wenzi1'>简历</text>
+        <text class='wenzi2'>只要简历多写点，高薪工作早出现</text>
+      </view>
+    </view>
+    <view class='percent'>
+      <view class='unfull'>0%</view>
+      <view class='nows'>
+        <image src='{{imgServerUrl}}/images/happyjob/edit.png'></image>
+        <text class='unwz'>继续完善</text>
+      </view>
+    </view>
+  </block>
 </view>
 
 <view class='query' bindtap='toPayRoll'>

pages/set/index.js

@@ -4,6 +4,7 @@ import {
 import {
   showToast
 } from '../../utils/tips.js'
+var app = getApp()
 Page({
 
   /**
@@ -26,9 +27,16 @@ Page({
       success(res) {
         if (res.confirm) {
           try {
-            wx.clearStorage()
-            wx.clearStorageSync()
-            showToast('清除成功')
+            wx.clearStorage({
+              success: function(res) {
+                wx.clearStorageSync()
+                app.globalData.userId = '';
+                app.globalData.userToken = '';
+                app.globalData.memberId = '';
+                app.globalData.userInfo = null;
+                showToast('清除成功')
+              }
+            })
           } catch (e) {
             // Do something when catch error
           }
@@ -53,6 +61,15 @@ Page({
           wx.removeStorageSync("user_id");
           wx.removeStorageSync("member_id");
           wx.removeStorageSync("user_token");
+          wx.removeStorageSync("userInfo");
+          app.globalData.userId = '';
+          app.globalData.userToken = '';
+          app.globalData.memberId = '';
+          app.globalData.userInfo = null;
+          showToast('退出成功');
+          setTimeout(function () {
+            wx.navigateBack();
+          }, 500)
         } else if (res.cancel) {
 
         }