Merge branch 'test' of https://newgitea.sxczgkj.cn/czg_team/cashier_wx into prod

common/api/market/distribution.js

@@ -136,6 +136,15 @@ export const getInviteCode = (data) => {
     data: data,
   });
 };
+export const autoGetInviteCode = (data) => {
+  return request({
+    url: prveUrl + "/user/distribution/autoGetInviteCode",
+    method: "get",
+    data: data,
+  });
+};
+
+
 
 // 获取配置
 export const getConfig = (data) => {
@@ -147,3 +156,11 @@ export const getConfig = (data) => {
 };
 
 
+// 分销员中心-无感-绑定邀请人
+export const autoBindInviteUser = (data) => {
+  return request({
+    url: prveUrl + "/user/distribution/autoBindInviteUser",
+    method: "post",
+    data: data,
+  });
+};

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'
+	})
+}

common/api/order/pointGoods.js

@@ -20,6 +20,12 @@ export const pointGoodsPage = (data) => {
         data: data
     })
 }
+export const pointsGoods = (data) => {
+    return request({
+        url: url + '/user/pointGoods/'+data.id,
+        method: 'get',
+    })
+}
 
 
 export const exchange = (data) => {

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);
 			},
 		});

common/config.js

@@ -1,12 +1,9 @@
 // const debug = process.env.NODE_ENV == 'development' ? true : false;
 // const debug = false; // false线上 true本地
-const debug = false; // false线上 true本地
+const debug = true; // false线上 true本地
 let baseUrl = ''
 let baseUrlwws = ''
 
-
-
-
 const version = "100";
 const autoRemoveCache = {
 	count: 100000,

common/css/common.scss

@@ -44,6 +44,9 @@ page,
 	image {
 		display: block;
 	}
+	.relative{
+		position: relative;
+	}
 	.absolute{
 		position: absolute;
 	}

components/ymf-components/ymf-share.vue

@@ -0,0 +1,38 @@
+<template>
+	<view class="relative">
+		<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>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	const emits = defineEmits(['shareClick'])
+	const props = defineProps({
+		size: {
+			type: String,
+			default: '36rpx'
+		},
+		color:{
+			type: String,
+			default: '#333'
+		}
+	})
+
+	function shareClick() {
+		emits('shareClick')
+	}
+</script>
+
+<style lang="scss">
+	.share-box {
+		left: 0;
+		right: 0;
+		bottom: 0;
+		top: 0;
+		opacity: 0;
+		overflow: hidden;
+	}
+</style>

distribution/shop-detail/components/share-popup.vue

@@ -1,38 +1,21 @@
 <template>
 	<view class="">
 		<view class="w-qrcode">
-      <w-qrcode
+			<w-qrcode :options="codeOptions" :opacity="0" ref="wQrcode" @generate="(e) => qrcodeResult(e)"></w-qrcode>
-        :options="codeOptions"
-        :opacity="0"
-        ref="wQrcode"
-        @generate="(e) => qrcodeResult(e)"
-      ></w-qrcode>
 		</view>
-
+		<up-popup :show="show" bgColor="transparent" :safeAreaInsetBottom="false" :closeOnClickOverlay="true" @close="close" mode="center">
-    <up-popup
-      :show="show"
-      bgColor="transparent"
-      :safeAreaInsetBottom="false"
-      :closeOnClickOverlay="true"
-      @close="close"
-      mode="center"
-    >
 			<view class="box">
 				<view class="info">
 					<view class="u-flex justify-center">
 						<up-avatar size="214rpx" :src="shopUserInfo.headImg"></up-avatar>
 					</view>
-          <view
+					<view class="u-m-t-48 font-14 font-700 color-333 text-center line-height-54">
-            class="u-m-t-48 font-14 font-700 color-333 text-center line-height-54"
-          >
 						<view>{{ shopUserInfo.nickName }}</view>
 						<view>{{ desensitizePhone(shopUserInfo.phone) }}</view>
 					</view>
 					<view class="u-m-t-16 font-14 line-height-54 text-center">
 						<text class="color-666">邀请码</text>
-            <text class="u-m-l-16 u-m-r-16 color-333 font-16 font-700">{{
+						<text class="u-m-l-16 u-m-r-16 color-333 font-16 font-700">{{ inviteCode }}</text>
-              inviteCode
-            }}</text>
 						<text class="" style="color: #fe6d11" @click="copyCode">复制</text>
 					</view>
 					<view class="u-flex justify-center" style="margin-top: 90rpx">
@@ -44,10 +27,10 @@
             ></w-qrcode> -->
 						<up-image width="322rpx" height="322rpx" :src="code"></up-image>
 					</view>
-
-          <view class="u-m-t-60 u-flex u-col-center justify-center">
-            <view class="confirm" @click="save">保存图片</view>
 				</view>
+				<view class="footer-wrap">
+					<view class="confirm line" @click="save">保存图片</view>
+					<ymf-share><view class="confirm">微信分享</view></ymf-share>
 				</view>
 			</view>
 		</up-popup>
@@ -55,47 +38,80 @@
 </template>
 
 <script setup>
-import wQrcode from "@/uni_modules/wmf-code/components/w-qrcode/w-qrcode.vue";
+import { shareMixin, handleMixinOnLoad, returnQuery } from '@/utils/share.js';
-import {desensitizePhone} from "@/utils/util.js";
+import ymfShare from '@/components/ymf-components/ymf-share.vue';
-import { ref } from "vue";
+import wQrcode from '@/uni_modules/wmf-code/components/w-qrcode/w-qrcode.vue';
+import { desensitizePhone } from '@/utils/util.js';
+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,
-    default: "",
+		default: ''
 	},
 	shopUserInfo: {
 		type: Object,
-    default: () => {},
+		default: () => {}
-  },
+	}
 });
+
 const codeOptions = ref({
+	padding: 10,
 	size: 200,
-  code: props.inviteCode,
+	code: ''
 });
+
 function copyCode() {
 	uni.setClipboardData({
 		data: props.inviteCode,
 		success: function () {
-      console.log("success");
+			console.log('success');
-    },
+		}
 	});
 }
-const code = ref("");
+const code = ref('');
 
 function qrcodeResult(e) {
-  console.log("qrcodeResult", e);
+	console.log('qrcodeResult', e);
 	code.value = e.img.tempFilePath;
-  console.log("code", code.value);
+	console.log('code', code.value);
 }
 
 const show = defineModel({
 	type: Boolean,
-  default: false,
+	default: false
 });
-const emits = defineEmits(["cancel", "confirm"]);
+const emits = defineEmits(['cancel', 'confirm']);
 function close() {
 	show.value = false;
-  emits("cancel");
+	emits('cancel');
 }
 function save() {
 	show.value = false;
@@ -105,7 +121,7 @@ function save() {
 		filePath: code.value,
 		success: function () {
 			uni.showToast({
-        title: "保存成功",
+				title: '保存成功',
 				icon: 'none'
 			});
 		},
@@ -151,14 +167,14 @@ function save() {
 			} else {
 				// 非授权问题的保存失败（如文件路径错误、系统问题等）
 				uni.showToast({
-          title: "保存失败",
+					title: '保存失败',
 					icon: 'none'
 				});
 			}
-    },
+		}
 	});
 
-  emits("confirm", code.value);
+	emits('confirm', code.value);
 }
 </script>
 
@@ -175,7 +191,8 @@ function save() {
 	width: 638rpx;
 	background-color: #fff;
 	border-radius: 16rpx;
-  overflow: hidden;
+	// overflow: hidden;
+	position: relative;
 	.title {
 		color: #000000;
 		font-size: 32rpx;
@@ -192,6 +209,14 @@ function save() {
 		min-width: 84rpx;
 		text-align: right;
 	}
+	.footer-wrap {
+		width: 100%;
+		position: absolute;
+		left: 0;
+		bottom: -100upx;
+		display: flex;
+		gap: 28upx;
+	}
 }
 
 .cancel {
@@ -205,15 +230,23 @@ function save() {
 	line-height: 48rpx;
 }
 .confirm {
+	$color: #e8ad7b;
+	flex: 1;
 	padding: 14rpx 76rpx;
 	border-radius: 16rpx;
-  background-color: #e8ad7b;
+	background-color: $color;
-  border: 2rpx solid #e8ad7b;
+	border: 2rpx solid $color;
 	color: #fff;
 	font-size: 32rpx;
 	font-weight: 400;
-  line-height: 48rpx;
 	white-space: nowrap;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	&.line {
+		background-color: #fff;
+		color: $color;
+	}
 }
 .line-height-54 {
 	line-height: 54rpx;
@@ -225,4 +258,3 @@ function save() {
 	z-index: -1;
 }
 </style>
-    

groupBuying/goodsDetail/goodsDetail.vue

@@ -28,11 +28,11 @@
 		<view class="bg-f7" style="height: 32rpx"></view>
 		<view class="desc">
 			<view class="u-flex">
-				<view class="color-666 no-wrap" style="min-width: 180rpx;">可核销门店：</view>
+				<view class="color-666 no-wrap" style="min-width: 180rpx">可核销门店：</view>
 				<view class="">{{ item.shopName }}</view>
 			</view>
 			<view class="u-flex u-m-t-16 u-col-baseline">
-				<view class="color-666 no-wrap" style="min-width: 180rpx;">门店地址：</view>
+				<view class="color-666 no-wrap" style="min-width: 180rpx">门店地址：</view>
 				<view class="">{{ item.shopAddress }}</view>
 			</view>
 		</view>
@@ -44,8 +44,9 @@
 				<view class="item u-flex" v-for="(item, index) in item.gbOrderList" :key="index">
 					<up-avatar size="76rpx" :src="item.avatar"></up-avatar>
 					<view class="u-flex u-flex-1 u-p-l-22 u-col-center u-row-between">
-						<view>立即购买购
+						<view>
-							<view class="color-000 u-line-1" style="max-width: 180rpx;">{{item.nickName}}</view>
+							立即购买购
+							<view class="color-000 u-line-1" style="max-width: 180rpx">{{ item.nickName }}</view>
 							<view class="main-color u-m-t-2">差{{ returnNeedPerpole(item) }}人拼成</view>
 						</view>
 						<view class="u-m-t-22">
@@ -54,17 +55,11 @@
 						</view>
 
 						<view class="btn" @click="fastBuy(item)">快速拼成</view>
-
 					</view>
-
 				</view>
 			</view>
 		</template>
 
-
-
-		
-
 		<view class="bg-f7" style="height: 24rpx"></view>
 
 		<view class="goods-detail" v-if="item.goodsCategory != '优惠券'">
@@ -72,9 +67,7 @@
 				<view class="title">商品详情</view>
 			</view>
 			<view class="u-m-t-32">
-				<image class="w-full" v-for="(item,index) in item.wareCommentImgs" :key="index" mode="widthFix"
+				<image class="w-full" v-for="(item, index) in item.wareCommentImgs" :key="index" mode="widthFix" :src="item"></image>
-					:src="item">
-				</image>
 			</view>
 		</view>
 
@@ -88,8 +81,6 @@
 			</view>
 		</view>
 
-
-
 		<!-- 需要支付的弹窗 -->
 		<up-popup :show="popupData.show" mode="bottom" closeOnClickOverlay @close="popupData.show = false">
 			<view class="popup-content">
@@ -112,7 +103,6 @@
 							</view>
 						</view>
 					</view>
-
 				</view>
 
 				<view class="bottom u-flex u-row-between u-col-center">
@@ -125,7 +115,6 @@
 						<text class="u-m-l-20 u-m-r-20">{{ number }}</text>
 						<up-icon name="plus-circle-fill" size="20" color="#ED5A2E" @click="changeNumber('+')"></up-icon>
 					</view>
-
 				</view>
 
 				<view class="u-m-t-42 u-flex u-row-center">
@@ -137,74 +126,63 @@
 	</view>
 </template>
 <script setup>
-	import {
+import { shareMixin, handleMixinOnLoad, returnQuery } from '@/utils/share.js';
-		computed,
+import { computed, reactive, watch } from 'vue';
-		reactive,
+import dayjs from 'dayjs';
-		watch
+import { wxShare } from '@/utils/share.js';
-	} from "vue";
+import { getOpenId } from '@/utils/uniapp.js';
-	import dayjs from "dayjs";
+import modal from '@/groupBuying/components/modal.vue';
-	import {wxShare} from '@/utils/share.js'
+import * as Api from '@/common/api/order/gbOrder.js';
-	import {
+import { pay } from '@/utils/pay.js';
-		getOpenId
+import { Storelogin } from '@/stores/user.js';
-	} from '@/utils/uniapp.js'
-	import modal from "@/groupBuying/components/modal.vue";
-	import * as Api from '@/common/api/order/gbOrder.js'
-	import {
-		pay
-	} from '@/utils/pay.js'
-	import {
-		Storelogin
-	} from '@/stores/user.js';
 const storelogin = Storelogin();
 
 const imgs = {
-		bg: "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/2/9fd6a3ad2b384f6cb4e88ed6b77bd334.png",
+	bg: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/2/9fd6a3ad2b384f6cb4e88ed6b77bd334.png'
 };
-	const number = ref(1)
+const number = ref(1);
 
-	import {
+import { BigNumber } from 'bignumber.js';
-		BigNumber
-	} from "bignumber.js";
 const totalPrice = computed(() => {
 	if (!item.groupPrice) {
 		return 0;
 	}
 
-		return BigNumber(number.value).times(item.groupPrice).toNumber()
+	return BigNumber(number.value).times(item.groupPrice).toNumber();
-	})
+});
 
 function changeNumber(step) {
 	if (step === '-') {
 		if (number.value == 1) {
-				return
+			return;
 		}
-			number.value--
+		number.value--;
-			return
+		return;
 	}
 	if (step === '+') {
 		if (item.limitBuyNum == -10086) {
-				number.value++
+			number.value++;
-				return
+			return;
 		}
 		if (number.value >= item.limitBuyNum) {
 			return uni.showToast({
 				title: '最多可购买' + item.limitBuyNum + '份',
 				icon: 'none'
-				})
+			});
 		}
-			number.value++
+		number.value++;
-			return
+		return;
 	}
 }
 const modalData = reactive({
-		show: false,
+	show: false
 });
 
 function prveImg(index) {
 	uni.previewImage({
 		urls: coverImgs.value,
 		current: index
-		})
+	});
 }
 
 const popupData = reactive({
@@ -213,52 +191,50 @@
 });
 
 function exchangeClick() {
-		popupData.show = true
+	popupData.show = true;
-
 }
 
 function fastBuy(item) {
 	popupData.item = item;
-		popupData.show = true
+	popupData.show = true;
 }
-	watch(() => popupData.show, (newval) => {
+watch(
+	() => popupData.show,
+	(newval) => {
 		if (!newval) {
-			popupData.item = null
+			popupData.item = null;
 		}
-	})
+	}
-
+);
 
 function dingyue() {
 	return new Promise((revlove, reject) => {
 		uni.requestSubscribeMessage({
-				tmplIds: ['JGPAGmqcPEgWB6mvAl0SC5cMqr5H5Qjcim8JCpHAZd0',
+			tmplIds: ['JGPAGmqcPEgWB6mvAl0SC5cMqr5H5Qjcim8JCpHAZd0', 'F4OyUhe_ZQ9BR731jlkaN2QXAUaA3HBZuUeVPfraSz0'],
-					'F4OyUhe_ZQ9BR731jlkaN2QXAUaA3HBZuUeVPfraSz0'
-				],
 			success(res) {},
 			complete() {
-					revlove()
+				revlove();
 			}
-			})
+		});
-		})
+	});
-
 }
 
 async function payExchange() {
 	uni.setStorageSync('group_buying_order', {
 		...item,
 		number: number.value,
-			groupOrderNo: popupData.item ? popupData.item.groupOrderNo : '',
+		groupOrderNo: popupData.item ? popupData.item.groupOrderNo : ''
-		})
+	});
 	uni.navigateTo({
 		url: '/groupBuying/confirm-order/confirm-order'
-		})
+	});
-		return
+	return;
 	await dingyue();
 	uni.showLoading({
 		title: '支付中……'
-		})
+	});
-		const openId = await getOpenId()
+	const openId = await getOpenId();
-		uni.hideLoading()
+	uni.hideLoading();
 	if (openId) {
 		Api.exchange({
 			paramId: item.id,
@@ -266,75 +242,68 @@
 			number: number.value,
 			groupOrderNo: popupData.item ? popupData.item.groupOrderNo : '',
 			openId
-			}).then(orderRes => {
+		}).then((orderRes) => {
 			popupData.show = false;
-				pay(orderRes.payInfo).then(res => {
+			pay(orderRes.payInfo).then((res) => {
-					console.log(res)
+				console.log(res);
 
 				if (res) {
 					uni.redirectTo({
-							url: '/groupBuying/success/index?detailId=' + orderRes.record
+						url: '/groupBuying/success/index?detailId=' + orderRes.record.id
-								.id
+					});
-						})
 				} else {
 					uni.showToast({
 						title: '开团失败',
 						icon: 'none'
-						})
+					});
 				}
-
+			});
-				})
+		});
-
-			})
 	} else {
 		uni.showToast({
 			title: '鉴权失败，兑换失败',
 			icon: 'none'
-			})
+		});
 	}
 }
 
