From 5bd9e8c6a2f2203f219e4403db611510975a6cc8 Mon Sep 17 00:00:00 2001 From: longjieli <11918793+longjieli@user.noreply.gitee.com> Date: Sat, 29 Mar 2025 23:46:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/login.js | 78 +++++----- api/user/user.js | 13 ++ pages.json | 7 +- pages/login/index.vue | 5 +- pages/login/wxUserInfo.vue | 226 +++++++++++++++++++++++++++++ pages/workbenchManage/components/modal.vue | 2 +- pages/workbenchManage/index.vue | 46 ++---- utils/request.js | 23 ++- 8 files changed, 309 insertions(+), 91 deletions(-) create mode 100644 api/user/user.js create mode 100644 pages/login/wxUserInfo.vue diff --git a/api/login.js b/api/login.js index 6ce7e7c..b427a37 100644 --- a/api/login.js +++ b/api/login.js @@ -2,58 +2,58 @@ import request from '@/utils/request' // 登录方法 export function login(username, password, code, uuid) { - const data = { - username, - password, - code, - uuid - } - return request({ - 'url': '/login', - headers: { - isToken: false - }, - 'method': 'post', - 'data': data - }) + const data = { + username, + password, + code, + uuid + } + return request({ + 'url': '/login', + headers: { + isToken: false + }, + 'method': 'post', + 'data': data + }) } // 注册方法 export function register(data) { - return request({ - url: '/register', - headers: { - isToken: false - }, - method: 'post', - data: data - }) + return request({ + url: '/register', + headers: { + isToken: false + }, + method: 'post', + data: data + }) } // 获取用户详细信息 export function getInfo() { - return request({ - 'url': '/getInfo', - 'method': 'get' - }) + return request({ + 'url': '/getInfo', + 'method': 'get' + }) } // 退出方法 export function logout() { - return request({ - 'url': '/logout', - 'method': 'post' - }) + return request({ + 'url': '/logout', + 'method': 'post' + }) } // 获取验证码 export function getCodeImg() { - return request({ - 'url': '/captchaImage', - headers: { - isToken: false - }, - method: 'get', - timeout: 20000 - }) -} + return request({ + 'url': '/captchaImage', + headers: { + isToken: false + }, + method: 'get', + timeout: 20000 + }) +} \ No newline at end of file diff --git a/api/user/user.js b/api/user/user.js new file mode 100644 index 0000000..1a778d3 --- /dev/null +++ b/api/user/user.js @@ -0,0 +1,13 @@ +import request from '@/utils/request' + +// 更新用户信息 +export const updateUserInfo = (data) => { + return request({ + url: '/applet/info/updateInfo', + headers: { + isToken: false + }, + method: 'post', + data + }) +} \ No newline at end of file diff --git a/pages.json b/pages.json index acb9e25..eb9eb7e 100644 --- a/pages.json +++ b/pages.json @@ -9,7 +9,6 @@ } }, "pages": [ - { "path": "pages/workbenchManage/index", "style": { @@ -45,6 +44,12 @@ "style": { "navigationBarTitleText": "登录" } + }, + { + "path": "pages/login/wxUserInfo", + "style": { + "navigationBarTitleText": "用户信息" + } } ], "subPackages": [{ diff --git a/pages/login/index.vue b/pages/login/index.vue index e1a6718..8b8e17a 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -54,15 +54,14 @@ uni.login({ success: (res) => { const code = res.code - console.log(code) wxLogin({ code }).then(res => { if (res.code === 200) { uni.setStorageSync("token", res.data.token) uni.setStorageSync("baseInfo", JSON.stringify(res.data.userInfo)) - uni.navigateBack({ - delta: 1 + uni.navigateTo({ + url: "/pages/login/wxUserInfo" }) } }) diff --git a/pages/login/wxUserInfo.vue b/pages/login/wxUserInfo.vue new file mode 100644 index 0000000..4686fda --- /dev/null +++ b/pages/login/wxUserInfo.vue @@ -0,0 +1,226 @@ + + + + + \ No newline at end of file diff --git a/pages/workbenchManage/components/modal.vue b/pages/workbenchManage/components/modal.vue index 0fa6a25..dc0be12 100644 --- a/pages/workbenchManage/components/modal.vue +++ b/pages/workbenchManage/components/modal.vue @@ -42,7 +42,7 @@ }) const init = () => { successList().then(res => { - state.info = res.rows[0] + // state.info = res.rows[0] }) } const close = () => { diff --git a/pages/workbenchManage/index.vue b/pages/workbenchManage/index.vue index 59ecf0f..15c491d 100644 --- a/pages/workbenchManage/index.vue +++ b/pages/workbenchManage/index.vue @@ -4,26 +4,25 @@ - - 合伙人工作台{{state}} + 合伙人工作台 - {{iconState.list2[0].iconName}} + 申请加入 > - + - + @@ -39,18 +38,18 @@ - {{iconState.list2[1].iconName}} + 申请加入 > - + - @@ -87,27 +86,6 @@ getLoginStatus } from "../../utils/useMixin"; - const accompanyData = [{ - name: "服务信息", - code: '1', - url: "" - }, { - name: "服务记录", - code: '2', - url: "" - }, { - name: "接单地址", - code: '3', - url: "" - }, { - name: "平台手册", - code: '4', - url: "" - }, { - name: "我的评价", - code: '5', - url: "" - }] const state = reactive({ banner: [] }) @@ -192,16 +170,14 @@ const iconState = reactive({ list1: [], list2: [], - accompanyData: [] }) const getpz = () => { indexConfig().then(res => { - iconState.list1 = res.rows + // 合伙人工作台菜单 + iconState.list1 = res?.rows?.slice(0,4) || []; + // 伴宠师工作台 + iconState.list2 = res?.rows?.slice(4) || []; }) - indexConfigIco().then(res => { - iconState.list2 = res.data - }) - } const show = ref(true) diff --git a/utils/request.js b/utils/request.js index 70e92cc..2e46616 100644 --- a/utils/request.js +++ b/utils/request.js @@ -42,7 +42,6 @@ const request = config => { }).then(res => { console.log(res); const code = res.data.code || 200 - console.log(code); const msg = errorCode[code] || res.data.msg || errorCode['default'] if (code === 401) { showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then(res => { @@ -65,17 +64,17 @@ const request = config => { resolve(res.data) }) .catch(error => { - let { - message - } = error - if (message === 'Network Error') { - message = '后端接口连接异常' - } else if (message.includes('timeout')) { - message = '系统接口请求超时' - } else if (message.includes('Request failed with status code')) { - message = '系统接口' + message.substr(message.length - 3) + '异常' - } - toast(message) + // let { + // message + // } = error + // if (message === 'Network Error') { + // message = '后端接口连接异常' + // } else if (message.includes('timeout')) { + // message = '系统接口请求超时' + // } else if (message.includes('Request failed with status code')) { + // message = '系统接口' + message.substr(message.length - 3) + '异常' + // } + // toast(message) reject(error) }) })