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

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

See merge request !97

myPackageA/businessCard/businessCard.vue

@@ -38,7 +38,7 @@
 						<view v-for="item in infoList" :key="item.id" class="infoCon" @click="handleInfo(item)">
 							<template v-if="item.value">
 								<view class="iconfont infoIcon" :class="`${item.icon}`"></view>
-								<view class="infoTxt" >
+								<view class="infoTxt">
 									{{item.value}}
 								</view>
 							</template>
@@ -71,10 +71,11 @@
 				<view class="content">
 					<view v-show="current === 0" class="tabcontent">
 						<view class="gapBox">
-							<view class="tabTitle" >
+							<view class="tabTitle">
 								品牌简介
 							</view>
-							<view class="insTxt" style="letter-spacing: 3rpx;">银盾家办（Supguard Family Office）由BHL（Budget Holdings
+							<view class="insTxt" style="letter-spacing: 3rpx;">银盾家办（Supguard Family Office）由BHL（Budget
+								Holdings
 								Limited)全资控股，来自英国拥有半个世纪的历史。依托BHL亚太区核心平台—Auto&General（A&G）集团专业能力，打造中国首个AI普惠型新家办。它带着国际先进的家庭财事治理经验来到中国，致力于成为中国领先的家事治理与风险管理解决方案供应商，为家庭提供全生命周期的风险管理、财产保值增值以及财富传承规划方案。
 							</view>
 							<view class="insTxt" style="margin-top: 20rpx;letter-spacing: 1.5rpx;">
@@ -371,7 +372,14 @@
 			} else {
 				this.getCard()
 			}
+			// #ifdef H5
+			if (dataHandling.h5RuntimeEnv() !== 'miniprogram') {
+				initJssdkShare(() => {
+					setWechatShare();
+				}, window.location.href);
+			}
 			
+			// #endif
 		},
 		onUnload() {
 			// #ifdef H5
@@ -384,6 +392,33 @@
 			// #endif
 		},
 		methods: {
+			// 新增方法：设置真实 meta 并初始化分享
+			  setRealPageMetaAndShare() {
+			    const data = {
+			      title: `${this.cardInfo.userName}| ${this.cardInfo.companyInfoList[0].position} - ${this.cardInfo.companyInfoList[0].companyName}`,
+			      desc: 'AI普惠型新家办领创家庭财事治理蓝海生态',
+			      link: `${shareURL}/myPackageA/businessCard/businessCard?userId=${this.userId}&cardId=${this.cardId}&isShareCard=1`,
+			      imgUrl: `${shareURL}/static/suplogo.png`
+			    };
+			
+			    // #ifdef H5
+				// 分享的时候一定要加这段代码，否则ios首次分享会使用系统默认分享
+				//安卓机型获取当前页面路径
+				let url = window.location.href.split('#')[0];
+				
+				//ios机型获取当前页面路径
+				let ua = navigator.userAgent.toLowerCase();
+				let isWeixin = ua.indexOf('micromessenger') !== -1;
+				if (isWeixin) {
+					let isiOS = /(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent); //ios终端
+				    if (isiOS && window.sessionStorage.getItem('firstEntryUrl')) {
+				        url = window.sessionStorage.getItem('firstEntryUrl').split('#')[0];
+				    }
+				}
+			    hshare(data, url);
+			    // #endif
+			  },
+
 			handleInfo(item) {
 				if (item.key == 'phone') {
 					if (item.value) {
@@ -445,9 +480,10 @@
 						this.infoList[1].value = this.cardInfo.email || null
 						this.infoList[2].value = this.cardInfo.address || '暂无'
 						if (dataHandling.h5RuntimeEnv() !== 'miniprogram') {
-							this.getshareData()
+							// this.getshareData()
+							this.setRealPageMetaAndShare()
 						}
-						console.log('cardInfo',this.cardInfo);
+						console.log('cardInfo', this.cardInfo);
 					} else {
 						uni.showToast({
 							title: res['message'],
@@ -481,7 +517,8 @@
 						// 	{companyName:'上海律宝科技有限公司',position:'CEO'},
 						// ]
 						if (dataHandling.h5RuntimeEnv() !== 'miniprogram') {
-							this.getshareData()
+							this.setRealPageMetaAndShare()
+							// this.getshareData()
 						}
 
 						this.getCardStatic()
@@ -554,7 +591,7 @@
 						return
 					}
 					// 如果是移动端
-					this.shareTipsFlag = true;//提示用户点击小程序的右上角胶囊进行分享
+					this.shareTipsFlag = true; //提示用户点击小程序的右上角胶囊进行分享
 					if (dataHandling.h5RuntimeEnv() !== 'miniprogram') {
 						this.getshareData()
 					}
@@ -605,9 +642,11 @@
 		height: auto;
 		box-sizing: border-box;
 		padding: 20rpx;
-		.insTxt{
+
+		.insTxt {
 			padding: 0rpx 6rpx;
 		}
+
 		.gapBox {
 			margin-bottom: 10rpx;
 			letter-spacing: 3rpx;
@@ -621,6 +660,7 @@
 			font-size: 0;
 			margin: 0;
 			padding: 0;
+
 			image {
 				display: block;
 				/* 将图像转为块级元素以去除底部空白 */
@@ -630,7 +670,8 @@
 				margin-top: -1rpx;
 			}
 		}
-		.tipTxt{
+
+		.tipTxt {
 			width: 100%;
 			font-size: 24rpx;
 			display: flex;
@@ -639,6 +680,7 @@
 			color: #585858;
 			margin-top: 20rpx;
 		}
+
 		.loginTip {
 			width: 100%;
 			height: 50vh;

uni_modules/uni-share-wx/index.vue

@@ -48,16 +48,19 @@
 					link: window.location.href, //分享链接
 					imgUrl: this.WXdata.imageUrl, //图片
 				}
-				// let url;
-				// if (navigator.userAgent.indexOf('iPhone') !== -1) {
-				//   // IOS 记录微信菜单打开时的url
-				//   url = uni.getStorageSync('entryUrl');
-				// } else {
-				//   // 安卓 记录当前使用SDK的页面的url
-				//   const { href } = window.location;
-				//   url = href.split('#')[0];
-				// }
-				var url = window.location.href.split('#')[0]
+				//安卓机型获取当前页面路径
+				let url = window.location.href.split('#')[0];
+
+				//ios机型获取当前页面路径
+				let ua = navigator.userAgent.toLowerCase();
+				let isWeixin = ua.indexOf('micromessenger') !== -1;
+				if (isWeixin) {
+					let isiOS = /(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent); //ios终端
+					if (isiOS && window.sessionStorage.getItem('firstEntryUrl')) {
+						url = window.sessionStorage.getItem('firstEntryUrl').split('#')[0];
+					}
+				}
+				
 				hshare(data, url)
 			},
 			open(option) {
@@ -121,11 +124,11 @@
 				// 			})	
 				// 			}
 			},
-			submitsuessc(type){
+			submitsuessc(type) {
 				let platform = uni.getSystemInfoSync().platform
 				let that = this
 				let UserShareRequestVO = {
-					systemType: platform == 'ios'? '1': '0',
+					systemType: platform == 'ios' ? '1' : '0',
 					userId: uni.getStorageSync('cffp_userId'),
 					businessType: '1', // 分享类型
 					businessId: that.WXdata.fileId, // 课程Id