From 121b70738b992f51d512d5a1e4979eaeb50cc695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=A4=E5=8D=83=E4=BA=A9=E5=B0=8F=E5=B0=91=E7=88=B7?= <517059477@qq.com> Date: Sat, 12 Mar 2022 09:11:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E9=94=AE=E7=99=BB?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nsgk_entry/app.js | 15 +-- nsgk_entry/pages/index/index.js | 28 +++--- nsgk_entry/pages/index/index.wxml | 6 +- nsgk_entry/pages/show/show.js | 1 - nsgk_entry/pages/user/login/login.js | 143 +++++++++++---------------- nsgk_entry/project.config.json | 2 +- nsgk_entry/utils/API.js | 11 ++- nsgk_entry/utils/storage.js | 16 +-- nsgk_entry/utils/util.js | 9 +- 9 files changed, 100 insertions(+), 131 deletions(-) diff --git a/nsgk_entry/app.js b/nsgk_entry/app.js index aa4e89c..e2774eb 100644 --- a/nsgk_entry/app.js +++ b/nsgk_entry/app.js @@ -1,6 +1,8 @@ import * as STORAGE from './utils/storage' import * as UTIL from './utils/util' import * as API from './utils/API' +let APP = getApp(); + App({ onLaunch() { var that = this; @@ -10,7 +12,6 @@ App({ //获取code UTIL.getCOdeFromWX({ complate: (code) => { - console.log('app:微信code,' + code); // //获取openId that.getOpenIdFromFW(code); } @@ -32,7 +33,6 @@ App({ globalData: { // 系统用户登录信息(用户id、token) userInfo: { - memberId: '', token: '', toastTimeout:null }, @@ -68,14 +68,16 @@ App({ } UTIL.httpRequestNoneDetal(API.URL_GET_OPENID, sendData, "POST", { success: (res) => { - if (res._code == API.SUCCESS_CODE) { - UTIL.showToastNoneIcon("openId:" + res._data.openid); + if (res.code == API.SUCCESS_CODE) { + // UTIL.showToastNoneIcon("openId:" + res._data.openid); + STORAGE.setToken(res.token) + STORAGE.setOpenId(res.data.openId) + STORAGE.setSessionKey(res.data.sessionKey) + getApp().globalData.userInfo.token = res.token; } else { //未获取到openId - // console.log("失败，获取到openId:" + res.msg); STORAGE.setOpenId(res.data.openId) STORAGE.setSessionKey(res.data.sessionKey) - // UTIL.showToastNoneIcon("openId:失败"); } } }) @@ -85,7 +87,6 @@ App({ */ initGlobalData() { var userInfo = { - memberId: STORAGE.getMemberId(), token: STORAGE.getToken() } console.log(userInfo) diff --git a/nsgk_entry/pages/index/index.js b/nsgk_entry/pages/index/index.js index 8f61f3f..5c6579e 100644 --- a/nsgk_entry/pages/index/index.js +++ b/nsgk_entry/pages/index/index.js @@ -1,22 +1,18 @@ import * as UTIL from '../../utils/util.js'; +import * as API from '../../utils/API.js'; Page({ data: { //顶部胶囊按钮位置信息rect CustomMenuButton: null, - wrokScrollHeight:0 + wrokScrollHeight:0, + userInfoObj:{} //用户信息 }, onLoad: function (options) { - this.computeBarLocation() + this.computeBarLocation(); + //获取用户信息 + this.getUserInfo() }, - onReady: function () { - }, - onShow: function () { - }, - onHide: function () { - }, - /** - * 计算bar 高度 - */ + /* 计算bar 高度*/ computeBarLocation() { var that = this; let CustomMenuButton = wx.getMenuButtonBoundingClientRect(); @@ -43,4 +39,14 @@ Page({ CustomMenuButton: CustomMenuButton, }); }, + /* 获取用户信息*/ + getUserInfo(){ + UTIL.httpRequest(API.URL_GET_GETINFO, {method:'GET'}, { + success: (res) => { + if (res.code == API.SUCCESS_CODE) { + this.setData({userInfoObj:res.user}) + } + } + }) + } }) \ No newline at end of file diff --git a/nsgk_entry/pages/index/index.wxml b/nsgk_entry/pages/index/index.wxml index f0f6e58..4a0a49f 100644 --- a/nsgk_entry/pages/index/index.wxml +++ b/nsgk_entry/pages/index/index.wxml @@ -7,10 +7,10 @@ - 张没事 + {{userInfoObj.nickName}} - 报账员 + {{userInfoObj.remark}} @@ -25,7 +25,7 @@ - 山东省威海市环翠区李 + {{userInfoObj.allDeptName}} diff --git a/nsgk_entry/pages/show/show.js b/nsgk_entry/pages/show/show.js index 05de84b..327c7be 100644 --- a/nsgk_entry/pages/show/show.js +++ b/nsgk_entry/pages/show/show.js @@ -217,7 +217,6 @@ Page({ centerWarehouseId: 10051, channel: 220, channelType: 22, - memberId: 24892, rows: 40, shopId: 10005, token: "LWXAPP1636599316684iv6qkhyqhr4izg", diff --git a/nsgk_entry/pages/user/login/login.js b/nsgk_entry/pages/user/login/login.js index f633f1d..35c3b65 100644 --- a/nsgk_entry/pages/user/login/login.js +++ b/nsgk_entry/pages/user/login/login.js @@ -4,72 +4,44 @@ import * as API from '../../../utils/API.js'; import * as STORAGE from '../../../utils/storage' const APP = getApp(); Page({ - - /** - * 页面的初始数据 - */ data: { isIPhoneX:false, privacyCheck:true //用户协议 }, - - /** - * 生命周期函数--监听页面加载 - */ onLoad: function (options) { this.setData({ isIPhoneX:UTIL.isIPhoneX() }) + this.automaticLogin() }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - + //自动登录 + automaticLogin(){ + let automatic = STORAGE.getToken(); + let getOpenId = STORAGE.getOpenId(); + if(automatic == '' && getOpenId ==''){ + UTIL.getCOdeFromWX({ + complate: (code) => { + let sendData = { + code: code + } + UTIL.httpRequestNoneDetal(API.URL_GET_OPENID, sendData, "POST", { + success: (res) => { + if (res.code == API.SUCCESS_CODE) { + wx.navigateTo({ + url: '/pages/index/index', + }) + } + } + }) + } + }); + }else{ + wx.navigateTo({ + url: '/pages/index/index', + }) + } }, + //用户隐私协议选项 checkboxChange: function(res) { let checkStatus = false; if(res.detail.value.length!=0){ @@ -81,6 +53,7 @@ Page({ privacyCheck:checkStatus }) }, + //微信一键登录授权 getPhoneNumber: function(res) { let that = this; let { @@ -101,47 +74,43 @@ Page({ } UTIL.httpRequest(API.URL_POST_DECRYPTEDWXDATA, sendData,{ success: (res) => { - if (res._code == API.SUCCESS_CODE) { + if (res.code == API.SUCCESS_CODE) { + let phoneNumber = res.data.phoneNumber; + //微信手机号码绑定 + that.wxUserBand(phoneNumber) // UTIL.showToastNoneIcon("数据共：" + res._data.length + "条"); } else { //待删 - wx.navigateTo({ - url: '/pages/index/index', - }) + UTIL.showToastNoneIcon(res.msg) } }, fail: (res) => { UTIL.showToastNoneIcon(API.MSG_FAIL_HTTP) - }, - complete: (res) => { } }); - //     if (res.detail.userInfo) { - //       //用户按了允许授权按钮 - //       var that = this; - //       // 获取到用户的信息了，打印到控制台上看下 - //       console.log("用户的信息如下："); - //       console.log(res.detail); - //       //授权成功后,通过改变 isHide 的值，让实现页面显示出来，把授权页面隐藏起来 - //       that.setData({ - //         isHide: false - //       }); - //     } else { - //       //用户按了拒绝按钮 - //       wx.showModal({ - //         title: '警告', - //         content: '您点击了拒绝授权，将无法进入小程序，请授权之后再进入!!!', - //         showCancel: false, - //         confirmText: '返回授权', - //         success: function(res) { - //           // 用户没有授权成功，不需要改变 isHide 的值 - //           if (res.confirm) { - //             console.log('用户点击了“返回授权”'); - //           } - //         } - //       }); - //     } + }, + wxUserBand(phone){ + let sendData = { + openId:STORAGE.getOpenId(), + phonenumber:phone + } + UTIL.httpRequest(API.URL_POST_USERBAND, sendData,{ + success: (res) => { + if (res.code == API.SUCCESS_CODE) { + wx.navigateTo({ + url: '/pages/index/index', + }) + }else{ + UTIL.showToastNoneIcon(res.msg) + } + }, + fail: (res) => { + UTIL.showToastNoneIcon(API.MSG_FAIL_HTTP) + } + }); + console.log(sendData) + // } }) \ No newline at end of file diff --git a/nsgk_entry/project.config.json b/nsgk_entry/project.config.json index b15c898..90d6b57 100644 --- a/nsgk_entry/project.config.json +++ b/nsgk_entry/project.config.json @@ -48,7 +48,7 @@ }, "compileType": "miniprogram", "libVersion": "2.21.1", - "appid": "wx90a68c6fdd650f48", + "appid": "wxaace54cc2cf8924b", "projectname": "WXMB", "debugOptions": { "hidedInDevtools": [] diff --git a/nsgk_entry/utils/API.js b/nsgk_entry/utils/API.js index 4a60dbe..dcc1738 100644 --- a/nsgk_entry/utils/API.js +++ b/nsgk_entry/utils/API.js @@ -8,7 +8,7 @@ let { //用户登录页面，接口检测用户token失效，需跳转重新登录 const USER_LOGIN_PAGE_PATH='/pages/user/login/login'; //接口成功 -const SUCCESS_CODE = '200'; +const SUCCESS_CODE = 200; //微信登陆失效 const INVALID_USER_TOKEN_CODE = '001007'; @@ -29,7 +29,10 @@ const MSG_INVALID_USER_TOKEN='登陆信息失效，请重新登陆'; const URL_GET_OPENID=`${URL_PREFIX}/wechat/codeLogin`; // 获取手机号解密接口 const URL_POST_DECRYPTEDWXDATA = `${URL_PREFIX}/wechat/decryptedWXData`; - +// 微信绑定手机号 +const URL_POST_USERBAND = `${URL_PREFIX}/register/wechat/band`; +//获取用户信息 +const URL_GET_GETINFO = `${URL_PREFIX}/getInfo`; /****************接口地址end****************/ @@ -45,5 +48,7 @@ export { MSG_ERROR_TO, MSG_INVALID_USER_TOKEN, URL_GET_OPENID, - URL_POST_DECRYPTEDWXDATA + URL_POST_DECRYPTEDWXDATA, + URL_POST_USERBAND, + URL_GET_GETINFO } \ No newline at end of file diff --git a/nsgk_entry/utils/storage.js b/nsgk_entry/utils/storage.js index 9e3c808..566da50 100644 --- a/nsgk_entry/utils/storage.js +++ b/nsgk_entry/utils/storage.js @@ -1,16 +1,4 @@ -/** - * 获取当前登录用户的 ID - */ -function getMemberId() { - return wx.getStorageSync('memberId'); -} -/** - * 存储用户ID - * @param {用户id} memberId - */ -function setMemberId(memberId) { - wx.setStorageSync('memberId', memberId); -} + /** * 获取当前登录用户的 token */ @@ -54,8 +42,6 @@ function setSessionKey(sessionKey) { export { - getMemberId, - setMemberId, getToken, setToken, getOpenId, diff --git a/nsgk_entry/utils/util.js b/nsgk_entry/utils/util.js index 6337178..4b0ade9 100644 --- a/nsgk_entry/utils/util.js +++ b/nsgk_entry/utils/util.js @@ -113,13 +113,16 @@ function httpRequest(url, data, { wx.showNavigationBarLoading(); let finalData = {}; Object.assign(finalData, data); - finalData.memberId = getApp().globalData.userInfo.memberId; - finalData.token = getApp().globalData.userInfo.token; + // finalData.token = getApp().globalData.userInfo.token; wx.request({ url, data: finalData, method: data.method || 'POST', timeout: 60000, + header: { + 'Authorization':'Bearer '+getApp().globalData.userInfo.token + // 'Authorization':'1111111111' + }, success: function (response) { if (response.data && response.data._code == API.INVALID_USER_TOKEN_CODE) { //微信登陆失效 @@ -257,7 +260,7 @@ function handleFail(data = '') { * 获取微信Code */ function getCOdeFromWX({ complate }) { - showLoadingHaveMask('正在检测账号..'); + showLoadingHaveMask('正在加载数据..'); wx.login({ success: function (data) { console.log(data)