-
 const item = reactive({
 	goodsDescription: []
-	})
+});
 
 const isCanExchange = computed(() => {
-
 	if (item.quantity <= 0) {
-			return false
+		return false;
 	}
 	if (item.limitQuota && item.boughtCount >= item.limitQuota) {
-			return false
+		return false;
 	}
-		return true
+	return true;
-	})
+});
 
 const returnBtmText = computed(() => {
 	if (isCanExchange.value) {
-			return '立即开团'
+		return '立即开团';
 	}
 	if (pointsUser.pointBalance < item.requiredPoints) {
-			const num = item.requiredPoints - pointsUser.pointBalance
+		const num = item.requiredPoints - pointsUser.pointBalance;
-			return `积分不足，还差${num}积分`
+		return `积分不足，还差${num}积分`;
 	}
 	if (item.quantity <= 0) {
-			return `库存不足`
+		return `库存不足`;
 	}
 	if (item.limitQuota && item.boughtCount >= item.limitQuota) {
-			return `单人兑换已达上限`
+		return `单人兑换已达上限`;
 	}
-	})
+});
-
 
 const query = reactive({
 	shopId: '',
 	wareId: '',
 	groupOrderNo: ''
-	})
+});
 
-
+const coverImgs = ref([]);
-	const coverImgs = ref([])
 
 async function init(opt) {
 	// 获取小程序进入场景和参数
@@ -343,17 +312,17 @@
 	// 获取链接上的参数
 	const launchOptionsQuery = launchOptions.query;
 	console.log('launchOptionsQuery', launchOptionsQuery);
-		Object.assign(query, launchOptionsQuery)
+	Object.assign(query, launchOptionsQuery);
-		console.log(opt)
+	console.log(opt);
-		Object.assign(query, opt)
+	Object.assign(query, opt);
-		console.log(query)
+	console.log(query);
-		await storelogin.actionslogin()
+	await storelogin.actionslogin();
-		getDetail()
+	getDetail();
 }
 
 function getDetail() {
-		Api.wareDetail(query).then(res => {
+	Api.wareDetail(query).then((res) => {
-			console.log('res',res)
+		console.log('res', res);
 		if (!res) {
 			uni.showModal({
 				title: '提示',
@@ -362,20 +331,19 @@
 				success() {
 					uni.redirectTo({
 						url: '/groupBuying/index/index'
-						})
+					});
 				}
-				})
+			});
 		}
 
-			res.wareCommentImgs = res.wareCommentImgs.split(',').filter(v => v)
+		res.wareCommentImgs = res.wareCommentImgs.split(',').filter((v) => v);
-			Object.assign(item, res)
+		Object.assign(item, res);
-			console.log(item)
+		console.log(item);
-			coverImgs.value = res.wareImgs.split(',')
+		coverImgs.value = res.wareImgs.split(',');
-			uni.cache.set('shopId',item.shopId)
+		uni.cache.set('shopId', item.shopId);
-		})
+	});
 }
 
