From 8afda7d17c20b10bec38f2cf16c8d45f59ce0f9a Mon Sep 17 00:00:00 2001 From: donqi Date: Tue, 24 May 2022 18:03:36 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91=EF=BC=8C?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/js/data.js | 4 +- common/js/request.js | 61 +++++++++++++ pages.json | 2 - pages/{my => index}/goods-manage.vue | 132 ++++++++++++++++----------- pages/index/index-home.vue | 129 +++++++++++++++++++------- pages/index/index.vue | 25 +++-- pages/index/my-home.vue | 4 - pages/my/new-serv.vue | 36 ++++++-- style/blue/blue-topic.css | 5 + 9 files changed, 287 insertions(+), 111 deletions(-) rename pages/{my => index}/goods-manage.vue (55%) diff --git a/common/js/data.js b/common/js/data.js index c9c49e6..e851ddd 100644 --- a/common/js/data.js +++ b/common/js/data.js @@ -9,8 +9,8 @@ const moduleBarInfos = [{ }, { id: 2, cuIcon: 'shop', - pageCode: 'shopingMallPage', - name: '商城' + pageCode: 'supplyChainPage', + name: '供应链' }, { id: 3, cuIcon: 'message', diff --git a/common/js/request.js b/common/js/request.js index f8d20cf..1021376 100644 --- a/common/js/request.js +++ b/common/js/request.js @@ -9,6 +9,7 @@ export default { // request 触发前拼接 url args.url = 'https://www.opsoul.com' + args.url; // args.url = 'http://127.0.0.1:80' + args.url; + // args.url = 'http://10.45.137.214:80' + args.url; if (args.data) { args.data.deptId = globalData.deptId; args.data.from = globalData.from; @@ -121,6 +122,29 @@ export default { uni.setStorageSync('userProfile', userInfo); return true; }, + async storageExistUser() { + uni.clearStorageSync('userProfile'); + // 获取微信登录凭证 + const wxLoginRes = await wx.login(); + // 获取openid + const wxAuthRes = await uni.request({ + url: '/wx/auth', + header: { + code: wxLoginRes.code + } + }) + const openId = wxAuthRes[1].data.data.openid; + // 从服务端获取用户信息 + let wxGetUserRes = await this.qryUserInfo(openId); + let userInfo = null; + if (wxGetUserRes.data) { + userInfo = { + ...wxGetUserRes.data, + wxLoginCode: wxLoginRes.code + } + } + uni.setStorageSync('userProfile', userInfo); + }, async registerUser(params = {}) { let res = await uni.request({ url: '/wx/addWorker', @@ -138,6 +162,43 @@ export default { } }) return res[1].data; + }, + async qryUserPhone(code) { + let res = await uni.request({ + url: '/wx/auth/phone', + method: 'GET', + header: { + code: code + } + }) + return res[1].data; + }, + async updateUserPhone(params = {}) { + let res = await uni.request({ + url: '/worker/update', + method: 'POST', + data: params + }) + // 更新用户信息的方法顺便更新本地缓存 + if (res[1].data.code === 0) { + let userInfo = this.getCurUserInfo(); + userInfo.phone = params.phone; + userInfo.account = params.account; + uni.setStorageSync('userProfile', userInfo); + } + return res[1].data; + }, + async storagePhoneIntoUserInfo(code) { + let phoneRes = await this.qryUserPhone(code) + if (phoneRes && phoneRes.data) { + let userInfo = this.getCurUserInfo(); + this.updateUserPhone({ + workerId: userInfo.workerId, + account: phoneRes.data, + phone: phoneRes.data + }) + return true; + } }, getCurUserInfo() { let userProfile = uni.getStorageSync('userProfile'); diff --git a/pages.json b/pages.json index f0f5e36..4fd4df6 100644 --- a/pages.json +++ b/pages.json @@ -33,8 +33,6 @@ "root": "pages/my/", "pages": [{ "path": "new-serv" - }, { - "path": "goods-manage" }, { "path": "master-occupancy" }, { diff --git a/pages/my/goods-manage.vue b/pages/index/goods-manage.vue similarity index 55% rename from pages/my/goods-manage.vue rename to pages/index/goods-manage.vue index 6e6ff95..040c7da 100644 --- a/pages/my/goods-manage.vue +++ b/pages/index/goods-manage.vue @@ -1,63 +1,64 @@