From c0aad1595f9740f4b8528bcce644ba0ad034fe03 Mon Sep 17 00:00:00 2001
From: corala <18339694416@163.com>
Date: Tue, 26 Apr 2022 15:30:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=AD=98=E5=82=A8=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js               |  4 ++-
 pages/login/index.js | 59 --------------------------------------------
 pages/share/index.js | 11 ++++-----
 3 files changed, 8 insertions(+), 66 deletions(-)

diff --git a/app.js b/app.js
index caaef00..d7b17a4 100644
--- a/app.js
+++ b/app.js
@@ -23,6 +23,7 @@ App({
     //     // 发送 res.code 到后台换取 openId, sessionKey, unionId
     //   }
     // })
+    
     this.loginGettoken()
   },
   globalData: {
@@ -32,6 +33,8 @@ App({
   //登录-获取token
   loginGettoken(){
     let that = this
+    wx.setStorageSync('token', '')
+    wx.setStorageSync('userInfo', '')
     wx.login({
       success (res) {
         if (res.code) {
@@ -46,7 +49,6 @@ App({
             },
             success(res1) {
               if (res1.statusCode == 200) {
-                let userInfo = res1.data.user_info
                 that.globalData.token = res1.data.access_token
                 that.globalData.userInfo = res1.data.user_info
                 // console.log(that.globalData.token) 
diff --git a/pages/login/index.js b/pages/login/index.js
index 9bb0cee..81da60d 100644
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -57,7 +57,6 @@ Page({
   },
  
   shouquan(){
-    let userInfo = wx.getStorageSync('userInfo')
     if(userInfo.phone){
       wx.showToast({
         icon: 'none',
@@ -87,64 +86,6 @@ Page({
       url: '/pages/out/index?index=1&userid='+ this.data.userid+'&gameid=1'+'&type=2',
     })
   },
-  //登录-获取token
-  loginGettoken(){
-    let that = this
-    wx.login({
-      success (res) {
-        if (res.code) {
-          //发起网络请求
-          wx.request({
-            url:'https://cktest.2weisou.com/meta/auth/mobile/token/social?grant_type=mobil&mobile=MINI_C@'+res.code+'@'+'',
-            method: "POST",
-            data: {
-            },
-            header: {
-              Authorization: "Basic YXBwbGV0OmFwcGxldA==",
-            },
-            success(res1) {
-              if (res1.statusCode == 200) {
-                let userInfo = res1.data.user_info
-                that.setData({
-                  token: res1.data.access_token,
-                  userid: userInfo.id,
-                  userInfo: userInfo
-                })
-                wx.setStorageSync('token', res1.data.access_token)
-                wx.setStorageSync('userInfo', userInfo)
-                if(!!userInfo.userWxName&&!!userInfo.phone){
-                  that.leave()
-                  return;
-                }
-                if(!userInfo.userWxName||!userInfo.phone){
-                  that.setData({
-                    showBg: true
-                  })
-                }else{
-                  that.setData({
-                    showBg: false
-                  })
-                }
-                that.setData({
-                  avatarModal: !!userInfo.userWxName?false:true,
-                  phoneModal1: !!userInfo.phone?false:true,
-                  step: 1
-                })
-                if(!that.data.avatarModal){
-                  that.setData({
-                    step: 2,
-                    phoneModal: that.data.phoneModal1
-                  })
-                }
-              }
-            }
-          })
-        } else {
-          console.log('登录失败！' + res.errMsg)
-        }
-      }
-    })
-  },
   // 绑定用户头像信息
   bindNickname(obj) {
     let that = this
diff --git a/pages/share/index.js b/pages/share/index.js
index 29c151d..eaa6dcc 100644
--- a/pages/share/index.js
+++ b/pages/share/index.js
@@ -1,4 +1,5 @@
-// pages/out/index.js
+
+
 Page({
 
   /**
@@ -13,10 +14,8 @@ Page({
     
   },
   closeShare(){
-    // wx.navigateBack({
-    //   delta: 1
-    // })
-    let userInfo = wx.getStorageSync('userInfo')
+    let userInfo = getApp().globalData.userInfo
+    console.log(userInfo)
       wx.navigateTo({
         url: `/pages/out/index?index=1&userid=${userInfo.id}&gameid=1&type=2`,
       })
@@ -76,7 +75,7 @@ Page({
     }
   },
   shareFun(){
-    let token = wx.getStorageSync('token')
+    let token = getApp().globalData.token
     wx.request({
       url: 'https://cktest.2weisou.com/meta/ar/user/share',
       method: "POST",