From bdeb2f566f1ed7ee011fa1d400854a89494d042b Mon Sep 17 00:00:00 2001 From: aihe <961836564@qq.com> Date: Sun, 14 Jul 2024 01:06:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E3=80=81=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/api/url.js | 3 +- common/api/user.js | 8 +- common/getCdnUrl.js | 4 +- common/manageServer.js | 1 - common/request.js | 2 +- common/upload.js | 8 +- common/validate.js | 4 +- components/buns-api/login/com-login.vue | 7 +- components/buns-api/login/mp-login.vue | 143 ++++++++++++++++-- pages/login/login.vue | 3 +- pages/post/freightCalculate.vue | 1 - store/actionKey.js | 1 + store/modules/user.js | 17 ++- .../uview-plus/components/u-input/u-input.vue | 4 + 14 files changed, 169 insertions(+), 37 deletions(-) diff --git a/common/api/url.js b/common/api/url.js index 2cbe8f2..b29df73 100644 --- a/common/api/url.js +++ b/common/api/url.js @@ -6,7 +6,8 @@ export default { uploadFile: '/common/ossUpload', loginByApp: `/loginByApp`, // 登录 loginByMP: `/loginByWeixin`, // 小程序登录 -- DONE - getInfoByApp: `/getInfoByApp`,// 获取用户基本信息 + bindPhone: `/bindPhoneByWx`, // 绑定手机号 -- DONE + getInfoByApp: `/getInfoByWxApp`,// 获取用户基本信息 -- DONE getStaffQRCodePng: `/emis/emisStaff/getStaffQRCodePng`,// 获取用户二维码 getEmisCountry: `/emis/emisCountry/listSimple`, // 获取国家列表 getEmisRegion: `/emis/emisRegion/listSimple`,// 获取省市区列表 diff --git a/common/api/user.js b/common/api/user.js index 64766a2..4007c50 100644 --- a/common/api/user.js +++ b/common/api/user.js @@ -9,7 +9,11 @@ export const loginByMP = (data = {})=> { return coreRequest(url.loginByMP, data) } -export const getInfoByApp = (data = {})=> { - return coreRequest(url.getInfoByApp, data, {}, 'GET') +export const bindPhone = (data = {}, option = {})=> { + return coreRequest(url.bindPhone, data, option) +} + +export const getInfoByApp = (data = {}, option = {})=> { + return coreRequest(url.getInfoByApp, data, option, 'GET') } diff --git a/common/getCdnUrl.js b/common/getCdnUrl.js index 4c6c86f..7fb21f9 100644 --- a/common/getCdnUrl.js +++ b/common/getCdnUrl.js @@ -1,6 +1,6 @@ export default (path)=> { - return `/sta_back/images/${path}` - // return `https://oms.tanex56.com/static/sapp/images/${path}` + // return `/sta_back/images/${path}` + return `https://oms.tanex56.com/static/sapp/images/${path}` } export const getCdnRoot = (path)=> { diff --git a/common/manageServer.js b/common/manageServer.js index 5cfffd8..6620d55 100644 --- a/common/manageServer.js +++ b/common/manageServer.js @@ -2,7 +2,6 @@ import { goto, getImageTempFilePath } from "./untool"; import { showToast, showLoading, hideLoading, downloadFile } from "./untool" import { setSessionXToken, getSessionXToken } from "@/session" import { textEncoder, textDecoder } from "./util" - const getCommonReqData = ()=> { const xToken = getSessionXToken() return { diff --git a/common/request.js b/common/request.js index 39a0637..284f169 100644 --- a/common/request.js +++ b/common/request.js @@ -65,8 +65,8 @@ let coreRequest = function(url, params = {}, options = {}, methodType, coreParam } url = `${host}${url}` options = { - ...options, ...comReqData.header, + ...options, } return dealRequest({ diff --git a/common/upload.js b/common/upload.js index 776ec95..6f38f33 100644 --- a/common/upload.js +++ b/common/upload.js @@ -30,7 +30,7 @@ const chooseFile = function (action = 'chooseImage', opt = {}) { }) } -const doRequest = function (file) { +const doRequest = function (file, opt = {}) { return new Promise((resolve, reject) => { let comReqData = getCommonReqData() uni.uploadFile({ @@ -55,7 +55,8 @@ const doRequest = function (file) { fail() { showToast("文件上传失败") reject() - } + }, + ...opt }) }) } @@ -104,5 +105,6 @@ const coreMultiUploadFile = async (action = 'chooseImage', opt = {})=> { export { coreUploadFile, - coreMultiUploadFile + coreMultiUploadFile, + doRequest } diff --git a/common/validate.js b/common/validate.js index 767f6df..631ea27 100644 --- a/common/validate.js +++ b/common/validate.js @@ -1,5 +1,5 @@ import { showToast } from "./untool" -const checkParams = (param, validConfig)=> { +const checkParams = (param, validConfig, showErrMsg = true)=> { return new Promise((resolve)=> { let errMsg = '' Object.keys(validConfig).map(key=> { @@ -13,7 +13,7 @@ const checkParams = (param, validConfig)=> { } }) if(errMsg) { - showToast(errMsg) + showErrMsg && showToast(errMsg) } else { resolve() } diff --git a/components/buns-api/login/com-login.vue b/components/buns-api/login/com-login.vue index c6b6097..c5f3a06 100644 --- a/components/buns-api/login/com-login.vue +++ b/components/buns-api/login/com-login.vue @@ -62,12 +62,7 @@ }, } }, - onShareAppMessage() { - return { - title: '', - } - }, - onLoad() { + created() { let info = getSessionLoginInfo() let { remberPassport } = info if(remberPassport[0]) { diff --git a/components/buns-api/login/mp-login.vue b/components/buns-api/login/mp-login.vue index cc3b9a8..4ab4cbb 100644 --- a/components/buns-api/login/mp-login.vue +++ b/components/buns-api/login/mp-login.vue @@ -13,35 +13,137 @@ + + + + + + + + + + + + + - 登录 + 登录 - @@ -60,4 +162,23 @@ left: 0; right: 0; } + .btn-open{ + display: inline-block; + height: auto; + margin: 0; + min-height: auto; + padding: 0; + line-height: normal; + background: inherit; + } + .avatar-empty{ + width: 100rpx; + height: 100rpx; + line-height: 100rpx; + background-color: #fff; + text-align: center; + border-radius: 10rpx; + font-size: 28rpx; + color: $uni-color-primary; + } diff --git a/pages/login/login.vue b/pages/login/login.vue index a85f328..b34588a 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -8,7 +8,7 @@ import { USERKEY } from "@/store/actionKey" import { getSessionLoginInfo, setSessionLoginInfo, setSessionXToken } from "@/session" import { encrypt } from "@/common/libs/jsencrypt_utils" - import { promiseTimeout } from "@/common/untool" + import { promiseTimeout, showToast } from "@/common/untool" // #ifdef MP import LoginComponent from "@/components/buns-api/login/mp-login" @@ -41,6 +41,7 @@ await promiseTimeout(300) await this.$store.dispatch(USERKEY.GETUSERINFO) this.goto("tabBar/sending/sending") + showToast("登录成功") } } } diff --git a/pages/post/freightCalculate.vue b/pages/post/freightCalculate.vue index c25a7d4..4a984c4 100644 --- a/pages/post/freightCalculate.vue +++ b/pages/post/freightCalculate.vue @@ -159,7 +159,6 @@ }, methods: { - getCdnUrl, initData() { }, diff --git a/store/actionKey.js b/store/actionKey.js index 603cbcd..6adaad3 100644 --- a/store/actionKey.js +++ b/store/actionKey.js @@ -2,6 +2,7 @@ export const USERKEY = { LOGIN: "LOGIN", GETUSERINFO: "GETUSERINFO", LOGOUT: "LOGOUT", + UPDATETOKEN: "UPDATETOKEN", } diff --git a/store/modules/user.js b/store/modules/user.js index 25bc630..d2b0c00 100644 --- a/store/modules/user.js +++ b/store/modules/user.js @@ -35,6 +35,16 @@ export default { // } }, actions: { + async [USERKEY.UPDATETOKEN]({ + dispatch, + commit, + state, + rootState + }, options) { + let { token } = options + setSessionXToken(token) + commit(USERKEY.LOGIN, token) + }, async [USERKEY.LOGIN]({ dispatch, commit, @@ -44,9 +54,7 @@ export default { let token = state.token const resLgn = await apiService.loginByApp(options) token = resLgn.token - setSessionXToken(token) - - commit(USERKEY.LOGIN, token) + dispatch(USERKEY.UPDATETOKEN, { token }) }, async [USERKEY.LOGOUT]({ dispatch, @@ -81,9 +89,6 @@ export default { permissions: resInfo.permissions } - let resQr = await apiService.getStaffQRCodePng() - info.qrCodeImgUrl = resQr?.data?.fileUrl - commit(USERKEY.GETUSERINFO, info) }, diff --git a/uni_modules/uview-plus/components/u-input/u-input.vue b/uni_modules/uview-plus/components/u-input/u-input.vue index 48d3eac..da83a31 100644 --- a/uni_modules/uview-plus/components/u-input/u-input.vue +++ b/uni_modules/uview-plus/components/u-input/u-input.vue @@ -44,6 +44,7 @@ @focus="onFocus" @confirm="onConfirm" @keyboardheightchange="onkeyboardheightchange" + @nicknamereview="onNicknamereview" />