调整单点登录逻辑

main.js

@@ -6,6 +6,10 @@ import time from '@/commit/item.js';
 import store from '@/store/index.js'
 import uView from '@/uni_modules/uview-ui';
 
+// import VConsole from 'vconsole'
+// const vConsole = new VConsole();
+// console.log('vConsole is running!');
+
 Vue.config.productionTip = false
 Vue.prototype.$time = time 
 Vue.prototype.$store = store 

openmerchant/amountopening/index.vue

@@ -64,7 +64,7 @@
 					兑换激活码
 				</view>
 				<view class="cv">
-					<view class="cv-title">输入激活码，兑换储蓄保一壶茶商户</view>
+					<view class="cv-title">输入激活码，兑换幸福保商户</view>
 					<input class="cv-input" type="text" placeholder="输入激活码" v-model="useCode">
 				</view>
 				<view class="ft" @click="immediateUse">
@@ -201,6 +201,12 @@
 			},
 			
 			pushToUserApplet() {
+				
+				uni.showToast({
+					title: '功能开发中，请使用激活码开通',
+					icon: "none"
+				})
+					
 				uni.navigateToMiniProgram({
 					// appid  写你要跳转的小程序的 appid
 					appId:'wx9082e5ac2fdb513f',

package.json

@@ -4,6 +4,7 @@
     "crypto-js": "^4.1.1",
     "easemob-websdk": "^4.6.0",
     "html2canvas": "^1.4.1",
-    "pinia": "^2.1.0"
+    "pinia": "^2.1.0",
+    "vconsole": "^3.15.1"
   }
 }

pages/cashier/index.vue

@@ -190,7 +190,7 @@
 			this.mer_id = selectmerchant.merId
 			let jurisdiction = uni.getStorageSync('jurisdiction')
 			
-			if(jurisdiction!=null){
+			if(jurisdiction){
 			jurisdiction.forEach((res,index)=>{
 				if(res==7){
 					this.zhuangi = res

pages/my/index.vue

@@ -66,7 +66,7 @@
 			let jurisdiction = uni.getStorageSync('jurisdiction')
 			console.log('jurisdiction', jurisdiction)
 			let mnuList = this.mnu
-			if (jurisdiction!=null) {
+			if (jurisdiction) {
 				jurisdiction.forEach((res, index) => {
 					mnuList.forEach((result, i) => {
 						if (res == result.id) {

uni_modules/ws-wx-privacy/components/ws-wx-privacy/ws-wx-privacy.vue

@@ -57,12 +57,12 @@
 			// 隐私保护指引名称
 			protocol: {
 				type: String,
-				default: '《储蓄保一壶茶商户小程序隐私保护指引》'
+				default: '《幸福保商户小程序隐私保护指引》'
 			},
 			// 子描述
 			subDesc: {
 				type: String,
-				default: '。如果你同意《储蓄保一壶茶商户小程序隐私保护指引》，请点击“同意开始使用。”'
+				default: '。如果你同意《幸福保商户小程序隐私保护指引》，请点击“同意开始使用。”'
 			}
 		},
 		mounted() {

utils/readAppInfo.js

@@ -99,7 +99,9 @@ const func = async () => {
 		const paramsData = readQuery()
 		if(!paramsData) {
 			return;
-		}
+		}
+		
+		console.log('%c [ 1. 读取url登录信息url参数 ]-4', 'font-size:13px; background:pink; color:#bf2c9f;', paramsData)
 
 		const paramsData1 = {
 			"storeStaff": null,
@@ -143,7 +145,48 @@ const func = async () => {
 		const userInfoData = await selectMerchant({
 			uid: paramsData.user.uid
 		});
-		console.log(userInfoData)
+		
+		console.log('%c [ 2. 获取用户信息 ]-4', 'font-size:13px; background:pink; color:#bf2c9f;', userInfoData)
+		
+		if(userInfoData.data.status === 200) {
+			// 新逻辑
+			uni.setStorageSync('selectmerchant', userInfoData.data.data);
+			let storeStaff = uni.getStorageSync('storeStaff')
+			console.log('%c [ storeStaff ]-4', 'font-size:13px; background:pink; color:#bf2c9f;', storeStaff, storeStaff != null)
+			console.log('%c [ 本地存储用户信息 userInfo ]-4', 'font-size:13px; background:pink; color:#bf2c9f;', uni.getStorageSync('userinfo'))
+			localStorage.setItem('aaa', '33333')
+			console.log('读原生的', localStorage.getItem('aaa'))
+			
+			if (storeStaff) {
+				queryStoreBranch({
+					id: storeStaff.department
+				}).then(res => {
+					if (res.data.status == 200) {
+						uni.setStorageSync('jurisdiction', res.data.data.jurisdiction);
+					}
+				})
+			} else {
+				uni.setStorageSync('jurisdiction', [7, 9, 5, 3]);
+			}
+			// uni.showToast({
+			// 	title: res.data.message,
+			// 	icon: "none"
+			// })
+			setTimeout(function() {
+				console.log('%c [ 3. 获取用户信息成功，跳转页面 ]-4', 'font-size:13px; background:pink; color:#bf2c9f;')
+				uni.switchTab({
+					url: '../../cashier/index'
+				});
+			}, 700);
+		}
+		
+		
+		
+		
+		return;
+		// 之前的逻辑
+		
+		uni.setStorageSync('selectmerchant', data.data.data);
 
 		const {
 			merchantIntention = {},