Merge branch 'feature-20260203-解决外部跳转页面登录问题' into 'dev'

Feature 20260203 解决外部跳转页面登录问题

See merge request !84

index.html

@@ -42,7 +42,7 @@
 		</div>
 		<script type="module" src="/main.js"></script>
 		<!-- uni 的 SDK，必须引用。 -->
-		<script type="text/javascript" src="/static/uni.webview.1.5.4.js"></script>
+		<!-- <script type="text/javascript" src="/static/uni.webview.1.5.4.js"></script>
 		<script type="text/javascript">
 			// 验证脚本是否加载成功（调试关键：控制台打印 webViewJs 确认）
 			const webViewJs = window.uni?.webView;
@@ -53,6 +53,6 @@
 				// 将 webViewJs 挂载到 window 全局，供 Vue 组件访问
 				window.webViewJs = webViewJs;
 			}
-		</script>
+		</script> -->
 	</body>
 </html>
\ No newline at end of file

myPackageA/ticket/unUsed.vue

@@ -106,6 +106,7 @@
 			"size": 10,
 		}
 		dealerId.value = JSON.parse(JSON.stringify(uni.getStorageSync('cffp_userInfo'))) ? JSON.parse(JSON.stringify(uni.getStorageSync('cffp_userInfo'))).dealerId :''
+		console.log('dealerId.value',dealerId.value);
 		getList(paginationInfo.value)
 	})
 </script>

pages.json

@@ -620,21 +620,21 @@
 			{
 				"navigationBarTitleText" : "我的名片"
 			}
-		},
-		{
-			"path" : "ticket/unUsed",
-			"style" : 
-			{
-				"navigationBarTitleText" : "我的卡券"
-			}
-		},
-		{
-			"path" : "ticket/alreadyUsed",
-			"style" : 
-			{
-				"navigationBarTitleText" : "使用记录"
-			}
 		}
+		// {
+		// 	"path" : "ticket/unUsed",
+		// 	"style" : 
+		// 	{
+		// 		"navigationBarTitleText" : "我的卡券"
+		// 	}
+		// },
+		// {
+		// 	"path" : "ticket/alreadyUsed",
+		// 	"style" : 
+		// 	{
+		// 		"navigationBarTitleText" : "使用记录"
+		// 	}
+		// }
 
 		]
 	},{

pages/courselist/courselist.vue

@@ -79,9 +79,8 @@
 		<view class="productBox">
 			<view class="productList" :style="{marginTop}">
 				<view class="tabBox">
-					<view :class="{'actived': courseClassify==4}" @click="transform('consult')"><text>咨询产品</text></view>
-					
 					<view :class="{'actived': courseClassify==3}" @click="transform('plan')"><text>规划产品</text></view>
+					<view :class="{'actived': courseClassify==4}" @click="transform('consult')"><text>咨询产品</text></view>
 				</view>
 				<view class="productItem" v-for="item in localCourseInfos" :key="item.fileId" >
 					<view class="top" @click="goDetail(item)">
@@ -235,7 +234,7 @@
 				env:dataHandling.getRuntimeEnv2(),
 				shareItem:{},//分享的产品
 				sharelogin: false,
-				courseClassify:4,
+				courseClassify:3,
 				posterImg:'https://yindun-images.oss-cn-shanghai-finance-1-pub.aliyuncs.com/ydMall/product/serviceContent-zx_jqsw1-1.png',
 				
 				qrCodeUrl: 'https://example.com',//二维码的链接地址

pages/personalCenter/personalCenter.vue

@@ -190,7 +190,7 @@
 				inviteEqrode: '',
 				currentPage: 'personalCenter',
 				customerBasicInfo: {},
-				loginornot: true,
+				loginornot: true,//登录状态
 				tabBarPadding: 100,
 				settingItem: {
 					title: '系统设置',
@@ -218,13 +218,14 @@
 								isShow: true,
 								identity: true
 							},
-							{
-								title: '我的卡券',
-								icon: 'icon-yifukuan',
-								link: '/myPackageA/ticket/unUsed',
-								isOpen: true,
-								isShow: true
-							},
+							// {
+							// 	title: '我的卡券',
+							// 	icon: 'icon-yifukuan',
+							// 	link: '/myPackageA/ticket/unUsed',
+							// 	isOpen: true,
+							// 	isShow: true,
+							// 	key:'ticket',
+							// },
 							{
 								title: '我的售后',
 								icon: 'icon-shouhoufuwu',
@@ -587,6 +588,7 @@
 			},
 			// 菜单跳转页面
 			goDetail(item) {
+				
 				if (uni.getStorageSync('cffp_userInfo')) {
 					this.userInfo = JSON.parse(uni.getStorageSync('cffp_userInfo'))
 				}
@@ -691,10 +693,21 @@
 					});
 					return
 				}
-				if (!this.loginornot && !item.islogin) {
+				
+				
+				console.log('判断',(!uni.getStorageSync('loginType') || uni.getStorageSync('loginType') == 'visitor') && !item.islogin);
+				if ((!uni.getStorageSync('loginType') || uni.getStorageSync('loginType') == 'visitor') && !item.islogin) {
 					this.isLogin()
 					return
 				}
+				// 登录状态下直接去我的卡券
+				if(item.key=='ticket'){
+					uni.navigateTo({
+						url: `${item.link}`
+					});
+					return
+				}
+				
 				if (item.isShow && item.isOpen) {
 					if (item.title === '我的邀请码') {
 						this.$refs.popup1.open('bottom');
@@ -722,7 +735,9 @@
 						url: `${item.link}?levelCode=` + this.customerBasicInfo.levelCode
 					});
 				} else {
+					
 					const urlObj = JSON.parse(JSON.stringify(item))
+					console.log('222222222',urlObj.link);
 					if (urlObj.type) {
 						urlObj.link =
 							`${urlObj.link}?type=${urlObj.type}&from=personalCenter&partnerType=${this.customerBasicInfo.partnerType}`

util/interceptor.ts

@@ -156,6 +156,7 @@ export const interceptor = () => {
 			if(args && args.data && args.data.errorCode && "T001"==args.data.errorCode){
 				 uni.removeStorageSync('isLogin');
 				 uni.removeStorageSync('uni-token');
+				 uni.setStorageSync('loginType','visitor')
 				 uni.switchTab({
 					url:'/pages/index/index'
 				})