feat：更新登录

component/auth/api.js

@@ -1,4 +1,5 @@
-const tempId = 'klhtcMH_MixbhY2AqKjZ6sl7y51UkpWJ4Xj4P4Cn9U0'
+// const tempId = 'klhtcMH_MixbhY2AqKjZ6sl7y51UkpWJ4Xj4P4Cn9U0'    //四维指房宝 
+const tempId = 'tb7kt53SnuJpwLyivqFVhW7KIqEzdMh_oc29iUzv9Bc'  //四维指房
 
 export const getSubOpen = () => {
   let userInfo = wx.getStorageSync('userInfo');

component/auth/auth.js

@@ -1,7 +1,9 @@
 // component/auth/auth.js
 const api = require('../../config/api')
 const util = require('../../utils/util.js');
-import {getSubOpen} from './api'
+import {
+  getSubOpen
+} from './api'
 
 Component({
 
@@ -12,17 +14,23 @@ Component({
     show: false,
     canIUse: wx.canIUse('button.open-type.getUserInfo')
   },
-  
+
   attached() {
     this.callback = () => {
-      this.setData({show: !getApp().globalData.loginProps.isLogin})
+      this.setData({
+        show: !getApp().globalData.loginProps.isLogin
+      })
 
       let pages = getCurrentPages()
       let currPage = pages[pages.length - 1].route
       if (currPage === 'pages/discover/discover') {
-        this.setData({bottom: '50px'})
+        this.setData({
+          bottom: '50px'
+        })
       } else {
-        this.setData({bottom: 0})
+        this.setData({
+          bottom: 0
+        })
       }
     }
     this.callback()
@@ -34,13 +42,13 @@ Component({
     getApp().removeLoginListener(this.callback)
   },
   methods: {
-    quitHandle: function() {
+    quitHandle: function () {
       getApp().setLoginProps(true)
     },
-    getCode: function() {
+    getCode: function () {
       return new Promise(r => {
         wx.login({
-          success: function(res) {
+          success: function (res) {
             console.log(res)
             if (res.code) {
               r(res.code)
@@ -52,7 +60,7 @@ Component({
     authLogin() {
       this.triggerEvent('login')
     },
-    bindGetUserInfo: async function(e) {
+    bindGetUserInfo: async function (e) {
       let code = await this.getCode()
       console.log('******')
       console.log(e.detail)
@@ -75,7 +83,7 @@ Component({
           getApp().setLoginProps(true)
           this.authLogin()
           getSubOpen()
-          
+
         } else {
           // util.showErrorToast(res.errmsg)
           // wx.showModal({
@@ -86,5 +94,45 @@ Component({
         }
       });
     },
+    getUserProfile: function (e) {
+      wx.getUserProfile({
+        desc: '用于完善用户资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
+        success: async  (userInfo_res) => {
+          console.log(userInfo_res.userInfo)
+          let info = {userInfo:userInfo_res.userInfo}
+          let code = await this.getCode()
+
+          //登录远程服务器
+          util.request(api.AuthLoginByWeixin, {
+            code: code,
+            userInfo: info
+          }, 'POST', 'application/json').then(res => {
+            if (res.errno === 0) {
+              console.log('&&&&&&&')
+              console.log(res.data)
+              //存储用户信息
+              res.data.userInfo.userId = res.data.userId
+              res.data.userInfo.sessionKey = res.data.sessionKey
+              console.log('-------', res.data.userInfo)
+              wx.setStorageSync('userInfo', res.data.userInfo);
+              wx.setStorageSync('token', res.data.token);
+              wx.setStorageSync('userId', res.data.userId);
+              wx.setStorageSync('isLogin', true);
+              getApp().setLoginProps(true)
+              this.authLogin()
+              getSubOpen()
+
+            } else {
+              // util.showErrorToast(res.errmsg)
+              // wx.showModal({
+              //   title: '提示',
+              //   content: res.errmsg,
+              //   showCancel: false
+              // });
+            }
+          });
+        }
+      })
+    }
   }
 })

component/auth/auth.wxml

@@ -15,6 +15,7 @@
         </cover-view>
       </cover-view>
 
-      <button class="button" wx:if="{{canIUse}}" open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo">允许使用</button>
+      <button class="button" bindtap="getUserProfile">允许使用</button>
+      <!-- <button class="button" wx:if="{{canIUse}}" open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo">允许使用</button> -->
     </cover-view>
 </view>

pages/user/user.js

@@ -48,7 +48,8 @@ Page({
 
   async getPhoneNumber(e) {
     let {encryptedData,iv} =  e.detail
-    // if (!encryptedData) return;
+    console.log(e)
+    if (!encryptedData) return;
     let res = await util.request(api.decryptedPhoneNum, { encryptedData, iv, sessionKey: this.sessionKey })
 
     console.log(res)

project.config.json

@@ -21,7 +21,7 @@
     "lazyloadPlaceholderEnable": false,
     "useMultiFrameRuntime": true,
     "useApiHook": true,
-    "useApiHostProcess": false,
+    "useApiHostProcess": true,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],
@@ -35,8 +35,8 @@
     "showES6CompileOption": false
   },
   "compileType": "miniprogram",
-  "libVersion": "2.6.6",
-  "appid": "wxf1eb182777211ed7",
+  "libVersion": "2.19.3",
+  "appid": "wx564b12f68f5e4feb",
   "projectname": "FDshop",
   "simulatorType": "wechat",
   "simulatorPluginLibVersion": {},

socket.js

@@ -418,6 +418,7 @@ export default {
     //     console.log(err)
     //   }
     // })
+    
   },
   changeRoomEnableTalk(data) {
     console.log(data)