-
 /**
  * 计算剩余时间差（毫秒）
  * @param {Object} item - 包含groupEndTime的订单/拼团对象
@@ -413,40 +381,52 @@
 	return `${pad(hours)}:${pad(minutes)}:${pad(seconds)}`;
 }
 
-
+let timer = null;
-	let timer = null
+let nowTime = ref(Date.now());
-	let nowTime = ref(Date.now())
 timer = setInterval(() => {
-		nowTime.value = Date.now()
+	nowTime.value = Date.now();
-	}, 1000)
+}, 1000);
 
 // 组合使用：获取格式化后的剩余时间
 function getRemainingHMS(item) {
-		nowTime.value
+	nowTime.value;
 	const ms = returnRemainingTime(item);
 	return formatTimeToHMS(ms);
 }
 
-
 function returnNeedPerpole(data) {
-		return data.groupPeopleNum - data.currentPeopleNum
+	return data.groupPeopleNum - data.currentPeopleNum;
 }
 
-
+onShareAppMessage(async () => {
-	onLoad(init)
+	let query = await returnQuery();
-	// #ifdef MP-WEIXIN
+	// query += `&wareId=${item.id}&shopId=${item.shopId}`;
-	uni.showShareMenu()
+	const options = {
-	// #endif
-	onShareAppMessage(() => {
-
-		const query = `wareId=${item.id}&shopId=${item.shopId}`
-		return wxShare({
 		title: item.wareName,
 		imageUrl: coverImgs.value[0],
-			path: '/groupBuying/goodsDetail/goodsDetail' + '?' + query,
+		path: '/groupBuying/goodsDetail/goodsDetail' + '?' + decodeURIComponent(query),
-			query,
+		query
-		})
+	};
-	})
+	console.log('onShareAppMessage===', options);
+	return options; 
+});
+
+onLoad(async (opt) => {
+	await handleMixinOnLoad(opt);
+	init(opt);
+});
+// #ifdef MP-WEIXIN
+uni.showShareMenu();
+// #endif
+// onShareAppMessage(() => {
+// 	const query = `wareId=${item.id}&shopId=${item.shopId}`;
+// 	return wxShare({
+// 		title: item.wareName,
+// 		imageUrl: coverImgs.value[0],
+// 		path: '/groupBuying/goodsDetail/goodsDetail' + '?' + query,
+// 		query
+// 	});
+// });
 </script>
 
 <style lang="scss" scoped>
@@ -494,8 +474,8 @@
 
 	.old-price {
 		margin-left: 16rpx;
-			color: #E7E7E7;
+		color: #e7e7e7;
-			opacity: .85;
+		opacity: 0.85;
 		font-weight: 700;
 		text-decoration: line-through;
 	}
@@ -517,8 +497,6 @@
 	}
 }
 
-
-
 .desc {
 	padding: 32rpx 28rpx;
 	background-color: #fff;
@@ -532,7 +510,7 @@
 		padding: 0 22rpx;
 
 		&::before {
-				content: "";
+			content: '';
 			display: block;
 			position: absolute;
 			right: 100%;
@@ -545,7 +523,7 @@
 
 		&::after {
 			left: 100%;
-				content: "";
+			content: '';
 			position: absolute;
 			top: 50%;
 			transform: translateY(-50%);
@@ -568,7 +546,6 @@
 	bottom: 0;
 	z-index: 10;
 
-
 	.btn {
 		padding: 22rpx;
 		border-radius: 200rpx;
@@ -576,7 +553,7 @@
 		color: #fff;
 		width: 556rpx;
 		text-align: center;
-			background-color: #E8AD7B;
+		background-color: #e8ad7b;
 
 		&.gray {
 			background: #9999992b;
@@ -633,7 +610,6 @@
 			color: #666;
 			line-height: 42rpx;
 		}
-
 	}
 
 	.bottom {
@@ -670,7 +646,7 @@
 
 	.item {
 		padding: 28rpx 0;
-			border-bottom: 2rpx solid #EDEDED;
+		border-bottom: 2rpx solid #ededed;
 
 		&:last-child {
 			border-bottom: none;
@@ -683,7 +659,7 @@
 		.btn {
 			padding: 8rpx 26rpx;
 			border-radius: 36rpx;
-				background: #E8AD7B;
+			background: #e8ad7b;
 			font-weight: 700;
 			color: #fff;
 		}
@@ -695,8 +671,9 @@
 	right: 0;
 	padding: 4rpx 30rpx;
 	border-radius: 0 0 0 24rpx;
-		 color: #ed5a2e; font-weight: 700;
+	color: #ed5a2e;
-		background: #FFF;
+	font-weight: 700;
+	background: #fff;
 	overflow: hidden;
 	.share {
 		position: absolute;

groupBuying/index/index.vue

@@ -2,8 +2,7 @@
 	<view class="min-page bg-f7 u-font-28">
 		<up-sticky :offsetTop="0" :customNavHeight="0">
 			<view class="top" :style="topStyle">
-				<up-navbar bg-color="transparent" :fixed="false" :placeholder="false" title="拼团特惠" @leftClick="back()"
+				<up-navbar bg-color="transparent" :fixed="false" :placeholder="false" title="拼团特惠" @leftClick="back()" left-icon-color="#fff" title-color="#fff"></up-navbar>
-					left-icon-color="#fff" title-color="#fff"></up-navbar>
 				<view class="u-flex info u-col-center">
 					<image :src="imgs.map" class="map"></image>
 					<view class="u-line-1 u-m-l-20">{{ shopInfo.shopName || '' }}</view>
@@ -26,31 +25,24 @@
 				</view>
 				<view class="filters">
 					<view class="u-flex tabs">
-						<view class="tab" v-for="(item,index) in tabs.list" :class="{'active':tabs.sel==index}"
+						<view class="tab" v-for="(item, index) in tabs.list" :class="{ active: tabs.sel == index }" @click="tabs.sel = index">{{ item }}</view>
-							@click="tabs.sel=index">{{item}}</view>
 					</view>
 
 					<view class="u-flex u-col-center" v-if="tabs.sel == 0">
-						<up-search v-model="query.wareName" @search="refresh" @clear="refresh"
+						<up-search v-model="query.wareName" @search="refresh" @clear="refresh" @custom="refresh"></up-search>
-							@custom="refresh"></up-search>
 						<!-- <perpoleNumber v-model="query.groupPeopleNum"></perpoleNumber> -->
 					</view>
 					<view class="u-flex orderStatus" v-if="tabs.sel == 1">
-						<view class="orderState" :class="{'active':orders.sel==index}"
+						<view class="orderState" :class="{ active: orders.sel == index }" v-for="(item, index) in orders.list" :key="index" @click="orders.sel = index">
-							v-for="(item,index) in orders.list" :key="index" @click="orders.sel=index">
 							{{ item.name }}
 						</view>
 					</view>
 				</view>
 			</view>
-
-
 		</up-sticky>
 
-
 		<view class="lists" v-if="tabs.sel == 0">
 			<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)">
-
 				<up-image width="218rpx" radius="16rpx" height="218rpx" :src="returnCoverImg(item)"></up-image>
 				<view class="u-flex-1 u-p-l-16">
 					<view class="u-flex u-col-center">
@@ -64,7 +56,7 @@
 								<text class="u-font-24">拼团到手</text>
 								<text class="u-font-32 font-bold">¥{{ item.groupPrice }}</text>
 							</view>
-							<view style="opacity: 0.84;">
+							<view style="opacity: 0.84">
 								<text class="u-font-24">原价</text>
 								<text class="">¥{{ item.originalPrice }}</text>
 							</view>
@@ -87,13 +79,11 @@
 					<up-image width="154rpx" height="154rpx" :src="item.goodsImg"></up-image>
 					<view class="u-flex-1 u-flex u-p-l-30 u-col-center u-row-between">
 						<view>
-							<view class="">{{item.wareJson.wareName}}</view>
+							<view class="" v-if="item.wareJson">{{ item.wareJson.wareName }}</view>
 							<view class="u-m-t-34 price">¥{{ item.payAmount }}</view>
 						</view>
 						<text class="u-font-40 font-bold">x{{ item.num }}</text>
 					</view>
-
-
 				</view>
 				<view class="u-m-t-32 info">
 					<view class="u-flex u-col-center">
@@ -124,62 +114,43 @@
 					</template>
 					<template v-else>
 						<view class="btn" @click.stop="refund(item)" v-if="canRefund(item)">申请退款</view>
-						<button open-type="share" class="btn black" @click.stop="share(item)"
+						<button open-type="share" class="btn black" @click.stop="share(item)" v-if="showShare(item)">邀请好友</button>
-							v-if="showShare(item)">邀请好友</button>
 					</template>
-
 				</view>
 			</view>
-
 		</view>
 
-
-
 		<LookQrcode v-model="modalData.show" :qrcode="qrcode"></LookQrcode>
 	</view>
 </template>
 
 <script setup>
-	import {
+import { APIusershopInfodetail } from '@/common/api/member.js';
-		APIusershopInfodetail
+import { back } from '@/utils/uniapp.js';
-	} from '@/common/api/member.js'
+import LookQrcode from '@/components/look-qrcode/look-qrcode.vue';
-	import {
+import { wxShare } from '@/utils/share.js';
-		back
+import { getRemainingHMS } from '@/utils/countdown.js';
-	} from '@/utils/uniapp.js'
+import { onShow } from '@dcloudio/uni-app';
-	import LookQrcode from "@/components/look-qrcode/look-qrcode.vue";
+import * as Api from '@/common/api/order/gbOrder.js';
-	import {
+import perpoleNumber from './components/perpole-number.vue';
-		wxShare
+import statusVue from '@/groupBuying/components/status.vue';
-	} from '@/utils/share.js'
+import { computed, reactive, watch } from 'vue';
-	import {
-		getRemainingHMS
-	} from '@/utils/countdown.js'
-	import {
-		onShow
-	} from '@dcloudio/uni-app'
-	import * as Api from '@/common/api/order/gbOrder.js'
-	import perpoleNumber from './components/perpole-number.vue'
-	import statusVue from '@/groupBuying/components/status.vue'
-	import {
-		computed,
-		reactive,
-		watch
-	} from 'vue'
 
-	const canRefundStatus = ['待成团', '待核销']
+const canRefundStatus = ['待成团', '待核销'];
 
 function canRefund(item) {
 	if (canRefundStatus.includes(item.status)) {
-			return true
+		return true;
 	}
-		return false
+	return false;
 }
 const modalData = reactive({
-		show: false,
+	show: false
 });
-	const qrcode = ref("");
+const qrcode = ref('');
 
 function lookCode(item) {
-		qrcode.value = item.verifyCode
+	qrcode.value = item.verifyCode;
 	modalData.show = true;
 }
 
@@ -188,21 +159,22 @@
 	bg1: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/604c3f917daa41af9239145196c6d3f3.png',
 	map: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/0a293f6e1a6a4e7b956379a5b6701104.png',
 	pin: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/3/4bcce5bdfa074f2a838a0209fac24241.png'
-	}
+};
 
-	const shopInfo = ref({})
+const shopInfo = ref({});
 
-	const steps = ['发起拼团', '邀请好友', '成团优惠']
+const steps = ['发起拼团', '邀请好友', '成团优惠'];
 
 const topStyle = {
 	backgroundImage: 'url(' + imgs.bg + ')'
-	}
+};
 const tabs = reactive({
 	list: ['活动列表', '我的拼团'],
 	sel: 0
-	})
+});
 const orders = reactive({
-		list: [{
+	list: [
+		{
 			name: '全部',
 			value: ''
 		},
@@ -221,102 +193,100 @@
 		{
 			name: '退款',
 			value: '退款'
-			},
+		}
 	],
 	sel: 0
-	})
+});
 
 const query = reactive({
 	page: 1,
 	size: 10,
 	wareName: '',
 	groupPeopleNum: '',
-		shopId: uni.cache.get('shopId'),
+	shopId: uni.cache.get('shopId')
-	})
+});
 
-	const list = ref([])
+const list = ref([]);
-	const isEnd = ref(false)
+const isEnd = ref(false);
 
 const status = computed(() => {
-		return orders.list[orders.sel].value
+	return orders.list[orders.sel].value;
-	})
+});
 
-	watch(() => status.value, () => {
+watch(
-		refresh()
+	() => status.value,
-	})
+	() => {
+		refresh();
+	}
+);
 
 function getData() {
 	if (tabs.sel == 0) {
-			Api.warePage(query).then(res => {
+		Api.warePage(query).then((res) => {
-				const newArr = res.records || []
+			const newArr = res.records || [];
 			if (query.page == 1) {
-					list.value = newArr
+				list.value = newArr;
 			} else {
-					list.value.push(...newArr)
+				list.value.push(...newArr);
 			}
-				isEnd.value = query.page >= res.totalPage * 1 ? true : false
+			isEnd.value = query.page >= res.totalPage * 1 ? true : false;
-			})
+		});
-			return
+		return;
 	}
 	if (tabs.sel == 1) {
-			const {
+		const { page, size, shopId } = query;
-				page,
-				size,
-				shopId
-			} = query
 		Api.record({
 			page,
 			size,
 			shopId,
-				status: status.value,
+			status: status.value
-			}).then(res => {
+		}).then((res) => {
-				const newArr = (res.records || []).map(v => {
+			const newArr = (res.records || []).map((v) => {
-					const wareJson = JSON.parse(v.wareJson)
+				const wareJson = JSON.parse(v.wareJson);
-					wareJson.wareImgs = wareJson.wareImgs.split(',').filter(v => v)
+				wareJson.wareImgs = wareJson.wareImgs.split(',').filter((v) => v);
 				return {
 					...v,
 					goodsImg: wareJson.wareImgs[0],
-						wareJson,
+					wareJson
-					}
+				};
-				})
+			});
 
 			if (query.page == 1) {
-					list.value = newArr
+				list.value = newArr;
 			} else {
-					list.value.push(...newArr)
+				list.value.push(...newArr);
 			}
-				console.log(list.value)
+			console.log(list.value);
-				isEnd.value = query.page >= res.totalPage * 1 ? true : false
+			isEnd.value = query.page >= res.totalPage * 1 ? true : false;
-			})
+		});
-			return
+		return;
 	}
 }
 
 function toDetail(item) {
 	uni.navigateTo({
 		url: '/groupBuying/goodsDetail/goodsDetail?wareId=' + item.id + '&shopId=' + item.shopId
-		})
+	});
 }
 
 function toOrderDetail(item) {
 	uni.navigateTo({
 		url: '/groupBuying/detail/index?detailId=' + item.id + '&shopId=' + item.shopId
-		})
+	});
 }
 
-
 function returnCoverImg(item) {
 	if (!item.wareImgs) {
-			return ''
+		return '';
 	}
-		const arr = item.wareImgs.split(',')
+	const arr = item.wareImgs.split(',');
-		return arr[0]
+	return arr[0];
 }
 
 function refresh() {
-		query.page = 1
+	query.page = 1;
-		isEnd.value = false
+	isEnd.value = false;
-		getData()
+	getData();
 }
 
 function refund(item) {
@@ -328,20 +298,20 @@
 			if (res.confirm) {
 				Api.applyRefund({
 					recordId: item.id,
-						orderNo: item.orderNo,
+					orderNo: item.orderNo
-					}).then(res => {
+				}).then((res) => {
 					if (res) {
 						uni.showToast({
 							title: '申请成功'
-							})
+						});
 						setTimeout(() => {
-								refresh()
+							refresh();
-							}, 1000)
+						}, 1000);
 					}
-					})
+				});
 			}
 		}
-		})
+	});
 }
 
 function cancelRefund(item) {
@@ -353,90 +323,92 @@
 			if (res.confirm) {
 				Api.cancelRefund({
 					recordId: item.id,
-						orderNo: item.orderNo,
+					orderNo: item.orderNo
-					}).then(res => {
+				}).then((res) => {
 					if (res) {
 						uni.showToast({
 							title: '取消成功'
-							})
+						});
 						setTimeout(() => {
-								refresh()
+							refresh();
-							}, 1000)
+						}, 1000);
 					}
-					})
+				});
 			}
 		}
-		})
+	});
 }
-	watch(() => tabs.sel, (newval) => {
+watch(
-		orders.sel = 0
+	() => tabs.sel,
-		refresh()
+	(newval) => {
-	})
+		orders.sel = 0;
+		refresh();
+	}
+);
 
 function showBtns(item) {
 	if (item.status == '已退款') {
-			return false
+		return false;
 	}
-		return true
+	return true;
 }
 
 function showShare(item) {
 	if (item.status == '待成团') {
-			return true
+		return true;
 	}
-		return false
+	return false;
 }
 
 function showTime(item) {
 	if (item.status == '待成团') {
-			return true
+		return true;
 	}
-		return false
+	return false;
 }
 
-
+let shareItem = null;
-	let shareItem = null
 
 function share(item) {
-		shareItem = item
+	shareItem = item;
 }
 
 onShareAppMessage(() => {
-		console.log('onShareAppMessage')
+	console.log('onShareAppMessage');
-		console.log(shareItem)
+	console.log(shareItem);
-		const query = `groupOrderNo=${shareItem.groupOrderNo}&shopId=${shareItem.shopId}`
+	const query = `groupOrderNo=${shareItem.groupOrderNo}&shopId=${shareItem.shopId}`;
 	return wxShare({
 		title: shareItem.wareJson.wareName,
 		imageUrl: shareItem.goodsImg,
 		path: '/groupBuying/detail/index' + '?' + query,
-			query,
+		query
-		})
+	});
-	})
+});
-	onShow(getData)
+onShow(getData);
 onLoad((opt) => {
-		const shopId=opt.shopId||uni.cache.get('shopId')
+	const shopId = opt.shopId || uni.cache.get('shopId');
-		query.shopId=shopId
+	query.shopId = shopId;
-		uni.cache.set('shopId',query.shopId)
+	uni.cache.set('shopId', query.shopId);
 	console.log('opt', opt);
 	APIusershopInfodetail({
 		shopId: shopId
-		}).then(res => {
+	}).then((res) => {
 		console.log(res);
-			shopInfo.value = res.shopInfo
+		shopInfo.value = res.shopInfo;
-			uni.cache.set('shopInfo', res.shopInfo)
+		uni.cache.set('shopInfo', res.shopInfo);
-			uni.cache.set('shopId', res.shopInfo.id)
+		uni.cache.set('shopId', res.shopInfo.id);
-		})
+	});
-	})
+});
 
-	let timer = null
+let timer = null;
-	let nowTime = ref(Date.now())
+let nowTime = ref(Date.now());
 timer = setInterval(() => {
-		nowTime.value = Date.now()
+	nowTime.value = Date.now();
-	}, 1000)
+}, 1000);
 
 function returnTime(item) {
-		nowTime.value
+	nowTime.value;
-		return getRemainingHMS(item)
+	return getRemainingHMS(item);
 }
 </script>
 
@@ -463,7 +435,7 @@
 	padding: 20rpx 20rpx;
 	gap: 20rpx;
 	border-radius: 14rpx 14rpx 0 0;
-		background: linear-gradient(90deg, #FFF5E6 0%, #FFD2CA 100%);
+	background: linear-gradient(90deg, #fff5e6 0%, #ffd2ca 100%);
 	align-items: center;
 
 	.step {
@@ -478,11 +450,11 @@
 		height: 44rpx;
 		line-height: 44rpx;
 		text-align: center;
-			background: #E55626;
+		background: #e55626;
 	}
 
 	.text {
-			color: #5A352F;
+		color: #5a352f;
 		margin-left: 10rpx;
 		margin-right: 22rpx;
 		white-space: nowrap;
@@ -493,7 +465,7 @@
 	}
 
 	.icon1 {
-			color: #5A352F;
+		color: #5a352f;
 	}
 }
 
@@ -504,15 +476,15 @@
 		display: flex;
 		padding: 32rpx 16rpx;
 		border-radius: 32rpx;
-			background: #FFF;
+		background: #fff;
 		margin-bottom: 14rpx;
 
 		.numbers {
-				background: #4C2828;
+			background: #4c2828;
 			padding: 8rpx 18rpx;
 			border-radius: 10rpx;
 			font-weight: 700;
-				color: #FAEAC6;
+			color: #faeac6;
 			white-space: nowrap;
 		}
 
@@ -522,13 +494,13 @@
 
 		.members {
 			margin-top: 26rpx;
-				background: #FDF1CB;
+			background: #fdf1cb;
 			padding: 4rpx 18rpx;
 			border-radius: 10rpx 10rpx 10rpx 0;
 			width: fit-content;
 			font-size: 24rpx;
 			font-weight: 700;
-				color: #ED5A2E;
+			color: #ed5a2e;
 		}
 
 		.info {
@@ -561,7 +533,7 @@
 .filters {
 	padding: 16rpx 28rpx;
 	border-radius: 6rpx 6rpx 16rpx 16rpx;
-		background: #FFF;
+	background: #fff;
 }
 
 .tabs {
@@ -572,11 +544,11 @@
 	padding: 32rpx 88rpx;
 
 	.tabs {
-			transition: all .3s linear;
+		transition: all 0.3s linear;
 	}
 
 	.active {
-			color: #ED5A2E;
+		color: #ed5a2e;
 		font-size: 32rpx;
 		font-weight: 700;
 		font-weight: 700;
@@ -594,7 +566,7 @@
 
 	.orderState {
 		color: #999;
-			transition: all .3s linear;
+		transition: all 0.3s linear;
 
 		&.active {
 			color: #000;
@@ -610,11 +582,11 @@
 	.item {
 		padding: 32rpx 24rpx;
 		border-radius: 16rpx;
-			background: #FFF;
+		background: #fff;
 		margin-bottom: 32rpx;
 
 		.numbers {
-				background-color: #ED5A2E;
+			background-color: #ed5a2e;
 			padding: 16rpx 30rpx;
 			border-radius: 12rpx;
 			font-size: 32rpx;
@@ -623,10 +595,8 @@
 			line-height: 36rpx;
 		}
 
-
-
 		.price {
-				color: #ED5A2E;
+			color: #ed5a2e;
 			font-weight: 700;
 			line-height: 36rpx;
 			font-size: 40rpx;
@@ -637,7 +607,7 @@
 			flex-direction: column;
 			align-items: flex-start;
 			border-radius: 8rpx;
-				background: #F8F8F8;
+			background: #f8f8f8;
 
 			.title {
 				min-width: 208rpx;
@@ -654,7 +624,6 @@
 					font-weight: 700;
 				}
 			}
-
 		}
 
 		.btns {
@@ -668,8 +637,8 @@
 				margin: 0;
 				padding: 12rpx 14rpx;
 				border-radius: 10rpx;
-					border: 2rpx solid #D9D9D9;
+				border: 2rpx solid #d9d9d9;
-					background: #FFF;
+				background: #fff;
 				font-size: 28rpx;
 
 				&.black {
@@ -682,7 +651,6 @@
 	}
 }
 
-
 .copy {
 	width: 28rpx;
 	height: 28rpx;

groupBuying/success/index.vue

@@ -1,10 +1,8 @@
 <template>
-
 	<view>
 		<template v-if="item.status == '待核销'">
 			<view class="min-page bg-f7 color-333 u-font-28 relative">
-				<up-navbar bg-color="#F8F8F8" :fixed="true" :placeholder="true" title="支付成功"
+				<up-navbar bg-color="#F8F8F8" :fixed="true" :placeholder="true" title="支付成功" @leftClick="uni.navigateBack()"></up-navbar>
-					@leftClick="uni.navigateBack()"></up-navbar>
 
 				<view class="bottom">
 					<view class="u-p-32 u-flex u-row-center u-col-center u-flex-col bg-fff">
@@ -14,16 +12,15 @@
 
 					<view class="shop">
 						<view class="u-flex">
-							<text style="min-width: 180rpx;" class="color-666">可核销门店：</text>
+							<text style="min-width: 180rpx" class="color-666">可核销门店：</text>
 							<text>{{ item.shopName }}</text>
 						</view>
 						<view class="u-m-t-32 u-flex">
-							<text style="min-width: 180rpx;" class="color-666">门店地址：</text>
+							<text style="min-width: 180rpx" class="color-666">门店地址：</text>
 							<text>{{ item.shopAddress }}</text>
 						</view>
 					</view>
 
-
 					<view class="goods u-flex u-col-center">
 						<up-image width="158rpx" height="158rpx" radius="14rpx" :src="item.goodsImg"></up-image>
 						<view class="u-flex-1 u-p-l-16">
@@ -34,9 +31,8 @@
 								</view>
 							</view>
 							<view class="u-m-t-16 u-flex u-col-center">
-								<view style="width: 356rpx;">
+								<view style="width: 356rpx">
-									<view class="font-bold" v-if="item.wareJson">{{item.wareJson
+									<view class="font-bold" v-if="item.wareJson">{{ item.wareJson.wareName }}</view>
-			.wareName}}</view>
 									<view class="u-flex u-m-t-10 u-col-center">
 										<view class="price">
 											<text class="u-font-30">¥</text>
@@ -48,13 +44,10 @@
 										</view>
 									</view>
 								</view>
-								<view class="u-p-l-16 color-333">
+								<view class="u-p-l-16 color-333">数量：{{ item.num }}</view>
-									数量：{{item.num}}
 							</view>
 						</view>
 					</view>
-					</view>
-
 
 					<view class="members">
 						<view class="list">
@@ -65,11 +58,9 @@
 										<view class="u-flex u-row-center absolute">
 											<text class="tuanzhang" v-if="index == 0">团长</text>
 										</view>
-
 									</view>
 									<view class="u-line-1 u-m-t-16 color-000 text-center">{{ user.userName }}</view>
 								</view>
-
 							</view>
 
 							<view class="item" v-if="false">
@@ -83,20 +74,15 @@
 									<view class="u-line-1 u-m-t-16 color-000 text-center">等待参团</view>
 								</view>
 							</view>
-
-
 						</view>
-
 					</view>
-
-
 				</view>
 
 				<view class="order">
 					<view class="u-flex u-row-between">
 						<view class="font-bold u-font-32">订单信息</view>
 
-						<view class="u-flex color-666" @click="showOrder=!showOrder" style="align-items: baseline;">
+						<view class="u-flex color-666" @click="showOrder = !showOrder" style="align-items: baseline">
 							<text class="u-m-r-18">{{ showOrder ? '收起' : '展开' }}</text>
 							<view class="guodu" :class="{ rotate: !showOrder }">
 								<up-icon name="arrow-down" bold></up-icon>
@@ -122,11 +108,9 @@
 							<view class="">{{ item.payTime }}</view>
 						</view>
 					</view>
-
 				</view>
 
-
+				<view style="height: 100px"></view>
-				<view style="height: 100px;"></view>
 				<view class="btns">
 					<view class="btn" @click="toPinIndex">继续拼团</view>
 					<button class="btn main" @click="toOrderDetail(item)">查看订单</button>
@@ -136,10 +120,16 @@
 		<template v-if="item.status == '待成团'">
 			<view class="min-page bg-f7 color-333 u-font-28 relative">
 				<view class="top" :style="topStyle">
-					<up-navbar bg-color="transparent" :fixed="false" :placeholder="false" title="支付成功"
+					<up-navbar
-						left-icon-color="#fff" @leftClick="uni.navigateBack()" title-color="#fff"></up-navbar>
+						bg-color="transparent"
-					<view class="u-flex info u-col-center">
+						:fixed="false"
-					</view>
+						:placeholder="false"
+						title="支付成功"
+						left-icon-color="#fff"
+						@leftClick="uni.navigateBack()"
+						title-color="#fff"
+					></up-navbar>
+					<view class="u-flex info u-col-center"></view>
 				</view>
 				<view class="bottom bottom1">
 					<view class="time" v-if="item.status == '待成团'">
@@ -161,12 +151,10 @@
 									<text class="">{{ item.groupPeopleNum }}人团</text>
 								</view>
 								<statusVue :status="item.status"></statusVue>
-
 							</view>
 							<view class="u-m-t-16 u-flex u-col-center u-row-between">
-								<view style="max-width: 356rpx;">
+								<view style="max-width: 356rpx">
-									<view class="font-bold u-line-1" v-if="item.wareJson">{{item.wareJson
+									<view class="font-bold u-line-1" v-if="item.wareJson">{{ item.wareJson.wareName }}</view>
-			.wareName}}</view>
 									<view class="u-flex u-m-t-10 u-col-center">
 										<view class="price">
 											<text class="u-font-30">¥</text>
@@ -178,9 +166,7 @@
 										</view>
 									</view>
 								</view>
-								<view class="u-p-l-16 color-333 no-wrap">
+								<view class="u-p-l-16 color-333 no-wrap">数量：{{ item.num }}</view>
-									数量：{{item.num}}
-								</view>
 							</view>
 						</view>
 					</view>
@@ -188,11 +174,11 @@
 					<view class="shop-box">
 						<view class="shop">
 							<view class="u-flex">
-								<text style="min-width: 180rpx;" class="color-666">可核销门店：</text>
+								<text style="min-width: 180rpx" class="color-666">可核销门店：</text>
 								<text>{{ item.shopName }}</text>
 							</view>
 							<view class="u-m-t-32 u-flex">
-								<text style="min-width: 180rpx;" class="color-666">门店地址：</text>
+								<text style="min-width: 180rpx" class="color-666">门店地址：</text>
 								<text>{{ item.shopAddress }}</text>
 							</view>
 						</view>
@@ -207,11 +193,9 @@
 										<view class="u-flex u-row-center absolute">
 											<text class="tuanzhang" v-if="index == 0">团长</text>
 										</view>
-
 									</view>
 									<view class="u-line-1 u-m-t-16 color-000 text-center">{{ user.userName }}</view>
 								</view>
-
 							</view>
 
 							<view class="item">
@@ -227,9 +211,9 @@
 							</view>
 						</view>
 						<view class="u-flex u-row-center" v-if="item.status == '待成团'">
-							<view class="pin-btn">邀请好友参团
+							<view class="pin-btn">
+								邀请好友参团
 								<button open-type="share" class="share">邀请好友参团</button>
-
 							</view>
 						</view>
 					</view>
@@ -238,7 +222,7 @@
 						<view class="u-flex u-row-between">
 							<view class="font-bold u-font-32">订单信息</view>
 
-							<view class="u-flex color-666" @click="showOrder=!showOrder" style="align-items: baseline;">
+							<view class="u-flex color-666" @click="showOrder = !showOrder" style="align-items: baseline">
 								<text class="u-m-r-18">{{ showOrder ? '收起' : '展开' }}</text>
 								<view class="guodu" :class="{ rotate: !showOrder }">
 									<up-icon name="arrow-down" bold></up-icon>
@@ -264,19 +248,23 @@
 								<view class="">{{ item.payTime }}</view>
 							</view>
 						</view>
-
 					</view>
 				</view>
-
 			</view>
 		</template>
 		<template v-if="item.status == '已退款'">
 			<view class="min-page bg-f7 color-333 u-font-28 relative">
 				<view class="top" :style="topStyle">
-					<up-navbar bg-color="transparent" :fixed="false" :placeholder="false" title="订单详情"
+					<up-navbar
-						left-icon-color="#fff" @leftClick="uni.navigateBack()" title-color="#fff"></up-navbar>
+						bg-color="transparent"
-					<view class="u-flex info u-col-center">
+						:fixed="false"
-					</view>
+						:placeholder="false"
+						title="订单详情"
+						left-icon-color="#fff"
+						@leftClick="uni.navigateBack()"
+						title-color="#fff"
+					></up-navbar>
+					<view class="u-flex info u-col-center"></view>
 				</view>
 				<view class="bottom bottom1">
 					<view class="time" v-if="item.status == '待成团'">
@@ -289,7 +277,7 @@
 							<text class="number">{{ returnNum(2) }}</text>
 						</view>
 					</view>
-					<view class="goods u-flex u-col-center" style="border-radius: 16rpx;">
+					<view class="goods u-flex u-col-center" style="border-radius: 16rpx">
 						<up-image width="158rpx" height="158rpx" radius="14rpx" :src="item.goodsImg"></up-image>
 						<view class="u-flex-1 u-p-l-16">
 							<view class="u-flex u-col-center u-row-between">
@@ -298,12 +286,10 @@
 									<text class="">{{ item.groupPeopleNum }}人团</text>
 								</view>
 								<statusVue :status="item.status"></statusVue>
-
 							</view>
 							<view class="u-m-t-16 u-flex u-col-center u-row-between">
-								<view style="max-width: 356rpx;">
+								<view style="max-width: 356rpx">
-									<view class="font-bold u-line-1" v-if="item.wareJson">{{item.wareJson
+									<view class="font-bold u-line-1" v-if="item.wareJson">{{ item.wareJson.wareName }}</view>
-					.wareName}}</view>
 									<view class="u-flex u-m-t-10 u-col-center">
 										<view class="price">
 											<text class="u-font-30">¥</text>
@@ -315,9 +301,7 @@
 										</view>
 									</view>
 								</view>
-								<view class="u-p-l-16 color-333 no-wrap">
+								<view class="u-p-l-16 color-333 no-wrap">数量：{{ item.num }}</view>
-									数量：{{item.num}}
-								</view>
 							</view>
 						</view>
 					</view>
@@ -325,23 +309,21 @@
 					<view class="shop-box">
 						<view class="shop">
 							<view class="u-flex">
-								<text style="min-width: 180rpx;" class="color-666">可核销门店：</text>
+								<text style="min-width: 180rpx" class="color-666">可核销门店：</text>
 								<text>{{ item.shopName }}</text>
 							</view>
 							<view class="u-m-t-32 u-flex">
-								<text style="min-width: 180rpx;" class="color-666">门店地址：</text>
+								<text style="min-width: 180rpx" class="color-666">门店地址：</text>
 								<text>{{ item.shopAddress }}</text>
 							</view>
 						</view>
 					</view>
 
-					
-
 					<view class="order">
 						<view class="u-flex u-row-between">
 							<view class="font-bold u-font-32">订单信息</view>
 
-							<view class="u-flex color-666" @click="showOrder=!showOrder" style="align-items: baseline;">
+							<view class="u-flex color-666" @click="showOrder = !showOrder" style="align-items: baseline">
 								<text class="u-m-r-18">{{ showOrder ? '收起' : '展开' }}</text>
 								<view class="guodu" :class="{ rotate: !showOrder }">
 									<up-icon name="arrow-down" bold></up-icon>
@@ -367,70 +349,58 @@
 								<view class="">{{ item.payTime }}</view>
 							</view>
 						</view>
-
 					</view>
 				</view>
-
 			</view>
 		</template>
-
-
 	</view>
-
 </template>
 
 <script setup>
-	import statusVue from '@/groupBuying/components/status.vue'
+import { shareMixin, handleMixinOnLoad, returnQuery } from '@/utils/share.js';
-	import * as Api from '@/common/api/order/gbOrder.js'
+import statusVue from '@/groupBuying/components/status.vue';
-	import {
+import * as Api from '@/common/api/order/gbOrder.js';
-		wxShare
+import { wxShare } from '@/utils/share.js';
-	} from '@/utils/share.js'
+import { computed, reactive } from 'vue';
-	import {
+import { getRemainingHMS } from '@/utils/countdown.js';
-		computed,
-		reactive
-	} from 'vue'
-	import {
-		getRemainingHMS
-	} from '@/utils/countdown.js'
 
 function toPinIndex() {
 	uni.redirectTo({
 		url: '/groupBuying/index/index'
-		})
+	});
 }
 const imgs = {
 	bg: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/d21f2dfd7bec44618f2d5e4b88372b08.png',
 	pin: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/2/3947892924dd481782331513aff00eb3.png',
 	success: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/3/6a75acd0c0db4bfe9937854b2b2df3f0.png'
-	}
+};
-
 
 const topStyle = {
 	backgroundImage: 'url(' + imgs.bg + ')'
-	}
+};
-	const showOrder = ref(true)
+const showOrder = ref(true);
 
 function copyText(text) {
 	uni.setClipboardData({
 		data: text,
 		success() {}
-		})
+	});
 }
 const query = reactive({
 	shopId: '',
-		detailId: '',
+	detailId: ''
-	})
+});
 
 function init(opt) {
-		console.log(opt)
+	console.log(opt);
-		Object.assign(query, opt)
+	Object.assign(query, opt);
-		getDetail()
+	getDetail();
 }
-	const item = reactive({})
+const item = reactive({});
 
 function getDetail() {
 	try {
-			Api.recordDetail(query).then(res => {
+		Api.recordDetail(query).then((res) => {
 			if (!res) {
 				uni.showModal({
 					title: '提示',
@@ -439,45 +409,43 @@
 					success(res) {
 						uni.redirectTo({
 							url: '/groupBuying/index/index'
-							})
+						});
 					}
-
+				});
-					})
+				return;
-					return
 			}
-				console.log(res, 'res')
+			console.log(res, 'res');
-				const wareJson = JSON.parse(res.wareJson)
+			const wareJson = JSON.parse(res.wareJson);
-				wareJson.wareImgs = wareJson.wareImgs.split(',').filter(v => v)
+			wareJson.wareImgs = wareJson.wareImgs.split(',').filter((v) => v);
 			res.wareJson = wareJson;
 			res.goodsImg = wareJson.wareImgs[0];
-				Object.assign(item, res)
+			Object.assign(item, res);
-				console.log('item', item)
+			console.log('item', item);
-			})
+		});
 	} catch (err) {
-			console.log('err', err)
+		console.log('err', err);
-
 	}
-
-
 }
-	onLoad(init)
+onLoad(async (opt) => {
+	await handleMixinOnLoad(opt);
+	init(opt);
+});
 
-	let timer = null
+let timer = null;
-	let nowTime = ref(Date.now())
+let nowTime = ref(Date.now());
 timer = setInterval(() => {
-		nowTime.value = Date.now()
+	nowTime.value = Date.now();
-	}, 1000)
+}, 1000);
 
 const returnTime = computed(() => {
-		nowTime.value
+	nowTime.value;
-		return getRemainingHMS(item)
+	return getRemainingHMS(item);
-	})
+});
 
 function returnNum(index) {
-		return returnTime.value.split(':')[index]
+	return returnTime.value.split(':')[index];
 }
 
-
 function refund(item) {
 	uni.showModal({
 		title: '提示',
@@ -487,39 +455,48 @@
 			if (res.confirm) {
 				Api.applyRefund({
 					recordId: item.id,
-						orderNo: item.orderNo,
+					orderNo: item.orderNo
-					}).then(res => {
+				}).then((res) => {
 					if (res) {
 						uni.showToast({
 							title: '申请成功'
-							})
+						});
 						setTimeout(() => {
-								getDetail()
+							getDetail();
-							}, 1000)
+						}, 1000);
 					}
-					})
+				});
 			}
 		}
-		})
+	});
 }
 
-	onShareAppMessage(() => {
+onShareAppMessage(async (res) => {
-		console.log('onShareAppMessage')
+	let query = await returnQuery();
-		console.log(item)
+	return {
-		const query = `groupOrderNo=${item.groupOrderNo}&shopId=${item.shopId}`
-		return wxShare({
 		title: item.wareJson.wareName,
 		imageUrl: item.goodsImg,
 		path: '/groupBuying/detail/index' + '?' + query,
-			query,
+		query
-		})
+	};
-	})
+});
 
+// onShareAppMessage(() => {
+// 	console.log('onShareAppMessage');
+// 	console.log(item);
+// 	const query = `groupOrderNo=${item.groupOrderNo}&shopId=${item.shopId}`;
+// 	return wxShare({
+// 		title: item.wareJson.wareName,
+// 		imageUrl: item.goodsImg,
+// 		path: '/groupBuying/detail/index' + '?' + query,
+// 		query
+// 	});
+// });
 
 function toOrderDetail(item) {
 	uni.navigateTo({
 		url: '/groupBuying/detail/index?detailId=' + item.id + '&shopId=' + item.shopId
-		})
+	});
 }
 </script>
 
@@ -534,8 +511,6 @@
 		font-size: 32rpx;
 		font-weight: 700;
 	}
-
-
 }
 
 .bottom {
@@ -544,7 +519,7 @@
 
 	.time {
 		padding: 18rpx 24rpx;
-			background: #FFF4E2;
+		background: #fff4e2;
 		display: flex;
 		align-items: center;
 		border-radius: 16rpx 16rpx 0 0;
@@ -552,7 +527,7 @@
 		.number {
 			padding: 6rpx;
 			border-radius: 16rpx;
-				background: #ED5A2E;
+			background: #ed5a2e;
 			color: #fff;
 			font-size: 32rpx;
 			margin-left: 18rpx;
@@ -578,7 +553,7 @@
 		.tuan-members {
 			padding: 0 16rpx 0 0;
 			border-radius: 0 6rpx 6rpx 0;
-				background: #4C2828;
+			background: #4c2828;
 			color: #f5d9ad;
 			font-weight: 700;
 		}
@@ -611,7 +586,7 @@
 
 	.shop {
 		border-radius: 8rpx;
-			background: #F8F8F8;
+		background: #f8f8f8;
 		padding: 16rpx 34rpx;
 	}
 
@@ -637,7 +612,7 @@
 			.add-box {
 				width: 140rpx;
 				height: 140rpx;
-					border: 2rpx dashed #D9D9D9;
+				border: 2rpx dashed #d9d9d9;
 				border-radius: 50%;
 				overflow: hidden;
 				position: relative;
@@ -676,14 +651,12 @@
 			.tuanzhang {
 				padding: 8rpx 18rpx;
 				border-radius: 20rpx;
-					background: #ED5A2E;
+				background: #ed5a2e;
 				color: #fff;
 				bottom: 0;
 			}
 		}
 	}
-
-
 }
 
 .btns {
@@ -704,19 +677,19 @@
 		line-height: 1;
 		margin: 0;
 		justify-content: center;
-			border: 2rpx solid #E8AD7B;
+		border: 2rpx solid #e8ad7b;
-			background: #FFF;
+		background: #fff;
-			color: #E8AD7B;
+		color: #e8ad7b;
 
 		&.main {
-				background-color: #E8AD7B;
+			background-color: #e8ad7b;
 			color: #fff;
 		}
 	}
 }
 
 .guodu {
-		transition: all .3s;
+	transition: all 0.3s;
 }
 
 .pin-btn {
@@ -725,8 +698,8 @@
 	text-align: center;
 	font-size: 32rpx;
 	justify-content: center;
-		border: 2rpx solid #E8AD7B;
+	border: 2rpx solid #e8ad7b;
-		background: #E8AD7B;
+	background: #e8ad7b;
 	color: #fff;
 	position: relative;
 
@@ -758,7 +731,7 @@
 .refund {
 	padding: 18rpx 164rpx;
 	border-radius: 0 0 16rpx 16rpx;
-		background: #FFF4E2;
+	background: #fff4e2;
 	font-weight: 700;
 	margin-bottom: 32rpx;
 }
@@ -780,7 +753,7 @@
 
 	.time {
 		padding: 18rpx 24rpx;
-			background: #FFF4E2;
+		background: #fff4e2;
 		display: flex;
 		align-items: center;
 		border-radius: 16rpx 16rpx 0 0;
@@ -788,7 +761,7 @@
 		.number {
 			padding: 6rpx;
 			border-radius: 16rpx;
-				background: #ED5A2E;
+			background: #ed5a2e;
 			color: #fff;
 			font-size: 32rpx;
 			margin-left: 18rpx;
@@ -814,7 +787,7 @@
 		.tuan-members {
 			padding: 0 16rpx 0 0;
 			border-radius: 0 6rpx 6rpx 0;
-				background: #4C2828;
+			background: #4c2828;
 			color: #f5d9ad;
 			font-weight: 700;
 		}
@@ -846,7 +819,7 @@
 
 	.shop {
 		border-radius: 8rpx;
-			background: #F8F8F8;
+		background: #f8f8f8;
 		padding: 16rpx 34rpx;
 	}
 
@@ -869,11 +842,10 @@
 			width: calc(100% / 3);
 			display: flex;
 
-
 			.add-box {
 				width: 140rpx;
 				height: 140rpx;
-					border: 2rpx dashed #D9D9D9;
+				border: 2rpx dashed #d9d9d9;
 				border-radius: 50%;
 				overflow: hidden;
 				position: relative;
@@ -912,7 +884,7 @@
 			.tuanzhang {
 				padding: 8rpx 18rpx;
 				border-radius: 20rpx;
-					background: #ED5A2E;
+				background: #ed5a2e;
 				color: #fff;
 				bottom: 0;
 			}

pages.json

@@ -2,6 +2,7 @@
 	"easycom": {
 		"autoscan": true,
 		"custom": {
+			"^my-(.*)": "@/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"

pages/index/index.vue

@@ -5,7 +5,8 @@
 			<!-- 轮播图 -->
 			<swipers :carousel="hometoplist.bannerList"></swipers>
 			<!-- 广告 -->
-			<advertisement :bannervo="hometoplist.freeBannerList" :itemStyle="advertisementStyle" ref="refbannervo"></advertisement>
+			<advertisement :bannervo="hometoplist.freeBannerList" :itemStyle="advertisementStyle" ref="refbannervo">
+			</advertisement>
 			<!-- 金刚区 -->
 			<diamond :district="hometoplist.district"></diamond>
 			<!-- 今日上线 -->
@@ -134,10 +135,27 @@
 
 <script setup>
 	import CouponModal from '@/components/coupon-modal.vue';
-import { ref, computed, onMounted, reactive, onBeforeUnmount, watch, getCurrentInstance, nextTick } from 'vue';
+	import {
-import { onLoad, onReady, onShow, onReachBottom, onPageScroll } from '@dcloudio/uni-app';
+		ref,
+		computed,
+		onMounted,
+		reactive,
+		onBeforeUnmount,
+		watch,
+		getCurrentInstance,
+		nextTick
+	} from 'vue';
+	import {
+		onLoad,
+		onReady,
+		onShow,
+		onReachBottom,
+		onPageScroll
+	} from '@dcloudio/uni-app';
 	// 获取全局属性
-const { proxy } = getCurrentInstance();
+	const {
+		proxy
+	} = getCurrentInstance();
 	import pageLoading from './components/pageLoading.vue';
 	import swipers from './components/swiper.vue'; //引入轮播
 	import advertisement from './components/advertisement.vue'; //广告
@@ -147,11 +165,22 @@ import indexs from './indexs.vue';
 	import AreaSelect from './components/AreaSelect.vue'; //城市联动
 	import grouping from './components/grouping.vue'; //其他
 	import Nav from '@/components/indexnav.vue'; //导航栏
-import { APIhomehomePageUp, APIhome } from '@/common/api/index/index.js';
+	import {
-import { APIgeocodelocation } from '@/common/api/api.js';
+		APIhomehomePageUp,
-import { useNavbarStore } from '@/stores/navbarStore';
+		APIhome
-import { productStore } from '@/stores/user.js';
+	} from '@/common/api/index/index.js';
-import { getUnReadCountReq } from '../../common/api/account/message';
+	import {
+		APIgeocodelocation
+	} from '@/common/api/api.js';
+	import {
+		useNavbarStore
+	} from '@/stores/navbarStore';
+	import {
+		productStore
+	} from '@/stores/user.js';
+	import {
+		getUnReadCountReq
+	} from '../../common/api/account/message';
 	const store = useNavbarStore();
 	const storeuser = productStore();
 	store.updateNavbarConfig({
@@ -316,7 +345,8 @@ const viewHistory = async (item, index) => {
 		}
 		// 是否有弹出层
 		if (item.isChild) {
-		showproductlist.value = showproductlist.value ? (viewHistoryindex.value == index ? false : true) : !showproductlist.value;
+			showproductlist.value = showproductlist.value ? (viewHistoryindex.value == index ? false : true) : !
+				showproductlist.value;
 		}
 		viewHistoryindex.value = index;
 	};
@@ -327,18 +357,35 @@ onPageScroll((res) => {
 	});
 
 	const indexsRef = ref(null);
-
+	const shopId = ref(null)
+	const shopInfo = ref(null)
 	onShow(async () => {
+		if (!storeuser.isHasLogin) {
+			await handleMixinOnLoad(options)
+			console.log('shopInfo', uni.cache.get('shopInfo'));
+			console.log('【页面】开始处理自身业务逻辑');
+			
+			onPageShow()
+		} else {
+			onPageShow()
+		}
+		setTimeout(() => {
+			showPageLoading.value = false;
+			getUnReadMsgCount();
+		}, 800);
+	});
+
+	async function onPageShow() {
 		try {
 			await storeuser.getLocation();
 			proxy.$isResolve();
-		const shopId = uni.cache.get('shopId');
+			shopId.value = uni.cache.get('shopId');
-		if (shopId) {
+			if (shopId.value) {
 				indexsRef.value.updateData();
 			}
 		} catch (error) {}
 		await proxy.$onLaunched;
-	if (uni.cache.get('shopId')) {
+		if (shopId.value) {
 			showindex.value = 'shopIndex';
 			await storeuser.actionsproductqueryProduct();
 			await nextTick();
@@ -349,7 +396,9 @@ onShow(async () => {
 			init_fn();
 			// 获取初始定位高度
 		}
-});
+
+		shopInfo.value = uni.cache.get('shopInfo');
+	}
 
 	const showPageLoading = ref(true);
 
@@ -369,18 +418,52 @@ const getUnReadMsgCount = async () => {
 		}
 	}
 
-onMounted(async () => {
-	setTimeout(() => {
-		showPageLoading.value = false;
 
-		getUnReadMsgCount();
-	}, 800);
-});
 
 	onReachBottom(() => {
 		onLoadhome();
 	});
 
+	import {
+		shareMixin,
+		handleMixinOnLoad
+	} from '@/utils/share.js'
+
+
+	watch(() => shopId.value, (newval) => {
+		if (newval) {
+			uni.showShareMenu({
+				withShareTicket: true, // 可选：是否返回分享票据
+				menus: ['shareAppMessage', 'shareTimeline'] // 显示「分享好友」和「分享朋友圈」
+			});
+		} else {
+			uni.hideShareMenu();
+		}
+	}, {
+		immediate: true
+	})
+
+
+	defineOptions({
+		mixins: [shareMixin],
+	});
+
+
+	const options = reactive({})
+
+	onLoad(async (opt) => {
+		Object.assign(options, opt)
+		// await handleMixinOnLoad(options)
+		// console.log('shopInfo', uni.cache.get('shopInfo'));
+		// console.log('【页面】开始处理自身业务逻辑');
+		// setTimeout(() => {
+		// 	showPageLoading.value = false;
+		// 	getUnReadMsgCount();
+		// }, 800);
+	})
+	
+
+
 	// 页面离开时清除定时器
 	// onBeforeUnmount(() => {
 	// 	if (refbannervo.value) {

pages/index/indexs.vue

@@ -2,9 +2,11 @@
 	<view class="content min-page bg-f7">
 		<view class="contentbox">
 			<template v-if="shopExtend.length">
-				<image class="bg" :src="shopExtend[0].value" mode="aspectFill" v-if="!isJsonArrayString(shopExtend[0].value)"></image>
+				<image class="bg" :src="shopExtend[0].value" mode="aspectFill"
+					v-if="!isJsonArrayString(shopExtend[0].value)"></image>
 				<swiper class="swiper" autoplay circular v-else>
-					<swiper-item class="swiper-item" v-for="(item, index) in JSON.parse(shopExtend[0].value)" :key="index">
+					<swiper-item class="swiper-item" v-for="(item, index) in JSON.parse(shopExtend[0].value)"
+						:key="index">
 						<image class="swiper-bg" :src="item"></image>
 					</swiper-item>
 				</swiper>
@@ -119,10 +121,23 @@
 
 <script setup>
 	import attractPopup from '@/components/attract-popup.vue';
-import { homeData } from '@/common/api/market/index.js';
+	import {
-import { getMemberConfig, getRechargeConfig } from '@/common/api/index/index.js';
+		homeData
-import { ref, reactive, defineProps, defineEmits, onMounted } from 'vue';
+	} from '@/common/api/market/index.js';
-import { isJsonArrayString } from '@/utils/util.js';
+	import {
+		getMemberConfig,
+		getRechargeConfig
+	} from '@/common/api/index/index.js';
+	import {
+		ref,
+		reactive,
+		defineProps,
+		defineEmits,
+		onMounted
+	} from 'vue';
+	import {
+		isJsonArrayString
+	} from '@/utils/util.js';
 
 	const attractPopupRef = ref(null);
 
@@ -165,8 +180,12 @@ function toIntegralMall() {
 		});
 	}
 
-import { productStore } from '@/stores/user.js';
+	import {
-import { onShow } from '@dcloudio/uni-app';
+		productStore
+	} from '@/stores/user.js';
+	import {
+		onShow
+	} from '@dcloudio/uni-app';
 
 	// 显示弹窗
 	const popupShow = ref(false);
@@ -295,6 +314,9 @@ function updateData() {
 	defineExpose({
 		updateData
 	});
+
+
+	
 </script>
 
 <style scoped lang="scss">
@@ -523,8 +545,7 @@ page {
 					background: #ededed;
 				}
 
-			.takeout {
+				.takeout {}
-			}
 			}
 
 			&.layout1 {

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,
 				});
 			}
 		})

pages/product/components/goods-modal.vue

@@ -13,8 +13,10 @@
 					<up-swiper :list="goods.images" @change="swiperChange" :current="swiperCurrent" radius="6px"
 						height="250" @click="prveImgs(goods.images, goods.images[swiperCurrent])">
 					</up-swiper>
-
+					<view class="shop_sku_name u-flex u-row-between">
-					<view class="shop_sku_name">{{ goods.name }}</view>
+						<view class="u-line-1" style="max-width: 600rpx;">{{ goods.name }}</view>
+						<ymfShare @shareClick="shareClick" />
+					</view>
 					<view class="shop_sku_description" v-if="isSkuGoods">
 						{{ goods.shortTitle ? goods.shortTitle : '' }}
 					</view>
@@ -190,7 +192,7 @@
 
 
 
-				<view class="shop_bottom" style="position: absolute;bottom: 0;">
+				<view class="shop_bottom" style="position: absolute;bottom: 0;z-index:100;">
 					<view class="flex-between">
 						<view class="price price-sku" v-if="goods.type != 'package' && goods.result">
 							<text class="i">￥</text>
@@ -308,6 +310,7 @@
 	import {
 		useNavbarStore
 	} from '@/stores/navbarStore';
+	import ymfShare from '@/components/ymf-components/ymf-share.vue'
 	const store = useNavbarStore();
 	const {
 		showBack,
@@ -479,11 +482,11 @@
 	const swiperCurrent = ref(0);
 
 	function returnFirstSku(product) {
-		console.log('returnFirstSku', product.skuList[0]);
+		console.log('returnFirstSku', product);
 		return {
-			...product.skuList[0],
+			...product.skuList[0]||'',
-			sku_id: product.skuList[0].id,
+			sku_id: product.skuList[0].id||'',
-			id: product.id,
+			id: product.id||'',
 		}
 	}
 	//返回是否是多规格商品
@@ -503,8 +506,10 @@
 		swiperCurrent.value = e.current;
 	}
 
-	const emits = defineEmits(['prveImgs', 'websocketsendMessage', 'close', 'modalAdd'])
+	const emits = defineEmits(['prveImgs', 'websocketsendMessage', 'close', 'modalAdd','shareClick'])
-
+	function shareClick(){
+		emits('shareClick',props.goods)
+	}
 	function prveImgs(images, currentUrl) {
 		emits('prveImgs', images, currentUrl)
 	}
@@ -831,7 +836,7 @@
 			padding: 0 28rpx;
 			margin-top: 20rpx;
 			font-weight: bold;
-			font-size: 32upx;
+			font-size: 32rpx;
 			margin-bottom: 16rpx;
 		}
 

pages/product/index.vue

@@ -574,14 +574,10 @@
 		<ModalList></ModalList>
 		<recommendGoodsModal v-if="isDataLoaded" @onBuyClick="onBuyClick"></recommendGoodsModal>
 
-		<view
+		<view v-for="(item,index) in goodsModalList" :key="index">
-		v-for="(item,index) in goodsModalList" :key="index"
+			<goodsModal :key="index" v-model="item.show" :goods="item.goods" @prveImgs="prveImgs"
-		>
+				@shareClick="shareClick" @close="goodsModalClose(index)" @websocketsendMessage="websocketsendMessage"
-		<goodsModal :key="index" v-model="item.show" :goods="item.goods" @prveImgs="prveImgs" @close="goodsModalClose(index)"
+				@modalAdd="modalAdd" :GoodsIDInCartNumMap="GoodsIDInCartNumMap"></goodsModal>
-		@websocketsendMessage="websocketsendMessage"
-		@modalAdd="modalAdd"
-		:GoodsIDInCartNumMap="GoodsIDInCartNumMap"
-		></goodsModal>
 		</view>
 
 		<xbSwiperPreview :visable="showPrveImg" :imgs="prveImgsList" @update:visable="updateShowPrveImg">
@@ -749,7 +745,9 @@
 		useCartStore
 	} from '@/stores/order.js';
 	import {
-		computed, provide
+		computed,
+		provide,
+		reactive
 	} from 'vue';
 	const cartStore = useCartStore();
 	/**
@@ -819,11 +817,7 @@
 
 
 
-	// 分步取值 + 每层兜底，避免某一环不存在导致 undefined
+	const shopExtend = ref('');
-	const shopExtendShopTable = uni.cache.get('shopTable') || {}; // 兜底空对象
-	const shopExtendMap = shopExtendShopTable.shopExtendMap || {}; // 兜底空对象
-	// 最终声明：即使 shopinfo_bg 不存在，也兜底为空字符串/默认值
-	const shopExtend = ref(shopExtendMap.shopinfo_bg || '');
 
 	/**
 	 * 通用数据合集 end
@@ -1375,6 +1369,7 @@
 	function goodsModalClose(index) {
 		goodsModalList.value.splice(index, 1)
 	}
+
 	function modalAdd(item) {
 		clickspecifications(item)
 	}
@@ -1445,7 +1440,12 @@
 		// showShopsku.value = true;
 		goodsModalList.value.push({
 			show: true,
-			goods:specifications.item
+			goods: {
+				...specifications.item,
+				/*过滤掉只有一个规格且下架的商品或者skuList为空的商品*/
+				relatedRecommendJson: (specifications.item.relatedRecommendJson || []).filter(v => v
+					.skuList && v.skuList.length)
+			}
 		})
 	};
 	// 判断商品是否在可售时间内
