分享问题修复

点餐页增加轮播图点击图片进入具体页面，点击分享正常分享，在对应的页面增加分享弹窗组件
2026-01-30 10:11:18 +08:00 · 2026-01-29 14:36:32 +08:00 · 2026-01-28 18:09:47 +08:00 · 2026-01-23 10:52:15 +08:00 · 2026-01-22 18:24:08 +08:00 · 2026-01-22 15:32:30 +08:00
27 changed files with 2196 additions and 1238 deletions
--- a/App.vue
+++ b/App.vue
@@ -1,3 +1,4 @@
+
 <script setup>
 	import {
 		useCartsStore
--- a/common/api/market/distribution.js
+++ b/common/api/market/distribution.js
@@ -164,3 +164,12 @@ export const autoBindInviteUser = (data) => {
    data: data,
  });
 };
+
+// 全民股东界面-进入过标识
+export const distributionEditIn = (data) => {
+  return request({
+    url: prveUrl + "/user/distribution/editIn",
+    method: "get",
+    data: data,
+  });
+};
--- a/common/api/market/index.js
+++ b/common/api/market/index.js
@@ -1,6 +1,8 @@
 // 引入 request 文件
 import request from '@/common/api/request.js'
-import {prveUrl} from './config.js'
+import {
+	prveUrl
+} from './config.js'

 export const consumeDiscount = (data) => {
 	return request({
@@ -16,3 +18,11 @@ export const homeData = (data) => {
 		data: data
 	})
 }
+
+// 清除所有分销绑定关系
+export const distributionClear = (data) => {
+	return request({
+		url: prveUrl + '/user/distribution/clean',
+		method: 'get'
+	})
+}
--- a/common/api/market/share.js
+++ b/common/api/market/share.js
@@ -0,0 +1,26 @@
+// 引入 request 文件
+import request from "@/common/api/request.js";
+import { prveUrl } from "./config.js";
+
+export const carousel = (data) => {
+  return request({
+    url: prveUrl + "/user/carousel",
+    method: "get",
+    data: data,
+  });
+};
+export const shareClaim = (data) => {
+  return request({
+    url: prveUrl + "/user/shareClaim",
+    method: "POST",
+    data: data,
+  });
+};
+export const shareConfig = (data) => {
+  return request({
+    url: prveUrl + "/user/share",
+    method: "get",
+    data: data,
+  });
+};
+
--- a/common/api/request.js
+++ b/common/api/request.js
@@ -52,7 +52,7 @@ export default async (params) => {
 				//获取成功
 				if (res.code == 200) {
 					uni.hideLoading();
-					uni.hideToast();
+					// uni.hideToast();
 					resolve(res.data ? res.data : true);
 				} else {
 					switch (res.code) {
@@ -135,7 +135,7 @@ export default async (params) => {
 				// 不管成功还是失败都会执行
 				setTimeout((res) => {
 					uni.hideLoading();
-					uni.hideToast();
+					// uni.hideToast();
 				}, 10000);
 			},
 		});
--- a/components/popup-distribution-group-code.vue
+++ b/components/popup-distribution-group-code.vue
@@ -0,0 +1,141 @@
+<!-- 私域引流 -->
+<template>
+	<u-popup :show="show" mode="center" :safeAreaInsetBottom="false">
+		<view class="new_preview">
+			<view class="header">{{ shopInfo.shopName }}</view>
+			<view class="content">
+				<view class="title">{{ group.title }}</view>
+				<view class="img_wrap">
+					<image class="img" :show-menu-by-longpress="true" :src="group.groupUrl" @click=""></image>
+				</view>
+				<view class="intro">
+					{{ group.content }}
+				</view>
+				<view class="foot">
+					如果长按不能识别，可截图或保存二维码图片至相册，通过微信扫码入群。
+				</view>
+			</view>
+			<view class="close" @click="closeHandle">
+				<u-icon name="close" color="#fff" size="14"></u-icon>
+			</view>
+		</view>
+	</u-popup>
+</template>
+
+<script setup>
+import dayjs from 'dayjs';
+import { ref, onMounted } from 'vue';
+import { centerConfig,distributionEditIn } from '@/common/api/market/distribution.js';
+import { checkArrayElementsExist } from '@/utils/util.js';
+
+const shopInfo = ref('');
+
+const props = defineProps({
+	type: {
+		type: String,
+		default: 'home' // 调用的位置 home首页 order支付成功后
+	},
+	group:{
+		type:Object,
+		default:()=>{}
+	}
+});
+
+const show = defineModel(false) ;
+function closeHandle() {
+	const shopUserInfo=uni.cache.get('shopUserInfo')
+	distributionEditIn({
+		shopUserId:shopUserInfo.id
+	})
+	show.value = false;
+}
+
+
+
+
+onMounted(() => {
+	shopInfo.value = uni.cache.get('shopInfo');
+});
+</script>
+
+<style scoped lang="scss">
+.new_preview {
+	--bg: #3f3b37;
+	--color: #f6dfc4;
+	--borderColor: #f6dfc45b;
+	width: 90vw;
+	background-color: var(--bg);
+	border-radius: 4px;
+	position: relative;
+	.close {
+		--size: 70upx;
+		width: var(--size);
+		height: var(--size);
+		border-radius: 50%;
+		background-color: var(--bg);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: absolute;
+		bottom: calc(var(--size) * -1 - 20upx);
+		left: 50%;
+		margin-left: calc(var(--size) / 2 * -1);
+	}
+
+	.header {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 16px;
+		color: var(--color);
+		height: 50px;
+		border-bottom: 1px dashed var(--borderColor);
+	}
+
+	.content {
+		padding-bottom: 14px;
+
+		.title {
+			font-size: 14px;
+			color: var(--color);
+			height: 50px;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+
+		.img_wrap {
+			display: flex;
+			justify-content: center;
+
+			.img {
+				--size: 220px;
+				width: var(--size);
+				height: var(--size);
+				border-radius: 4px;
+			}
+		}
+
+		.intro {
+			height: 40px;
+			font-size: 14px;
+			color: var(--color);
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			padding: 0 14px;
+		}
+
+		.foot {
+			height: 40px;
+			color: var(--borderColor);
+			font-size: 14px;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			padding: 0 14px;
+			text-align: center;
+		}
+	}
+}
+</style>
--- a/components/ymf-components/ymf-share-popup.vue
+++ b/components/ymf-components/ymf-share-popup.vue
@@ -0,0 +1,224 @@
+<template>
+	<view class="ynf-share">
+		<up-popup :show="show" mode="center" bg-color="transparent">
+			<view >
+				<view class="bg" v-if="config.sharerCoupon" :style="returnBg('bg')">
+					<view class="title">邀请奖励</view>
+					<view class="desc">邀请1人，即可得超值优惠券{{config.sharerCouponNum}}张</view>
+					<view class="u-flex u-row-center">
+						<view class="coupon" :style="returnBg('coupon')">
+							<template v-if="config.sharerCoupon.couponType==1">
+								<view class="font-bold text-center color">
+									<text class="fuhao">¥</text>
+									<text>{{config.sharerCoupon.fullAmount}}-{{config.sharerCoupon.discountAmount}}</text>
+								</view>
+							</template>
+							<template v-if="config.sharerCoupon.couponType==2">
+								<view class="font-bold text-center color">
+									<text>{{config.sharerCoupon.discountNum}}件</text>
+								</view>
+							</template>
+							<template v-if="config.sharerCoupon.couponType==3">
+								<view class="font-bold text-center color">
+									<text>{{config.sharerCoupon.discountRate/10}}折</text>
+								</view>
+							</template>
+							<template v-if="config.sharerCoupon.couponType==3">
+								<view class="font-bold text-center color">
+									<text>{{config.sharerCoupon.discountRate/10}}折</text>
+								</view>
+							</template>
+							<template v-if="config.sharerCoupon.couponType==4">
+								<view class="font-bold text-center color">
+									<text>第二件半价</text>
+								</view>
+							</template>
+							<template v-if="config.sharerCoupon.couponType==6">
+								<view class="font-bold text-center color">
+									<text>买一送一</text>
+								</view>
+							</template>
+							<view class="font-bold name">{{config.sharerCoupon.title}}</view>
+						</view>
+					</view>
+					<view class="u-flex u-row-center u-m-t-44">
+						<ymf-share>
+							<view class="share-btn" :style="returnBg('btn')"></view>
+						</ymf-share>
+					</view>
+				</view>
+				<view class="u-flex u-row-center u-m-t-30">
+					<view class="close-box u-flex u-col-center u-row-center" @click="close">
+						<up-icon name="close" size="36rpx" color="#000" :bold="true"></up-icon>
+					</view>
+				</view>
+			</view>
+		</up-popup>
+	</view>
+</template>
+
+<script setup>
+
+	import {
+		shareConfig,
+	} from '@/common/api/market/share.js'
+	import {returnPageTags} from '@/utils/share.js'
+	
+	import {
+		productStore
+	} from '@/stores/user.js';
+	
+	const userStore = productStore();
+
+	
+	const show = defineModel(false)
+	const imgs = {
+		btn: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/2/14ca8d88516b4739b4020b10d95a33c2.png',
+		coupon: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/2/4ccffb7cf8414cd19f0a10c6cf45b45b.png',
+		bg: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/2/1ac6490c4efd4290abe7ca7f6d8e6eb2.png'
+	}
+
+	function returnBg(key) {
+		return {
+			backgroundImage: 'url(' + imgs[key] + ')'
+		}
+	}
+	// watch(() => show.value, (newval)=>{
+	// 	if(newval){
+	// 		getData()
+	// 	}
+	// })
+
+	function close() {
+		show.value = false
+	}
+	const config = reactive({})
+	async function getData(id) {
+		const pages = getCurrentPages();
+		const currentPage = pages[pages.length - 1];
+		const currentPath = currentPage.route;
+		const currentOptions = currentPage.options;
+		const  path = `/${currentPath}`;
+		
+		const shopId = id||currentOptions.shopId||uni.cache.get('shopId')
+		// console.log('分享组件挂载完毕:shopId',shopId);
+		if (!shopId) {
+			return
+		}
+		shareConfig({
+			shopId
+		}).then(res => {
+			// console.log('分享组件挂载完毕:shareConfig',res);
+			// console.log('分享组件挂载完毕:currentOptions',currentOptions);
+			if(res){
+				Object.assign(config,res)
+				const rewardSharePages=res.rewardSharePages.split(',')
+				const pTag = returnPageTags(path)
+				if( pTag&&rewardSharePages.includes(pTag)&&currentOptions.fromUserId&&res.isSharedUserPopup){
+					show.value=true
+				}
+				// if(res.sharedUserCouponId&&res.sharedUserCouponNum){
+				// }
+			}
+		})
+	}
+	
+	watch(()=>userStore.shopInfo.id,(newval)=>{
+		if(newval){
+			// getData()
+			shareConfig({
+				shopId:newval
+			}).then(res => {
+				if(res){
+					Object.assign(config,res)
+				}
+			})
+		}
+	})
+	onMounted(() => {
+		console.log('分享组件挂载完毕！');
+		getData()
+	})
+</script>
+
+<style lang="scss">
+	.bg {
+		width: 710rpx;
+		background-size: cover;
+		min-height: 820rpx;
+		padding-top: 260rpx;
+		background-color: transparent;
+		padding-left: 26rpx;
+
+		.title {
+			font-weight: 700;
+			font-size: 74rpx;
+			text-align: center;
+			background-image: linear-gradient(to bottom, #FF7E2D, #FF270E);
+			/* 定义渐变色 */
+			-webkit-background-clip: text;
+			/* Webkit 浏览器前缀 */
+			background-clip: text;
+			/* 标准属性 */
+			color: transparent;
+			/* 使文本透明，显示背景渐变 */
+		}
+
+		.desc {
+			margin-top: 20rpx;
+			font-size: 28rpx;
+			font-weight: 700;
+			text-align: center;
+			color: #FF280F;
+		}
+
+	}
+
+	.coupon {
+		margin-top: 30rpx;
+		width: 436rpx;
+		height: 182rpx;
+		background-size: cover;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		font-size: 54rpx;
+		text-align: center;
+
+
+		.color {
+			background-image: linear-gradient(to bottom, #FFFFFB, #FFEBB0);
+			/* 定义渐变色 */
+			-webkit-background-clip: text;
+			/* Webkit 浏览器前缀 */
+			background-clip: text;
+			/* 标准属性 */
+			color: transparent;
+			/* 使文本透明，显示背景渐变 */
+		}
+
+		.fuhao {
+			font-size: 32rpx;
+		}
+
+		.name {
+			font-size: 36rpx;
+			color: #FFFFFB;
+		}
+	}
+
+	.close-box {
+		width: 74rpx;
+		height: 74rpx;
+		opacity: 0.82;
+		border-radius: 50%;
+		background: #fff;
+	}
+
+	.share-btn {
+		width: 262rpx;
+		height: 72rpx;
+		background-size: cover;
+	}
+</style>
--- a/components/ymf-components/ymf-share.vue
+++ b/components/ymf-components/ymf-share.vue
@@ -3,7 +3,7 @@
 		<slot v-if="$slots.default" name="default"></slot>
 		<up-icon v-else name="share-square" bold :color="color" :size="size"></up-icon>
 		<view class="absolute share-box">
-			<button open-type="share" @click="shareClick">分享</button>
+			<button open-type="share" @click.stop="shareClick">分享</button>
 		</view>
 	</view>
 </template>
--- a/distribution/shop-detail/components/share-popup.vue
+++ b/distribution/shop-detail/components/share-popup.vue
@@ -38,10 +38,39 @@
 </template>

 <script setup>
+import { shareMixin, handleMixinOnLoad, returnQuery } from '@/utils/share.js';
 import ymfShare from '@/components/ymf-components/ymf-share.vue';
 import wQrcode from '@/uni_modules/wmf-code/components/w-qrcode/w-qrcode.vue';
 import { desensitizePhone } from '@/utils/util.js';
-import { ref } from 'vue';
+import { ref, onMounted, nextTick } from 'vue';
+
+onMounted(async () => {
+	setTimeout(async () => {
+		await nextTick();
+		const query = await returnQuery();
+		codeOptions.value.code = `https://cashier.sxczgkj.com/invite?${removeQAndAfter(query)}`;
+		console.log('codeOptions.value', codeOptions.value);
+	}, 500);
+});
+
+/** 
+ * 截取字符串，移除 &q 及后面的所有内容
+ * @param {string} str - 原始字符串
+ * @returns {string} 处理后的字符串
+ */
+function removeQAndAfter(str) {
+	// 检查是否为空字符串
+	if (!str || typeof str !== 'string') {
+		return str || '';
+	}
+
+	// 找到 &q 的起始位置
+	const qIndex = str.indexOf('&q');
+
+	// 如果找到 &q，截取前面的部分；否则返回原字符串
+	return qIndex !== -1 ? str.slice(0, qIndex) : str;
+}
+
 const props = defineProps({
 	inviteCode: {
 		type: String,
@@ -52,10 +81,13 @@ const props = defineProps({
 		default: () => {}
 	}
 });
+
 const codeOptions = ref({
+	padding: 10,
 	size: 200,
-	code: props.inviteCode
+	code: ''
 });
+
 function copyCode() {
 	uni.setClipboardData({
 		data: props.inviteCode,
--- a/distribution/shop-detail/index.vue
+++ b/distribution/shop-detail/index.vue
--- a/groupBuying/goodsDetail/goodsDetail.vue
+++ b/groupBuying/goodsDetail/goodsDetail.vue
@@ -123,6 +123,9 @@
 			</view>
 		</up-popup>
 		<!-- 兑换确认弹窗end -->
+		
+		
+		<ymf-share-popup ></ymf-share-popup>
 	</view>
 </template>
 <script setup>
@@ -408,7 +411,7 @@ onShareAppMessage(async () => {
 		query
 	};
 	console.log('onShareAppMessage===', options);
-	return options; 
+	return wxShare(options); 
 });

 onLoad(async (opt) => {
--- a/groupBuying/index/index.vue
+++ b/groupBuying/index/index.vue
@@ -121,6 +121,7 @@
 		</view>

 		<LookQrcode v-model="modalData.show" :qrcode="qrcode"></LookQrcode>
+		<ymf-share-popup ></ymf-share-popup>
 	</view>
 </template>

--- a/pages.json
+++ b/pages.json
@@ -2,7 +2,7 @@
 	"easycom": {
 		"autoscan": true,
 		"custom": {
-			"^my-(.*)": "@/components/ymf-components/ymf-$1.vue",
+			"^ymf-(.*)": "@/components/ymf-components/ymf-$1.vue",
 			"^u--(.*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue",
 			"^up-(.*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue",
 			"^u-([^-].*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue"
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -130,6 +130,7 @@
 		<!-- <CouponModal></CouponModal> -->
 		<!-- 页面加载动画 -->
 		<pageLoading v-if="showPageLoading" />
+		
 	</view>
 </template>

--- a/pages/index/indexs.vue
+++ b/pages/index/indexs.vue
@@ -90,7 +90,7 @@
 			</view>
 			<view class="item" @click="toFenxiao">
 				<image :src="imgs.share" class="img"></image>
-				<view class="title">股东共享</view>
+				<view class="title">全民股东</view>
 				<view class="desc">邀请好友，获得佣金</view>
 			</view>
 		</view>
@@ -116,6 +116,8 @@
 		</u-popup>
 		<!-- 私域引流弹窗 -->
 		<attractPopup type="home" ref="attractPopupRef" />
+		
+		<ymf-share-popup ></ymf-share-popup>
 	</view>
 </template>

--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -70,7 +70,7 @@
 										v-else-if="item1.isTemporary &&item1.productName=='签子'"
 										src="https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/5/b97054debd83486ab7ad8e20ca6a360a.png"
 									></u-image>
-									<u-image width="112" height="112" radius="20"
+									<u-image width="56" height="56" radius="10"
 										:src="'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/table.png'"
 										mode="heightFix" v-else></u-image>
 									<text class="productName"> {{ item1.productName }} </text>
@@ -151,7 +151,7 @@
 				uni.cache.set("shopId", item.shopId);
 				uni.navigateTo({
 					url: "/pages/product/index?type=beforehand&order_id=" + item.id +
-						'&one_more_order=1',
+						'&one_more_order=1&shopId='+item.shopId,
 				});
 			}
 		})
--- a/pages/product/index.vue
+++ b/pages/product/index.vue
@@ -192,6 +192,29 @@
 					</scroll-view>
 				</view>
 				<view class="main">
+					<view class="u-p-r-32">
+						<up-swiper indicator indicatorMode="line" height="188rpx" :list="carouselList"
+							keyName="imageUrl">
+							<template #default="scope">
+								<view class="relative">
+									<image :src="scope.item.imageUrl" mode="aspectFill"
+										style="width:600rpx;height: 188rpx;"></image>
+									<view class="absolute swiper-mask" @click.stop="swiperClick(scope.item)">
+										<view class="share-btn-box" v-if="showShare(scope.item)">
+											<ymf-share
+											@shareClick="shareBtnClick(scope.item)"
+											>
+												<view class="share-btn">分享</view>
+											</ymf-share>
+										</view>
+										
+									</view>
+								</view>
+
+							</template>
+						</up-swiper>
+					</view>
+
 					<view>
 						<view class="item main-item" v-for="(item, index) in shopProductList.productInfo" :key="index"
 							:id="'item-' + index">
@@ -616,6 +639,8 @@
 				</view>
 			</view>
 		</u-popup>
+
+		<ymf-share-popup ></ymf-share-popup>
 	</view>
 </template>

@@ -649,6 +674,11 @@
 	import {
 		APIproductqueryShop
 	} from '@/common/api/member.js';
+
+
+	import {
+		carousel
+	} from '@/common/api/market/share.js'
 	/**
 	 * api合集 end
 	 */
@@ -817,11 +847,7 @@



-	// 分步取值 + 每层兜底，避免某一环不存在导致 undefined
-	const shopExtendShopTable = uni.cache.get('shopTable') || {}; // 兜底空对象
-	const shopExtendMap = shopExtendShopTable.shopExtendMap || {}; // 兜底空对象
-	// 最终声明：即使 shopinfo_bg 不存在，也兜底为空字符串/默认值
-	const shopExtend = ref(shopExtendMap.shopinfo_bg || '');
+	const shopExtend = ref('');

 	/**
 	 * 通用数据合集 end
@@ -994,6 +1020,79 @@
 		uni.$u.debounce(mainScroll(res), 500);
 	});

+
+
+
+	/*商品区域轮播图 start*/
+	
+	const shareSwiperItem=ref(null)
+	function swiperClick(item) {
+		console.log('swiperClick',item);
+		shareSwiperItem.value=item
+		const pTag=returnPageTags(item.jumpPagePath)
+	
+		if(pTag==='pp-list'){
+			return uni.navigateTo({
+				url:item.jumpPagePath+'&shopId='+uni.cache.get('shopId')
+			})
+		}
+		if(pTag==='pp-detail'){
+			const url=item.jumpPagePath+'&shopId='+uni.cache.get('shopId')+'&'+item.extendParam
+			return uni.navigateTo({
+				url:url.replace('goodsId','id')
+			})
+		}
+		if(pTag==='gb-list'){
+			return uni.navigateTo({
+				url:item.jumpPagePath+'&shopId='+uni.cache.get('shopId')
+			})
+		}
+		if(pTag==='gb-detail'){
+			const url=item.jumpPagePath+'&shopId='+uni.cache.get('shopId')+'&'+item.extendParam
+			return uni.navigateTo({
+				url:url.replace('goodsId','wareId')
+			})
+		}
+		if(pTag==='dis'){
+			return uni.navigateTo({
+				url:item.jumpPagePath+'&shopId='+uni.cache.get('shopId')
+			})
+		}
+		if(pTag==='index'){
+			return uni.switchTab({
+				url:item.jumpPagePath+'&shopId='+uni.cache.get('shopId')
+			})
+		}
+		
+		if(pTag==='eat'){
+			if (item.extendParam) {
+				const id=item.extendParam.split('=')[1]
+				const item = allGoodsArr.value.find(v => v.id == id)
+				if (item) {
+					clickspecifications(item)
+				}
+			}
+		}
+		
+		if(pTag==='point'){
+			return uni.navigateTo({
+				url:item.jumpPagePath+'&shopId='+uni.cache.get('shopId')
+			})
+		}
+		if(pTag==='point-detail'){
+			const url=item.jumpPagePath+'&shopId='+uni.cache.get('shopId')+'&'+item.extendParam
+			return uni.navigateTo({
+				url:url.replace('goodsId','id')
+			})
+		}
+	}
+	function showShare(item){
+		if(item.isShareable&&item.isEnabled){
+			return true
+		}
+		return false
+	}
+	/*商品区域轮播图 end*/
 	// 点击详情
 	const showShopsku = ref(false);

@@ -1454,6 +1553,9 @@
 	};
 	// 判断商品是否在可售时间内
 	const isProductAvailable = async (sellDaysStr, startTimeStr, endTimeStr) => {
+		if(!sellDaysStr){
+			return false
+		}
 		// 将后端返回的字符串转换为数组
 		const sellDays = sellDaysStr.split(',');
 		const now = dayjs();
@@ -1765,8 +1867,11 @@
 			if (Message.operate_type == 'init') {
 				// cartStore.limitTimeDiscount = Message.time_dis_info;
 				cartInit(Message.data)
-
-				uni.hideLoading();
+				try {
+					uni.hideLoading();
+				} catch (error) {
+					//TODO handle the exception
+				}
 				isLoading.value = false;

 				if (!socketInitFinished) {
@@ -2457,9 +2562,9 @@
 		handleMixinOnLoad,
 		returnQuery,
 		jsonToUrl,
+		wxShare,returnPageTags,
 		returnCommonQuery
 	} from '@/utils/share.js'
-import { onShareTimeline } from '@dcloudio/uni-app';
 	// defineOptions({
 	// 	mixins: [shareMixin],
 	// });
@@ -2471,31 +2576,69 @@ import { onShareTimeline } from '@dcloudio/uni-app';
 		isGoodsShare.value = true
 	}
 	
-	async function onShare(){
+	function getPage(pageStr){
+		
+	}
+	function shareBtnClick(item){
+		console.log('shareBtnClick',item);
+		shareSwiperItem.value=item
+	}
+	function swiperShare(queryJson){
+		console.log('shareSwiperItem',shareSwiperItem.value);
+		const pTag=returnPageTags(shareSwiperItem.value.jumpPagePath)
+		let query = jsonToUrl(queryJson)
+		query +=('&'+shareSwiperItem.value.extendParam) 
+		const shopName = uni.cache.get('shopInfo').shopName || ''
+		const path=shareSwiperItem.value.jumpPagePath?shareSwiperItem.value.jumpPagePath:'/pages/product/index?type=beforehand'
+		console.log('path',path);
+		const json={
+			imageUrl:shareSwiperItem.value.imageUrl,
+			path:  path+'&'+query,
+			title:shareSwiperItem.value.name+ (shopName ? `-${shopName}` : ''),
+		}
+		if(pTag==='pp-detail'){
+			json.path=json.path.replace('goodsId','id')
+		}
+		if(pTag==='gb-detail'){
+			json.path=json.path.replace('goodsId','wareId')
+		}
+		if(pTag==='point-detail'){
+			json.path=json.path.replace('goodsId','id')
+		}
+		if(pTag.includes('eat')){
+			if(shareSwiperItem.value.extendParam){
+				json.path=json.path.replace('goodsId','showGoodsId')
+			}
+		}
+		return wxShare(json)
+	}
+
+
+	async function onShare() {
 		const queryJson = await returnCommonQuery()
+		if(shareSwiperItem.value){
+			return swiperShare(queryJson)
+		}
 		let query = jsonToUrl(queryJson)
 		query += '&type=beforehand'
-		let json={}
+		let json = {}
+		const shopName = uni.cache.get('shopInfo').shopName || ''
 		if (goodsModalList.value.length && isGoodsShare.value) {
 			const goods = goodsModalList.value[goodsModalList.value.length - 1].goods
 			query += '&showGoodsId=' + goods.id
-			json.title = goods.name
+			json.title = goods.name + (shopName ? `-${shopName}` : '')
 			json.imageUrl = goods.coverImg
 			json.showGoodsId = goods.id
-		}else{
-			json.title=uni.cache.get('shopInfo').shopName||''
-			json.imageUrl=uni.cache.get('shopInfo').logo||''
+		} else {
+			json.title = shopName
+			json.imageUrl = uni.cache.get('shopInfo').logo || ''
 		}
-		console.log('onShareAppMessage', {
+	
+		return wxShare({
 			query,
 			...json,
 			path: '/pages/product/index' + '?' + query
-		});
-		return {
-			query,
-			...json,
-			path: '/pages/product/index' + '?' + query
-		}
+		})
 	}

 	onShareAppMessage(onShare)
@@ -2503,17 +2646,24 @@ import { onShareTimeline } from '@dcloudio/uni-app';
 	onShareTimeline(onShare)

 	const pageOptions = reactive({})
+
+	const carouselList = ref([])
 	onLoad(async (e) => {
 		Object.assign(pageOptions, e)
 		if (e.type) {
 			orderType.value = e.type;
 		}
+
 		await handleMixinOnLoad({
 			...e,
 			shopId: e.shopId || uni.cache.get('shopId')
 		})
-		const userInfo = userStore.userInfo
-		const shopInfoRes = userStore.shopInfo
+
+		if (userStore.shopUserInfo.shopExtendList) {
+			shopExtend.value = userStore.shopUserInfo.shopExtendList.find(v => v.autoKey == 'shopinfo_bg') ||
+				''
+		}
+
 		// //获取用户信息
 		// const userInfo = await APIshopUserInfo({
 		// 	shopId: uni.cache.get('shopId')
@@ -2522,14 +2672,14 @@ import { onShareTimeline } from '@dcloudio/uni-app';
 		// const shopInfoRes = await APIusershopInfodetail({
 		// 	shopId: uni.cache.get('shopId')
 		// });
-		if (shopInfoRes && shopInfoRes.shopInfo) {
-			Object.assign(shopInfo, shopInfoRes.shopInfo);
+		Object.assign(shopInfo, userStore.shopInfo);
+		if (e.type == 'beforehand') {
+			uni.cache.set("tableCode", userStore.shopUserInfo.id);
+			options.initMessage.table_code = userStore.shopUserInfo.id
 		}
+		options.initMessage.shop_id = userStore.shopInfo.id
+		shopUserInfo.value = userStore.shopUserInfo

-
-		if (userInfo && typeof userInfo === 'object') {
-			shopUserInfo.value = userInfo
-		}
 		await productqueryProduct();

 		const extraInitPar = {}
@@ -2541,6 +2691,11 @@ import { onShareTimeline } from '@dcloudio/uni-app';

 		const time_dis_info = await getLimitDiscount()
 		options.initMessage.time_dis_info = time_dis_info
+
+		console.log('options.initMessage', {
+			...options.initMessage,
+			...extraInitPar,
+		})
 		useSocket.connect({
 			...options.initMessage,
 			...extraInitPar,
@@ -2557,6 +2712,13 @@ import { onShareTimeline } from '@dcloudio/uni-app';
 		// 满减活动
 		getDiscountActivity();

+		//分享轮播
+		carousel({
+			shopId: uni.cache.get('shopId')
+		}).then(res => {
+			carouselList.value = res
+		})
+
 		let res = await APIhistoryOrder({
 			tableCode: uni.cache.get('tableCode')
 		});
@@ -2661,7 +2823,8 @@ import { onShareTimeline } from '@dcloudio/uni-app';
 		useSocket.setOnMessage(() => {});
 	}
 	onHide(() => {
-		isGoodsShare.value=false
+		isGoodsShare.value = false
+		shareSwiperItem.value=null
 		closeSocket();
 	});
 	onUnload(() => {
@@ -3902,4 +4065,26 @@ import { onShareTimeline } from '@dcloudio/uni-app';
 			}
 		}
 	}
+
+	.swiper-mask {
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		padding: 32rpx 28rpx;
+	}
+
+	.share-btn-box{
+		position: absolute;
+		right: 8rpx;
+		bottom: 14rpx;
+	}
+	.share-btn {
+
+		padding: 10rpx 32rpx;
+		border-radius: 50rpx;
+		background: #E3AD7F;
+		font-size: 24rpx;
+		color: #ffffff;
+	}
 </style>
--- a/pages/user/member/czzx.vue
+++ b/pages/user/member/czzx.vue
@@ -199,8 +199,79 @@ function toPwd() {
 }

 function back() {
-	uni.navigateBack();
+	safeNavigateBack();
 }
+
+/**
+ * 修复版：安全的页面返回方法
+ * 彻底避免 "cannot navigate back at first page" 报错
+ * @param {Number} delta 返回的页面数，默认1
+ * @param {Function} fallback 失败时的降级处理函数
+ */
+function safeNavigateBack(delta = 1, fallback) {
+	// 1. 立即获取页面栈，确保拿到最新状态（关键修复点）
+	const pages = getCurrentPages();
+	// 2. 严谨判断：页面栈长度必须大于 delta 才能返回
+	const canNavigateBack = pages.length > delta;
+
+	console.log('页面栈信息:', {
+		pagesLength: pages.length,
+		delta: delta,
+		canNavigateBack: canNavigateBack
+	});
+
+	// 3. 如果不能返回，直接执行降级逻辑
+	if (!canNavigateBack) {
+		console.warn('当前是首页/页面栈不足，无法返回');
+		handleFallback(fallback);
+		return; // 终止后续执行，彻底避免调用 navigateBack
+	}
+
+	// 4. 能返回时才执行 navigateBack
+	try {
+		uni.navigateBack({
+			delta: delta,
+			success: () => {
+				console.log('页面返回成功');
+			},
+			fail: (err) => {
+				console.error('navigateBack 执行失败:', err);
+				handleFallback(fallback);
+			}
+		});
+	} catch (error) {
+		console.error('页面返回异常:', error);
+		handleFallback(fallback);
+	}
+}
+
+/**
+ * 统一处理降级逻辑
+ * @param {Function} fallback 自定义降级函数
+ */
+function handleFallback(fallback) {
+	if (typeof fallback === 'function') {
+		fallback(); // 执行自定义降级
+	} else {
+		// 默认降级：返回首页（请替换为你的首页路径）
+		uni.showToast({
+			title: '已到首页，无法返回',
+			icon: 'none',
+			duration: 1500
+		});
+
+		// 如果需要强制跳首页，解开下面注释（根据你的业务选择）
+		uni.switchTab({
+			url: '/pages/index/index',
+			fail: () => {
+				uni.redirectTo({
+					url: '/pages/index/index'
+				});
+			}
+		});
+	}
+}
+
 const list = ref([]);
 const sel = ref(0);
 const money = ref(null);
--- a/scoreShop/detail/index.vue
+++ b/scoreShop/detail/index.vue
@@ -27,7 +27,10 @@
 			</view>
 			<text class="text">剩余：{{item.quantity}}</text>
 		</view>
-		<view class="goods-name">{{item.goodsName}}</view>
+		<view class="goods-name u-flex u-row-between">
+			<text class="u-m-r-30" style="word-break: break-all;">{{item.goodsName}}</text>
+			<ymfShare color="#333" />
+		</view>
 		<view class="bg-f7" style="height: 24rpx"></view>
 		<view class="desc">
 			<view class="u-flex">
@@ -113,9 +116,12 @@
 			</view>
 		</up-popup>
 		<!-- 兑换确认弹窗end -->
+		
+		<ymf-share-popup ></ymf-share-popup>
 	</view>
 </template>
 <script setup>
+	import ymfShare from '@/components/ymf-components/ymf-share.vue'
 	import {
 		computed,
 		reactive
@@ -335,7 +341,7 @@

 	import {
 		shareMixin,
-		handleMixinOnLoad,wxShare,returnQuery 
+		handleMixinOnLoad,wxShare,returnQuery ,returnIndexBg,
 	} from '@/utils/share.js'
 	// defineOptions({
 	// 	mixins: [shareMixin],
@@ -343,12 +349,13 @@
 	
 	onShareAppMessage(async(res)=>{
 		const query=await returnQuery()
+		const shopInfo=uni.cache.get('shopInfo')
 		return wxShare({
 			...res,
-			title:item.goodsName,
+			title:item.goodsName +'-'+shopInfo.shopName,
 			path:'/scoreShop/detail/index'+'?'+query,
 			query,
-			imageUrl:item.goodsImageUrl||''
+			imageUrl:item.goodsImageUrl||returnIndexBg()||''
 		})
 	})
 	
--- a/scoreShop/index/index.vue
+++ b/scoreShop/index/index.vue
@@ -31,10 +31,13 @@
 					<view class="tab-item" :class="tabActive === 0 ? 'active' : ''" @click="tabActive = 0">优惠券</view>
 					<view class="tab-item" :class="tabActive === 1 ? 'active' : ''" @click="tabActive = 1">其它商品</view>
 				</view>
-				<view class="u-flex gap-20" @click="toggleLayout">
-					<image :src="layout === 'block' ? imgs.layout_block : imgs.layout" class="layout" />
+				<view class="u-flex gap-20">
+					<view  @click="toggleLayout">
+						<image :src="layout === 'block' ? imgs.layout_block : imgs.layout" class="layout" />
+					</view>
 					<ymfShare size="40rpx" color="#9C571F"></ymfShare>
 				</view>
+				
 			</view>
 			<goodsList :pointsUser="pointsUser" :layout="layout" :list="list" @exchange="exchange"></goodsList>

@@ -42,6 +45,8 @@
 				<up-loadmore :status="isEnd?'nomore':'loadmore'"></up-loadmore>
 			</view>
 		</view>
+		
+		<ymf-share-popup ></ymf-share-popup>
 	</view>
 </template>
 <script setup>
@@ -73,11 +78,11 @@

 	function back() {
 		const pages = getCurrentPages();
-		if(pages.length<2){
+		if (pages.length < 2) {
 			uni.switchTab({
 				url: '/pages/index/index'
 			})
-		}else{
+		} else {
 			uni.navigateBack({
 				delta: 1,
 			});
@@ -148,12 +153,32 @@

 	import {
 		shareMixin,
-		handleMixinOnLoad
+		handleMixinOnLoad,
+		returnQuery,
+		jsonToUrl,
+		wxShare,returnIndexBg ,
+		returnCommonQuery
 	} from '@/utils/share.js'
-	defineOptions({
-		mixins: [shareMixin],
-	});
+	// defineOptions({
+	// 	mixins: [shareMixin],
+	// });

+	async function onShare() {
+		const queryJson = await returnCommonQuery()
+		let query = jsonToUrl(queryJson)
+		let json = {}
+
+		json.title = '积分乐园，好物兑换'
+		json.imageUrl = returnIndexBg()||uni.cache.get('shopInfo').logo || ''
+		return wxShare({
+			query,
+			...json,
+			path: '/scoreShop/index/index' + '?' + query
+		})
+	}
+
+	onShareAppMessage(onShare)
+	onShareTimeline(onShare)
 	const options = reactive({

 	})
@@ -180,6 +205,10 @@
 	import {
 		productStore
 	} from '@/stores/user.js';
+	import {
+		onShareAppMessage
+	} from '@dcloudio/uni-app';
+import { onShareTimeline } from '@dcloudio/uni-app';
 	const storeuser = productStore();


@@ -200,9 +229,11 @@
 		flex-direction: column;
 		justify-content: flex-end;
 	}
-	.gap-20{
+
+	.gap-20 {
 		gap: 20rpx;
 	}
+
 	.top {
 		padding: 138rpx 26rpx 48rpx 42rpx;
 		display: flex;
--- a/src/auto-imports.d.ts
+++ b/src/auto-imports.d.ts
@@ -39,6 +39,7 @@ declare global {
  const onScopeDispose: typeof import('vue')['onScopeDispose']
  const onServerPrefetch: typeof import('vue')['onServerPrefetch']
  const onShareAppMessage: typeof import('@dcloudio/uni-app')['onShareAppMessage']
+  const onShareTimeline: typeof import('@dcloudio/uni-app')['onShareTimeline']
  const onShow: typeof import('@dcloudio/uni-app')['onShow']
  const onUnload: typeof import('@dcloudio/uni-app')['onUnload']
  const onUnmounted: typeof import('vue')['onUnmounted']
--- a/stores/carts-websocket.js
+++ b/stores/carts-websocket.js
@@ -90,11 +90,13 @@ export const useWebSocket = defineStore('socketTask', () => {
 	let onMessage = () => {

 	}
-	function setOnMessage(onMessageBallBack){
-		onMessage=onMessageBallBack
+
+	function setOnMessage(onMessageBallBack) {
+		onMessage = onMessageBallBack
 	}
-	function chnageInitMessage(data){
-		initMessage=data
+
+	function chnageInitMessage(data) {
+		initMessage = data
 	}
 	// 连接 WebSocket
 	const connect = async (connectMsg, onMessageBallBack) => {
@@ -127,6 +129,8 @@ export const useWebSocket = defineStore('socketTask', () => {
 			url: uni.conf.baseUrlwws + '?' + Date.now(),
 			success: (res) => {
 				console.log('连接成功');
+				console.log('connectMsg', connectMsg);
+				console.log('initMessage', initMessage);
 				isConnected.value = true;
 				// 监听初始化成功在开启心跳
 				startHeartbeat();
@@ -233,7 +237,7 @@ export const useWebSocket = defineStore('socketTask', () => {

 	// 发送消息
 	const sendMessage = (data) => {
-		if(!data){
+		if (!data) {
 			return
 		}
 		if (isConnected.value && data) {
@@ -369,6 +373,8 @@ export const useWebSocket = defineStore('socketTask', () => {
 		initNetworkListener,
 		connect,
 		allowReconnect,
-		socketTask,setOnMessage,chnageInitMessage
+		socketTask,
+		setOnMessage,
+		chnageInitMessage
 	};
 })
--- a/userPackage/goodsDetail/goodsDetail.vue
+++ b/userPackage/goodsDetail/goodsDetail.vue
--- a/userPackage/index/index.vue
+++ b/userPackage/index/index.vue
@@ -167,6 +167,7 @@


 		<LookQrcode v-model="modalData.show" :qrcode="qrcode"></LookQrcode>
+		<ymf-share-popup ></ymf-share-popup>
 	</view>
 </template>

@@ -513,9 +514,9 @@
 		})
 	})

-	onLoad(() => {
+	onLoad((opt) => {
 		APIusershopInfodetail({
-			shopId: uni.cache.get('shopId')
+			shopId: uni.cache.get('shopId')||opt.shopId
 		}).then(res => {
 			console.log(res);
 			shopInfo.value = res.shopInfo
--- a/userPackage/order/detail.vue
+++ b/userPackage/order/detail.vue
@@ -538,7 +538,7 @@ onShareAppMessage(async () => {
 		query
 	};
 	console.log('onShareAppMessage===', options);
-	return options;
+	return wxShare(options);
 });

 onLoad(async (opt) => {
--- a/utils/share.js
+++ b/utils/share.js
@@ -2,6 +2,10 @@ import {
 	autoBindInviteUser,
 	autoGetInviteCode
 } from '@/common/api/market/distribution.js'
+
+import {
+	shareClaim
+} from '@/common/api/market/share.js'
 import {
 	APIshopUserInfo,
 	APIusershopInfodetail
@@ -10,8 +14,17 @@ import {
 	productStore
 } from '@/stores/user.js';
 const accountStore = productStore();
+// #ifdef MP-WEIXIN
 const accountInfo = wx.getAccountInfoSync();
 export const envVersion = accountInfo.miniProgram.envVersion;
+// #endif
+
+// #ifdef H5
+const accountInfo = {};
+export const envVersion = 'release'
+// #endif
+
+
 let type = 3;
 if (envVersion === 'trial') {
 	console.log('当前环境是体验版');
@@ -24,38 +37,78 @@ if (envVersion === 'trial') {
 	console.log('当前环境是开发版或其他');
 }

+export const pageTags = {
+	'/userPackage/index/index': 'pp-list', //套餐推广列表页
+	'/userPackage/goodsDetail/goodsDetail': 'pp-detail', //套餐推广商品详情页
+	'/groupBuying/index/index': 'gb-list', //商品拼团列表页
+	'/groupBuying/goodsDetail/goodsDetail': 'gb-detail', //商品拼团详情页
+	'/distribution/shop-detail/index': 'dis', //全民股东页面
+	'/pages/index/index': 'index', //店铺首页
+	'/pages/product/index': 'eat', //点餐页
+	'/pages/product/index?pTag=eat-detail': 'eat-detail', //点餐商品详情弹窗页
+	'/scoreShop/index/index':'point' ,//积分商品
+	'/scoreShop/detail/index':'point-detail' ,//积分商品详情
+}

+export function returnPageTags(page) {
+	for (let key in pageTags) {
+		if (page.includes(key)) {
+			if (page.includes('/pages/product/index')) {
+				if (page.includes('showGoodsId=')||page.includes('goodsId=')) {
+					return 'eat-detail'
+				} else {
+					return 'eat'
+				}
+			} else {
+				return pageTags[key]
+			}
+		}
+	}
+	return ''
+}
 /**
 * 绑定用户邀请关系（核心函数）
 * 功能说明：校验邀请码有效性，有效则调用自动绑定接口完成邀请关系绑定
 * @param {Object} args - 绑定邀请关系的入参对象
- * @param {number} [args.shopUserId] - 需要绑定邀请人的用户ID（integer <int64>，可选）
- * @param {number} [args.shopId] - 店铺ID（integer <int64>，可选）
- * @param {string} args.inviteCode - 邀请人的邀请码（必填，非空校验通过后才会执行绑定逻辑）
+ * @param {number} args.fromUserId - 需要绑定邀请人的用户ID（integer <int64>，必填）
+ * @param {number} args.shopId - 店铺ID（integer <int64>，必填）
+ * @param {string} args.pTag - 来源页面类型
 * @returns {void} 无返回值
 */
-export function bindInvite(args) {
+export async function bindInvite(args) {
 	// 解构入参对象，获取需要的核心参数
 	const {
-		shopUserId,
+		fromUserId,
 		shopId,
-		inviteCode
+		pTag,
 	} = args;
-
-	// 校验邀请码有效性：若邀请码为空、null、undefined，则直接返回，不执行后续绑定逻辑
-	if (!inviteCode || inviteCode === null || inviteCode === undefined) {
+	console.log('bindInvite',args);
+	if (!fromUserId || !shopId) {
 		return;
 	}

+	const shopUserInfo = uni.cache.get('shopUserInfo')
 	// 邀请码有效，调用自动绑定邀请人接口，传递绑定所需参数
-	autoBindInviteUser({
-		id: shopUserId,
+	return await shareClaim({
+		tagType: pTag || '',
 		shopId,
-		inviteCode
+		fromUserId: fromUserId,
+		toUserId: shopUserInfo.id
 	});
 }

 export function wxShare(par) {
+	const path = par.path
+	const pTag = returnPageTags(path)
+	if (pTag) {
+		par.path += '&pTag=' + pTag
+		par.query += '&pTag=' + pTag
+	}
+	console.log('pTag', pTag);
+	console.log('wxShare', {
+		...par,
+		type
+	});
 	return {
 		...par,
 		type
@@ -66,15 +119,15 @@ export async function returnCommonQuery() {
 	const shopId = uni.cache.get('shopId')
 	const shopUserInfo = uni.cache.get('shopUserInfo')
 	const shopInfo = uni.cache.get('shopInfo')
-	const inviteCode = await autoGetInviteCode({
-		shopId: shopId,
-		shopUserId: shopUserInfo.id
-	})
+	// const inviteCode = await autoGetInviteCode({
+	// 	shopId: shopId,
+	// 	fromUserId: shopUserInfo.id
+	// })

 	const queryJson = {
-		inviteCode: (inviteCode && inviteCode !== true) ? inviteCode : null,
+		// inviteCode: (inviteCode && inviteCode !== true) ? inviteCode : null,
 		shopId,
-		shopUserId: shopUserInfo.id,
+		fromUserId: shopUserInfo.id,
 	}
 	return Promise.resolve(queryJson)
 }
@@ -103,10 +156,10 @@ export async function returnQuery(query, showkeys) {
 	const shopId = uni.cache.get('shopId')
 	const shopUserInfo = uni.cache.get('shopUserInfo')
 	const shopInfo = uni.cache.get('shopInfo')
-	const inviteCode = await autoGetInviteCode({
-		shopId: shopId,
-		shopUserId: shopUserInfo.id
-	})
+	// const inviteCode = await autoGetInviteCode({
+	// 	shopId: shopId,
+	// 	fromUserId: shopUserInfo.id
+	// })

 	const pages = getCurrentPages();
 	const currentPage = pages[pages.length - 1];
@@ -116,9 +169,9 @@ export async function returnQuery(query, showkeys) {

 	let sharePath = `/${currentPath}`;
 	const queryJson = {
-		inviteCode: (inviteCode && inviteCode !== true) ? inviteCode : null,
+		// inviteCode: (inviteCode && inviteCode !== true) ? inviteCode : null,
 		shopId,
-		shopUserId: shopUserInfo.id,
+		fromUserId: shopUserInfo.id,
 		...query
 	}
 	for (const key in currentOptions) {
@@ -131,8 +184,8 @@ export async function returnQuery(query, showkeys) {
 		}
 	}
 	queryJson.shopId = shopId
-	queryJson.inviteCode = (inviteCode && inviteCode !== true) ? inviteCode : null
-	queryJson.shopUserId = shopUserInfo.id
+	// queryJson.inviteCode = (inviteCode && inviteCode !== true) ? inviteCode : null
+	queryJson.fromUserId = shopUserInfo.id

 	let result = ''
 	for (let key in queryJson) {
@@ -177,87 +230,64 @@ export async function handleMixinOnLoad(opt, vm) {
 		await accountStore.pageOnload()
 	}
 	uni.setStorageSync('loadFinsh', true)
-	// const shopId = uni.cache.get('shopId')
-	// const shopUserInfo = uni.cache.get('shopUserInfo')
-	// const shopInfo = uni.cache.get('shopInfo')
-	// const inviteCode = await autoGetInviteCode({
-	// 	shopId: shopId,
-	// 	shopUserId: shopUserInfo.id
-	// })

-	if (options.inviteCode) {
-		bindInvite(options)
+	if (options.shopId) {
+		return await bindInvite(options)
 	}
 }
+
+import {
+	isJsonArrayString
+} from '@/utils/util.js';
+
+
+/**
+ * 返回店铺首页图片
+ */
+export function returnIndexBg() {
+	try {
+		const orderVIP = uni.cache.get('orderVIP')
+		if (!orderVIP || !orderVIP.shopExtendList) {
+			return ''
+		}
+		if (!isJsonArrayString(orderVIP.shopExtendList[0].value)) {
+			return ''
+		}
+		return JSON.parse(orderVIP.shopExtendList[0].value)[0]
+	} catch (error) {
+		console.error('orderVIP.shopExtendList[0].value 格式不正确')
+		return ''
+		//TODO handle the exception
+	}
+
+
+}
+
 // utils/share.js
 export const shareMixin = {

-	// async onLoad(opt) {
-	// 	console.log('onLoad');
-	// 	const options = {}
-	// 	if (opt.q) {
-	// 		const q = decodeURIComponent(opt.q);
-	// 		const params = parseQueryString(q.split("?")[1]);
-	// 		Object.assign(options, params);
-	// 	} else {
-	// 		Object.assign(options, opt);
-	// 	}
-	// 	console.log('options', options);
-	// 	if (options.shopId) {
-	// 		uni.cache.set('shopId', options.shopId)
-	// 	}

-	// 	const shopId = uni.cache.get('shopId')
-	// 	const shopUserInfo = uni.cache.get('shopUserInfo')
-	// 	const shopInfo = uni.cache.get('shopInfo')
-	// 	const inviteCode = await autoGetInviteCode({
-	// 		shopId: shopId,
-	// 		shopUserId: shopUserInfo.id
-	// 	})
-
-	// 	uni.setStorageSync('loadFinsh',true)
-
-
-	// 	if (options.inviteCode) {
-	// 		bindInvite(options)
-	// 	}
-	// },
 	async onShareAppMessage(res) {
-		// const shopId = uni.cache.get('shopId')
-		// const shopUserInfo = uni.cache.get('shopUserInfo')
+
 		const shopInfo = uni.cache.get('shopInfo')
-		// const inviteCode = await autoGetInviteCode({
-		// 	shopId: shopId,
-		// 	shopUserId: shopUserInfo.id
-		// })
 		const pages = getCurrentPages();
 		const currentPage = pages[pages.length - 1];
 		const currentPath = currentPage.route;
 		const currentOptions = currentPage.options;

 		let sharePath = `/${currentPath}`;
-		// const queryJson = {
-		// 	inviteCode: (inviteCode && inviteCode !== true) ? inviteCode : null,
-		// 	shopId,
-		// 	shopUserId: shopUserInfo.id,
-		// }
-		// for (const key in currentOptions) {
-		// 	if (currentOptions.hasOwnProperty(key)) {
-		// 		queryJson[key] = encodeURIComponent(currentOptions[key])
-		// 	}
-		// }
-		// queryJson.shopId = shopId
-		// queryJson.inviteCode = (inviteCode && inviteCode !== true) ? inviteCode : null
-		// queryJson.shopUserId = shopUserInfo.id

-		const query =await returnQuery()

+		let query = await returnQuery()
+		const indexBg = returnIndexBg()
+		console.log('indexBg', indexBg);
+		const imageUrl = indexBg || shopInfo.logo

 		// 全局默认配置（可被页面覆盖）
 		const defaultShareConfig = {
 			title: shopInfo.shopName,
 			path: sharePath + '?' + query,
-			imageUrl: shopInfo.logo,
+			imageUrl: imageUrl,
 			query,
 			// desc: '描述',
 			success: (res) => {
@@ -270,9 +300,6 @@ export const shareMixin = {
 		};


-
-
-
 		// 页面自定义配置覆盖全局
 		const pageShareConfig = this.$options.shareConfig || {};
 		console.log('mixIn onShareAppMessage', {
@@ -286,16 +313,12 @@ export const shareMixin = {
 	},


+
 	async onShareTimeline() {


-		// const shopId = uni.cache.get('shopId')
-		// const shopUserInfo = uni.cache.get('shopUserInfo')
+
 		const shopInfo = uni.cache.get('shopInfo')
-		// const inviteCode = await autoGetInviteCode({
-		// 	shopId: shopId,
-		// 	shopUserId: shopUserInfo.id
-		// })

 		const pages = getCurrentPages();
 		const currentPage = pages[pages.length - 1];
@@ -304,26 +327,17 @@ export const shareMixin = {


 		let sharePath = `/${currentPath}`;
-		// const queryJson = {
-		// 	inviteCode: (inviteCode && inviteCode !== true) ? inviteCode : null,
-		// 	shopId,
-		// 	shopUserId: shopUserInfo.id,
-		// }
-		// for (const key in currentOptions) {
-		// 	if (currentOptions.hasOwnProperty(key)) {
-		// 		queryJson[key] = encodeURIComponent(currentOptions[key])
-		// 	}
-		// }
-		// queryJson.shopId = shopId
-		// queryJson.inviteCode = (inviteCode && inviteCode !== true) ? inviteCode : null
-		// queryJson.shopUserId = shopUserInfo.id

-		const query = await returnQuery()
+
+		let query = await returnQuery()
+		const indexBg = returnIndexBg()
+		const imageUrl = indexBg || shopInfo.logo
+

 		const defaultTimelineConfig = {
 			title: shopInfo.shopName,
 			path: sharePath + '?' + query,
-			imageUrl: shopInfo.logo,
+			imageUrl: imageUrl,
 			query,
 		};

--- a/vite.config.js
+++ b/vite.config.js
@@ -15,6 +15,7 @@ module.exports = defineConfig({
 				{
 					"@dcloudio/uni-app": [
 						"onShareAppMessage",
+						"onShareTimeline",
 						"onLoad",
 						"onShow",
 						"onHide",
Author	SHA1	Message	Date
YeMingfei666	189459845c	分享问题修复	2026-01-30 10:11:18 +08:00
YeMingfei666	c0e277fd8f	分享问题修复	2026-01-29 14:36:32 +08:00
YeMingfei666	37fe706d6a	点餐页增加轮播图点击图片进入具体页面，点击分享正常分享，在对应的页面增加分享弹窗组件	2026-01-28 18:09:47 +08:00
gyq	93d3f9196c	去除清除绑定分销关系的方法	2026-01-23 10:52:15 +08:00
gyq	ee34d94ca0	修复分销中心绑定成功后不刷新的问题	2026-01-22 18:24:08 +08:00
gyq	cb139acf13	优化分销中心分享进来后的返回	2026-01-22 15:32:30 +08:00
YeMingfei666	4eb9eb27e3	Merge branch 'test' of https://newgitea.sxczgkj.cn/czg_team/cashier_wx into test	2026-01-22 15:02:09 +08:00
YeMingfei666	8810c218b3	点餐页问题修复	2026-01-22 15:02:06 +08:00
gyq	dc3174ef13	增加分销二维码邀请	2026-01-22 14:50:28 +08:00
gyq	94be2739af	优化充值中心返回	2026-01-22 13:40:43 +08:00
YeMingfei666	9037e205a0	修复分享问题	2026-01-22 11:36:49 +08:00
YeMingfei666	2afc2f9fab	修改点餐页分享	2026-01-21 17:19:04 +08:00