From cfe15b06d4c3f84906fae8277e62eb241ab720ca Mon Sep 17 00:00:00 2001 From: "yang-zongying@qq.com" Date: Sat, 30 Mar 2024 17:23:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0store?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/cardTit.vue | 2 +- config/request.js | 46 +++++----- manifest.json | 2 +- package-lock.json | 4 +- package.json | 4 +- pages/Login.vue | 7 +- pages/main.vue | 48 ++++++----- pages/workSpace/baoxiu/baoxiuSQ.vue | 12 +-- pages/workSpace/jijian/jijianSQ.vue | 14 +-- pages/workSpace/jiudian/jiudianSQ.vue | 15 ++-- pages/workSpace/wupin/wupinSL.vue | 14 +-- pages/workSpace/yongche/yongcheSQ.vue | 12 +-- pages/workSpace/zhaodai/zhaodaiSQ.vue | 45 +++++----- store/modules/userStore.js | 80 ++++++++++-------- .../dist/build/app-plus/app-config-service.js | 4 +- unpackage/dist/build/app-plus/app-service.js | 10 +-- unpackage/dist/build/app-plus/app-view.js | 2 +- unpackage/dist/build/app-plus/manifest.json | 2 +- .../dist/build/app-plus/static/common.scss | 44 +++++++++- .../dist/build/app-plus/static/icon/rydd.psd | Bin 950073 -> 1007016 bytes .../dist/build/app-plus/static/icon/wpcg.png | Bin 2422 -> 2455 bytes .../dist/build/app-plus/static/icon/wpsl.png | Bin 2554 -> 2657 bytes unpackage/dist/build/app-plus/view.css | 2 +- 23 files changed, 221 insertions(+), 148 deletions(-) diff --git a/components/cardTit.vue b/components/cardTit.vue index 6e10c09..52e9dea 100644 --- a/components/cardTit.vue +++ b/components/cardTit.vue @@ -44,7 +44,7 @@ return { imgbaseUrl: this.$globalv.imgBaseUrl, }; - } + }, } diff --git a/config/request.js b/config/request.js index 9749b1c..97b0d27 100644 --- a/config/request.js +++ b/config/request.js @@ -19,32 +19,37 @@ module.exports = (vm) => { // const urlObj = new URL(url); // return urlObj.pathname; // } - // const path = config.url; + const path = config.url; // const userInfo = uni.getStorageSync('userInfo'); // 初始化请求拦截器时,会执行此方法,此时data为undefined,赋予默认{} - config.data = config.data || {} + // config.data = config.data || {} // // 根据custom参数中配置的是否需要token,添加对应的请求头 // if(config?.custom?.auth) { // // 可以在此通过vm引用vuex中的变量,具体值在vm.$store.state中 // config.header.token = vm.$store.state.userInfo.token // } - // if (path.startsWith('/api')) { - // console.log('accessToken',accessToken) - // if(userInfo){ - // // config.header.Authorization = `Bearer ${accessToken}`; - // }else { - // // 没有访问令牌,可以选择拒绝请求或重定向到登录页面 - // uni.showToast({ - // title: '令牌已失效,请重新登录!', - // icon: 'fail', - // duration: 5000 - // }); - // uni.navigateTo({ - // url: '/pages/Login' - // }) - // return Promise.reject(new Error('No access token available')); - // } - // } + console.log("拦截url",path) + if (!path.startsWith('/User/UserInfor')) { + console.log('state :', vm.$store.state) + console.log('getters :', vm.$store.getters) + const isUserLoggedIn = vm.$store.getters.isLoggedIn; // 假设这是从 Vuex 获取的 + const userInfo = vm.$store.state.userStore.userInfo; // 假设这是用户信息 + console.log('检查用户是否登录 :', isUserLoggedIn) + console.log('检查用户是否登录-userInfo :', userInfo) + // 检查用户是否登录 + if (!isUserLoggedIn || !userInfo) { + // 用户未登录或信息为空,跳转到登录页面 + uni.showToast({ + title: '登录已失效,请重新登录!', + icon: 'fail', + duration: 5000 + }); + uni.navigateTo({ + url: '/pages/Login' + }) + return Promise.reject(new Error('用户未登录')); + } + } return config }, config => { // 可使用async await 做异步操作 return Promise.reject(config) @@ -56,6 +61,7 @@ module.exports = (vm) => { title: '加载中', mask: true }); + let data = response.data console.log("响应response:",response) // 自定义参数 @@ -83,4 +89,4 @@ module.exports = (vm) => { // 对响应错误做点什么 (statusCode !== 200) return Promise.reject(response) }) -} +} \ No newline at end of file diff --git a/manifest.json b/manifest.json index c654d01..2306491 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "yawei", "appid" : "__UNI__C8F0E5D", "description" : "亚威变压器", - "versionName" : "1.0.10", + "versionName" : "1.0.11", "versionCode" : "100", "transformPx" : false, /* 5+App特有相关 */ diff --git a/package-lock.json b/package-lock.json index cd0d4a0..6dab863 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { - "name": "tuiguang", - "version": "1.0.0", + "name": "yawei", + "version": "1.1.0", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/package.json b/package.json index a4efc7a..7ae32ad 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "tuiguang", - "version": "1.0.0", + "name": "yawei", + "version": "1.1.0", "description": "", "main": "main.js", "scripts": { diff --git a/pages/Login.vue b/pages/Login.vue index 6f73532..bf4ebf0 100644 --- a/pages/Login.vue +++ b/pages/Login.vue @@ -46,7 +46,7 @@ @@ -99,10 +105,10 @@ .tabbar { height: 60px; } - .tabbar-item{ - - } - .main-con{ + + .tabbar-item {} + + .main-con { height: calc(100vh - 60px); overflow-y: auto; } diff --git a/pages/workSpace/baoxiu/baoxiuSQ.vue b/pages/workSpace/baoxiu/baoxiuSQ.vue index 2c46a0d..0700e1d 100644 --- a/pages/workSpace/baoxiu/baoxiuSQ.vue +++ b/pages/workSpace/baoxiu/baoxiuSQ.vue @@ -59,6 +59,9 @@