From 7f92f9b9e797a62fa9158c4918ba83a16b5b8081 Mon Sep 17 00:00:00 2001 From: xiao-fajia <1665375861@qq.com> Date: Fri, 27 Sep 2024 18:42:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 + config.js | 1 + package-lock.json | 15 ++- package.json | 4 +- pages/home/active.vue | 19 +-- pages/home/content.vue | 38 +++++- pages/home/home.vue | 14 +- pages/login/login.vue | 178 ++++++++++++++----------- pages/my/my.vue | 33 +++-- pages/my/register.vue | 40 +++--- pages/myCar/myCar.vue | 16 +-- pages/myReservation/addReservation.vue | 15 --- pages/myReservation/myReservation.vue | 14 -- utils/auth.js | 9 -- utils/common.js | 24 +--- utils/request.js | 6 +- 16 files changed, 213 insertions(+), 215 deletions(-) diff --git a/.gitignore b/.gitignore index 35afcea..f29620c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ unpackage/* unpackage .idea +node_modules + diff --git a/config.js b/config.js index 32be26b..15dda3b 100644 --- a/config.js +++ b/config.js @@ -2,6 +2,7 @@ module.exports = { // baseUrl: 'https://www.nuoyunr.com', baseUrl: 'http://127.0.0.1:48080', + // baseUrl: 'http://192.168.1.31:48080', imagesUrl: 'http://shequ.0315e.com/static/images/pages/', baseImageUrl: 'https://www.nuoyunr.com/minio/', wsUrl: 'wss://www.nuoyunr.com', diff --git a/package-lock.json b/package-lock.json index 76814ac..3c43d3f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,12 +5,13 @@ "packages": { "": { "dependencies": { + "rich-text-parser": "^1.0.2", "uview-ui": "^2.0.36", "weapp-qrcode": "^1.0.0" }, "devDependencies": { - "sass": "^1.69.5", - "sass-loader": "^10.4.1" + "sass": "^1.79.3", + "sass-loader": "^10.5.2" } }, "node_modules/@jridgewell/gen-mapping": { @@ -731,6 +732,11 @@ "url": "https://paulmillr.com/funding/" } }, + "node_modules/rich-text-parser": { + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/rich-text-parser/-/rich-text-parser-1.0.2.tgz", + "integrity": "sha512-fv6Piuikqf0PCuFGfFMtfOdc9fWE/HoSxi4gkDawco/NDKHfR6W5t1/t7Lh0pySf3GkV/rVcgAp/LKx8ZMwjuw==" + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -1682,6 +1688,11 @@ "integrity": "sha512-GkMg9uOTpIWWKbSsgwb5fA4EavTR+SG/PMPoAY8hkhHfEEY0/vqljY+XHqtDf2cr2IJtoNRDbrrEpZUiZCkYRw==", "dev": true }, + "rich-text-parser": { + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/rich-text-parser/-/rich-text-parser-1.0.2.tgz", + "integrity": "sha512-fv6Piuikqf0PCuFGfFMtfOdc9fWE/HoSxi4gkDawco/NDKHfR6W5t1/t7Lh0pySf3GkV/rVcgAp/LKx8ZMwjuw==" + }, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz", diff --git a/package.json b/package.json index 2db41f6..eb718a9 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,12 @@ { "dependencies": { + "rich-text-parser": "^1.0.2", "uview-ui": "^2.0.36", "weapp-qrcode": "^1.0.0" }, "devDependencies": { "sass": "^1.79.3", - "sass-loader": "^10.5.2" + "sass-loader": "^10.5.2", + "rich-text-parser": "^1.0.2" } } diff --git a/pages/home/active.vue b/pages/home/active.vue index 558f730..7f1f657 100644 --- a/pages/home/active.vue +++ b/pages/home/active.vue @@ -19,8 +19,6 @@ + \ No newline at end of file diff --git a/pages/my/my.vue b/pages/my/my.vue index a27d3f8..7d61712 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -65,22 +65,16 @@ import VNavigationBar from '@/components/VNavigationBar.vue' import tabBarVue from '@/components/tabBar/tabBar.vue' import request from "@/utils/request"; - import {getUserInfoRequest} from "@/utils/common.js"; - import {getToken,setUserInfo} from '@/utils/auth.js' + import {getToken} from '@/utils/auth.js' export default { components: { tabBarVue, VNavigationBar }, onShow(data) { - if(!getToken()){ - uni.reLaunch({ - url: '/pages/login/login' - }) - }else{ - console.log("已登录") - this.getServer() - } + if(getToken()){ + this.getServer() + } }, data() { return { @@ -111,9 +105,22 @@ }, //获取当前登录用户信息 async getServer() { - console.log("获取用户信息") - this.customInfo = getUserInfoRequest() - } + const res = await request({ + url: "/userClient/customer/getUserCustomer", + method: 'get', + params:{} + }) + if(!res.data){ + uni.reLaunch({ + url: '/pages/my/register' + }) + + }else{ + this.customInfo = res.data + uni.setStorageSync('customerInfo', JSON.stringify(this.customInfo)) + } + + } } } diff --git a/pages/my/register.vue b/pages/my/register.vue index 6bc54e6..b36360a 100644 --- a/pages/my/register.vue +++ b/pages/my/register.vue @@ -4,7 +4,7 @@ - 完善会员信息 + 注册会员 @@ -39,12 +39,12 @@ - - - - - - + + 手机号 + + + + 联系地址 @@ -52,7 +52,7 @@ - 保存 + 注册 @@ -77,7 +77,7 @@ export default { sex: "", idCard:"", birthday:"请选择你的生日", - // phoneNumber:"", + phoneNumber:"", address:"", }, //性别 @@ -103,7 +103,7 @@ export default { goHome(){ uni.reLaunch({ url:'/pages/home/home' - }) + }) }, /** * 注册 @@ -153,13 +153,13 @@ export default { }) return false } - // if(""==this.formData.phoneNumber || !this.isValidPhoneNumber(this.formData.phoneNumber)){ - // uni.showToast({ - // title: '请填写手机号', - // icon: 'none' - // }) - // return false - // } + if(""==this.formData.phoneNumber || !this.isValidPhoneNumber(this.formData.phoneNumber)){ + uni.showToast({ + title: '请填写手机号', + icon: 'none' + }) + return false + } if(""==this.formData.address){ uni.showToast({ title: '请填写联系地址', @@ -327,12 +327,12 @@ export default { .top_Bar{ width: 100%; height: 40px; - + display: flex; align-items: center; justify-content: space-between; - - + + padding-top: 44px; } .title_top{ diff --git a/pages/myCar/myCar.vue b/pages/myCar/myCar.vue index b2f57ba..7882622 100644 --- a/pages/myCar/myCar.vue +++ b/pages/myCar/myCar.vue @@ -26,8 +26,6 @@ import VNavigationBar from '@/components/VNavigationBar.vue'; import request from "../../utils/request"; import config from "config"; -import {getUserInfoRequest} from "@/utils/common.js"; -import {getToken,setUserInfo} from '@/utils/auth.js' export default { computed: { @@ -56,23 +54,11 @@ export default { this.getList(); }, onShow() { - if(!getToken()){ - uni.reLaunch({ - url: '/pages/login/login' - }) - }else{ - console.log("已登录") - this.getUserInfos() - } // 页面显示时执行初始化操作 this.getList(); }, methods: { - //获取当前登录用户信息 - async getUserInfos() { - console.log("获取用户信息") - getUserInfoRequest() - }, + getList(){ request({ url: '/userClient/base/myCar/get', diff --git a/pages/myReservation/addReservation.vue b/pages/myReservation/addReservation.vue index 2761174..b946f34 100644 --- a/pages/myReservation/addReservation.vue +++ b/pages/myReservation/addReservation.vue @@ -102,8 +102,6 @@ import request from '../../utils/request'; import VNavigationBar from '@/components/VNavigationBar.vue' import config from "@/config"; - import {getUserInfoRequest} from "@/utils/common.js"; - import {getToken,setUserInfo} from '@/utils/auth.js' export default { components: { @@ -188,23 +186,10 @@ this.getServer(this.info.id) }, onShow() { - if(!getToken()){ - uni.reLaunch({ - url: '/pages/login/login' - }) - }else{ - console.log("已登录") - this.getUserInfos() - } this.initCarList() this.initDateList() }, methods: { - //获取当前登录用户信息 - async getUserInfos() { - console.log("获取用户信息") - getUserInfo() - }, initDateList(){ const daysOfWeek = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']; const currentDate = new Date(); diff --git a/pages/myReservation/myReservation.vue b/pages/myReservation/myReservation.vue index 294f0c2..c762801 100644 --- a/pages/myReservation/myReservation.vue +++ b/pages/myReservation/myReservation.vue @@ -18,8 +18,6 @@ import tabBarVue from '@/components/tabBar/tabBar.vue' import reservationOrderVue from '../../components/reservationOrder/reservationOrder.vue' import request from "@/utils/request"; - import {getUserInfoRequest} from "@/utils/common.js"; - import {getToken,setUserInfo} from '@/utils/auth.js' export default { components: { @@ -48,21 +46,9 @@ } }, onShow() { - if(!getToken()){ - uni.reLaunch({ - url: '/pages/login/login' - }) - }else{ - console.log("已登录") - this.getUserInfos() - } this.getBookingPage() }, methods: { - //获取当前登录用户信息 - async getUserInfos() { - getUserInfoRequest() - }, async getBookingPage(){ const res = await request({ url: "/userClient/repair/booking/page", diff --git a/utils/auth.js b/utils/auth.js index 0a35c4a..7191f87 100644 --- a/utils/auth.js +++ b/utils/auth.js @@ -1,5 +1,4 @@ const TokenKey = 'App-Token' -const UserInfo = 'customerInfo' const TenantIdKey = 'TENANT_ID' export function getToken() { return uni.getStorageSync(TokenKey) @@ -30,11 +29,3 @@ export function hasRole(roleCode) { } return false } - -export function getUserInfo() { - return uni.getStorageSync(UserInfo) -} - -export function setUserInfo(userInfo) { - return uni.setStorageSync(UserInfo, userInfo) -} diff --git a/utils/common.js b/utils/common.js index bf1e83e..00d4137 100644 --- a/utils/common.js +++ b/utils/common.js @@ -1,5 +1,3 @@ -import request from "@/utils/request"; -import {setUserInfo} from '@/utils/auth.js' /** * 显示消息提示框 * @param content 提示的标题 @@ -53,24 +51,4 @@ export function tansParams(params) { } } return result -} - -/** - * 获取当前登录用户信息 - * @returns {Promise} - */ -export async function getUserInfoRequest(){ - const res = await request({ - url: "/userClient/customer/getUserCustomer", - method: 'get', - params:{} - }) - if(!res.data){ - uni.reLaunch({ - url: '/pages/my/register' - }) - }else{ - setUserInfo(JSON.stringify(res.data)) - return res.data - } -} +} \ No newline at end of file diff --git a/utils/request.js b/utils/request.js index 0e5a3be..aacf440 100644 --- a/utils/request.js +++ b/utils/request.js @@ -13,6 +13,8 @@ const request = config => { config.header = config.header || {} if (getToken() && !isToken) { config.header['Authorization'] = 'Bearer ' + getToken() + }else{ + config.header['Authorization'] = 'Bearer ' +'6e753c0a509e4d01bde4f315f6a39ceb' } // get请求映射params参数 if (config.params) { @@ -43,8 +45,8 @@ console.log(config.header,424242); const code = res.data.code || 200 const msg = errorCode[code] || res.data.msg || errorCode['default'] if (code === 401) { - uni.clearStorageSync() - uni.reLaunch({ url: '/pages/login/login' }) + uni.clearStorageSync() + uni.reLaunch({ url: '/pages/login/login' }) // store.dispatch('LogOut').then(res => { // uni.reLaunch({ url: '/pages/login/login' }) // })