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

cffp分享数据统计，返回小程序多次统计发布生产

See merge request !108

pages/courselist/courselist.vue

@@ -231,6 +231,7 @@
 			}
 			}
 
 
 		},
 		},
+		
 		onShow() {
 		onShow() {
 			this.isLoading = false
 			this.isLoading = false
 			this.generatedImage = ''
 			this.generatedImage = ''
@@ -308,8 +309,6 @@
 						'产品中心',
 						'产品中心',
 						'pages/courselist/courselist'
 						'pages/courselist/courselist'
 					)
 					)
-
-					console.log('env', dataHandling.h5RuntimeEnv() == 'wechat-miniprogram');
 					if (dataHandling.h5RuntimeEnv() == 'wechat-miniprogram') {
 					if (dataHandling.h5RuntimeEnv() == 'wechat-miniprogram') {
 						this.jumpMplogin()
 						this.jumpMplogin()
 						return
 						return
@@ -403,10 +402,12 @@
 					wx.miniProgram.postMessage({
 					wx.miniProgram.postMessage({
 						data: {
 						data: {
 							type: 'share',
 							type: 'share',
-							shareData: JSON.stringify(shareInfo)
+							shareData: JSON.stringify(shareInfo),
+							messageId: nanoid()  // 唯一消息ID
 						}
 						}
 
 
 					})
 					})
+					
 					return
 					return
 				}
 				}
 				this.getshareData2(shareCode, jumptime, this.shareItem)
 				this.getshareData2(shareCode, jumptime, this.shareItem)

pages/index/index.vue

@@ -341,6 +341,7 @@
 			this.dataToken = ''
 			this.dataToken = ''
 		  // 清除事件监听
 		  // 清除事件监听
 		  uni.$off('loginUpdate', this.queryAreaCenterInfo);
 		  uni.$off('loginUpdate', this.queryAreaCenterInfo);
+		  
 		},
 		},
 		methods: {
 		methods: {
 			 // 初始化首页分享   注意sdk时序问题。传递的url一定要是当前页面的url window.location.href.split('#')[0]
 			 // 初始化首页分享   注意sdk时序问题。传递的url一定要是当前页面的url window.location.href.split('#')[0]

pages/lanch/index.vue

@@ -123,7 +123,7 @@
 					})
 					})
 				}else if(landingPage == 'orderStatus'){
 				}else if(landingPage == 'orderStatus'){
 					uni.reLaunch({
 					uni.reLaunch({
-						url:`/pages/orderStatus/orderStatus?orderId=${jumpInfo.value.orderId}&fileId=${jumpInfo.value.fileId}&orderStatus=2&userId=${res.data.userId}`
+						url:`/pages/orderStatus/orderStatus?orderId=${jumpInfo.value.orderId}&fileId=${jumpInfo.value.fileId}&orderStatus=2&userId=${res.data.userId}&backMySelf=1`
 					})
 					})
 				}
 				}
 			} else {
 			} else {

pages/orderStatus/orderStatus.vue

@@ -57,6 +57,8 @@
 	import courseItem from "@/components/courseItem/courseItem.vue";
 	import courseItem from "@/components/courseItem/courseItem.vue";
 	import tabBar from '../../components/tabBar/tabBar.vue';
 	import tabBar from '../../components/tabBar/tabBar.vue';
 	import { initJssdkShare, setWechatShare } from '@/util/fiveshare';
 	import { initJssdkShare, setWechatShare } from '@/util/fiveshare';
+	import dataHandling from "@/util/dataHandling";
+	import wx from 'weixin-js-sdk'
 	export default {
 	export default {
 		components:{tabBar,courseItem},
 		components:{tabBar,courseItem},
 		data() {
 		data() {
@@ -155,6 +157,7 @@
 			this.orderId = options.orderId;
 			this.orderId = options.orderId;
 			this.orderStatus = options.orderStatus;
 			this.orderStatus = options.orderStatus;
 			this.fileId = options.fileId;
 			this.fileId = options.fileId;
+			
 			// 没有oldToken代表支付订单人和提供订单人不是同一个人
 			// 没有oldToken代表支付订单人和提供订单人不是同一个人
 			if(options.userId && options.userId != "undefined"&&!uni.getStorageSync('oldToken')){
 			if(options.userId && options.userId != "undefined"&&!uni.getStorageSync('oldToken')){
 				this.userId = options.userId;
 				this.userId = options.userId;