Browse Source

更改userId和openid

sunChengjie 11 months ago
parent
commit
a08c7de374

+ 2 - 2
src/main.js

@@ -47,10 +47,10 @@ router.beforeEach((to, from, next) => {
 	// if (to.matched.some(record => record.meta.needLogin)) { // 判断该路由是否需要登录权限
 	if (!whiteList.includes(to.path)) {
 		console.log('有登录权限')
-		if (!localStorage.getItem('userId')) { // 判断当前用户的登录信息userId是否存在
+		if (!localStorage.getItem('courierUserId')) { // 判断当前用户的登录信息userId是否存在
 			console.log('无userId')
 			next('/Login')
-		} else if (!localStorage.getItem('openid')) {
+		} else if (!localStorage.getItem('courierOpenid')) {
 			console.log('无openId')
 			getWxOpenId().then(() => {
 				next()

+ 1 - 1
src/pages/email.vue

@@ -34,7 +34,7 @@ export default {
 			this.$router.push('My')
 		},
 		async getUser() {
-			const res = await getSysUserInfoByUserIdAPI({ userId: localStorage.getItem("userId") })
+			const res = await getSysUserInfoByUserIdAPI({ userId: localStorage.getItem("courierUserId") })
 			this.$store.state.user = res.sysUserInfo
 			console.log(this.$store.state.user, 'this.$state.state.user')
 		}

+ 4 - 4
src/pages/forgetpassword.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="content">
-		
+
 		<div class="login">
 			<!-- <div class="item">
 				<van-cell-group>
@@ -44,8 +44,8 @@ export default {
 		}
 	},
 	created: function () {
-		
-		this.userId = localStorage.getItem('userId');
+
+		this.userId = localStorage.getItem('courierUserId');
 	},
 	methods: {
 		async save() {
@@ -66,7 +66,7 @@ export default {
 				password: this.password
 			})
 			if (res.msg == 'success') {
-				localStorage.removeItem("userId");
+				localStorage.removeItem("courierUserId");
 				this.$router.push({ path: '/' });
 			} else {
 				Toast('修改失败!');

+ 1 - 1
src/pages/login.vue

@@ -63,7 +63,7 @@ export default {
 
 			if (res.result == 'success') {
 				//localStorage
-				localStorage.setItem("userId", res.userId);
+				localStorage.setItem("courierUserId", res.userId);
 				localStorage.setItem("roomId", res.roomId);
 				localStorage.setItem("courierId", res.userId);
 				this.$router.push({ path: '/' });

+ 3 - 3
src/pages/my.vue

@@ -44,7 +44,7 @@ export default {
 	},
 	created: function () {
 
-		this.userId = localStorage.getItem("userId");
+		this.userId = localStorage.getItem("courierUserId");
 		console.log('userId:' + this.userId);
 		// this.getUser();
 		this.user = this.$store.state.user
@@ -54,8 +54,8 @@ export default {
 	methods: {
 		//退出登录
 		loginout() {
-			localStorage.removeItem("userId");
-			localStorage.removeItem("openid");
+			localStorage.removeItem("courierUserId");
+			localStorage.removeItem("courierOpenid");
 			this.$router.push('/Login')
 
 			// 配置一下  环境

+ 1 - 1
src/pages/new/storage.vue

@@ -268,7 +268,7 @@ export default {
         },
         // 获取用户信息
         async getUser() {
-            const res = await getSysUserInfoByUserIdAPI({ userId: localStorage.getItem("userId") })
+            const res = await getSysUserInfoByUserIdAPI({ userId: localStorage.getItem("courierUserId") })
             this.$store.state.user = res.sysUserInfo
             console.log(this.$store.state.user, 'this.$state.state.user')
         }

+ 1 - 1
src/pages/personinfomation.vue

@@ -32,7 +32,7 @@ export default {
 		}
 	},
 	created: function () {
-		this.userId = localStorage.getItem("userId");
+		this.userId = localStorage.getItem("courierUserId");
 		// this.getUser();
 		this.user = this.$store.state.user
 	},

+ 3 - 3
src/script/common.js

@@ -2,18 +2,18 @@ import { getWxUserInfo, getWxConfig } from '../api/login'
 export default {
 	install(Vue) {
 		Vue.prototype.getOpenid = async function () {
-			if (localStorage.getItem("openid") != 'undefined' && localStorage.getItem("openid") != null)
+			if (localStorage.getItem("courierOpenid") != 'undefined' && localStorage.getItem("openid") != null)
 				return;
 			var code = this.getUrlParam("code");
 			if (code == 'undefined' || code == null || code == "") {
 				this.urlredirect();
 				return;
 			}
-			const res = await getWxUserInfo({ code: code, userId: localStorage.getItem("userId") })
+			const res = await getWxUserInfo({ code: code, userId: localStorage.getItem("courierUserId") })
 			console.log(res, '================================getWxUserInfo')
 			if (res.code == '0') {
 				console.log('直接走+======', res)
-				localStorage.setItem("openid", res.openId);
+				localStorage.setItem("courierOpenid", res.openId);
 				localStorage.setItem("headimgurl", res.headimgurl);
 			} else {
 				this.urlredirect();

+ 3 - 3
src/script/wxGetOpenId.js

@@ -1,7 +1,7 @@
 import { getWxUserInfo, getWxConfig } from '../api/login'
 
 export async function getWxOpenId() {
-    if (localStorage.getItem("openid") != 'undefined' && localStorage.getItem("openid") != null && localStorage.getItem("openid") != '') {
+    if (localStorage.getItem("courierOpenid") != 'undefined' && localStorage.getItem("courierOpenid") != null && localStorage.getItem("courierOpenid") != '') {
         return;
     }
 
@@ -13,11 +13,11 @@ export async function getWxOpenId() {
         return;
     }
 
-    const res = await getWxUserInfo({ code: code, userId: localStorage.getItem("userId") })
+    const res = await getWxUserInfo({ code: code, userId: localStorage.getItem("courierUserId") })
     console.log(res, '================================getWxUserInfo')
     if (res.code == '0') {
         console.log('直接走+======', res)
-        localStorage.setItem("openid", res.openId);
+        localStorage.setItem("courierOpenid", res.openId);
         localStorage.setItem("headimgurl", res.headimgurl);
     } else {
         urlredirect();