@@ -1761,8 +1761,11 @@
 			if (Message.operate_type == 'init') {
 				// cartStore.limitTimeDiscount = Message.time_dis_info;
 				cartInit(Message.data)
-
+				try {
 					uni.hideLoading();
+				} catch (error) {
+					//TODO handle the exception
+				}
 				isLoading.value = false;
 
 				if (!socketInitFinished) {
@@ -2256,6 +2259,16 @@
 			}, 1000);
 			return false;
 		}
+
+		if (pageOptions.showGoodsId) {
+			const item = allGoodsArr.value.find(v => v.id == pageOptions.showGoodsId)
+			if (item) {
+				clickspecifications(item)
+			}
+			pageOptions.showGoodsId = null
+		}
+
+
 	};
 
 	provide('cartStore', cartStore);
@@ -2437,28 +2450,90 @@
 		});
 	}
 
+
+	import {
+		shareMixin,
+		handleMixinOnLoad,
+		returnQuery,
+		jsonToUrl,
+		wxShare,
+		returnCommonQuery
+	} from '@/utils/share.js'
+	// defineOptions({
+	// 	mixins: [shareMixin],
+	// });
+
+
+	let isGoodsShare = ref(false)
+
+	function shareClick() {
+		isGoodsShare.value = true
+	}
+
+	async function onShare() {
+		const queryJson = await returnCommonQuery()
+		let query = jsonToUrl(queryJson)
+		query += '&type=beforehand'
+		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 + (shopName ? `-${shopName}` : '')
+			json.imageUrl = goods.coverImg
+			json.showGoodsId = goods.id
+		} else {
+			json.title = shopName
+			json.imageUrl = uni.cache.get('shopInfo').logo || ''
+		}
+		console.log('onShareAppMessage', {
+			query,
+			...json,
+			path: '/pages/product/index' + '?' + query
+		});
+		return wxShare({
+			query,
+			...json,
+			path: '/pages/product/index' + '?' + query
+		})
+	}
+
+	onShareAppMessage(onShare)
+
+	onShareTimeline(onShare)
+
+	const pageOptions = reactive({})
 	onLoad(async (e) => {
+		Object.assign(pageOptions, e)
 		if (e.type) {
 			orderType.value = e.type;
 		}
-		//获取用户信息
+
-		const userInfo = await APIshopUserInfo({
+		await handleMixinOnLoad({
-			shopId: uni.cache.get('shopId')
+			...e,
+			shopId: e.shopId || uni.cache.get('shopId')
 		})
-		//获取店铺信息
+		
-		const shopInfoRes = await APIusershopInfodetail({
+		if(userStore.shopUserInfo.shopExtendList){
-			shopId: uni.cache.get('shopId')
+			shopExtend.value=userStore.shopUserInfo.shopExtendList.find(v=>v.autoKey=='shopinfo_bg')||''
-		});
-		if (shopInfoRes && shopInfoRes.shopInfo) {
-			Object.assign(shopInfo, shopInfoRes.shopInfo);
-			uni.cache.set('shopInfo', shopInfoRes.shopInfo)
 		}
 
-
+		// //获取用户信息
-		if (userInfo && typeof userInfo === 'object') {
+		// const userInfo = await APIshopUserInfo({
-			shopUserInfo.value = userInfo
+		// 	shopId: uni.cache.get('shopId')
-			uni.cache.set('shopUserInfo', userInfo)
+		// })
+		// //获取店铺信息
+		// const shopInfoRes = await APIusershopInfodetail({
+		// 	shopId: uni.cache.get('shopId')
+		// });
+		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
+
 		await productqueryProduct();
 
 		const extraInitPar = {}
@@ -2470,6 +2545,11 @@
 
 		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,
@@ -2590,6 +2670,7 @@
 		useSocket.setOnMessage(() => {});
 	}
 	onHide(() => {
+		isGoodsShare.value = false
 		closeSocket();
 	});
 	onUnload(() => {

pages/user/member/czzx.vue

@@ -1,23 +1,16 @@
 <!-- 充值中心 -->
 <template>
 	<view class="container">
-    <up-navbar
+		<up-navbar bgColor="transparent" title="充值中心" @leftClick="back"></up-navbar>
-      bgColor="transparent"
-      title="充值中心"
-      @leftClick="back"
-    ></up-navbar>
 		<view class="header-wrap">
-      <image
+			<image class="bg" src="/static/czzx_header_bg.png" mode="aspectFill"></image>
-        class="bg"
-        src="/static/czzx_header_bg.png"
-        mode="aspectFill"
-      ></image>
 			<view class="select-shop">
 				<view class="select-btn">
 					<up-icon name="map" color="#333"></up-icon>
 					<text class="t">{{ shopInfo.shopName }}</text>
 					<up-icon name="arrow-right" color="#333"></up-icon>
 				</view>
+				<ymf-share></ymf-share>
 			</view>
 			<view class="balance-wrap">
 				<view class="left">
@@ -37,11 +30,7 @@
 		<view class="bottom">
 			<view class="u-flex u-flex-between">
 				<view class="u-flex">
-          <image
+					<image src="/static/vip/money.png" style="width: 44rpx; height: 44rpx" mode=""></image>
-            src="/static/vip/money.png"
-            style="width: 44rpx; height: 44rpx"
-            mode=""
-          ></image>
 					<text class="u-m-l-24 color-333 font-16 font-700">立即充值</text>
 				</view>
 				<view class="font-12 color-999">
@@ -50,27 +39,12 @@
 				</view>
 			</view>
 			<view class="list u-m-t-40">
-        <view
+				<view class="item color1" @click="sel = index" v-for="(item, index) in list" :key="index" :class="{ active: sel == index }">
-          class="item color1"
-          @click="sel = index"
-          v-for="(item, index) in list"
-          :key="index"
-          :class="{ active: sel == index }"
-        >
 					<view class="">
 						<text>￥</text>
-            <text
+						<text class="font-700" style="font-size: 48 u-flex-1rpx" :class="{ color2: sel == index }">{{ item.amount }}</text>
-              class="font-700"
-              style="font-size: 48 u-flex-1rpx"
-              :class="{ color2: sel == index }"
-              >{{ item.amount }}</text
-            >
 					</view>
-          <view
+					<view class="font-12" v-if="item.rewardAmount" :class="{ color2: sel == index }">
-            class="font-12"
-            v-if="item.rewardAmount"
-            :class="{ color2: sel == index }"
-          >
 						<text>赠</text>
 						<text>￥</text>
 						<text class="font-14">{{ item.rewardAmount }}</text>
@@ -84,12 +58,7 @@
 						<text>送</text>
 						<text>{{ couponNum(item.couponInfoList) }}</text>
 						<text>张券</text>
-            <text
+						<text class="color2 u-m-l-8" v-if="sel == index" @click="lookCoupon(item)">查看</text>
-              class="color2 u-m-l-8"
-              v-if="sel == index"
-              @click="lookCoupon(item)"
-              >查看</text
-            >
 					</view>
 
 					<view class="sel u-flex" v-if="sel == index">
@@ -100,24 +69,12 @@
 			<template v-if="state.isCustom">
 				<view class="u-flex other flex-center">
 					<text class="font-14 color-333 font-700 u-m-r-28">其他金额</text>
-          <up-input
+					<up-input v-model="money" type="number" placeholder="请输入充值金额" border="none" placeholder-style="font-size:14px;"></up-input>
-            v-model="money"
-            type="number"
-            placeholder="请输入充值金额"
-            border="none"
-            placeholder-style="font-size:14px;"
-          ></up-input>
 				</view>
-        <view class="color-999 font-12 u-m-t-4"
+				<view class="color-999 font-12 u-m-t-4">自定义金额充值时，不享受任何优惠赠送</view>
-          >自定义金额充值时，不享受任何优惠赠送</view
-        >
 			</template>
 
-      <button
+			<button class="buy-btn" @click="buy" :class="{ disabled: !state.isEnable }">
-        class="buy-btn"
-        @click="buy"
-        :class="{ disabled: !state.isEnable }"
-      >
 				<text class="font-16">￥{{ charge_money }}</text>
 				<text class="font-14 u-m-l-24">立即充值</text>
 			</button>
@@ -125,9 +82,7 @@
 				<view>充值说明</view>
 				<view class="u-m-t-16">
 					<text>适用门店</text>
-          <text class="color2 u-m-l-28" @click="toShopList"
+					<text class="color2 u-m-l-28" @click="toShopList">全国门店通用 {{ '>' }}</text>
-            >全国门店通用 {{ ">" }}
-          </text>
 				</view>
 				<view class="u-m-t-16">
 					<text>有效期限</text>
@@ -143,37 +98,36 @@
 				<view class="u-m-t-16 u-flex u-flex-y-center">
 					<text class="no-wrap">充值说明</text>
 					<text class="u-m-l-28" style="word-break: break-all">
-            {{ state.remark || "" }}
+						{{ state.remark || '' }}
 					</text>
 				</view>
 			</view>
 		</view>
-    <CouponList
+		<CouponList v-model="couponModel.show" :list="couponModel.couponInfoList"></CouponList>
-      v-model="couponModel.show"
-      :list="couponModel.couponInfoList"
-    ></CouponList>
 	</view>
 </template>
 
 <script setup>
-import { APIusershopInfodetail, APIshopUserInfo } from "@/common/api/member.js";
+import ymfShare from '@/components/ymf-components/ymf-share.vue';
-import CouponList from "@/components/coupon/list.vue";
+import { shareMixin, handleMixinOnLoad, returnQuery } from '@/utils/share.js';
-import * as rechargeApi from "@/common/api/market/recharge.js";
+import { APIusershopInfodetail, APIshopUserInfo } from '@/common/api/member.js';
-import { recharge } from "@/common/api/order/index.js";
+import CouponList from '@/components/coupon/list.vue';
-import { joinMember } from "@/common/api/order/index.js";
+import * as rechargeApi from '@/common/api/market/recharge.js';
-import { ref, onMounted, computed, reactive, watch } from "vue";
+import { recharge } from '@/common/api/order/index.js';
-import { onLoad, onShow } from "@dcloudio/uni-app";
+import { joinMember } from '@/common/api/order/index.js';
-import { pay } from "@/utils/pay.js";
+import { ref, onMounted, computed, reactive, watch } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+import { pay } from '@/utils/pay.js';
 
 function toShopList() {
 	uni.navigateTo({
-    url: "/pages/user/member/czzx-shop-list?shopId=" + option.shopId,
+		url: '/pages/user/member/czzx-shop-list?shopId=' + option.shopId
 	});
 }
 
 function toduihuan() {
 	uni.navigateTo({
-    url: "/user/exchange/index",
+		url: '/user/exchange/index'
 	});
 }
 
@@ -184,7 +138,7 @@ function couponNum(list) {
 }
 const couponModel = reactive({
 	show: false,
-  couponInfoList: [],
+	couponInfoList: []
 });
 
 function lookCoupon(item) {
@@ -194,19 +148,19 @@ function lookCoupon(item) {
 async function buy() {
 	if (!state.isEnable) {
 		return uni.showToast({
-      title: "充值未开启，暂不能充值",
+			title: '充值未开启，暂不能充值',
-      icon: "none",
+			icon: 'none'
 		});
 	}
 	if (!charge_money.value) {
 		return uni.showToast({
-      title: "请选择或者输入充值金额",
+			title: '请选择或者输入充值金额',
-      icon: "none",
+			icon: 'none'
 		});
 	}
 	const json = {
 		shopId: option.shopId,
-    shopUserId: shopUserInfo.id,
+		shopUserId: shopUserInfo.id
 	};
 	if (sel.value < 0) {
 		json.amount = `${money.value}`.trim() * 1;
@@ -217,16 +171,16 @@ async function buy() {
 	const res = await recharge(json);
 	if (!res) {
 		return uni.showToast({
-      title: "充值失败",
+			title: '充值失败',
-      icon: "error",
+			icon: 'error'
 		});
 	}
 	const payRes = await pay(res);
 	console.log(payRes);
 	if (payRes) {
 		uni.showToast({
-      title: "充值成功",
+			title: '充值成功',
-      icon: "none",
+			icon: 'none'
 		});
 		init();
 	}
@@ -234,43 +188,114 @@ async function buy() {
 
 function toDetail() {
 	uni.navigateTo({
-    url: "/pages/user/member/billDetails?type=1&shopId=" + option.shopId,
+		url: '/pages/user/member/billDetails?type=1&shopId=' + option.shopId
 	});
 }
 
 function toPwd() {
 	uni.navigateTo({
-    url: "/pages/user/member/setPassword?type=1&shopId=" + option.shopId,
+		url: '/pages/user/member/setPassword?type=1&shopId=' + option.shopId
 	});
 }
 
 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);
 const option = reactive({
-  shopId: "",
+	shopId: ''
 });
 const shopInfo = reactive({});
 const shopUserInfo = reactive({});
 const state = reactive({});
 async function init() {
 	const shopInfoRes = await APIusershopInfodetail({
-    shopId: option.shopId,
+		shopId: option.shopId
 	});
 	if (shopInfoRes) {
 		Object.assign(shopInfo, shopInfoRes.shopInfo);
 	}
 	const shopUserInfoRes = await APIshopUserInfo({
-    shopId: option.shopId,
+		shopId: option.shopId
 	});
 	if (shopUserInfoRes) {
 		Object.assign(shopUserInfo, shopUserInfoRes);
 	}
 	const res = await rechargeApi.config({
-    shopId: option.shopId,
+		shopId: option.shopId
 	});
 	if (res) {
 		Object.assign(state, res);
@@ -282,16 +307,28 @@ const charge_money = computed(() => {
 		if (money.value > 0) {
 			return money.value;
 		}
-    return "";
+		return '';
 	}
 	const item = list.value[sel.value];
 	if (item) {
 		return item.amount;
 	}
-  return "";
+	return '';
 });
-onLoad((opt) => {
+
+onShareAppMessage(async (res) => {
+	let query = await returnQuery();
+	return {
+		title: `充值-${shopInfo.shopName}`,
+		path: `/pages/user/member/czzx?${query}`,
+		imageUrl: shopInfo.logo,
+		query
+	};
+});
+
+onLoad(async (opt) => {
 	Object.assign(option, opt);
+	await handleMixinOnLoad(opt);
 	// init();
 });
 
@@ -325,8 +362,7 @@ onShow(() => {
 	font-weight: 700;
 	border-radius: 80rpx;
 	line-height: 1;
-  background: linear-gradient(98deg, #fe6d1100 40.64%, #ffd1b4 105.2%),
+	background: linear-gradient(98deg, #fe6d1100 40.64%, #ffd1b4 105.2%), linear-gradient(259deg, #fe6d11 50.14%, #ffd1b4 114.93%);
-    linear-gradient(259deg, #fe6d11 50.14%, #ffd1b4 114.93%);
 	box-shadow: 0 14rpx 30.4rpx 0 #fe8b435e;
 	&.disabled {
 		background: #eee;
@@ -359,6 +395,7 @@ onShow(() => {
 
 	.select-shop {
 		display: flex;
+		justify-content: space-between;
 		align-items: center;
 		position: relative;
 

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">
@@ -116,6 +119,7 @@
 	</view>
 </template>
 <script setup>
+	import ymfShare from '@/components/ymf-components/ymf-share.vue'
 	import {
 		computed,
 		reactive
@@ -125,6 +129,11 @@
 	} from '@/utils/uniapp.js'
 	import modal from "@/scoreShop/components/modal.vue";
 	import * as pointGoodsApi from "@/common/api/order/pointGoods.js";
+	import {
+		userPoints
+	} from "@/common/api/market/points.js";
+
+
 	import couponIcon from "@/components/coupon-icon/index";
 	import {
 		pay
@@ -304,16 +313,64 @@
 			return `单人兑换已达上限`
 		}
 	})
-	onLoad((opt) => {
+	async function getGoods() {
-		const exchange_goods = uni.getStorageSync('exchange_goods')
+		const res = await pointGoodsApi.pointsGoods({
-		if (exchange_goods.goodsDescription) {
+			id: options.id
-			exchange_goods.goodsDescription = JSON.parse(exchange_goods.goodsDescription)
+		})
+		if (res.goodsDescription) {
+			res.goodsDescription = JSON.parse(res.goodsDescription)
 		} else {
-			exchange_goods.goodsDescription = []
+			res.goodsDescription = []
 		}
-		const pointsUserData = uni.getStorageSync('pointsUser')
+		res.couponInfo=res.couponInfo||{}
-		Object.assign(item, exchange_goods)
+
-		Object.assign(pointsUser, pointsUserData)
+		Object.assign(item, res)
+	}
+	async function getPointUser() {
+		const res = await userPoints({
+			shopUserId: uni.cache.get('shopUserInfo').id || ''
+		})
+		Object.assign(pointsUser, res.pointsUser)
+	}
+	async function init() {
+		await getGoods()
+		await getPointUser()
+	}
+
+	import {
+		shareMixin,
+		handleMixinOnLoad,wxShare,returnQuery ,returnIndexBg,
+	} from '@/utils/share.js'
+	// defineOptions({
+	// 	mixins: [shareMixin],
+	// });
+	
+	onShareAppMessage(async(res)=>{
+		const query=await returnQuery()
+		const shopInfo=uni.cache.get('shopInfo')
+		return wxShare({
+			...res,
+			title:item.goodsName +'-'+shopInfo.shopName,
+			path:'/scoreShop/detail/index'+'?'+query,
+			query,
+			imageUrl:item.goodsImageUrl||returnIndexBg()||''
+		})
+	})
+	
+	const options = reactive({})
+	onLoad(async (opt) => {
+		Object.assign(options, opt)
+		await handleMixinOnLoad(opt)
+		await init()
+		// const exchange_goods = uni.getStorageSync('exchange_goods')
+		// if (exchange_goods.goodsDescription) {
+		// 	exchange_goods.goodsDescription = JSON.parse(exchange_goods.goodsDescription)
+		// } else {
+		// 	exchange_goods.goodsDescription = []
+		// }
+		// const pointsUserData = uni.getStorageSync('pointsUser')
+		// Object.assign(item, exchange_goods)
+		// Object.assign(pointsUser, pointsUserData)
 	})
 </script>
 
@@ -463,6 +520,7 @@
 				height: 184rpx;
 				border-radius: 16rpx;
 				background: #d9d9d9;
+
 				&.bg-fff {
 					background-color: #fff;
 				}
@@ -487,6 +545,7 @@
 			font-size: 700;
 		}
 	}
+
 	.w-full {
 		width: 100%;
 	}

scoreShop/index/components/goods-list.vue

@@ -74,7 +74,7 @@
 	function toDetail(item) {
 		uni.setStorageSync('exchange_goods', item)
 		uni.navigateTo({
-			url: '/scoreShop/detail/index?id=' + item.id,
+			url: '/scoreShop/detail/index?id=' + item.id+'&shopId='+item.shopId,
 		})
 	}
 

scoreShop/index/index.vue

@@ -31,9 +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" @click="toggleLayout">
+				<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>
 
@@ -44,6 +48,7 @@
 	</view>
 </template>
 <script setup>
+	import ymfShare from '@/components/ymf-components/ymf-share.vue'
 	import * as pointGoodsApi from "@/common/api/order/pointGoods.js";
 	import goodsList from "./components/goods-list.vue";
 	import {
@@ -70,11 +75,20 @@
 	}
 
 	function back() {
+		const pages = getCurrentPages();
+		if (pages.length < 2) {
+			uni.switchTab({
+				url: '/pages/index/index'
+			})
+		} else {
 			uni.navigateBack({
 				delta: 1,
 			});
 		}
 
+
+	}
+
 	// function exchange(item) {
 	// 	pointGoodsApi.exchange({
 	// 		pointsGoodsId: item.id,
@@ -92,7 +106,8 @@
 		}
 
 		uni.navigateTo({
-			url: '/pages/user/member/billDetails?type=2&shopId=' + query.shopId + '&id=' + (pointsUser.value?pointsUser.value.id :
+			url: '/pages/user/member/billDetails?type=2&shopId=' + query.shopId + '&id=' + (pointsUser.value ?
+				pointsUser.value.id :
 				'')
 		})
 	}
@@ -132,7 +147,41 @@
 			}
 		})
 	}
-	onLoad((opt) => {
+
+
+	import {
+		shareMixin,
+		handleMixinOnLoad,
+		returnQuery,
+		jsonToUrl,
+		wxShare,returnIndexBg ,
+		returnCommonQuery
+	} from '@/utils/share.js'
+	// 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({
+
+	})
+	onLoad(async (opt) => {
+		Object.assign(options, opt)
 		query.shopId = opt.shopId || ''
 	})
 	watch(() => tabActive.value, (newval, oldval) => {
@@ -151,8 +200,23 @@
 		query.page++
 		getList();
 	})
-	onShow(() => {
+	import {
+		productStore
+	} from '@/stores/user.js';
+	import {
+		onShareAppMessage
+	} from '@dcloudio/uni-app';
+import { onShareTimeline } from '@dcloudio/uni-app';
+	const storeuser = productStore();
+
+
+	onShow(async () => {
+		if (!storeuser.isHasLogin) {
+			await handleMixinOnLoad(options)
 			refresh()
+		} else {
+			refresh()
+		}
 	});
 </script>
 <style scoped lang="scss">
@@ -164,6 +228,10 @@
 		justify-content: flex-end;
 	}
 
+	.gap-20 {
+		gap: 20rpx;
+	}
+
 	.top {
 		padding: 138rpx 26rpx 48rpx 42rpx;
 		display: flex;

scoreShop/success/index.vue

@@ -1,12 +1,7 @@
 <template>
 	<view class="min-page bg-f7 u-font-28 color-333">
-    <up-navbar
+		<up-navbar title="兑换成功" bgColor="transparent" leftIconColor="#333" @leftClick="back()"
-      title="兑换成功"
+			titleStyle="color:#333"></up-navbar>
-      bgColor="transparent"
-      leftIconColor="#333"
-	  @leftClick="back()"
-      titleStyle="color:#333"
-    ></up-navbar>
 		<view class="content">
 			<view class="bg" :style="{ backgroundImage: `url(${imgs.bg})` }">
 				<image :src="imgs.success" class="success"></image>
@@ -50,16 +45,22 @@
 </template>
 
 <script setup>
-
-
 	const imgs = {
 		bg: "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/2/b625560a5b75418c9e643841f8674a0c.png",
-  success:
+		success: "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/2/c2f0865efb444de58ff0d8bb3a51d300.png",
-    "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/2/c2f0865efb444de58ff0d8bb3a51d300.png",
 	};
+
 	function back() {
+		const pages = getCurrentPages();
+		if(pages.length<2){
+			uni.redirectTo({
+				url: '/scoreShop/index/index?shopId=' + item.shopId
+			})
+		}else{
 			uni.navigateBack();
 		}
+	}
+
 	function lookOrder() {
 		uni.redirectTo({
 			url: '/scoreShop/order/index?shopId=' + item.shopId
@@ -80,6 +81,7 @@ onLoad(opt=>{
 		background: linear-gradient(180deg, #f5cd82 0%, rgba(247, 219, 165, 0) 100%);
 		height: 670rpx;
 		$color: #9c571f;
+
 		.bg {
 			width: 100%;
 			height: 586rpx;
@@ -96,11 +98,13 @@ onLoad(opt=>{
 				height: 206rpx;
 			}
 		}
+
 		.info {
 			padding-left: 174rpx;
 			padding-right: 32rpx;
 		}
 	}
+
 	.bottom {
 		gap: 48rpx;
 		margin-top: 44rpx;
@@ -110,10 +114,12 @@ onLoad(opt=>{
 			border-radius: 100rpx;
 			font-size: 32rpx;
 			border: 1px solid transparent;
+
 			&.back {
 				border-color: $my-main-color;
 				color: $my-main-color;
 			}
+
 			&.look {
 				background-color: $my-main-color;
 				border-color: $my-main-color;

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']

stores/carts-websocket.js

@@ -90,9 +90,11 @@ export const useWebSocket = defineStore('socketTask', () => {
 	let onMessage = () => {
 
 	}
+
 	function setOnMessage(onMessageBallBack) {
 		onMessage = onMessageBallBack
 	}
+
 	function chnageInitMessage(data) {
 		initMessage = data
 	}
@@ -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();
@@ -369,6 +373,8 @@ export const useWebSocket = defineStore('socketTask', () => {
 		initNetworkListener,
 		connect,
 		allowReconnect,
-		socketTask,setOnMessage,chnageInitMessage
+		socketTask,
+		setOnMessage,
+		chnageInitMessage
 	};
 })

stores/user.js

@@ -110,12 +110,90 @@ export const productStore = defineStore("product", {
 			latitude: "",
 			longitude: "",
 		},
+		token: "",
+		miniAppOpenId: "",
+		userInfo: "",
+		shopId: uni.cache.get('shopId') || '',
 		shopInfo: {
 			shopId: "",
 			isOrderFence: 0,
+			id: '',
 		},
+		shopUserInfo:{
+			
+		},
+		isHasLogin:false
 	}),
 	actions: {
+		actionslogin() {
+			return new Promise(async (resolve, reject) => {
+				// #ifdef MP-WEIXIN
+				uni.login({
+					provider: "weixin",
+					success: (data) => {
+						// 微信小程序环境
+						uni.getUserInfo({
+							provider: "weixin",
+							success: async (infoRes) => {
+								let res = await APIuserlogin({
+									code: data.code, //临时登录凭证
+									rawData: infoRes.rawData,
+									source: "wechat",
+								});
+								console.log('APIuserlogin', res);
+								if (res) {
+									this.token = res.token;
+									this.isHasLogin=true
+									this.miniAppOpenId = res.userInfo
+										.miniAppOpenId;
+									this.userInfo = res.userInfo;
+									uni.cache.set("token", res.token);
+									uni.cache.set("userInfo", res.userInfo);
+									uni.cache.set("followIndex", res
+										.followIndex || "");
+								}
+								resolve(true);
+							},
+							fail: (err) => {
+								reject(false);
+							},
+						});
+					},
+				});
+				// #endif
+				// #ifdef MP-ALIPAY
+				my.getAuthCode({
+					scopes: "auth_base",
+					success: async (data) => {
+						// 支付宝小程序环境
+						// my.getAuthUserInfo({
+						// success: async (infoRes) => {
+						let res = await APIuserlogin({
+							code: data.authCode, //临时登录凭证
+							// rawData: JSON.stringify(infoRes),
+							source: "alipay",
+						});
+						if (res) {
+							this.isHasLogin=true
+							this.token = res.token;
+							this.miniAppOpenId = res.userInfo.miniAppOpenId;
+							this.userInfo = res.userInfo;
+							uni.cache.set("token", res.token);
+							uni.cache.set("openId", res.userInfo.alipayOpenId);
+							uni.cache.set("userInfo", res.userInfo);
+							resolve(true);
+						}
+					},
+					fail: () => {
+						reject(false);
+					},
+				});
+				// #endif
+				// #ifdef H5
+				resolve(true)
+				// #endif
+			});
+		},
 		getLocation() {
 			return new Promise((resolve, reject) => {
 				console.log("获取经纬度");
@@ -448,19 +526,43 @@ export const productStore = defineStore("product", {
 
 		// 通过shopId  获取店铺会员信息
 		actionsproductqueryProduct() {
+			console.log('actionsproductqueryProduct:token',uni.cache.get('token'));
 			return new Promise(async (resolve, reject) => {
 				try {
 					let res = await APIshopUserInfo();
+					if(res&& typeof res === 'object'){
+						this.shopUserInfo=res;
 						uni.cache.set("shopUserInfo", res);
 						uni.cache.set("orderVIP", res);
 						uni.cache.set("ordershopUserInfo", res.shopInfo);
 						resolve(res);
+					}else{
+						reject(false);
+					}
+					
 				} catch (e) {
 					reject(false);
 				}
 			});
 		},
 
+		async pageOnload() {
+			console.log('开始加载必须数据')
+			//登录
+			await this.actionslogin()
+			//获取会员信息
+			await this.actionsproductqueryProduct()
+			//获取店铺信息
+			await this.getShopInfo()
+			console.log('必须数据加载完毕')
+		},
+		async getShopInfo(shopId) {
+			const shopRes = await APIusershopInfodetail({
+				shopId: this.shopId || shopId,
+			});
+			this.shopInfo = shopRes.shopInfo;
+			uni.cache.set("shopInfo", shopRes.shopInfo);
+		},
 		// 用户信息获取
 		actionsAPIuser() {
 			return new Promise(async (resolve, reject) => {

userPackage/goodsDetail/goodsDetail.vue

@@ -28,11 +28,11 @@
 		<view class="bg-f7" style="height: 32rpx"></view>
 		<view class="desc">
 			<view class="u-flex">
-				<view class="color-666 no-wrap" style="min-width: 180rpx;">可核销门店：</view>
+				<view class="color-666 no-wrap" style="min-width: 180rpx">可核销门店：</view>
 				<view class="">{{ item.shopName }}</view>
 			</view>
 			<view class="u-flex u-m-t-16 u-col-baseline">
-				<view class="color-666 no-wrap" style="min-width: 180rpx;">门店地址：</view>
+				<view class="color-666 no-wrap" style="min-width: 180rpx">门店地址：</view>
 				<view class="">{{ item.shopAddress }}</view>
 			</view>
 		</view>
@@ -45,7 +45,7 @@
 					<up-avatar size="76rpx" :src="item.avatar"></up-avatar>
 					<view class="u-flex u-flex-1 u-p-l-22 u-col-center u-row-between">
 						<view>
-							<view class="color-000 u-line-1" style="max-width: 180rpx;">{{item.nickName}}</view>
+							<view class="color-000 u-line-1" style="max-width: 180rpx">{{ item.nickName }}</view>
 							<view class="main-color u-m-t-2">差{{ returnNeedPerpole(item) }}人拼成</view>
 						</view>
 						<view class="u-m-t-22">
@@ -54,26 +54,21 @@
 						</view>
 
 						<view class="btn" @click="fastBuy(item)">快速拼成</view>
-
 					</view>
-
 				</view>
 			</view>
 		</template>
 
-
-
 		<view class="bg-f7" style="height: 24rpx"></view>
 		<view class="goods-group">
 			<view class="u-flex u-row-between">
 				<view class="name">套餐商品</view>
-				<view class="u-flex color-666" @click="showGroup=!showGroup" style="align-items: baseline;">
+				<view class="u-flex color-666" @click="showGroup = !showGroup" style="align-items: baseline">
 					<text class="u-m-r-18">{{ showGroup ? '收起' : '展开' }}</text>
 					<view class="guodu" :class="{ rotate: !showGroup }">
 						<up-icon name="arrow-down" bold></up-icon>
 					</view>
 				</view>
-
 			</view>
 			<view class="" v-if="showGroup">
 				<view class="u-m-t-48" v-for="(item, index) in item.packageContent" :key="index">
@@ -82,35 +77,27 @@
 						<text class="u-m-l-30">{{ item.packageProducts.length }}选{{ item.num }}</text>
 					</view>
 					<view class="">
-						<view class="u-flex u-m-t-24 u-row-between" v-for="(goods,goodsIndex) in item.packageProducts"
+						<view class="u-flex u-m-t-24 u-row-between" v-for="(goods, goodsIndex) in item.packageProducts" :key="goodsIndex">
-							:key="goodsIndex">
 							<text>{{ goods.name }}</text>
 							<view class="u-flex text-right">
 								<text class="color-666 u-m-r-42">x{{ goods.num }}</text>
-								<view style="min-width: 110rpx;">¥{{goods.price}}</view>
+								<view style="min-width: 110rpx">¥{{ goods.price }}</view>
 							</view>
 						</view>
 					</view>
-
-
-
 				</view>
 			</view>
-
-
 		</view>
 
-
 		<view class="desc" v-if="item.tieredDiscount && item.tieredDiscount.length > 0">
 			<view class="u-flex u-row-between">
 				<view class="name">分享说明</view>
-				<view class="u-flex color-666" @click="showDesc=!showDesc" style="align-items: baseline;">
+				<view class="u-flex color-666" @click="showDesc = !showDesc" style="align-items: baseline">
 					<text class="u-m-r-18">{{ showDesc ? '收起' : '展开' }}</text>
 					<view class="guodu" :class="{ rotate: !showDesc }">
 						<up-icon name="arrow-down" bold></up-icon>
 					</view>
 				</view>
-
 			</view>
 			<template v-if="showDesc">
 				<view class="u-m-t-26 text-center table">
@@ -125,64 +112,37 @@
 				</view>
 
 				<view class="u-m-t-26">
-					<view>
+					<view>分享期限（小时）：{{ item.expireHours }}</view>
-						分享期限（小时）：{{item.expireHours}}
+					<view class="u-m-t-10">规定期限内的助力才会被计入</view>
-					</view>
+					<view class="u-m-t-40">如何才是分享成功？被分享人只需要点击《助力》，提示助力成功后即可</view>
-					<view class="u-m-t-10">
-						规定期限内的助力才会被计入
-					</view>
-					<view class="u-m-t-40">
-						如何才是分享成功？被分享人只需要点击《助力》，提示助力成功后即可
-						
-						
-					</view>
-
 				</view>
 			</template>
-
-
-
-
 		</view>
 
-		
 		<view class="desc">
 			<view class="u-flex u-row-between">
 				<view class="name">使用说明</view>
-				<view class="u-flex color-666" @click="useDescShow=!useDescShow" style="align-items: baseline;">
+				<view class="u-flex color-666" @click="useDescShow = !useDescShow" style="align-items: baseline">
 					<text class="u-m-r-18">{{ useDescShow ? '收起' : '展开' }}</text>
 					<view class="guodu" :class="{ rotate: !useDescShow }">
 						<up-icon name="arrow-down" bold></up-icon>
 					</view>
 				</view>
-		
 			</view>
 			<template v-if="useDescShow">
 				<view class="u-m-t-16 color-666">
-					<view>
+					<view>1、可用时间段：{{ canuseTime }}</view>
-						1、可用时间段：{{canuseTime}}
+					<view v-if="item.otherDesc">2、其他使用说明：{{ item.otherDesc }}</view>
 				</view>
-					<view v-if="item.otherDesc">
-						2、其他使用说明：{{item.otherDesc}}
-					</view>
-				</view>
-		
-				
 			</template>
-		
-		
-		
-		
 		</view>
 
-
 		<view class="goods-detail" v-if="item.goodsCategory != '优惠券'">
 			<view class="u-flex u-row-center">
 				<view class="title">商品详情</view>
 			</view>
 			<view class="u-m-t-32">
-				<image class="w-full" v-for="(item,index) in item.detailImages" :key="index" mode="widthFix" :src="item">
+				<image class="w-full" v-for="(item, index) in item.detailImages" :key="index" mode="widthFix" :src="item"></image>
-				</image>
 			</view>
 		</view>
 
@@ -194,14 +154,9 @@
 			<view v-if="isCanExchange" class="btn" @click="payExchange">
 				{{ returnBtmText }}
 			</view>
-			<view class="btn gray u-m-t-32" @click="createOrder" v-if="item.tieredDiscount&&item.tieredDiscount.length>0">
+			<view class="btn gray u-m-t-32" @click="createOrder" v-if="item.tieredDiscount && item.tieredDiscount.length > 0">发起助力</view>
-				发起助力
 		</view>
 
-		</view>
-
-
-
 		<!-- 需要支付的弹窗 -->
 		<up-popup :show="popupData.show" mode="bottom" closeOnClickOverlay @close="popupData.show = false">
 			<view class="popup-content">
@@ -224,7 +179,6 @@
 							</view>
 						</view>
 					</view>
-
 				</view>
 
 				<view class="bottom u-flex u-row-between u-col-center">
@@ -237,7 +191,6 @@
 						<text class="u-m-l-20 u-m-r-20">{{ number }}</text>
 						<up-icon name="plus-circle-fill" size="20" color="#ED5A2E" @click="changeNumber('+')"></up-icon>
 					</view>
-
 				</view>
 
 				<view class="u-m-t-42 u-flex u-row-center">
@@ -249,79 +202,66 @@
 	</view>
 </template>
 <script setup>
-	import {
+import { shareMixin, handleMixinOnLoad, returnQuery } from '@/utils/share.js';
-		Storelogin
+import { Storelogin } from '@/stores/user.js';
-	} from '@/stores/user.js';
 const storelogin = Storelogin();
-	import {
+import { computed, reactive, watch } from 'vue';
-		computed,
+import dayjs from 'dayjs';
-		reactive,
+import { wxShare } from '@/utils/share.js';
-		watch
+import { getOpenId } from '@/utils/uniapp.js';
-	} from "vue";
+import modal from '@/groupBuying/components/modal.vue';
-	import dayjs from "dayjs";
+import * as Api from '@/common/api/market/package.js';
-	import {
+import { pay } from '@/utils/pay.js';
-		wxShare
-	} from '@/utils/share.js'
-	import {
-		getOpenId
-	} from '@/utils/uniapp.js'
-	import modal from "@/groupBuying/components/modal.vue";
-	import * as Api from '@/common/api/market/package.js'
-	import {
-		pay
-	} from '@/utils/pay.js'
 const imgs = {
-		bg: "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/2/9fd6a3ad2b384f6cb4e88ed6b77bd334.png",
+	bg: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/2/9fd6a3ad2b384f6cb4e88ed6b77bd334.png'
 };
-	const number = ref(1)
+const number = ref(1);
 
-	const showGroup = ref(true)
+const showGroup = ref(true);
-	const showDesc = ref(true)
+const showDesc = ref(true);
-	const useDescShow=ref(true)
+const useDescShow = ref(true);
 
-	import {
+import { BigNumber } from 'bignumber.js';
-		BigNumber
-	} from "bignumber.js";
 const totalPrice = computed(() => {
 	if (!item.price) {
 		return 0;
 	}
 
-		return BigNumber(number.value).times(item.price).toNumber()
+	return BigNumber(number.value).times(item.price).toNumber();
-	})
+});
 
 function changeNumber(step) {
 	if (step === '-') {
 		if (number.value == 1) {
-				return
+			return;
 		}
-			number.value--
+		number.value--;
-			return
+		return;
 	}
 	if (step === '+') {
 		if (item.limitBuyNum == -10086) {
-				number.value++
+			number.value++;
-				return
+			return;
 		}
 		if (number.value >= item.limitBuyNum) {
 			return uni.showToast({
 				title: '最多可购买' + item.limitBuyNum + '份',
 				icon: 'none'
-				})
+			});
 		}
-			number.value++
+		number.value++;
-			return
+		return;
 	}
 }
 const modalData = reactive({
-		show: false,
+	show: false
 });
 
 function prveImg(index) {
 	uni.previewImage({
 		urls: coverImgs.value,
 		current: index
-		})
+	});
 }
 
 const popupData = reactive({
@@ -330,69 +270,67 @@
 });
 
 function exchangeClick() {
-		popupData.show = true
+	popupData.show = true;
-
 }
 
 function fastBuy(item) {
 	popupData.item = item;
-		popupData.show = true
+	popupData.show = true;
 }
-	watch(() => popupData.show, (newval) => {
+watch(
+	() => popupData.show,
+	(newval) => {
 		if (!newval) {
-			popupData.item = null
+			popupData.item = null;
 		}
-	})
+	}
-
+);
 
 function dingyue() {
 	return new Promise((revlove, reject) => {
 		uni.requestSubscribeMessage({
-				tmplIds: ['JGPAGmqcPEgWB6mvAl0SC5cMqr5H5Qjcim8JCpHAZd0',
+			tmplIds: ['JGPAGmqcPEgWB6mvAl0SC5cMqr5H5Qjcim8JCpHAZd0', 'F4OyUhe_ZQ9BR731jlkaN2QXAUaA3HBZuUeVPfraSz0'],
-					'F4OyUhe_ZQ9BR731jlkaN2QXAUaA3HBZuUeVPfraSz0'
-				],
 			success(res) {},
 			complete() {
-					revlove()
+				revlove();
 			}
-			})
+		});
-		})
+	});
-
 }
 
 async function createOrder() {
 	Api.createOrder({
 		packageId: item.id,
-			shopId: item.shopId,
+		shopId: item.shopId
-		}).then(res=>{
+	}).then((res) => {
 		if (res) {
 			uni.redirectTo({
 				url: '/userPackage/order/detail?orderId=' + res
-				})
+			});
 		} else {
 			uni.showToast({
 				title: '发起助力失败',
 				icon: 'none'
-				})
+			});
 		}
-		})
+	});
 }
 
 async function payExchange() {
 	uni.setStorageSync('group_buying_order', {
 		...item,
-			number: number.value,
+		number: number.value
-		})
+	});
 	uni.navigateTo({
 		url: '/userPackage/confirm-order/confirm-order'
-		})
+	});
-		return
+	return;
 	await dingyue();
 	uni.showLoading({
 		title: '支付中……'
-		})
+	});
-		const openId = await getOpenId()
+	const openId = await getOpenId();
-		uni.hideLoading()
+	uni.hideLoading();
 	if (openId) {
 		Api.exchange({
 			paramId: item.id,
@@ -400,74 +338,67 @@
 			number: number.value,
 			groupOrderNo: popupData.item ? popupData.item.groupOrderNo : '',
 			openId
-			}).then(orderRes => {
+		}).then((orderRes) => {
 			popupData.show = false;
-				pay(orderRes.payInfo).then(res => {
+			pay(orderRes.payInfo).then((res) => {
-					console.log(res)
+				console.log(res);
 
 				if (res) {
 					uni.redirectTo({
-							url: '/groupBuying/success/index?detailId=' + orderRes.record
+						url: '/groupBuying/success/index?detailId=' + orderRes.record.id
-								.id
+					});
-						})
 				} else {
 					uni.showToast({
 						title: '开团失败',
 						icon: 'none'
-						})
+					});
 				}
-
+			});
-				})
+		});
-
-			})
 	} else {
 		uni.showToast({
 			title: '鉴权失败，兑换失败',
 			icon: 'none'
-			})
+		});
 	}
 }
 
-
 const item = reactive({
 	goodsDescription: []
-	})
+});
 
 const isCanExchange = computed(() => {
-
 	if (item.quantity <= 0) {
-			return false
+		return false;
 	}
 	if (item.limitQuota && item.boughtCount >= item.limitQuota) {
-			return false
+		return false;
 	}
-		return true
+	return true;
-	})
+});
 
 const returnBtmText = computed(() => {
 	if (isCanExchange.value) {
-			return '立即购买'
+		return '立即购买';
 	}
 	if (pointsUser.pointBalance < item.requiredPoints) {
-			const num = item.requiredPoints - pointsUser.pointBalance
+		const num = item.requiredPoints - pointsUser.pointBalance;
-			return `积分不足，还差${num}积分`
+		return `积分不足，还差${num}积分`;
 	}
 	if (item.quantity <= 0) {
-			return `库存不足`
+		return `库存不足`;
 	}
 	if (item.limitQuota && item.boughtCount >= item.limitQuota) {
-			return `单人兑换已达上限`
+		return `单人兑换已达上限`;
 	}
-	})
+});
-
 
 const query = reactive({
 	shopId: '',
-		id: '',
+	id: ''
-	})
+});
 
-
+const coverImgs = ref([]);
-	const coverImgs = ref([])
 
 async function init(opt) {
 	// 获取小程序进入场景和参数
@@ -476,24 +407,23 @@
 	// 获取链接上的参数
 	const launchOptionsQuery = launchOptions.query;
 	console.log('launchOptionsQuery', launchOptionsQuery);
-		Object.assign(query, launchOptionsQuery)
+	Object.assign(query, launchOptionsQuery);
-		console.log(opt)
+	console.log(opt);
-		Object.assign(query, opt)
+	Object.assign(query, opt);
-		console.log(query)
+	console.log(query);
-		await storelogin.actionslogin()
+	await storelogin.actionslogin();
-		getDetail()
+	getDetail();
 }
 
 function getDetail() {
-		Api.getPackageDetail(query).then(res => {
+	Api.getPackageDetail(query).then((res) => {
-			Object.assign(item, res)
+		Object.assign(item, res);
-			console.log(item)
+		console.log(item);
-			coverImgs.value = res.images
+		coverImgs.value = res.images;
-			uni.cache.set('shopId', item.shopId)
+		uni.cache.set('shopId', item.shopId);
-		})
+	});
 }
 
-
 /**
  * 计算剩余时间差（毫秒）
  * @param {Object} item - 包含groupEndTime的订单/拼团对象
@@ -531,43 +461,47 @@
 	return `${pad(hours)}:${pad(minutes)}:${pad(seconds)}`;
 }
 
-
+let timer = null;
-	let timer = null
+let nowTime = ref(Date.now());
-	let nowTime = ref(Date.now())
 timer = setInterval(() => {
-		nowTime.value = Date.now()
+	nowTime.value = Date.now();
-	}, 1000)
+}, 1000);
 
 // 组合使用：获取格式化后的剩余时间
 function getRemainingHMS(item) {
-		nowTime.value
+	nowTime.value;
 	const ms = returnRemainingTime(item);
 	return formatTimeToHMS(ms);
 }
 
-
 function returnNeedPerpole(data) {
-		return data.groupPeopleNum - data.currentPeopleNum
+	return data.groupPeopleNum - data.currentPeopleNum;
 }
 
+onLoad(async (opt) => {
+	await handleMixinOnLoad(opt);
+	init(opt);
+});
 
-	onLoad(init)
 // #ifdef MP-WEIXIN
-	uni.showShareMenu()
+uni.showShareMenu();
 // #endif
-	onShareAppMessage(() => {
+
-		const query = `id=${item.id}&shopId=${item.shopId}`
+onShareAppMessage(async () => {
-		return wxShare({
+	let query = await returnQuery();
-			title: item.wareName,
+	const options = {
+		title: item.packageName,
 		imageUrl: coverImgs.value[0],
 		path: '/userPackage/goodsDetail/goodsDetail' + '?' + query,
-			query,
+		query
-		})
+	};
-	})
+	console.log('onShareAppMessage===', options);
+	return options;
+});
 
 const canuseTime = computed(() => {
-		return item.useWeeks.join('、')+' '+item.useTimes
+	return item.useWeeks.join('、') + ' ' + item.useTimes;
-	})
+});
 </script>
 
 <style lang="scss" scoped>
@@ -615,8 +549,8 @@
 
 	.old-price {
 		margin-left: 16rpx;
-			color: #E7E7E7;
+		color: #e7e7e7;
-			opacity: .85;
+		opacity: 0.85;
 		font-weight: 700;
 		text-decoration: line-through;
 	}
@@ -638,8 +572,6 @@
 	}
 }
 
-
-
 .desc {
 	padding: 32rpx 28rpx;
 	background-color: #fff;
@@ -653,7 +585,7 @@
 		padding: 0 22rpx;
 
 		&::before {
-				content: "";
+			content: '';
 			display: block;
 			position: absolute;
 			right: 100%;
@@ -666,7 +598,7 @@
 
 		&::after {
 			left: 100%;
-				content: "";
+			content: '';
 			position: absolute;
 			top: 50%;
 			transform: translateY(-50%);
@@ -694,13 +626,13 @@
 		color: #fff;
 		width: 556rpx;
 		text-align: center;
-			background-color: #E8AD7B;
+		background-color: #e8ad7b;
 		border: 1px solid transparent;
 
 		&.gray {
 			background: #fff;
-				color: #E8AD7B;
+			color: #e8ad7b;
-				border-color: #E8AD7B;
+			border-color: #e8ad7b;
 		}
 	}
 }
@@ -753,7 +685,6 @@
 			color: #666;
 			line-height: 42rpx;
 		}
-
 	}
 
 	.bottom {
@@ -790,7 +721,7 @@
 
 	.item {
 		padding: 28rpx 0;
-			border-bottom: 2rpx solid #EDEDED;
+		border-bottom: 2rpx solid #ededed;
 
 		&:last-child {
 			border-bottom: none;
@@ -803,7 +734,7 @@
 		.btn {
 			padding: 8rpx 26rpx;
 			border-radius: 36rpx;
-				background: #E8AD7B;
+			background: #e8ad7b;
 			font-weight: 700;
 			color: #fff;
 		}
@@ -818,7 +749,7 @@
 	border-radius: 0 0 0 24rpx;
 	color: #ed5a2e;
 	font-weight: 700;
-		background: #FFF;
+	background: #fff;
 	overflow: hidden;
 
 	.share {
@@ -856,7 +787,7 @@
 	}
 
 	.table {
-			border: 2rpx solid #EDEDED;
+		border: 2rpx solid #ededed;
 		border-radius: 8rpx;
 		margin: 0 52rpx;
 
@@ -865,7 +796,7 @@
 		}
 
 		.row {
-				border-top: 2rpx solid #EDEDED;
+			border-top: 2rpx solid #ededed;
 
 			&:first-child {
 				border-top: none;
@@ -879,6 +810,6 @@
 }
 
 .guodu {
-		transition: all .3s;
+	transition: all 0.3s;
 }
 </style>

utils/share.js

@@ -1,3 +1,15 @@
+import {
+	autoBindInviteUser,
+	autoGetInviteCode
+} from '@/common/api/market/distribution.js'
+import {
+	APIshopUserInfo,
+	APIusershopInfodetail
+} from '@/common/api/member.js'
+import {
+	productStore
+} from '@/stores/user.js';
+const accountStore = productStore();
 const accountInfo = wx.getAccountInfoSync();
 export const envVersion = accountInfo.miniProgram.envVersion;
 let type = 3;
@@ -13,9 +25,306 @@ if (envVersion === 'trial') {
 }
 
 
+/**
+ * 绑定用户邀请关系（核心函数）
+ * 功能说明：校验邀请码有效性，有效则调用自动绑定接口完成邀请关系绑定
+ * @param {Object} args - 绑定邀请关系的入参对象
+ * @param {number} [args.shopUserId] - 需要绑定邀请人的用户ID（integer <int64>，可选）
+ * @param {number} [args.shopId] - 店铺ID（integer <int64>，可选）
+ * @param {string} args.inviteCode - 邀请人的邀请码（必填，非空校验通过后才会执行绑定逻辑）
+ * @returns {void} 无返回值
+ */
+export async function bindInvite(args) {
+	// 解构入参对象，获取需要的核心参数
+	const {
+		shopUserId,
+		shopId,
+		inviteCode
+	} = args;
+
+	// 校验邀请码有效性：若邀请码为空、null、undefined，则直接返回，不执行后续绑定逻辑
+	if (!inviteCode || inviteCode === null || inviteCode === undefined) {
+		return;
+	}
+
+	const shopUserInfo = uni.cache.get('shopUserInfo')
+	// 邀请码有效，调用自动绑定邀请人接口，传递绑定所需参数
+	return await autoBindInviteUser({
+		id: shopUserInfo.id,
+		shopId,
+		inviteCode
+	});
+}
+
 export function wxShare(par) {
 	return {
 		...par,
 		type
 	}
 }
+
+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 queryJson = {
+		inviteCode: (inviteCode && inviteCode !== true) ? inviteCode : null,
+		shopId,
+		shopUserId: shopUserInfo.id,
+	}
+	return Promise.resolve(queryJson)
+}
+
+export function jsonToUrl(json) {
+	let result = ''
+	for (let key in json) {
+		if (json[key]) {
+			if (result === '') {
+				result += `${key}=${json[key]}`
+			} else {
+				result += `&${key}=${json[key]}`
+			}
+		}
+	}
+	return result
+}
+
+/**
+ * @param {Object} query 参数对象
+ * @param {Array} showkeys  需要显示的key不包括公共参数 
+ */
+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 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,
+		...query
+	}
+	for (const key in currentOptions) {
+		if (currentOptions.hasOwnProperty(key)) {
+			if (showkeys && Array.isArray(showkeys) && showkeys.includes(key)) {
+				queryJson[key] = encodeURIComponent(currentOptions[key])
+			} else {
+				queryJson[key] = encodeURIComponent(currentOptions[key])
+			}
+		}
+	}
+	queryJson.shopId = shopId
+	queryJson.inviteCode = (inviteCode && inviteCode !== true) ? inviteCode : null
+	queryJson.shopUserId = shopUserInfo.id
+
+	let result = ''
+	for (let key in queryJson) {
+		if (queryJson[key]) {
+			if (result === '') {
+				result += `${key}=${queryJson[key]}`
+			} else {
+				result += `&${key}=${queryJson[key]}`
+			}
+		}
+	}
+	return Promise.resolve(result)
+}
+
+function parseQueryString(queryString) {
+	const queryParams = queryString.split("&").map((param) => param.split("="));
+	const params = {};
+	for (const [key, value] of queryParams) {
+		params[key] = value;
+	}
+	return params;
+}
+/**
+ * 混入的 onLoad 核心逻辑（抽成独立函数）
+ * @param {Object} opt - 页面 onLoad 接收的参数
+ * @param {Object} vm - 组件实例（this）
+ */
+export async function handleMixinOnLoad(opt, vm) {
+	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)
+		accountStore.shopId = options.shopId
+		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) {
+		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 shopInfo = uni.cache.get('shopInfo')
+		const pages = getCurrentPages();
+		const currentPage = pages[pages.length - 1];
+		const currentPath = currentPage.route;
+		const currentOptions = currentPage.options;
+
+		let sharePath = `/${currentPath}`;
+
+
+		const query = await returnQuery()
+		const indexBg = returnIndexBg()
+		console.log('indexBg', indexBg);
+		const imageUrl = indexBg || shopInfo.logo
+		// 全局默认配置（可被页面覆盖）
+		const defaultShareConfig = {
+			title: shopInfo.shopName,
+			path: sharePath + '?' + query,
+			imageUrl: imageUrl,
+			query,
+			// desc: '描述',
+			success: (res) => {
+				console.log('分享好友成功', res);
+				// 可加埋点等统一逻辑
+			},
+			fail: (err) => {
+				console.error('分享好友失败', err);
+			}
+		};
+
+
+		// 页面自定义配置覆盖全局
+		const pageShareConfig = this.$options.shareConfig || {};
+		console.log('mixIn onShareAppMessage', {
+			...defaultShareConfig,
+			...pageShareConfig
+		})
+		return wxShare({
+			...defaultShareConfig,
+			...pageShareConfig
+		});
+	},
+
+
+
+	async onShareTimeline() {
+
+
+
+		const shopInfo = uni.cache.get('shopInfo')
+
+		const pages = getCurrentPages();
+		const currentPage = pages[pages.length - 1];
+		const currentPath = currentPage.route;
+		const currentOptions = currentPage.options;
+
+
+		let sharePath = `/${currentPath}`;
+
+
+		const query = await returnQuery()
+		const indexBg = returnIndexBg()
+		const imageUrl = indexBg || shopInfo.logo
+		const defaultTimelineConfig = {
+			title: shopInfo.shopName,
+			path: sharePath + '?' + query,
+			imageUrl: imageUrl,
+			query,
+		};
+
+		const pageTimelineConfig = this.$options.shareTimelineConfig || {};
+		return wxShare({
+			...defaultTimelineConfig,
+			...pageTimelineConfig
+		});
+	}
+};

vite.config.js

@@ -15,6 +15,7 @@ module.exports = defineConfig({
 				{
 					"@dcloudio/uni-app": [
 						"onShareAppMessage",
+						"onShareTimeline",
 						"onLoad",
 						"onShow",
 						"onHide",