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

修复产品详情分享bug

See merge request !101

myPackageA/businessCard/businessCard.vue

@@ -481,7 +481,7 @@
 								title: ` ${this.cardInfo.userName}| ${this.cardInfo.companyInfoList[0].position} - ${this.cardInfo.companyInfoList[0].companyName}`,
 								desc: '​AI普惠型新家办领创家庭财事治理蓝海生态',
 								link: `${shareURL}/pages/lanch/index?userId=${this.userId}&cardId=${this.cardId}&isShareCard=1&landingPage=businessCard&miniShare=1`,
-								imgUrl: `${shareURL}/myPackageA/static/images/logo3.webp`, //图片
+								imgUrl: `${shareURL}/myPackageA/static/images/logo3.png`, //图片
 								sharePage:'businessCard',//分享的哪个页面
 								userId:this.userId,
 								cardId:this.cardId,
@@ -534,7 +534,7 @@
 								title: ` ${this.cardInfo.userName}| ${this.cardInfo.companyInfoList[0].position} - ${this.cardInfo.companyInfoList[0].companyName}`,
 								desc: '​AI普惠型新家办领创家庭财事治理蓝海生态',
 								link: `${shareURL}/pages/lanch/index?userId=${this.userId}&cardId=${this.cardId}&isShareCard=1&landingPage=businessCard&miniShare=1`,
-								imgUrl: `${shareURL}/myPackageA/static/images/logo3.webp`, //图片
+								imgUrl: `${shareURL}/myPackageA/static/images/logo3.png`, //图片
 								sharePage:'businessCard',//分享的哪个页面
 								userId:this.userId,
 								cardId:this.cardId,
@@ -643,7 +643,7 @@
 							desc: '​AI普惠型新家办领创家庭财事治理蓝海生态',
 							link: `${shareURL}/pages/lanch/index?userId=${this.userId}&cardId=${this.cardId}&isShareCard=1&landingPage=businessCard&miniShare=1`,
 							// link: `${shareURL}/myPackageA/businessCard/businessCard?userId=${this.userId}&cardId=${this.cardId}&isShareCard=1`, //分享链接
-							imgUrl: `${shareURL}/myPackageA/static/images/logo3.webp`, //图片
+							imgUrl: `${shareURL}/myPackageA/static/images/logo3.png`, //图片
 							sharePage:'businessCard',//分享的哪个页面
 							userId:this.userId,
 							cardId:this.cardId,

pages/courseDetail/courseDetail.vue

@@ -803,6 +803,9 @@
 			},
 			// 课程详情页面
 			courseDetail() {
+				this.userId = uni.getStorageSync('cffp_userId')
+				const shareCode = nanoid() + this.userId
+				const jumptime = Date.parse(new Date()) / 1000
 				api.courseDetail({
 					fileId: this.fileId,
 					userId: uni.getStorageSync('cffp_userId'),
@@ -831,11 +834,18 @@
 						const shareCode = nanoid() + this.userId
 						const jumptime = Date.parse(new Date()) / 1000
 						if(dataHandling.h5RuntimeEnv() == 'wechat-miniprogram'){
+							let newLink = ''
+							if(uni.getStorageSync('loginType')=='codelogin'){
+								newLink =  `${shareURL}/pages/lanch/index?fileId=${this.fileId}&coursesharing=1&serialsNo=${nanoid()}&shareCode=${shareCode}&shareUserId=${this.userId}&jumpUrl=${jumptime}&landingPage=courseDetail&miniShare=1`
+							}else {
+								newLink =  `${shareURL}/pages/lanch/index?fileId=${this.fileId}&landingPage=courseDetail&miniShare=1`
+							}
 							let shareInfo = {
 								title: this.courseInfo.fileTitle,
 								// desc: '加入我们开启学习之旅',
 								desc:this.courseInfo.fileSynopsis,
-								link: `${shareURL}/pages/lanch/index?fileId=${this.fileId}&landingPage=courseDetail&miniShare=1`,
+								// link: `${shareURL}/pages/lanch/index?fileId=${this.fileId}&coursesharing=1&serialsNo=${nanoid()}&shareCode=${shareCode}&shareUserId=${this.userId}&jumpUrl=${jumptime}&landingPage=courseDetail&miniShare=1`,
+								link: newLink,
 								// link: shareURL + "/pages/courseDetail/courseDetail?fileId=" + this.fileId, //分享链接
 								imgUrl: this.courseInfo.displayImage, //图片
 								sharePage:'courseDetail',//分享的哪个页面
@@ -1433,7 +1443,12 @@
 			jumpMplogin(){
 				let  currentUrl = ``;
 				if(this.miniShareInfo.miniShare){
-					currentUrl =  `${shareURL}/pages/lanch/index?fileId=${this.miniShareInfo.fileId}&coursesharing=1&serialsNo=${this.miniShareInfo.serialsNo}&shareCode=${this.miniShareInfo.shareCode}&shareUserId=${this.miniShareInfo.shareUserId}&jumpUrl=${this.miniShareInfo.jumpUrl}&landingPage=courseDetail&miniShare=1`
+					if(uni.getStorageSync('loginType')=='codelogin'){
+						currentUrl =  `${shareURL}/pages/lanch/index?fileId=${this.miniShareInfo.fileId}&coursesharing=1&serialsNo=${this.miniShareInfo.serialsNo}&shareCode=${this.miniShareInfo.shareCode}&shareUserId=${this.miniShareInfo.shareUserId}&jumpUrl=${this.miniShareInfo.jumpUrl}&landingPage=courseDetail&miniShare=1`
+					}else {
+						currentUrl =  `${shareURL}/pages/lanch/index?fileId=${this.miniShareInfo.fileId}&landingPage=courseDetail&miniShare=1`
+					}
+					
 				}else {
 					currentUrl = `${shareURL}/pages/lanch/index?fileId=${this.fileId}&landingPage=courseDetail&noShare=1`
 				}

pages/courselist/courselist.vue

@@ -723,11 +723,7 @@
 				let currentUrl =
 					`${shareURL}/pages/lanch/index?landingPage=${this.pageSource}&noShare=1`;
 				console.log('获取页面路径');
-				// if(this.miniShareInfo.miniShare){
-				// 	currentUrl =  `${shareURL}/pages/lanch/index?fileId=${this.miniShareInfo.fileId}&coursesharing=1&serialsNo=${this.miniShareInfo.serialsNo}&shareCode=${this.miniShareInfo.shareCode}&shareUserId=${this.miniShareInfo.userId}&jumpUrl=${this.miniShareInfo.jumpUrl}&landingPage=courseDetail&miniShare=1`
-				// }else {
-				// 	currentUrl = `${shareURL}/pages/lanch/index?fileId=${this.fileId}&landingPage=courseDetail&noShare=1`
-				// }
+				
 
 				let data = {
 					type: 'login',

pages/index/index.vue

@@ -298,7 +298,7 @@
 			 		title: '成为银盾合伙人，分享商品赚不停',
 			 		desc:  `资源+伙伴，共赢未来！`,
 			 		link: `${shareURL}/pages/index/index?miniShare=1`, //分享链接
-			 		imgUrl: `${shareURL}/myPackageA/static/images/logo3.webp`, //图片
+			 		imgUrl: `${shareURL}/myPackageA/static/images/logo3.png`, //图片
 			 		commonId:uni.getStorageSync('cffp_userId') || Date.now(),
 			 		sharePage:'index'//分享出去得页面
 			 	}

pages/inviteJoin/inviteJoin.vue

@@ -177,7 +177,7 @@
 			if (this.companyType == '1') {
 				this.ydLogoShare = `${shareURL}/static/cffp_logo.jpg`;
 			} else {
-				this.ydLogoShare = `${shareURL}/myPackageA/static/images/logo3.webp`;
+				this.ydLogoShare = `${shareURL}/myPackageA/static/images/logo3.png`;
 			}
 			if (companyInfo.companyType == '1') {
 				this.companyLogo = '../../static/myteam/Group1633.png';

pages/lanch/index.vue

@@ -24,7 +24,12 @@
 		} else if (options.miniShare) {
 			// 通过小程序分享进来的但没登录
 			if (options.landingPage == 'courseDetail') {
-				uni.reLaunch({ url: `/pages/courseDetail/courseDetail?fileId=${jumpInfo.value.fileId}&coursesharing=1&serialsNo=${jumpInfo.value.serialsNo}&shareCode=${jumpInfo.value.shareCode}&shareUserId=${jumpInfo.value.shareUserId}&jumpUrl=${jumpInfo.value.jumpUrl}&miniShare=1` })
+				if(jumpInfo.value.shareUserId){
+					uni.reLaunch({ url: `/pages/courseDetail/courseDetail?fileId=${jumpInfo.value.fileId}&coursesharing=1&serialsNo=${jumpInfo.value.serialsNo}&shareCode=${jumpInfo.value.shareCode}&shareUserId=${jumpInfo.value.shareUserId}&jumpUrl=${jumpInfo.value.jumpUrl}&miniShare=1` })
+				}else {
+					uni.reLaunch({ url: `/pages/courseDetail/courseDetail?fileId=${jumpInfo.value.fileId}&miniShare=1` })
+				}
+				
 			} else if (options.landingPage == 'businessCard') {
 				uni.reLaunch({ url: `/myPackageA/businessCard/businessCard?userId=${jumpInfo.value.userId}&isShareCard=1&cardId=${jumpInfo.value.cardId}&miniShare=1` })
 			} else if (options.landingPage == 'applyFranchise') {
@@ -37,7 +42,11 @@
 				uni.reLaunch({
 					url:'/pages/courselist/courselist'
 				})
-			}
+			}else if(options.landingPage == 'personalCenter'){
+					uni.reLaunch({
+						url:'/pages/personalCenter/personalCenter'
+					})
+				}
 			return
 		}else if(options.noLogin){
 			// 去到小程序登录页了，没登录
@@ -51,7 +60,11 @@
 				uni.reLaunch({
 					url:'/pages/courselist/courselist'
 				})
-			}
+			}else if(options.landingPage == 'personalCenter'){
+					uni.reLaunch({
+						url:'/pages/personalCenter/personalCenter'
+					})
+				}
 		}
 
 	})
@@ -86,7 +99,12 @@
 					if(jumpInfo.value.noShare){
 						uni.reLaunch({ url: `/pages/courseDetail/courseDetail?fileId=${jumpInfo.value.fileId}&noShare=1`})
 					} else {
-						uni.reLaunch({ url: `/pages/courseDetail/courseDetail?fileId=${jumpInfo.value.fileId}&coursesharing=1&serialsNo=${jumpInfo.value.serialsNo}&shareCode=${jumpInfo.value.shareCode}&shareUserId=${jumpInfo.value.shareUserId}&jumpUrl=${jumpInfo.value.jumpUrl}&miniShare=1` })
+						if(jumpInfo.value.shareUserId){
+							uni.reLaunch({ url: `/pages/courseDetail/courseDetail?fileId=${jumpInfo.value.fileId}&coursesharing=1&serialsNo=${jumpInfo.value.serialsNo}&shareCode=${jumpInfo.value.shareCode}&shareUserId=${jumpInfo.value.shareUserId}&jumpUrl=${jumpInfo.value.jumpUrl}&miniShare=1` })
+						}else {
+							uni.reLaunch({ url: `/pages/courseDetail/courseDetail?fileId=${jumpInfo.value.fileId}&miniShare=1` })
+						}
+						// uni.reLaunch({ url: `/pages/courseDetail/courseDetail?fileId=${jumpInfo.value.fileId}&coursesharing=1&serialsNo=${jumpInfo.value.serialsNo}&shareCode=${jumpInfo.value.shareCode}&shareUserId=${jumpInfo.value.shareUserId}&jumpUrl=${jumpInfo.value.jumpUrl}&miniShare=1` })
 					}
 					return
 				} else if (landingPage == 'businessCard') {
@@ -101,6 +119,10 @@
 					uni.reLaunch({
 						url:'/pages/courselist/courselist'
 					})
+				}else if(landingPage == 'personalCenter'){
+					uni.reLaunch({
+						url:'/pages/personalCenter/personalCenter'
+					})
 				}
 			} else {
 				uni.showToast({

pages/personalCenter/personalCenter.vue

@@ -174,7 +174,7 @@
 	import common from "../../common/common";
 	import tabBar from '../../components/tabBar/tabBar.vue';
 	import api from "@/api/api";
-	import { companyInfo } from "@/environments/environment";
+	import { companyInfo, shareURL } from "@/environments/environment";
 	import FloatingButton from '@/components/FloatingButton/FloatingButton.vue';
 	import JoinPopup from '@/components/commonPopup/JoinPopup.vue';
 	import PartnerTipPopup from "@/components/commonPopup/PartnerTipPopup.vue";
@@ -587,10 +587,10 @@
 				this.bootpage = false
 			},
 			isLogin() {
-				// if (dataHandling.h5RuntimeEnv() == 'wechat-miniprogram') {
-				// 	this.jumpMplogin()
-				// 	return
-				// }
+				if (dataHandling.h5RuntimeEnv() == 'wechat-miniprogram') {
+					this.jumpMplogin()
+					return
+				}
 				uni.navigateTo({
 					url: '/myPackageA/login/login?from=personalCenter'
 				})
@@ -955,7 +955,8 @@
 				})
 			},
 			jumpMplogin(){
-							let  currentUrl = window.location.href;
+							let currentUrl =
+								`${shareURL}/pages/lanch/index?landingPage=personalCenter&noShare=1`;
 							console.log('获取页面路径');
 							// if(this.miniShareInfo.miniShare){
 							// 	currentUrl =  `${shareURL}/pages/lanch/index?fileId=${this.miniShareInfo.fileId}&coursesharing=1&serialsNo=${this.miniShareInfo.serialsNo}&shareCode=${this.miniShareInfo.shareCode}&shareUserId=${this.miniShareInfo.userId}&jumpUrl=${this.miniShareInfo.jumpUrl}&landingPage=courseDetail&miniShare=1`

util/router.js

@@ -49,7 +49,7 @@ export default function initApp(){
 						title: '成为银盾合伙人，分享商品赚不停',
 						desc:  `资源+伙伴，共赢未来！`,
 						link: `${shareURL}/pages/index/index?miniShare=1`, //分享链接
-						imgUrl: `${shareURL}/myPackageA/static/images/logo3.webp`, //图片
+						imgUrl: `${shareURL}/myPackageA/static/images/logo3.png`, //图片
 						commonId:uni.getStorageSync('cffp_userId'),
 						sharePage:'index'//分享出去得页面
 					}
@@ -153,7 +153,7 @@ export default function initApp(){
 		  			title: '成为银盾合伙人，分享商品赚不停',
 		  			desc:  `资源+伙伴，共赢未来！`,
 		  			link: `${shareURL}/pages/index/index?miniShare=1`, //分享链接
-		  			imgUrl: `${shareURL}/myPackageA/static/images/logo3.webp`, //图片
+		  			imgUrl: `${shareURL}/myPackageA/static/images/logo3.png`, //图片
 		  			commonId:uni.getStorageSync('cffp_userId'),
 		  			sharePage:'index'//分享出去得页面
 		  		}
@@ -210,7 +210,7 @@ export default function initApp(){
 					title: '成为银盾合伙人，分享商品赚不停',
 					desc:  `资源+伙伴，共赢未来！`,
 					link: `${shareURL}/pages/index/index?miniShare=1`, //分享链接
-					imgUrl: `${shareURL}/myPackageA/static/images/logo3.webp`, //图片
+					imgUrl: `${shareURL}/myPackageA/static/images/logo3.png`, //图片
 					commonId:uni.getStorageSync('cffp_userId'),
 					sharePage:'index'//分享出去得页面
 				}