diff --git a/common/api/market/distribution.js b/common/api/market/distribution.js
index 89f453f..85f66e0 100644
--- a/common/api/market/distribution.js
+++ b/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,
+  });
+};
\ No newline at end of file
diff --git a/common/api/market/index.js b/common/api/market/index.js
index 4f69fdb..94afe52 100644
--- a/common/api/market/index.js
+++ b/common/api/market/index.js
@@ -1,6 +1,8 @@
 // 引入 request 文件
 import request from '@/common/api/request.js'
-import {prveUrl} from './config.js'
+import {
+	prveUrl
+} from './config.js'
 
 export const consumeDiscount = (data) => {
 	return request({
@@ -16,3 +18,11 @@ export const homeData = (data) => {
 		data: data
 	})
 }
+
+// 清除所有分销绑定关系
+export const distributionClear = (data) => {
+	return request({
+		url: prveUrl + '/user/distribution/clean',
+		method: 'get'
+	})
+}
\ No newline at end of file
diff --git a/common/api/order/pointGoods.js b/common/api/order/pointGoods.js
index 8dca627..38d3c79 100644
--- a/common/api/order/pointGoods.js
+++ b/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) => {
diff --git a/common/api/request.js b/common/api/request.js
index c6a2e1b..8e7f50f 100644
--- a/common/api/request.js
+++ b/common/api/request.js
@@ -52,7 +52,7 @@ export default async (params) => {
 				//获取成功
 				if (res.code == 200) {
 					uni.hideLoading();
-					uni.hideToast();
+					// uni.hideToast();
 					resolve(res.data ? res.data : true);
 				} else {
 					switch (res.code) {
@@ -135,7 +135,7 @@ export default async (params) => {
 				// 不管成功还是失败都会执行
 				setTimeout((res) => {
 					uni.hideLoading();
-					uni.hideToast();
+					// uni.hideToast();
 				}, 10000);
 			},
 		});
diff --git a/common/config.js b/common/config.js
index 91fe54d..1273981 100644
--- a/common/config.js
+++ b/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,
diff --git a/common/css/common.scss b/common/css/common.scss
index 425b73c..0957cdb 100644
--- a/common/css/common.scss
+++ b/common/css/common.scss
@@ -44,6 +44,9 @@ page,
 	image {
 		display: block;
 	}
+	.relative{
+		position: relative;
+	}
 	.absolute{
 		position: absolute;
 	}
diff --git a/components/ymf-components/ymf-share.vue b/components/ymf-components/ymf-share.vue
new file mode 100644
index 0000000..62b7bf2
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/distribution/shop-detail/components/share-popup.vue b/distribution/shop-detail/components/share-popup.vue
index f8fc284..c828f94 100644
--- a/distribution/shop-detail/components/share-popup.vue
+++ b/distribution/shop-detail/components/share-popup.vue
@@ -1,228 +1,260 @@
 <template>
-  <view class="">
-    <view class="w-qrcode">
-      <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"
-    >
-      <view class="box">
-        <view class="info">
-          <view class="u-flex justify-center">
-            <up-avatar size="214rpx" :src="shopUserInfo.headImg"></up-avatar>
-          </view>
-          <view
-            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">{{
-              inviteCode
-            }}</text>
-            <text class="" style="color: #fe6d11" @click="copyCode">复制</text>
-          </view>
-          <view class="u-flex justify-center" style="margin-top: 90rpx">
-            <!-- <w-qrcode
+	<view class="">
+		<view class="w-qrcode">
+			<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">
+			<view class="box">
+				<view class="info">
+					<view class="u-flex justify-center">
+						<up-avatar size="214rpx" :src="shopUserInfo.headImg"></up-avatar>
+					</view>
+					<view 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">{{ inviteCode }}</text>
+						<text class="" style="color: #fe6d11" @click="copyCode">复制</text>
+					</view>
+					<view class="u-flex justify-center" style="margin-top: 90rpx">
+						<!-- <w-qrcode
               :options="codeOptions"
               :opacity="1"
               ref="wQrcode"
               @generate="(e) => qrcodeResult(e)"
             ></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>
-      </view>
-    </up-popup>
-  </view>
+						<up-image width="322rpx" height="322rpx" :src="code"></up-image>
+					</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>
+	</view>
 </template>
-    
-    <script setup>
-import wQrcode from "@/uni_modules/wmf-code/components/w-qrcode/w-qrcode.vue";
-import {desensitizePhone} from "@/utils/util.js";
-import { ref } from "vue";
-const props = defineProps({
-  inviteCode: {
-    type: String,
-    default: "",
-  },
-  shopUserInfo: {
-    type: Object,
-    default: () => {},
-  },
+
+<script setup>
+import { shareMixin, handleMixinOnLoad, returnQuery } from '@/utils/share.js';
+import ymfShare from '@/components/ymf-components/ymf-share.vue';
+import wQrcode from '@/uni_modules/wmf-code/components/w-qrcode/w-qrcode.vue';
+import { desensitizePhone } from '@/utils/util.js';
+import { ref, 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);
 });
-const codeOptions = ref({
-  size: 200,
-  code: props.inviteCode,
-});
-function copyCode() {
-  uni.setClipboardData({
-    data: props.inviteCode,
-    success: function () {
-      console.log("success");
-    },
-  });
+
+/** 
+ * 截取字符串，移除 &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 code = ref("");
+
+const props = defineProps({
+	inviteCode: {
+		type: String,
+		default: ''
+	},
+	shopUserInfo: {
+		type: Object,
+		default: () => {}
+	}
+});
+
+const codeOptions = ref({
+	padding: 10,
+	size: 200,
+	code: ''
+});
+
+function copyCode() {
+	uni.setClipboardData({
+		data: props.inviteCode,
+		success: function () {
+			console.log('success');
+		}
+	});
+}
+const code = ref('');
 
 function qrcodeResult(e) {
-  console.log("qrcodeResult", e);
-  code.value = e.img.tempFilePath;
-  console.log("code", code.value);
+	console.log('qrcodeResult', e);
+	code.value = e.img.tempFilePath;
+	console.log('code', code.value);
 }
 
 const show = defineModel({
-  type: Boolean,
-  default: false,
+	type: Boolean,
+	default: false
 });
-const emits = defineEmits(["cancel", "confirm"]);
+const emits = defineEmits(['cancel', 'confirm']);
 function close() {
-  show.value = false;
-  emits("cancel");
+	show.value = false;
+	emits('cancel');
 }
 function save() {
-  show.value = false;
+	show.value = false;
 
-  // 保存图片到相册
-  uni.saveImageToPhotosAlbum({
-    filePath: code.value,
-    success: function () {
-      uni.showToast({
-        title: "保存成功",
-        icon: 'none'
-      });
-    },
-    fail: function (err) {
-      console.log('保存失败原因：', err);
-      // 判断是否为授权拒绝（微信小程序授权拒绝的特征）
-      if (err.errMsg.includes('auth deny') || err.errMsg.includes('authorize fail')) {
-        // 弹出提示引导用户去设置页开启授权
-        uni.showModal({
-          title: '授权提示',
-          content: '保存图片需要授权访问相册，请前往设置开启授权',
-          showCancel: true,
-          cancelText: '取消',
-          confirmText: '去设置',
-          success: function (res) {
-            if (res.confirm) {
-              // 跳转到微信小程序的授权设置页
-              uni.openSetting({
-                success: function (settingRes) {
-                  // 检查用户是否开启了相册授权
-                  if (settingRes.authSetting['scope.writePhotosAlbum']) {
-                    uni.showToast({
-                      title: '授权成功，可重新保存',
-                      icon: 'none'
-                    });
-                  } else {
-                    uni.showToast({
-                      title: '未开启授权，保存失败',
-                      icon: 'none'
-                    });
-                  }
-                },
-                fail: function () {
-                  uni.showToast({
-                    title: '打开设置失败',
-                    icon: 'none'
-                  });
-                }
-              });
-            }
-          }
-        });
-      } else {
-        // 非授权问题的保存失败（如文件路径错误、系统问题等）
-        uni.showToast({
-          title: "保存失败",
-          icon: 'none'
-        });
-      }
-    },
-  });
+	// 保存图片到相册
+	uni.saveImageToPhotosAlbum({
+		filePath: code.value,
+		success: function () {
+			uni.showToast({
+				title: '保存成功',
+				icon: 'none'
+			});
+		},
+		fail: function (err) {
+			console.log('保存失败原因：', err);
+			// 判断是否为授权拒绝（微信小程序授权拒绝的特征）
+			if (err.errMsg.includes('auth deny') || err.errMsg.includes('authorize fail')) {
+				// 弹出提示引导用户去设置页开启授权
+				uni.showModal({
+					title: '授权提示',
+					content: '保存图片需要授权访问相册，请前往设置开启授权',
+					showCancel: true,
+					cancelText: '取消',
+					confirmText: '去设置',
+					success: function (res) {
+						if (res.confirm) {
+							// 跳转到微信小程序的授权设置页
+							uni.openSetting({
+								success: function (settingRes) {
+									// 检查用户是否开启了相册授权
+									if (settingRes.authSetting['scope.writePhotosAlbum']) {
+										uni.showToast({
+											title: '授权成功，可重新保存',
+											icon: 'none'
+										});
+									} else {
+										uni.showToast({
+											title: '未开启授权，保存失败',
+											icon: 'none'
+										});
+									}
+								},
+								fail: function () {
+									uni.showToast({
+										title: '打开设置失败',
+										icon: 'none'
+									});
+								}
+							});
+						}
+					}
+				});
+			} else {
+				// 非授权问题的保存失败（如文件路径错误、系统问题等）
+				uni.showToast({
+					title: '保存失败',
+					icon: 'none'
+				});
+			}
+		}
+	});
 
-  emits("confirm", code.value);
+	emits('confirm', code.value);
 }
 </script>
 
 <style lang="scss" scoped>
 :deep(.info .canvas) {
-  opacity: 1;
+	opacity: 1;
 }
 .border {
-  border: 2rpx solid #d9d9d9;
-  padding: 18rpx;
-  border-radius: 4rpx;
+	border: 2rpx solid #d9d9d9;
+	padding: 18rpx;
+	border-radius: 4rpx;
 }
 .box {
-  width: 638rpx;
-  background-color: #fff;
-  border-radius: 16rpx;
-  overflow: hidden;
-  .title {
-    color: #000000;
-    font-size: 32rpx;
-    font-weight: 700;
-  }
-  .top {
-    border-bottom: 2rpx solid #ededed;
-  }
-  .info {
-    padding: 96rpx 40rpx 96rpx 40rpx;
-    font-size: 28rpx;
-  }
-  .small-title {
-    min-width: 84rpx;
-    text-align: right;
-  }
+	width: 638rpx;
+	background-color: #fff;
+	border-radius: 16rpx;
+	// overflow: hidden;
+	position: relative;
+	.title {
+		color: #000000;
+		font-size: 32rpx;
+		font-weight: 700;
+	}
+	.top {
+		border-bottom: 2rpx solid #ededed;
+	}
+	.info {
+		padding: 96rpx 40rpx 96rpx 40rpx;
+		font-size: 28rpx;
+	}
+	.small-title {
+		min-width: 84rpx;
+		text-align: right;
+	}
+	.footer-wrap {
+		width: 100%;
+		position: absolute;
+		left: 0;
+		bottom: -100upx;
+		display: flex;
+		gap: 28upx;
+	}
 }
 
 .cancel {
-  padding: 14rpx 76rpx;
-  border-radius: 36rpx;
-  border: 2rpx solid #e8ad7b;
-  color: #e8ad7b;
-  font-size: 32rpx;
-  font-weight: 400;
-  white-space: nowrap;
-  line-height: 48rpx;
+	padding: 14rpx 76rpx;
+	border-radius: 36rpx;
+	border: 2rpx solid #e8ad7b;
+	color: #e8ad7b;
+	font-size: 32rpx;
+	font-weight: 400;
+	white-space: nowrap;
+	line-height: 48rpx;
 }
 .confirm {
-  padding: 14rpx 76rpx;
-  border-radius: 16rpx;
-  background-color: #e8ad7b;
-  border: 2rpx solid #e8ad7b;
-  color: #fff;
-  font-size: 32rpx;
-  font-weight: 400;
-  line-height: 48rpx;
-  white-space: nowrap;
+	$color: #e8ad7b;
+	flex: 1;
+	padding: 14rpx 76rpx;
+	border-radius: 16rpx;
+	background-color: $color;
+	border: 2rpx solid $color;
+	color: #fff;
+	font-size: 32rpx;
+	font-weight: 400;
+	white-space: nowrap;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	&.line {
+		background-color: #fff;
+		color: $color;
+	}
 }
 .line-height-54 {
-  line-height: 54rpx;
+	line-height: 54rpx;
 }
 .w-qrcode {
-  position: fixed;
-  left: -9999px;
-  top: -9999px;
-  z-index: -1;
+	position: fixed;
+	left: -9999px;
+	top: -9999px;
+	z-index: -1;
 }
 </style>
-    
\ No newline at end of file
diff --git a/distribution/shop-detail/index.vue b/distribution/shop-detail/index.vue
index 9fb1639..3da5184 100644
--- a/distribution/shop-detail/index.vue
+++ b/distribution/shop-detail/index.vue
@@ -1,908 +1,867 @@
 <template>
-  <view class="min-h-100vh bg-gray">
-    <up-navbar
-      bg-color="transparent"
-      title="分销中心"
-      @leftClick="back"
-      :fixed="true"
-    ></up-navbar>
-    <view class="top">
-      <image
-        class="top_bg"
-        src="/distribution/static/top_bg.png"
-        :style="imageStyle"
-      ></image>
-      <view class="box" :class="{ type1: isActivated }">
-        <view class="u-flex align-center justify-between">
-          <view class="u-flex align-center">
-            <!-- <up-avatar size="62rpx" /> -->
-            <text class="u-m-l-14 font-14 color-333 font-700">{{
-              state.shopName
-            }}</text>
-          </view>
-          <view>
-            <template v-if="state.parentPhone">
-              <view class="font-12 color-666">
-                上级：{{ state.parentName }}{{ state.parentPhone }}
-              </view>
-            </template>
-            <template v-if="!state.parentPhone">
-              <view class="bind" @click="showBindShangji = true">
-                绑定上级
-              </view>
-            </template>
-          </view>
-        </view>
+	<view class="min-h-100vh bg-gray">
+		<up-navbar bg-color="transparent" title="分销中心" @leftClick="back" :fixed="true"></up-navbar>
+		<view class="top">
+			<image class="top_bg" src="/distribution/static/top_bg.png" :style="imageStyle"></image>
+			<view class="box" :class="{ type1: isActivated }">
+				<view class="u-flex align-center justify-between">
+					<view class="u-flex align-center">
+						<!-- <up-avatar size="62rpx" /> -->
+						<text class="u-m-l-14 font-14 color-333 font-700">{{ state.shopName }}</text>
+					</view>
+					<view>
+						<template v-if="state.parentPhone">
+							<view class="font-12 color-666">上级：{{ state.parentName }}{{ state.parentPhone }}</view>
+						</template>
+						<template v-if="!state.parentPhone">
+							<view class="bind" @click="showBindShangji = true">绑定上级</view>
+						</template>
+					</view>
+				</view>
 
-        <view
-          class="top_content type1 u-m-t-32"
-          v-if="state.distributionUser && state.distributionUser.level"
-        >
-          <view class="font-14">
-            <view class="u-flex align-center">
-              <text class="color-666">我的分销等级：</text>
-              <text
-                class="color-333 font-700 u-m-r-6"
-                v-if="state.distributionUser"
-                >{{ state.distributionUser.level }}级
-                {{ state.distributionUser.levelName }}</text
-              >
-              <up-icon
-                name="question-circle"
-                size="24rpx"
-                color="#666"
-                @click="questionClick('等级升级条件')"
-              />
-            </view>
-            <view
-              class="u-m-t-28 u-flex align-center"
-              v-if="
-                juNextLvMoney &&
-                state.distributionUser &&
-                state.distributionUser.isAssignLevel == 0
-              "
-            >
-              <text class="color-666">距离下一级还差：</text>
-              <text class="color-333 font-700 u-m-r-18"
-                >{{ juNextLvMoney }}
-              </text>
-              <text class="color-333 font-700 u-m-r-18"
-                >{{ config.upgradeType == "cost" ? "元" : "人" }}
-              </text>
-              <!-- <up-icon
+				<view class="top_content type1 u-m-t-32" v-if="state.distributionUser && state.distributionUser.level">
+					<view class="font-14">
+						<view class="u-flex align-center">
+							<text class="color-666">我的分销等级：</text>
+							<text class="color-333 font-700 u-m-r-6" v-if="state.distributionUser">
+								{{ state.distributionUser.level }}级 {{ state.distributionUser.levelName }}
+							</text>
+							<up-icon name="question-circle" size="24rpx" color="#666" @click="questionClick('等级升级条件')" />
+						</view>
+						<view class="u-m-t-28 u-flex align-center" v-if="juNextLvMoney && state.distributionUser && state.distributionUser.isAssignLevel == 0">
+							<text class="color-666">距离下一级还差：</text>
+							<text class="color-333 font-700 u-m-r-18">{{ juNextLvMoney }}</text>
+							<text class="color-333 font-700 u-m-r-18">{{ config.upgradeType == 'cost' ? '元' : '人' }}</text>
+							<!-- <up-icon
                 name="question-circle"
                 size="24rpx"
                 color="#666"
                 @click="showRule = true"
               /> -->
-            </view>
-            <view class="u-flex u-m-t-28">
-              <view class="u-flex-1">
-                <view class="u-flex align-center">
-                  <text
-                    class="u-m-r-10 font-12 color-666"
-                    @click="toShouyiDetail('')"
-                    >总收益</text
-                  >
-                  <up-icon
-                    name="question-circle"
-                    size="24rpx"
-                    color="#666"
-                    @click="questionClick('总收益')"
-                  />
-                </view>
-                <view
-                  class="u-m-t-16 price"
-                  @click="toShouyiDetail('')"
-                  v-if="state.distributionUser"
-                  >{{ state.distributionUser.totalIncome }}</view
-                >
-              </view>
-              <view class="u-flex-1">
-                <view class="u-flex align-center">
-                  <text
-                    class="u-m-r-10 font-12 color-666"
-                    @click="toShouyiDetail('待入账')"
-                    >待入账</text
-                  >
-                  <up-icon
-                    name="question-circle"
-                    size="24rpx"
-                    color="#666"
-                    @click="questionClick('待入账')"
-                  />
-                </view>
-                <view
-                  class="u-m-t-16 price"
-                  @click="toShouyiDetail('待入账')"
-                  v-if="state.distributionUser"
-                  >{{ state.distributionUser.pendingIncome }}</view
-                >
-              </view>
-            </view>
-          </view>
-        </view>
-        <template v-else>
-          <view class="top_content u-m-t-32" v-if="config">
-            <template v-if="config.openType == 'auto'">
-              <view class="color-333 font-16 font-700"> 如何成为分销员 </view>
-              <view class="u-m-t-16 color-666 font-14">
-                <view> 需要邀请人数：{{ config.inviteCount }}人</view>
-                <view
-                  >是否需要邀请人数下单：{{
-                    config.inviteConsume ? "是" : "否"
-                  }}
-                </view>
-                <view
-                  >每人可获得的分销奖励次数：{{
-                    config.rewardCount == -1
-                      ? "永久"
-                      : config.rewardCount + "次"
-                  }}
-                </view>
-              </view>
-            </template>
-            <template v-if="config.openType == 'pay'">
-              <view class="color-333 font-16 font-700 text-center">
-                如何成为分销员
-              </view>
-              <view class="u-m-t-16 color-666 font-14 text-center">
-                <view
-                  >只需付费{{ config.payAmount || "" }}元，即可成为分销员</view
-                >
-              </view>
-            </template>
-            <template v-if="config.openType == 'manual'">
-              <view class="color-333 font-16 font-700 text-center">
-                如何成为分销员
-              </view>
-              <view class="u-m-t-16 color-666 font-14 text-center">
-                <view>请联系商家咨询详情</view>
-              </view>
-            </template>
-          </view>
-        </template>
-      </view>
-    </view>
+						</view>
+						<view class="u-flex u-m-t-28">
+							<view class="u-flex-1">
+								<view class="u-flex align-center">
+									<text class="u-m-r-10 font-12 color-666" @click="toShouyiDetail('')">总收益</text>
+									<up-icon name="question-circle" size="24rpx" color="#666" @click="questionClick('总收益')" />
+								</view>
+								<view class="u-m-t-16 price" @click="toShouyiDetail('')" v-if="state.distributionUser">
+									{{ state.distributionUser.totalIncome }}
+								</view>
+							</view>
+							<view class="u-flex-1">
+								<view class="u-flex align-center">
+									<text class="u-m-r-10 font-12 color-666" @click="toShouyiDetail('待入账')">待入账</text>
+									<up-icon name="question-circle" size="24rpx" color="#666" @click="questionClick('待入账')" />
+								</view>
+								<view class="u-m-t-16 price" @click="toShouyiDetail('待入账')" v-if="state.distributionUser">{{ state.distributionUser.pendingIncome }}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<template v-else>
+					<view class="top_content u-m-t-32" v-if="config">
+						<template v-if="config.openType == 'auto'">
+							<view class="color-333 font-16 font-700">如何成为分销员</view>
+							<view class="u-m-t-16 color-666 font-14">
+								<view>需要邀请人数：{{ config.inviteCount }}人</view>
+								<view>是否需要邀请人数下单：{{ config.inviteConsume ? '是' : '否' }}</view>
+								<view>每人可获得的分销奖励次数：{{ config.rewardCount == -1 ? '永久' : config.rewardCount + '次' }}</view>
+							</view>
+						</template>
+						<template v-if="config.openType == 'pay'">
+							<view class="color-333 font-16 font-700 text-center">如何成为分销员</view>
+							<view class="u-m-t-16 color-666 font-14 text-center">
+								<view>只需付费{{ config.payAmount || '' }}元，即可成为分销员</view>
+							</view>
+						</template>
+						<template v-if="config.openType == 'manual'">
+							<view class="color-333 font-16 font-700 text-center">如何成为分销员</view>
+							<view class="u-m-t-16 color-666 font-14 text-center">
+								<view>请联系商家咨询详情</view>
+							</view>
+						</template>
+					</view>
+				</template>
+			</view>
+		</view>
 
-    <view class="bottom type1" v-if="isActivated">
-      <view class="u-flex justify-between align-center">
-        <view class="u-flex align-center">
-          <view class="color-333 font-16 u-m-r-6"
-            >我的邀请（{{ inviteUserRes.totalRow }}）</view
-          >
-          <up-icon
-            name="question-circle"
-            size="24rpx"
-            @click="showRule = true"
-            color="#666"
-          />
-        </view>
-        <view class="font-10 color-999 u-flex align-center">
-          <text
-            >分成比例{{ state.distributionUser.levelOneCommission || 0 }}%</text
-          >
-          <up-icon
-            name="question-circle"
-            size="24rpx"
-            color="#666"
-            @click="questionClick('等级分成比例')"
-          />
-        </view>
-      </view>
+		<view class="bottom type1" v-if="isActivated">
+			<view class="u-flex justify-between align-center">
+				<view class="u-flex align-center">
+					<view class="color-333 font-16 u-m-r-6">我的邀请（{{ inviteUserRes.totalRow }}）</view>
+					<up-icon name="question-circle" size="24rpx" @click="showRule = true" color="#666" />
+				</view>
+				<view class="font-10 color-999 u-flex align-center">
+					<text>分成比例{{ state.distributionUser.levelOneCommission || 0 }}%</text>
+					<up-icon name="question-circle" size="24rpx" color="#666" @click="questionClick('等级分成比例')" />
+				</view>
+			</view>
 
-      <view class="tabs" v-if="false">
-        <view
-          class="tabs-item"
-          :class="{ active: activeTab == 'distributor' }"
-          @click="activeTab = 'distributor'"
-          >分销员</view
-        >
-        <view
-          class="tabs-item"
-          :class="{ active: activeTab == 'inviter' }"
-          @click="activeTab = 'inviter'"
-          >邀请人</view
-        >
-      </view>
+			<view class="tabs" v-if="false">
+				<view class="tabs-item" :class="{ active: activeTab == 'distributor' }" @click="activeTab = 'distributor'">分销员</view>
+				<view class="tabs-item" :class="{ active: activeTab == 'inviter' }" @click="activeTab = 'inviter'">邀请人</view>
+			</view>
 
-      <view class="u-m-t-48 font-14">
-        <view class="u-flex justify-between color-333">
-          <view>用户</view>
-          <view>获得利益(元)</view>
-          <view>邀请时间</view>
-        </view>
-        <view class="u-m-t-16">
-          <view
-            v-for="(item, index) in userList"
-            :key="index"
-            class="u-flex justify-between align-center recoder-item color-666 font-12"
-          >
-            <view class="">
-              <view class="u-line-1" style="max-width: 160rpx">
-                <text>
-                  {{ item.shopUserName }}
-                </text>
-              </view>
-              <view class="u-line-1" style="max-width: 160rpx">
-                <text v-if="item.levelName"> ( {{ item.levelName }}) </text>
-              </view>
+			<view class="u-m-t-48 font-14">
+				<view class="u-flex justify-between color-333">
+					<view>用户</view>
+					<view>获得利益(元)</view>
+					<view>邀请时间</view>
+				</view>
+				<view class="u-m-t-16">
+					<view v-for="(item, index) in userList" :key="index" class="u-flex justify-between align-center recoder-item color-666 font-12">
+						<view class="">
+							<view class="u-line-1" style="max-width: 160rpx">
+								<text>
+									{{ item.shopUserName }}
+								</text>
+							</view>
+							<view class="u-line-1" style="max-width: 160rpx">
+								<text v-if="item.levelName">( {{ item.levelName }})</text>
+							</view>
 
-              <view>{{ desensitizePhone(item.shopUserPhone) }}</view>
-            </view>
-            <view>
-              <text>{{ item.oneIncome }}</text>
-              <text v-if="item.distributionLevelName"
-                >（{{ item.distributionLevelName }}）</text
-              >
-            </view>
-            <view>
-              <text v-if="item.inviteTime">{{
-                item.inviteTime.split(" ")[0]
-              }}</text>
-              <text style="color: #fff" v-else>{{ "yyyy-MM-dd" }}</text>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-    <template v-else>
-      <view class="bottom" v-if="config">
-        <view class="u-flex">
-          <view class="title">规则说明</view>
-        </view>
-        <view>
-          <view class="font-12 color-666 u-m-t-16">
-            <view>
-              <view> 我的收益什么时候可以到账？</view>
-              <view> 分销的结算时长为{{ config.settlementDay || 0 }}天</view>
-            </view>
-            <template
-              v-if="
-                config.upgradeType != 'not_upgrade' &&
-                config.levelConfigList &&
-                config.levelConfigList.length >= 2
-              "
-            >
-              <view class="u-m-t-40">
-                <view>怎么样才能升级分销员等级？</view>
+							<view>{{ desensitizePhone(item.shopUserPhone) }}</view>
+						</view>
+						<view>
+							<text>{{ item.oneIncome }}</text>
+							<text v-if="item.distributionLevelName">（{{ item.distributionLevelName }}）</text>
+						</view>
+						<view>
+							<text v-if="item.inviteTime">{{ item.inviteTime.split(' ')[0] }}</text>
+							<text style="color: #fff" v-else>{{ 'yyyy-MM-dd' }}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<template v-else>
+			<view class="bottom" v-if="config">
+				<view class="u-flex">
+					<view class="title">规则说明</view>
+				</view>
+				<view>
+					<view class="font-12 color-666 u-m-t-16">
+						<view>
+							<view>我的收益什么时候可以到账？</view>
+							<view>分销的结算时长为{{ config.settlementDay || 0 }}天</view>
+						</view>
+						<template v-if="config.upgradeType != 'not_upgrade' && config.levelConfigList && config.levelConfigList.length >= 2">
+							<view class="u-m-t-40">
+								<view>怎么样才能升级分销员等级？</view>
 
-                <template v-if="config.upgradeType == 'invite' && nextLvMoney">
-                  <view>邀请的有效人数达到{{ nextLvMoney }}人即可升级</view>
-                  <view class="u-m-t-40"> 什么是有效邀请人数？</view>
-                  <view> 被邀请人在店铺消费过，即有一笔订单完成才算有效</view>
-                </template>
-                <template v-if="config.upgradeType == 'cost' && nextLvMoney">
-                  <view> 消费金额总计达到{{ nextLvMoney }}元即可升级</view>
-                </template>
+								<template v-if="config.upgradeType == 'invite' && nextLvMoney">
+									<view>邀请的有效人数达到{{ nextLvMoney }}人即可升级</view>
+									<view class="u-m-t-40">什么是有效邀请人数？</view>
+									<view>被邀请人在店铺消费过，即有一笔订单完成才算有效</view>
+								</template>
+								<template v-if="config.upgradeType == 'cost' && nextLvMoney">
+									<view>消费金额总计达到{{ nextLvMoney }}元即可升级</view>
+								</template>
 
-                <template v-else>
-                  <view>请联系商家</view>
-                </template>
-              </view>
-            </template>
+								<template v-else>
+									<view>请联系商家</view>
+								</template>
+							</view>
+						</template>
 
-            <view class="u-m-t-40" v-if="config.upgradeType == 'cost'">
-              <view>消费金额如何计算？</view>
-              <view
-                >消费金额是计算您和您邀请的人在店铺消费的总金额，但退款订单不计入</view
-              >
-            </view>
-          </view>
-        </view>
-      </view>
-      <view class="parse-html">
-        <up-parse :content="content"></up-parse>
-      </view>
-      <view style="height: 240rpx"></view>
-    </template>
+						<view class="u-m-t-40" v-if="config.upgradeType == 'cost'">
+							<view>消费金额如何计算？</view>
+							<view>消费金额是计算您和您邀请的人在店铺消费的总金额，但退款订单不计入</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="parse-html">
+				<up-parse :content="content"></up-parse>
+			</view>
+			<view style="height: 240rpx"></view>
+		</template>
 
-    <view
-      class="tips u-m-t-32"
-      v-if="state.distributionUser && state.distributionUser.status"
-      >您的分销员身份已取消，不再获得分成有疑问可联系商家</view
-    >
+		<view class="tips u-m-t-32" v-if="state.distributionUser && state.distributionUser.status">您的分销员身份已取消，不再获得分成有疑问可联系商家</view>
 
-    <view class="u-flex justify-center bottom-btn" v-if="showInviteCode">
-      <view class="copy" @click="copyCode">
-        <view>复制邀请码</view>
-        <view v-if="inviteCode">{{ inviteCode }}</view>
-      </view>
-      <view class="u-flex u-flex-col justify-center">
-        <view class="share" @click="showSharePopup = true">分享邀请</view>
-      </view>
-    </view>
+		<view class="u-flex justify-center bottom-btn" v-if="showInviteCode">
+			<view class="copy" @click="copyCode">
+				<view>复制邀请码</view>
+				<view v-if="inviteCode">{{ inviteCode }}</view>
+			</view>
+			<view class="u-flex u-flex-col justify-center">
+				<view class="share" @click="showSharePopup = true">分享邀请</view>
+			</view>
+		</view>
 
-    <view
-      class="buy"
-      v-if="config.openType == 'pay' && config.payAmount && !isActivated"
-      @click="buy"
-    >
-      付费{{ config.payAmount }}元开通
-    </view>
+		<view class="buy" v-if="config.openType == 'pay' && config.payAmount && !isActivated" @click="buy">付费{{ config.payAmount }}元开通</view>
 
-    <bindShangji
-      v-model="showBindShangji"
-      @confirm="confirmBindShangji"
-    ></bindShangji>
-    <sharePopup
-      v-model="showSharePopup"
-      v-if="
-        (state.distributionUser && state.distributionUser.inviteCode) ||
-        inviteCode
-      "
-      :inviteCode="
-        state.distributionUser ? state.distributionUser.inviteCode : inviteCode
-      "
-      :shopUserInfo="shopUserInfo"
-    ></sharePopup>
+		<bindShangji v-model="showBindShangji" @confirm="confirmBindShangji"></bindShangji>
+		<sharePopup
+			v-model="showSharePopup"
+			v-if="(state.distributionUser && state.distributionUser.inviteCode) || inviteCode"
+			:inviteCode="state.distributionUser ? state.distributionUser.inviteCode : inviteCode"
+			:shopUserInfo="shopUserInfo"
+		></sharePopup>
 
-    <TipsPopup v-model="showPopup" :tips-type="tipsType"></TipsPopup>
-    <commissionPopup
-      :tipsType="commissionTipsType"
-      v-model="showCommission"
-      :config="config"
-      :levelConfigList="config.levelConfigList || []"
-    ></commissionPopup>
-    <rulePopup
-      v-model="showRule"
-      :config="config"
-      :distributionUser="state.distributionUser"
-    ></rulePopup>
-  </view>
+		<TipsPopup v-model="showPopup" :tips-type="tipsType"></TipsPopup>
+		<commissionPopup :tipsType="commissionTipsType" v-model="showCommission" :config="config" :levelConfigList="config.levelConfigList || []"></commissionPopup>
+		<rulePopup v-model="showRule" :config="config" :distributionUser="state.distributionUser"></rulePopup>
+	</view>
 </template>
-    
+
 <script setup>
-import bindShangji from "./components/bind-shangji.vue";
-import sharePopup from "./components/share-popup.vue";
-import TipsPopup from "../components/tips-popup.vue";
-import commissionPopup from "../components/commission.vue";
-import rulePopup from "../components/rule.vue";
-import { desensitizePhone } from "@/utils/util.js";
-import BigNumber from "bignumber.js";
-import * as distributionApi from "@/common/api/market/distribution.js";
-import { distributionLtPayOrder } from "@/common/api/order/index.js";
-import { APIshopUserInfo } from "@/common/api/member.js";
-import { pay } from "@/utils/pay.js";
-import { onLoad, onReachBottom } from "@dcloudio/uni-app";
+import { distributionClear } from '@/common/api/market';
+import { shareMixin, handleMixinOnLoad, returnQuery } from '@/utils/share.js';
+import bindShangji from './components/bind-shangji.vue';
+import sharePopup from './components/share-popup.vue';
+import TipsPopup from '../components/tips-popup.vue';
+import commissionPopup from '../components/commission.vue';
+import rulePopup from '../components/rule.vue';
+import { desensitizePhone } from '@/utils/util.js';
+import BigNumber from 'bignumber.js';
+import * as distributionApi from '@/common/api/market/distribution.js';
+import { distributionLtPayOrder } from '@/common/api/order/index.js';
+import { APIshopUserInfo } from '@/common/api/member.js';
+import { pay } from '@/utils/pay.js';
+import { onLoad, onReachBottom } from '@dcloudio/uni-app';
 const showBindShangji = ref(false);
 const showSharePopup = ref(false);
-import { ref, reactive, computed, watch } from "vue";
-const content = ref("");
+import { ref, reactive, computed, watch } from 'vue';
+const content = ref('');
 const showPopup = ref(false);
 const showRule = ref(false);
 const showCommission = ref(false);
-const tipsType = ref("");
-const commissionTipsType = ref("");
+const tipsType = ref('');
+const commissionTipsType = ref('');
 
 function toShouyiDetail(name) {
-  uni.navigateTo({
-    url:
-      "/distribution/income-details/index?name=" +
-      name +
-      "&shopId=" +
-      options.shopId,
-  });
+	uni.navigateTo({
+		url: '/distribution/income-details/index?name=' + name + '&shopId=' + options.shopId
+	});
 }
 function questionClick(title) {
-  if (title == "总收益") {
-    tipsType.value = "总收益";
-    showPopup.value = true;
-  }
-  if (title == "待入账") {
-    tipsType.value = "待入账";
-    showPopup.value = true;
-  }
-  if (title == "等级分成比例") {
-    commissionTipsType.value = "等级分成比例";
-    showCommission.value = true;
-  }
-  if (title == "等级升级条件") {
-    commissionTipsType.value = "等级升级条件";
-    showCommission.value = true;
-  }
+	if (title == '总收益') {
+		tipsType.value = '总收益';
+		showPopup.value = true;
+	}
+	if (title == '待入账') {
+		tipsType.value = '待入账';
+		showPopup.value = true;
+	}
+	if (title == '等级分成比例') {
+		commissionTipsType.value = '等级分成比例';
+		showCommission.value = true;
+	}
+	if (title == '等级升级条件') {
+		commissionTipsType.value = '等级升级条件';
+		showCommission.value = true;
+	}
 }
 function back() {
-  uni.navigateBack({
-    delta: 1,
-  });
+	// uni.navigateBack({
+	// 	delta: 1
+	// });
+	safeNavigateBack();
+}
+
+/**
+ * 修复版：安全的页面返回方法
+ * 彻底避免 "cannot navigate back at first page" 报错
+ * @param {Number} delta 返回的页面数，默认1
+ * @param {Function} fallback 失败时的降级处理函数
+ */
+function safeNavigateBack(delta = 1) {
+	// 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();
+		return; // 终止后续执行，彻底避免调用 navigateBack
+	}
+
+	// 4. 能返回时才执行 navigateBack
+	try {
+		uni.navigateBack({
+			delta: delta,
+			success: () => {
+				console.log('页面返回成功');
+			},
+			fail: (err) => {
+				console.error('navigateBack 执行失败:', err);
+				handleFallback();
+			}
+		});
+	} catch (error) {
+		console.error('页面返回异常:', error);
+		handleFallback();
+	}
+}
+
+/**
+ * 统一处理降级逻辑
+ * @param {Function} fallback 自定义降级函数
+ */
+function handleFallback() {
+	uni.switchTab({
+		url: '/pages/index/index',
+		fail: () => {
+			uni.redirectTo({
+				url: '/pages/index/index'
+			});
+		}
+	});
 }
 
 async function confirmBindShangji(code) {
-  const res = await distributionApi.bindInviteUser({
-    shopId: options.shopId,
-    inviteCode: code,
-    id: shopUserInfo.value.id,
-  });
-  if (res) {
-    uni.showToast({
-      title: "绑定成功",
-      icon: "none",
-    });
-    setTimeout(() => {
-      init();
-    }, 1500);
-  }
-  // else {
-  //   uni.showToast({
-  //     title: "绑定失败",
-  //     icon: "none",
-  //   });
-  // }
+	const res = await distributionApi.bindInviteUser({
+		shopId: options.shopId,
+		inviteCode: code,
+		id: shopUserInfo.value.id
+	});
+	if (res) {
+		uni.showToast({
+			title: '绑定成功',
+			icon: 'none'
+		});
+		setTimeout(() => {
+			init();
+		}, 1500);
+	}
+	// else {
+	//   uni.showToast({
+	//     title: "绑定失败",
+	//     icon: "none",
+	//   });
+	// }
 }
 function copyCode() {
-  uni.setClipboardData({
-    data: inviteCode.value,
-    success: function () {
-      console.log("success");
-    },
-  });
+	uni.setClipboardData({
+		data: inviteCode.value,
+		success: function () {
+			console.log('success');
+		}
+	});
 }
 
 const shopUserInfo = ref();
 const config = reactive({});
 //邀请码
-const inviteCode = ref("");
+const inviteCode = ref('');
 async function init() {
-  const shopUserRes = await APIshopUserInfo({
-    shopId: options.shopId,
-  });
+	const shopUserRes = await APIshopUserInfo({
+		shopId: options.shopId
+	});
 
-  const configRes = await distributionApi.getConfig({
-    shopId: options.shopId,
-  });
-  Object.assign(config, configRes);
+	const configRes = await distributionApi.getConfig({
+		shopId: options.shopId
+	});
+	Object.assign(config, configRes);
 
-  if (shopUserRes) {
-    shopUserInfo.value = shopUserRes;
-  }
-  if (configRes && configRes.openType == "auto") {
-    const codeRes = await distributionApi.getInviteCode({
-      shopId: options.shopId,
-      shopUserId: shopUserRes.id,
-    });
-    if (codeRes) {
-      inviteCode.value = codeRes;
-    }
-  }
+	if (shopUserRes) {
+		shopUserInfo.value = shopUserRes;
+	}
+	if (configRes && configRes.openType == 'auto') {
+		const codeRes = await distributionApi.getInviteCode({
+			shopId: options.shopId,
+			shopUserId: shopUserRes.id
+		});
+		if (codeRes) {
+			inviteCode.value = codeRes;
+		}
+	}
 
-  const res = await distributionApi.centerConfig({
-    shopId: options.shopId,
-  });
-  if (res) {
-    if (res.distributionId) {
-      options.type = "activates";
-    }
-    Object.assign(state, res);
-    if (res.distributionUser) {
-      inviteCode.value = res.distributionUser.inviteCode;
-    }
-    content.value = res.config ? res.config.notActivatedPage : "";
-  }
+	const res = await distributionApi.centerConfig({
+		shopId: options.shopId
+	});
+	if (res) {
+		if (res.distributionId) {
+			options.type = 'activates';
+		}
+		Object.assign(state, res);
+		if (res.distributionUser) {
+			inviteCode.value = res.distributionUser.inviteCode;
+		}
+		content.value = res.config ? res.config.notActivatedPage : '';
+	}
+
+	return res;
 }
-const options = reactive({ type: "" });
+const options = reactive({ type: '' });
 const imageStyle = computed(() => {
-  return {
-    height: isActivated.value ? "580rpx" : "580rpx",
-  };
+	return {
+		height: isActivated.value ? '580rpx' : '580rpx'
+	};
 });
 
 async function buy() {
-  const res = await distributionLtPayOrder({
-    shopId: options.shopId,
-    userId: uni.cache.get("userInfo") ? uni.cache.get("userInfo").id : "",
-    returnUrl: "",
-    buyerRemark: "",
-    amount: "",
-    remark: "",
-    code: "",
-  });
-  const payRes = await pay(res);
-  if (payRes) {
-    uni.showToast({
-      title: "购买成功",
-      icon: "none",
-    });
-    setTimeout(() => {
-      init();
-      getRecoders();
-    }, 1500);
-  }
+	const res = await distributionLtPayOrder({
+		shopId: options.shopId,
+		userId: uni.cache.get('userInfo') ? uni.cache.get('userInfo').id : '',
+		returnUrl: '',
+		buyerRemark: '',
+		amount: '',
+		remark: '',
+		code: ''
+	});
+	const payRes = await pay(res);
+	if (payRes) {
+		uni.showToast({
+			title: '购买成功',
+			icon: 'none'
+		});
+		setTimeout(() => {
+			init();
+			getRecoders();
+		}, 1500);
+	}
 }
 
 const state = reactive({
-  parentPhone: "",
-  parentName: "",
-  shopName: "",
+	parentPhone: '',
+	parentName: '',
+	shopName: ''
 });
 
 const query = reactive({
-  page: 1,
-  size: 10,
+	page: 1,
+	size: 10
 });
 const isEnd = ref(false);
-const activeTab = ref("inviter");
+const activeTab = ref('inviter');
 const userList = ref([]);
 
 const inviteUserRes = reactive({
-  records: [],
-  totalRow: 0,
-  totalPage: 0,
+	records: [],
+	totalRow: 0,
+	totalPage: 0
 });
 async function getRecoders() {
-  if (state.config) return;
-  const ajaxQuery = {
-    ...query,
-    shopId: options.shopId,
-  };
-  if (activeTab.value == "distributor") {
-    ajaxQuery.parentId = state.distributionUser.distributionId;
-  } else {
-    ajaxQuery.id = state.distributionUser.distributionId;
-  }
-  const res =
-    activeTab.value == "distributor"
-      ? await distributionApi.childUser(ajaxQuery)
-      : await distributionApi.inviteUser(ajaxQuery);
-  if (res) {
-    Object.assign(inviteUserRes, res);
-    if (query.page == 1) {
-      userList.value = res.records || [];
-    } else {
-      userList.value.push(...(res.records || []));
-    }
-    isEnd.value = query.page >= res.totalPage * 1;
-  }
+	if (state.config) return;
+	const ajaxQuery = {
+		...query,
+		shopId: options.shopId
+	};
+	if (activeTab.value == 'distributor') {
+		ajaxQuery.parentId = state.distributionUser.distributionId;
+	} else {
+		ajaxQuery.id = state.distributionUser.distributionId;
+	}
+	const res = activeTab.value == 'distributor' ? await distributionApi.childUser(ajaxQuery) : await distributionApi.inviteUser(ajaxQuery);
+	if (res) {
+		Object.assign(inviteUserRes, res);
+		if (query.page == 1) {
+			userList.value = res.records || [];
+		} else {
+			userList.value.push(...(res.records || []));
+		}
+		isEnd.value = query.page >= res.totalPage * 1;
+	}
 }
 const nextLvMoney = computed(() => {
-  let nextLv = undefined;
+	let nextLv = undefined;
 
-  if (!config.levelConfigList || !config.levelConfigList.length) {
-    return "";
-  }
-  const nowLevel = state.distributionUser
-    ? state.distributionUser.level || 1
-    : 1;
-  if (!nowLevel) {
-    nextLv = config.levelConfigList[0];
-  } else {
-    nextLv = config.levelConfigList.find((v) => v.level == nowLevel + 1);
-  }
+	if (!config.levelConfigList || !config.levelConfigList.length) {
+		return '';
+	}
+	const nowLevel = state.distributionUser ? state.distributionUser.level || 1 : 1;
+	if (!nowLevel) {
+		nextLv = config.levelConfigList[0];
+	} else {
+		nextLv = config.levelConfigList.find((v) => v.level == nowLevel + 1);
+	}
 
-  if (nextLv) {
-    if (config.upgradeType == "cost") {
-      return nextLv.costAmount;
-    }
-    if (config.upgradeType == "invite") {
-      return nextLv.inviteCount;
-    }
-  }
-  return "";
+	if (nextLv) {
+		if (config.upgradeType == 'cost') {
+			return nextLv.costAmount;
+		}
+		if (config.upgradeType == 'invite') {
+			return nextLv.inviteCount;
+		}
+	}
+	return '';
 });
 
 const juNextLvMoney = computed(() => {
-  if (!nextLvMoney.value) {
-    return "";
-  }
-  let total = 0;
-  if (config.upgradeType == "cost" && state.distributionUser) {
-    total = new BigNumber(nextLvMoney.value).minus(state.distributionUser.consumeAmount || 0).toNumber();
-  }
-  if (config.upgradeType == "invite" && state.distributionUser) {
-    total = new BigNumber(nextLvMoney.value).minus(config.inviteCount || 0).toNumber();
-  }
-  return Math.max(total, 0);
+	if (!nextLvMoney.value) {
+		return '';
+	}
+	let total = 0;
+	if (config.upgradeType == 'cost' && state.distributionUser) {
+		total = new BigNumber(nextLvMoney.value).minus(state.distributionUser.consumeAmount || 0).toNumber();
+	}
+	if (config.upgradeType == 'invite' && state.distributionUser) {
+		total = new BigNumber(nextLvMoney.value).minus(config.inviteCount || 0).toNumber();
+	}
+	return Math.max(total, 0);
 });
 //是否显示邀请码
 
 const showInviteCode = computed(() => {
-  if (config.upgradeType == "invite") {
-    return true;
-  }
-  if (
-    config.openType == "manual" &&
-    (!state.distributionUser || !state.distributionUser.level)
-  ) {
-    return false;
-  }
-  if (
-    state.distributionUser &&
-    state.distributionUser.level &&
-    inviteCode.value
-  ) {
-    return true;
-  }
-  if(  config.openType == "auto" ){
-	  return true;
-  }
-  if (!state.distributionUser && config.openType == "manual") {
-    return true;
-  }
-  return false;
+	if (config.upgradeType == 'invite') {
+		return true;
+	}
+	if (config.openType == 'manual' && (!state.distributionUser || !state.distributionUser.level)) {
+		return false;
+	}
+	if (state.distributionUser && state.distributionUser.level && inviteCode.value) {
+		return true;
+	}
+	if (config.openType == 'auto') {
+		return true;
+	}
+	if (!state.distributionUser && config.openType == 'manual') {
+		return true;
+	}
+	return false;
 });
 
 //是否已成为分销员
 const isActivated = computed(() => {
-  return state.distributionUser && state.distributionUser.level;
+	return state.distributionUser && state.distributionUser.level;
 });
 watch(
-  () => activeTab.value,
-  (newVal, oldVal) => {
-    query.page = 1;
-    isEnd.value = false;
-    if (newVal != oldVal) {
-      getRecoders();
-    }
-  }
+	() => activeTab.value,
+	(newVal, oldVal) => {
+		query.page = 1;
+		isEnd.value = false;
+		if (newVal != oldVal) {
+			getRecoders();
+		}
+	}
 );
 
 function parseQueryString(queryString) {
-  const queryParams = queryString.split("&").map((param) => param.split("="));
-  const params = {};
-  for (const [key, value] of queryParams) {
-    params[key] = value;
-  }
-  return params;
+	const queryParams = queryString.split('&').map((param) => param.split('='));
+	const params = {};
+	for (const [key, value] of queryParams) {
+		params[key] = value;
+	}
+	return params;
 }
+
+// defineOptions({
+// 	mixins: [shareMixin]
+// });
+
+onShareAppMessage(async (res) => {
+	let query = await returnQuery();
+	return {
+		title: `股东共享-${state.shopName}`,
+		path: `/distribution/shop-detail/index?${query}`,
+		imageUrl: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/3/ec402c96a183489788f9e43430962d04.png',
+		query
+	};
+});
+
 onLoad(async (opt) => {
-  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);
-  await init();
-  getRecoders();
+	try {
+		await handleMixinOnLoad(opt);
+		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);
+		await init();
+		getRecoders();
+	} catch (error) {
+		console.log(error);
+	}
 });
 
 onReachBottom(async () => {
-  if (!isEnd.value) {
-    query.page++;
-    await getRecoders();
-  }
+	if (!isEnd.value) {
+		query.page++;
+		await getRecoders();
+	}
 });
 </script>
-    
+
 <style scoped lang="scss">
 .input-number-box {
-  width: 428rpx;
-  padding-bottom: 10rpx;
-  border-bottom: 1px solid #999;
-  font-size: 28rpx;
-  align-items: baseline;
-  .fuhao {
-    font-size: 64rpx;
-    color: #333;
-  }
-  .input-number {
-    flex: 1;
-    height: 100%;
-    font-size: 28rpx;
-    color: #333;
-    padding-left: 24rpx;
-    padding-right: 10rpx;
-  }
-  .all-in {
-    font-size: 28rpx;
-    color: #fe7e00;
-  }
+	width: 428rpx;
+	padding-bottom: 10rpx;
+	border-bottom: 1px solid #999;
+	font-size: 28rpx;
+	align-items: baseline;
+
+	.fuhao {
+		font-size: 64rpx;
+		color: #333;
+	}
+
+	.input-number {
+		flex: 1;
+		height: 100%;
+		font-size: 28rpx;
+		color: #333;
+		padding-left: 24rpx;
+		padding-right: 10rpx;
+	}
+
+	.all-in {
+		font-size: 28rpx;
+		color: #fe7e00;
+	}
 }
+
 .list {
-  .shop-item {
-    padding: 32rpx 28rpx;
-    border-bottom: 2rpx solid #ededed;
-    font-size: 28rpx;
-    color: #666;
-    display: flex;
-    align-items: center;
-    &:last-child {
-      border-bottom: none;
-    }
-    .fufei {
-      color: #e8ad7b;
-    }
-    .tag {
-      font-size: 24rpx;
-      color: #ff1c1c;
-      background-color: #ffe4e4;
-      padding: 8rpx 20rpx;
-      border-radius: 8rpx;
-    }
-    .name {
-      color: #333;
-      font-weight: 700;
-    }
-    .shouxufei {
-    }
-    .shouyi {
-      font-size: 24rpx;
-      color: #666;
-      text-align: center;
-    }
-  }
+	.shop-item {
+		padding: 32rpx 28rpx;
+		border-bottom: 2rpx solid #ededed;
+		font-size: 28rpx;
+		color: #666;
+		display: flex;
+		align-items: center;
+
+		&:last-child {
+			border-bottom: none;
+		}
+
+		.fufei {
+			color: #e8ad7b;
+		}
+
+		.tag {
+			font-size: 24rpx;
+			color: #ff1c1c;
+			background-color: #ffe4e4;
+			padding: 8rpx 20rpx;
+			border-radius: 8rpx;
+		}
+
+		.name {
+			color: #333;
+			font-weight: 700;
+		}
+
+		.shouxufei {
+		}
+
+		.shouyi {
+			font-size: 24rpx;
+			color: #666;
+			text-align: center;
+		}
+	}
 }
+
 .status {
-  font-size: 28rpx;
-  font-weight: 700;
-  text-align: right;
-  color: #333333;
-  &.fail {
-    color: #ff1c1c;
-  }
+	font-size: 28rpx;
+	font-weight: 700;
+	text-align: right;
+	color: #333333;
+
+	&.fail {
+		color: #ff1c1c;
+	}
 }
+
 .lingqu {
-  font-size: 28rpx;
-  border-radius: 8rpx;
-  background: #fe6d11;
-  padding: 8rpx 16rpx;
-  color: #ffffff;
+	font-size: 28rpx;
+	border-radius: 8rpx;
+	background: #fe6d11;
+	padding: 8rpx 16rpx;
+	color: #ffffff;
 }
+
 .price {
-  font-weight: 700;
-  font-size: 40rpx;
-  color: #333;
+	font-weight: 700;
+	font-size: 40rpx;
+	color: #333;
 }
+
 .top {
-  position: relative;
-  .box {
-    position: absolute;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    padding: 28rpx 28rpx 52rpx 28rpx;
-    &.type1 {
-      padding-bottom: 0;
-    }
-  }
-  .top_content {
-    border: 1px solid rgba(255, 255, 255, 0.8);
-    border-radius: 16rpx;
-    flex-shrink: 0;
-    fill: #ffffff3b;
-    stroke-width: 2rpx;
-    padding: 32rpx 28rpx;
-    stroke: #fff;
-    filter: drop-shadow(2rpx -4rpx 13.4rpx #ff6f0124);
-    backdrop-filter: blur(5.1rpx);
-    &.type1 {
-      filter: none;
-      border: none;
-      background-color: #fcf5ed;
-      border-radius: 36rpx 36rpx 0 0;
-      padding: 32rpx 36rpx;
-    }
-  }
+	position: relative;
+
+	.box {
+		position: absolute;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		padding: 28rpx 28rpx 52rpx 28rpx;
+
+		&.type1 {
+			padding-bottom: 0;
+		}
+	}
+
+	.top_content {
+		border: 1px solid rgba(255, 255, 255, 0.8);
+		border-radius: 16rpx;
+		flex-shrink: 0;
+		fill: #ffffff3b;
+		stroke-width: 2rpx;
+		padding: 32rpx 28rpx;
+		stroke: #fff;
+		filter: drop-shadow(2rpx -4rpx 13.4rpx #ff6f0124);
+		backdrop-filter: blur(5.1rpx);
+
+		&.type1 {
+			filter: none;
+			border: none;
+			background-color: #fcf5ed;
+			border-radius: 36rpx 36rpx 0 0;
+			padding: 32rpx 36rpx;
+		}
+	}
 }
+
 .btn-group {
-  position: absolute;
-  right: 28rpx;
-  top: 50%;
-  transform: translateY(-50%);
-  .btn {
-    padding: 8rpx 16rpx;
-    border-radius: 8rpx;
-    font-size: 24rpx;
-    border: 2rpx solid #fe6d11;
-    &.shiming {
-      color: #fe6d11;
-    }
-    &.tixian {
-      color: #fff;
-      background-color: #fe6d11;
-    }
-  }
+	position: absolute;
+	right: 28rpx;
+	top: 50%;
+	transform: translateY(-50%);
+
+	.btn {
+		padding: 8rpx 16rpx;
+		border-radius: 8rpx;
+		font-size: 24rpx;
+		border: 2rpx solid #fe6d11;
+
+		&.shiming {
+			color: #fe6d11;
+		}
+
+		&.tixian {
+			color: #fff;
+			background-color: #fe6d11;
+		}
+	}
 }
+
 .tips {
-  padding: 16rpx 18rpx;
-  background: #ffe2e2;
-  padding: 16rpx 18rpx;
-  font-size: 28rpx;
-  line-height: 48rpx;
-  color: #ff1c1c;
+	padding: 16rpx 18rpx;
+	background: #ffe2e2;
+	padding: 16rpx 18rpx;
+	font-size: 28rpx;
+	line-height: 48rpx;
+	color: #ff1c1c;
 }
+
 .bind {
-  padding: 8rpx 32rpx;
-  border-radius: 8rpx;
-  font-size: 24rpx;
-  border: 2rpx solid #fe6d11;
-  color: #fff;
-  background-color: #fe6d11;
+	padding: 8rpx 32rpx;
+	border-radius: 8rpx;
+	font-size: 24rpx;
+	border: 2rpx solid #fe6d11;
+	color: #fff;
+	background-color: #fe6d11;
 }
+
 .top_bg {
-  width: 100%;
+	width: 100%;
 }
+
 .bottom {
-  margin: 0 28rpx;
-  border-radius: 36rpx;
-  background-color: #fff;
-  transform: translateY(-20rpx);
-  padding: 32rpx 28rpx;
-  &.type1 {
-    transform: translateY(0);
-    margin: 0;
-    padding-bottom: 42rpx;
-  }
+	margin: 0 28rpx;
+	border-radius: 36rpx;
+	background-color: #fff;
+	transform: translateY(-20rpx);
+	padding: 32rpx 28rpx;
+
+	&.type1 {
+		transform: translateY(0);
+		margin: 0;
+		padding-bottom: 42rpx;
+	}
 }
+
 .title {
-  font-size: 32rpx;
-  font-weight: 700;
-  color: #333;
+	font-size: 32rpx;
+	font-weight: 700;
+	color: #333;
 }
+
 .small-title {
-  font-size: 28rpx;
-  font-weight: 700;
-  color: #333;
+	font-size: 28rpx;
+	font-weight: 700;
+	color: #333;
 }
+
 .parse-html {
-  margin: 32rpx 28rpx;
-  font-size: 28rpx;
+	margin: 32rpx 28rpx;
+	font-size: 28rpx;
 }
+
 .recoder-item {
-  padding: 16rpx 0;
-  border-bottom: 2rpx solid #ededed;
+	padding: 16rpx 0;
+	border-bottom: 2rpx solid #ededed;
 }
+
 .share {
-  border-radius: 16rpx;
-  background: #e8ad7b;
-  padding: 14rpx 76rpx;
-  font-size: 32rpx;
-  line-height: 48rpx;
-  color: #fff;
+	border-radius: 16rpx;
+	background: #e8ad7b;
+	padding: 14rpx 76rpx;
+	font-size: 32rpx;
+	line-height: 48rpx;
+	color: #fff;
 }
+
 .copy {
-  padding: 4rpx 30rpx;
-  border-radius: 18rpx;
-  border: 2rpx solid #e8ad7b;
-  background: #fff;
-  font-size: 28rpx;
-  color: #e8ad7b;
-  line-height: 48rpx;
-  text-align: center;
+	padding: 4rpx 30rpx;
+	border-radius: 18rpx;
+	border: 2rpx solid #e8ad7b;
+	background: #fff;
+	font-size: 28rpx;
+	color: #e8ad7b;
+	line-height: 48rpx;
+	text-align: center;
 }
+
 .bottom-btn {
-  position: fixed;
-  left: 84rpx;
-  right: 84rpx;
-  bottom: 100rpx;
-  white-space: nowrap;
-  gap: 54rpx;
+	position: fixed;
+	left: 84rpx;
+	right: 84rpx;
+	bottom: 100rpx;
+	white-space: nowrap;
+	gap: 54rpx;
 }
+
 .buy {
-  padding: 32rpx 224rpx;
-  border-radius: 40rpx;
-  background: linear-gradient(98deg, #fe6d1100 40.64%, #ffd1b4 105.2%),
-    linear-gradient(259deg, #fe6d11 50.14%, #ffd1b4 114.93%);
-  box-shadow: 0 14rpx 30.4rpx 0 #fe8b435e;
-  font-size: 32rpx;
-  color: #fff;
-  font-weight: 700;
-  position: fixed;
-  left: 28rpx;
-  right: 28rpx;
-  bottom: 62rpx;
-  white-space: nowrap;
+	padding: 32rpx 224rpx;
+	border-radius: 40rpx;
+	background: linear-gradient(98deg, #fe6d1100 40.64%, #ffd1b4 105.2%), linear-gradient(259deg, #fe6d11 50.14%, #ffd1b4 114.93%);
+	box-shadow: 0 14rpx 30.4rpx 0 #fe8b435e;
+	font-size: 32rpx;
+	color: #fff;
+	font-weight: 700;
+	position: fixed;
+	left: 28rpx;
+	right: 28rpx;
+	bottom: 62rpx;
+	white-space: nowrap;
 }
+
 .tabs {
-  display: flex;
-  margin: 20rpx 0;
-  gap: 30rpx;
-  .tabs-item {
-    flex: 1;
-    padding: 4rpx 30rpx;
-    border-radius: 18rpx;
-    border: 2rpx solid #e8ad7b;
-    background: #fff;
-    font-size: 28rpx;
-    color: #e8ad7b;
-    line-height: 48rpx;
-    text-align: center;
-    transition: all 0.3s ease-in-out;
-    &.active {
-      background-color: #e8ad7b;
-      color: #fff;
-    }
-  }
+	display: flex;
+	margin: 20rpx 0;
+	gap: 30rpx;
+
+	.tabs-item {
+		flex: 1;
+		padding: 4rpx 30rpx;
+		border-radius: 18rpx;
+		border: 2rpx solid #e8ad7b;
+		background: #fff;
+		font-size: 28rpx;
+		color: #e8ad7b;
+		line-height: 48rpx;
+		text-align: center;
+		transition: all 0.3s ease-in-out;
+
+		&.active {
+			background-color: #e8ad7b;
+			color: #fff;
+		}
+	}
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/groupBuying/goodsDetail/goodsDetail.vue b/groupBuying/goodsDetail/goodsDetail.vue
index d40fa20..91839cb 100644
--- a/groupBuying/goodsDetail/goodsDetail.vue
+++ b/groupBuying/goodsDetail/goodsDetail.vue
@@ -10,30 +10,30 @@
 
 		<view class="sku">
 			<view class="u-flex u-col-center">
-				<text class="price">¥{{item.groupPrice}}</text>
-				<text class="old-price">¥{{item.originalPrice}}</text>
+				<text class="price">¥{{ item.groupPrice }}</text>
+				<text class="old-price">¥{{ item.originalPrice }}</text>
 			</view>
 			<view>
-				<view class="u-m-t-16 text" v-if="item.limitBuyNum&&item.limitBuyNum!='-10086'"> 限购{{item.limitBuyNum}}份 </view>
-				<view class="text u-m-t-10">已团：{{item.groupedNum||0}}</view>
+				<view class="u-m-t-16 text" v-if="item.limitBuyNum && item.limitBuyNum != '-10086'">限购{{ item.limitBuyNum }}份</view>
+				<view class="text u-m-t-10">已团：{{ item.groupedNum || 0 }}</view>
 			</view>
 		</view>
 		<view class="goods">
-			<view class="goods-name">{{item.wareName}}</view>
+			<view class="goods-name">{{ item.wareName }}</view>
 			<view class="u-m-t-20 color-666">
-				{{item.wareDetail}}
+				{{ item.wareDetail }}
 			</view>
 		</view>
 
 		<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="">{{item.shopName}}</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="">{{item.shopAddress}}</view>
+				<view class="color-666 no-wrap" style="min-width: 180rpx">门店地址：</view>
+				<view class="">{{ item.shopAddress }}</view>
 			</view>
 		</view>
 
@@ -41,55 +41,46 @@
 			<view class="bg-f7" style="height: 32rpx"></view>
 			<view class="groups">
 				<view class="color-000 u-m-b-28 u-font-32 font-700">立即拼团</view>
-				<view class="item u-flex" v-for="(item,index) in item.gbOrderList" :key="index">
+				<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 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="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">
 							<text class="color-666">剩余：</text>
-							<text class="main-color">{{getRemainingHMS(item)}}</text>
+							<text class="main-color">{{ getRemainingHMS(item) }}</text>
 						</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!='优惠券'">
+		<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.wareCommentImgs" :key="index" mode="widthFix"
-					:src="item">
-				</image>
+				<image class="w-full" v-for="(item, index) in item.wareCommentImgs" :key="index" mode="widthFix" :src="item"></image>
 			</view>
 		</view>
 
 		<view style="height: 140px"></view>
 		<view class="fixed-bottom u-flex u-row-center">
 			<view v-if="isCanExchange" class="btn" @click="exchangeClick">
-				{{returnBtmText}}
+				{{ returnBtmText }}
 			</view>
 			<view class="btn gray" v-else>
-				{{returnBtmText}}
+				{{ returnBtmText }}
 			</view>
 		</view>
 
-
-
 		<!-- 需要支付的弹窗 -->
 		<up-popup :show="popupData.show" mode="bottom" closeOnClickOverlay @close="popupData.show = false">
 			<view class="popup-content">
@@ -101,31 +92,29 @@
 						<image class="cover" :src="coverImgs[0]"></image>
 						<view class="u-flex u-flex-1 u-row-between u-p-l-16 u-col-center">
 							<view>
-								<view class="u-font-32 font-bold">{{item.wareName}}</view>
+								<view class="u-font-32 font-bold">{{ item.wareName }}</view>
 
-								<view class="u-m-t-12 color-666 u-line-2">{{item.wareDetail}}</view>
+								<view class="u-m-t-12 color-666 u-line-2">{{ item.wareDetail }}</view>
 							</view>
 							<view>
-								<view class="price">¥{{item.groupPrice}}</view>
-								<view class="old-price">¥{{item.originalPrice}}</view>
-								<view class="limitBuyNum" v-if="item.limitBuyNum&&item.limitBuyNum!=-10086"> 限购{{item.limitBuyNum}} </view>
+								<view class="price">¥{{ item.groupPrice }}</view>
+								<view class="old-price">¥{{ item.originalPrice }}</view>
+								<view class="limitBuyNum" v-if="item.limitBuyNum && item.limitBuyNum != -10086">限购{{ item.limitBuyNum }}</view>
 							</view>
 						</view>
 					</view>
-
 				</view>
 
-				<view class="bottom   u-flex u-row-between u-col-center">
+				<view class="bottom u-flex u-row-between u-col-center">
 					<view class="u-flex u-col-baseline">
 						<text class="color-666">合计：</text>
-						<text class=" price">{{totalPrice}}</text>
+						<text class="price">{{ totalPrice }}</text>
 					</view>
 					<view class="u-flex">
 						<up-icon name="minus-circle" size="20" color="#666" @click="changeNumber('-')"></up-icon>
-						<text class="u-m-l-20 u-m-r-20">{{number}}</text>
+						<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,574 +126,562 @@
 	</view>
 </template>
 <script setup>
-	import {
-		computed,
-		reactive,
-		watch
-	} from "vue";
-	import dayjs from "dayjs";
-	import {wxShare} from '@/utils/share.js'
-	import {
-		getOpenId
-	} 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",
-	};
-	const number = ref(1)
+import { shareMixin, handleMixinOnLoad, returnQuery } from '@/utils/share.js';
+import { computed, reactive, watch } from 'vue';
+import dayjs from 'dayjs';
+import { wxShare } from '@/utils/share.js';
+import { getOpenId } 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();
 
-	import {
-		BigNumber
-	} from "bignumber.js";
-	const totalPrice = computed(() => {
-		if (!item.groupPrice) {
-			return 0;
-		}
+const imgs = {
+	bg: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/2/9fd6a3ad2b384f6cb4e88ed6b77bd334.png'
+};
+const number = ref(1);
 
-		return BigNumber(number.value).times(item.groupPrice).toNumber()
-	})
-
-	function changeNumber(step) {
-		if (step === '-') {
-			if (number.value == 1) {
-				return
-			}
-			number.value--
-			return
-		}
-		if (step === '+') {
-			if(item.limitBuyNum==-10086){
-				number.value++
-				return
-			}
-			if(number.value>=item.limitBuyNum){
-				return uni.showToast({
-					title:'最多可购买'+item.limitBuyNum+'份',
-					icon:'none'
-				})
-			}
-			number.value++
-			return
-		}
+import { BigNumber } from 'bignumber.js';
+const totalPrice = computed(() => {
+	if (!item.groupPrice) {
+		return 0;
 	}
-	const modalData = reactive({
-		show: false,
+
+	return BigNumber(number.value).times(item.groupPrice).toNumber();
+});
+
+function changeNumber(step) {
+	if (step === '-') {
+		if (number.value == 1) {
+			return;
+		}
+		number.value--;
+		return;
+	}
+	if (step === '+') {
+		if (item.limitBuyNum == -10086) {
+			number.value++;
+			return;
+		}
+		if (number.value >= item.limitBuyNum) {
+			return uni.showToast({
+				title: '最多可购买' + item.limitBuyNum + '份',
+				icon: 'none'
+			});
+		}
+		number.value++;
+		return;
+	}
+}
+const modalData = reactive({
+	show: false
+});
+
+function prveImg(index) {
+	uni.previewImage({
+		urls: coverImgs.value,
+		current: index
 	});
+}
 
-	function prveImg(index) {
-		uni.previewImage({
-			urls: coverImgs.value,
-			current: index
-		})
-	}
+const popupData = reactive({
+	show: false,
+	item: null
+});
 
-	const popupData = reactive({
-		show: false,
-		item: null
-	});
+function exchangeClick() {
+	popupData.show = true;
+}
 
-	function exchangeClick() {
-		popupData.show = true
-
-	}
-
-	function fastBuy(item) {
-		popupData.item = item;
-		popupData.show = true
-	}
-	watch(() => popupData.show, (newval) => {
+function fastBuy(item) {
+	popupData.item = item;
+	popupData.show = true;
+}
+watch(
+	() => popupData.show,
+	(newval) => {
 		if (!newval) {
-			popupData.item = null
+			popupData.item = null;
 		}
-	})
-
-
-	function dingyue() {
-		return new Promise((revlove, reject) => {
-			uni.requestSubscribeMessage({
-				tmplIds: ['JGPAGmqcPEgWB6mvAl0SC5cMqr5H5Qjcim8JCpHAZd0',
-					'F4OyUhe_ZQ9BR731jlkaN2QXAUaA3HBZuUeVPfraSz0'
-				],
-				success(res) {},
-				complete() {
-					revlove()
-				}
-			})
-		})
-
 	}
+);
 
-	async function payExchange() {
-		uni.setStorageSync('group_buying_order', {
-			...item,
+function dingyue() {
+	return new Promise((revlove, reject) => {
+		uni.requestSubscribeMessage({
+			tmplIds: ['JGPAGmqcPEgWB6mvAl0SC5cMqr5H5Qjcim8JCpHAZd0', 'F4OyUhe_ZQ9BR731jlkaN2QXAUaA3HBZuUeVPfraSz0'],
+			success(res) {},
+			complete() {
+				revlove();
+			}
+		});
+	});
+}
+
+async function payExchange() {
+	uni.setStorageSync('group_buying_order', {
+		...item,
+		number: number.value,
+		groupOrderNo: popupData.item ? popupData.item.groupOrderNo : ''
+	});
+	uni.navigateTo({
+		url: '/groupBuying/confirm-order/confirm-order'
+	});
+	return;
+	await dingyue();
+	uni.showLoading({
+		title: '支付中……'
+	});
+	const openId = await getOpenId();
+	uni.hideLoading();
+	if (openId) {
+		Api.exchange({
+			paramId: item.id,
+			shopId: item.shopId,
 			number: number.value,
 			groupOrderNo: popupData.item ? popupData.item.groupOrderNo : '',
-		})
-		uni.navigateTo({
-			url: '/groupBuying/confirm-order/confirm-order'
-		})
-		return
-		await dingyue();
-		uni.showLoading({
-			title: '支付中……'
-		})
-		const openId = await getOpenId()
-		uni.hideLoading()
-		if (openId) {
-			Api.exchange({
-				paramId: item.id,
-				shopId: item.shopId,
-				number: number.value,
-				groupOrderNo: popupData.item ? popupData.item.groupOrderNo : '',
-				openId
-			}).then(orderRes => {
-				popupData.show = false;
-				pay(orderRes.payInfo).then(res => {
-					console.log(res)
+			openId
+		}).then((orderRes) => {
+			popupData.show = false;
+			pay(orderRes.payInfo).then((res) => {
+				console.log(res);
 
-					if (res) {
-						uni.redirectTo({
-							url: '/groupBuying/success/index?detailId=' + orderRes.record
-								.id
-						})
-					} else {
-						uni.showToast({
-							title: '开团失败',
-							icon: 'none'
-						})
-					}
-
-				})
-
-			})
-		} else {
-			uni.showToast({
-				title: '鉴权失败，兑换失败',
-				icon: 'none'
-			})
-		}
+				if (res) {
+					uni.redirectTo({
+						url: '/groupBuying/success/index?detailId=' + orderRes.record.id
+					});
+				} else {
+					uni.showToast({
+						title: '开团失败',
+						icon: 'none'
+					});
+				}
+			});
+		});
+	} else {
+		uni.showToast({
+			title: '鉴权失败，兑换失败',
+			icon: 'none'
+		});
 	}
+}
 
+const item = reactive({
+	goodsDescription: []
+});
 
-	const item = reactive({
-		goodsDescription: []
-	})
-
-	const isCanExchange = computed(() => {
-
-		if (item.quantity <= 0) {
-			return false
-		}
-		if (item.limitQuota && item.boughtCount >= item.limitQuota) {
-			return false
-		}
-		return true
-	})
-
-	const returnBtmText = computed(() => {
-		if (isCanExchange.value) {
-			return '立即开团'
-		}
-		if (pointsUser.pointBalance < item.requiredPoints) {
-			const num = item.requiredPoints - pointsUser.pointBalance
-			return `积分不足，还差${num}积分`
-		}
-		if (item.quantity <= 0) {
-			return `库存不足`
-		}
-		if (item.limitQuota && item.boughtCount >= item.limitQuota) {
-			return `单人兑换已达上限`
-		}
-	})
-
-
-	const query = reactive({
-		shopId: '',
-		wareId: '',
-		groupOrderNo: ''
-	})
-
-
-	const coverImgs = ref([])
-
-	async function init(opt) {
-		// 获取小程序进入场景和参数
-		const launchOptions = uni.getLaunchOptionsSync();
-		console.log(launchOptions);
-		// 获取链接上的参数
-		const launchOptionsQuery = launchOptions.query;
-		console.log('launchOptionsQuery', launchOptionsQuery);
-		Object.assign(query, launchOptionsQuery)
-		console.log(opt)
-		Object.assign(query, opt)
-		console.log(query)
-		await storelogin.actionslogin()
-		getDetail()
+const isCanExchange = computed(() => {
+	if (item.quantity <= 0) {
+		return false;
 	}
-
-	function getDetail() {
-		Api.wareDetail(query).then(res => {
-			console.log('res',res)
-			if(!res){
-				uni.showModal({
-					title:'提示',
-					content:'当前商品已下架',
-					showCancel:false,
-					success() {
-						uni.redirectTo({
-							url:'/groupBuying/index/index'
-						})
-					}
-				})
-			}
-			
-			res.wareCommentImgs = res.wareCommentImgs.split(',').filter(v => v)
-			Object.assign(item, res)
-			console.log(item)
-			coverImgs.value = res.wareImgs.split(',')
-			uni.cache.set('shopId',item.shopId)
-		})
+	if (item.limitQuota && item.boughtCount >= item.limitQuota) {
+		return false;
 	}
+	return true;
+});
 
-
-	/**
-	 * 计算剩余时间差（毫秒）
-	 * @param {Object} item - 包含groupEndTime的订单/拼团对象
-	 * @returns {number} 剩余时间（毫秒）
-	 */
-	function returnRemainingTime(item) {
-		if (!item?.groupEndTime) return 0; // 容错：无结束时间则返回0
-		return dayjs(item.groupEndTime).valueOf() - dayjs().valueOf();
+const returnBtmText = computed(() => {
+	if (isCanExchange.value) {
+		return '立即开团';
 	}
-
-	/**
-	 * 将毫秒差格式化为 HH:MM:SS（最多72小时）
-	 * @param {number} ms - 时间差（毫秒）
-	 * @returns {string} 格式化后的时分秒（如 09:09:09、72:00:00、00:00:00）
-	 */
-	function formatTimeToHMS(ms) {
-		// 边界1：已过期/无剩余时间 → 显示00:00:00
-		if (ms <= 0) return '00:00:00';
-
-		// 边界2：超过72小时 → 按72小时算（72*60*60*1000 = 259200000毫秒）
-		const maxMs = 72 * 60 * 60 * 1000;
-		const validMs = Math.min(ms, maxMs);
-
-		// 转换为总秒数（取整，避免小数）
-		const totalSeconds = Math.floor(validMs / 1000);
-
-		// 拆解小时、分钟、秒
-		const hours = Math.floor(totalSeconds / 3600);
-		const remainingSeconds = totalSeconds % 3600;
-		const minutes = Math.floor(remainingSeconds / 60);
-		const seconds = remainingSeconds % 60;
-
-		// 补零（确保两位数，如 9 → 09）
-		const pad = (num) => String(num).padStart(2, '0');
-		return `${pad(hours)}:${pad(minutes)}:${pad(seconds)}`;
+	if (pointsUser.pointBalance < item.requiredPoints) {
+		const num = item.requiredPoints - pointsUser.pointBalance;
+		return `积分不足，还差${num}积分`;
 	}
-
-
-	let timer = null
-	let nowTime = ref(Date.now())
-	timer = setInterval(() => {
-		nowTime.value = Date.now()
-	}, 1000)
-
-	// 组合使用：获取格式化后的剩余时间
-	function getRemainingHMS(item) {
-		nowTime.value
-		const ms = returnRemainingTime(item);
-		return formatTimeToHMS(ms);
+	if (item.quantity <= 0) {
+		return `库存不足`;
 	}
-
-
-	function returnNeedPerpole(data) {
-		return data.groupPeopleNum - data.currentPeopleNum
+	if (item.limitQuota && item.boughtCount >= item.limitQuota) {
+		return `单人兑换已达上限`;
 	}
+});
 
+const query = reactive({
+	shopId: '',
+	wareId: '',
+	groupOrderNo: ''
+});
 
-	onLoad(init)
-	// #ifdef MP-WEIXIN
-	uni.showShareMenu()
-	// #endif
-	onShareAppMessage(() => {
+const coverImgs = ref([]);
 
-		const query = `wareId=${item.id}&shopId=${item.shopId}`
-		return wxShare({
-			title: item.wareName,
-			imageUrl: coverImgs.value[0],
-			path: '/groupBuying/goodsDetail/goodsDetail' + '?' + query,
-			query,
-		})
-	})
+async function init(opt) {
+	// 获取小程序进入场景和参数
+	const launchOptions = uni.getLaunchOptionsSync();
+	console.log(launchOptions);
+	// 获取链接上的参数
+	const launchOptionsQuery = launchOptions.query;
+	console.log('launchOptionsQuery', launchOptionsQuery);
+	Object.assign(query, launchOptionsQuery);
+	console.log(opt);
+	Object.assign(query, opt);
+	console.log(query);
+	await storelogin.actionslogin();
+	getDetail();
+}
+
+function getDetail() {
+	Api.wareDetail(query).then((res) => {
+		console.log('res', res);
+		if (!res) {
+			uni.showModal({
+				title: '提示',
+				content: '当前商品已下架',
+				showCancel: false,
+				success() {
+					uni.redirectTo({
+						url: '/groupBuying/index/index'
+					});
+				}
+			});
+		}
+
+		res.wareCommentImgs = res.wareCommentImgs.split(',').filter((v) => v);
+		Object.assign(item, res);
+		console.log(item);
+		coverImgs.value = res.wareImgs.split(',');
+		uni.cache.set('shopId', item.shopId);
+	});
+}
+
+/**
+ * 计算剩余时间差（毫秒）
+ * @param {Object} item - 包含groupEndTime的订单/拼团对象
+ * @returns {number} 剩余时间（毫秒）
+ */
+function returnRemainingTime(item) {
+	if (!item?.groupEndTime) return 0; // 容错：无结束时间则返回0
+	return dayjs(item.groupEndTime).valueOf() - dayjs().valueOf();
+}
+
+/**
+ * 将毫秒差格式化为 HH:MM:SS（最多72小时）
+ * @param {number} ms - 时间差（毫秒）
+ * @returns {string} 格式化后的时分秒（如 09:09:09、72:00:00、00:00:00）
+ */
+function formatTimeToHMS(ms) {
+	// 边界1：已过期/无剩余时间 → 显示00:00:00
+	if (ms <= 0) return '00:00:00';
+
+	// 边界2：超过72小时 → 按72小时算（72*60*60*1000 = 259200000毫秒）
+	const maxMs = 72 * 60 * 60 * 1000;
+	const validMs = Math.min(ms, maxMs);
+
+	// 转换为总秒数（取整，避免小数）
+	const totalSeconds = Math.floor(validMs / 1000);
+
+	// 拆解小时、分钟、秒
+	const hours = Math.floor(totalSeconds / 3600);
+	const remainingSeconds = totalSeconds % 3600;
+	const minutes = Math.floor(remainingSeconds / 60);
+	const seconds = remainingSeconds % 60;
+
+	// 补零（确保两位数，如 9 → 09）
+	const pad = (num) => String(num).padStart(2, '0');
+	return `${pad(hours)}:${pad(minutes)}:${pad(seconds)}`;
+}
+
+let timer = null;
+let nowTime = ref(Date.now());
+timer = setInterval(() => {
+	nowTime.value = Date.now();
+}, 1000);
+
+// 组合使用：获取格式化后的剩余时间
+function getRemainingHMS(item) {
+	nowTime.value;
+	const ms = returnRemainingTime(item);
+	return formatTimeToHMS(ms);
+}
+
+function returnNeedPerpole(data) {
+	return data.groupPeopleNum - data.currentPeopleNum;
+}
+
+onShareAppMessage(async () => {
+	let query = await returnQuery();
+	// query += `&wareId=${item.id}&shopId=${item.shopId}`;
+	const options = {
+		title: item.wareName,
+		imageUrl: coverImgs.value[0],
+		path: '/groupBuying/goodsDetail/goodsDetail' + '?' + decodeURIComponent(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>
-	$topHeight: 350rpx;
+$topHeight: 350rpx;
 
-	.top-img {
-		width: 750rpx;
-		height: $topHeight;
+.top-img {
+	width: 750rpx;
+	height: $topHeight;
+}
+
+.top {
+	margin: 14rpx 18rpx;
+	background-size: cover;
+	height: $topHeight;
+	box-sizing: border-box;
+	padding-left: 70rpx;
+	padding-top: 95rpx;
+
+	.name {
+		color: #000000;
+		font-size: 36rpx;
+		font-weight: 700;
 	}
 
-	.top {
-		margin: 14rpx 18rpx;
-		background-size: cover;
-		height: $topHeight;
-		box-sizing: border-box;
-		padding-left: 70rpx;
-		padding-top: 95rpx;
+	.info {
+		color: #333333;
+		font-size: 48rpx;
+		font-weight: 700;
+		margin-top: 62rpx;
+	}
+}
 
-		.name {
-			color: #000000;
-			font-size: 36rpx;
-			font-weight: 700;
-		}
+.sku {
+	display: flex;
+	justify-content: space-between;
+	padding: 20rpx 36rpx;
+	align-items: center;
+	background: linear-gradient(90deg, #ff4a63 0%, #fd1f48 100%);
 
-		.info {
-			color: #333333;
-			font-size: 48rpx;
-			font-weight: 700;
-			margin-top: 62rpx;
-		}
+	.price {
+		color: #fff;
+		font-weight: 700;
+		font-size: 40rpx;
 	}
 
-	.sku {
-		display: flex;
-		justify-content: space-between;
-		padding: 20rpx 36rpx;
-		align-items: center;
-		background: linear-gradient(90deg, #ff4a63 0%, #fd1f48 100%);
+	.old-price {
+		margin-left: 16rpx;
+		color: #e7e7e7;
+		opacity: 0.85;
+		font-weight: 700;
+		text-decoration: line-through;
+	}
+
+	.text {
+		color: #fff;
+		font-size: 28rpx;
+	}
+}
+
+.goods {
+	padding: 20rpx 28rpx;
+	background: #fff;
+
+	.goods-name {
+		font-size: 32rpx;
+		font-weight: 700;
+		color: #333;
+	}
+}
+
+.desc {
+	padding: 32rpx 28rpx;
+	background-color: #fff;
+}
+
+.goods-detail {
+	padding: 32rpx;
+
+	.title {
+		position: relative;
+		padding: 0 22rpx;
+
+		&::before {
+			content: '';
+			display: block;
+			position: absolute;
+			right: 100%;
+			width: 70rpx;
+			height: 2rpx;
+			top: 50%;
+			transform: translateY(-50%);
+			background: linear-gradient(90deg, #f7f8f9 0%, #c9cbcc 100%);
+		}
+
+		&::after {
+			left: 100%;
+			content: '';
+			position: absolute;
+			top: 50%;
+			transform: translateY(-50%);
+			display: block;
+			width: 70rpx;
+			height: 2rpx;
+			background: linear-gradient(90deg, #c9cbcc 0%, #f7f8f9 100%);
+		}
+	}
+}
+
+.fixed-bottom {
+	position: fixed;
+	background-color: #fff;
+	left: 0;
+	right: 0;
+	padding-bottom: 30px;
+	padding-top: 32rpx;
+	background-color: #fff;
+	bottom: 0;
+	z-index: 10;
+
+	.btn {
+		padding: 22rpx;
+		border-radius: 200rpx;
+		font-size: 32rpx;
+		color: #fff;
+		width: 556rpx;
+		text-align: center;
+		background-color: #e8ad7b;
+
+		&.gray {
+			background: #9999992b;
+			color: #999999;
+		}
+	}
+}
+
+.waring {
+	background-color: rgba(255, 204, 0, 0.09);
+	padding: 32rpx 24rpx;
+	color: #ff8d28;
+}
+
+.popup-content {
+	font-size: 28rpx;
+	min-height: 300px;
+
+	.popup-content-top {
+		padding: 32rpx 28rpx;
+		border-bottom: 1px solid #ededed;
+	}
+
+	.goods-info {
+		padding: 32rpx 28rpx;
+		border-bottom: 1px solid #ededed;
+
+		.cover {
+			width: 184rpx;
+			height: 184rpx;
+			border-radius: 16rpx;
+			background: #d9d9d9;
+
+			&.bg-fff {
+				background-color: #fff;
+			}
+		}
 
 		.price {
-			color: #fff;
+			font-size: 32rpx;
 			font-weight: 700;
-			font-size: 40rpx;
+			color: #ed5a2e;
+			line-height: 46rpx;
 		}
 
 		.old-price {
-			margin-left: 16rpx;
-			color: #E7E7E7;
-			opacity: .85;
-			font-weight: 700;
-			text-decoration: line-through;
+			font-size: 32rpx;
+			color: #999;
+			text-decoration-line: line-through;
+			line-height: 48rpx;
 		}
 
-		.text {
-			color: #fff;
-			font-size: 28rpx;
+		.limitBuyNum {
+			color: #666;
+			line-height: 42rpx;
 		}
 	}
 
-	.goods {
-		padding: 20rpx 28rpx;
-		background: #fff;
+	.bottom {
+		padding: 20rpx;
+		border-bottom: 1px solid #ededed;
 
-		.goods-name {
+		.price {
+			color: #ed5a2e;
 			font-size: 32rpx;
 			font-weight: 700;
-			color: #333;
 		}
 	}
 
-
-
-	.desc {
-		padding: 32rpx 28rpx;
-		background-color: #fff;
+	.btn {
+		display: flex;
+		padding: 22rpx 214rpx;
+		align-items: flex-start;
+		gap: 20rpx;
+		border-radius: 66rpx;
+		background: #e8ad7b;
+		font-size: 32rpx;
+		color: #fff;
+		font-size: 700;
 	}
+}
 
-	.goods-detail {
-		padding: 32rpx;
+.w-full {
+	width: 100%;
+}
 
-		.title {
-			position: relative;
-			padding: 0 22rpx;
+.groups {
+	padding: 28rpx 22rpx;
+	background-color: #fff;
 
-			&::before {
-				content: "";
-				display: block;
-				position: absolute;
-				right: 100%;
-				width: 70rpx;
-				height: 2rpx;
-				top: 50%;
-				transform: translateY(-50%);
-				background: linear-gradient(90deg, #f7f8f9 0%, #c9cbcc 100%);
-			}
+	.item {
+		padding: 28rpx 0;
+		border-bottom: 2rpx solid #ededed;
 
-			&::after {
-				left: 100%;
-				content: "";
-				position: absolute;
-				top: 50%;
-				transform: translateY(-50%);
-				display: block;
-				width: 70rpx;
-				height: 2rpx;
-				background: linear-gradient(90deg, #c9cbcc 0%, #f7f8f9 100%);
-			}
+		&:last-child {
+			border-bottom: none;
+		}
+
+		.main-color {
+			color: #ed5a2e;
+		}
+
+		.btn {
+			padding: 8rpx 26rpx;
+			border-radius: 36rpx;
+			background: #e8ad7b;
+			font-weight: 700;
+			color: #fff;
 		}
 	}
-
-	.fixed-bottom {
-		position: fixed;
-		background-color: #fff;
+}
+.share-box {
+	top: 0;
+	position: absolute;
+	right: 0;
+	padding: 4rpx 30rpx;
+	border-radius: 0 0 0 24rpx;
+	color: #ed5a2e;
+	font-weight: 700;
+	background: #fff;
+	overflow: hidden;
+	.share {
+		position: absolute;
 		left: 0;
 		right: 0;
-		padding-bottom: 30px;
-		padding-top: 32rpx;
-		background-color: #fff;
-		bottom: 0;
-		z-index: 10;
-
-
-		.btn {
-			padding: 22rpx;
-			border-radius: 200rpx;
-			font-size: 32rpx;
-			color: #fff;
-			width: 556rpx;
-			text-align: center;
-			background-color: #E8AD7B;
-
-			&.gray {
-				background: #9999992b;
-				color: #999999;
-			}
-		}
-	}
-
-	.waring {
-		background-color: rgba(255, 204, 0, 0.09);
-		padding: 32rpx 24rpx;
-		color: #ff8d28;
-	}
-
-	.popup-content {
-		font-size: 28rpx;
-		min-height: 300px;
-
-		.popup-content-top {
-			padding: 32rpx 28rpx;
-			border-bottom: 1px solid #ededed;
-		}
-
-		.goods-info {
-			padding: 32rpx 28rpx;
-			border-bottom: 1px solid #ededed;
-
-			.cover {
-				width: 184rpx;
-				height: 184rpx;
-				border-radius: 16rpx;
-				background: #d9d9d9;
-
-				&.bg-fff {
-					background-color: #fff;
-				}
-			}
-
-			.price {
-				font-size: 32rpx;
-				font-weight: 700;
-				color: #ed5a2e;
-				line-height: 46rpx;
-			}
-
-			.old-price {
-				font-size: 32rpx;
-				color: #999;
-				text-decoration-line: line-through;
-				line-height: 48rpx;
-			}
-
-			.limitBuyNum {
-				color: #666;
-				line-height: 42rpx;
-			}
-
-		}
-
-		.bottom {
-			padding: 20rpx;
-			border-bottom: 1px solid #ededed;
-
-			.price {
-				color: #ed5a2e;
-				font-size: 32rpx;
-				font-weight: 700;
-			}
-		}
-
-		.btn {
-			display: flex;
-			padding: 22rpx 214rpx;
-			align-items: flex-start;
-			gap: 20rpx;
-			border-radius: 66rpx;
-			background: #e8ad7b;
-			font-size: 32rpx;
-			color: #fff;
-			font-size: 700;
-		}
-	}
-
-	.w-full {
-		width: 100%;
-	}
-
-	.groups {
-		padding: 28rpx 22rpx;
-		background-color: #fff;
-
-		.item {
-			padding: 28rpx 0;
-			border-bottom: 2rpx solid #EDEDED;
-
-			&:last-child {
-				border-bottom: none;
-			}
-
-			.main-color {
-				color: #ed5a2e;
-			}
-
-			.btn {
-				padding: 8rpx 26rpx;
-				border-radius: 36rpx;
-				background: #E8AD7B;
-				font-weight: 700;
-				color: #fff;
-			}
-		}
-	}
-	.share-box{
 		top: 0;
-		position: absolute;
-		right: 0;
-		padding: 4rpx 30rpx;
-		border-radius: 0 0 0 24rpx;
-		 color: #ed5a2e; font-weight: 700;
-		background: #FFF;
-		overflow: hidden;
-		.share{
-			position: absolute;
-			left:0;
-			right: 0;
-			top:0;
-			bottom: 0;
-			opacity: 0;
-		}
+		bottom: 0;
+		opacity: 0;
 	}
-</style>
\ No newline at end of file
+}
+</style>
diff --git a/groupBuying/index/index.vue b/groupBuying/index/index.vue
index b748001..f9c2549 100644
--- a/groupBuying/index/index.vue
+++ b/groupBuying/index/index.vue
@@ -2,71 +2,63 @@
 	<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()"
-					left-icon-color="#fff" title-color="#fff"></up-navbar>
+				<up-navbar bg-color="transparent" :fixed="false" :placeholder="false" title="拼团特惠" @leftClick="back()" 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>
+					<view class="u-line-1 u-m-l-20">{{ shopInfo.shopName || '' }}</view>
 				</view>
 			</view>
 			<view class="translateY20">
 				<view class="steps">
-					<view class="step" v-for="(item,index) in steps" :key="index">
-						<text class="index">{{index+1}}</text>
-						<text class="text">{{item}}</text>
-						<template v-if="index<steps.length-1">
+					<view class="step" v-for="(item, index) in steps" :key="index">
+						<text class="index">{{ index + 1 }}</text>
+						<text class="text">{{ item }}</text>
+						<template v-if="index < steps.length - 1">
 							<text class="icon">
-								{{'>'}}
+								{{ '>' }}
 							</text>
 							<text class="icon icon1">
-								{{'>'}}
+								{{ '>' }}
 							</text>
 						</template>
 					</view>
 				</view>
-				<view class="filters ">
+				<view class="filters">
 					<view class="u-flex tabs">
-						<view class="tab" v-for="(item,index) in tabs.list" :class="{'active':tabs.sel==index}"
-							@click="tabs.sel=index">{{item}}</view>
+						<view class="tab" v-for="(item, index) in tabs.list" :class="{ active: tabs.sel == index }" @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"
-							@custom="refresh"></up-search>
+					<view class="u-flex u-col-center" v-if="tabs.sel == 0">
+						<up-search v-model="query.wareName" @search="refresh" @clear="refresh" @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}"
-							v-for="(item,index) in orders.list" :key="index" @click="orders.sel=index">
-							{{item.name}}
+					<view class="u-flex orderStatus" v-if="tabs.sel == 1">
+						<view class="orderState" :class="{ active: 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)">
-
+		<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">
-						<text class="numbers">{{item.groupPeopleNum}}人团</text>
-						<text class="u-line-1 font-bold u-m-l-18 name">{{item.wareName}}</text>
+						<text class="numbers">{{ item.groupPeopleNum }}人团</text>
+						<text class="u-line-1 font-bold u-m-l-18 name">{{ item.wareName }}</text>
 					</view>
-					<view class="members">已团：{{item.groupedNum}}</view>
+					<view class="members">已团：{{ item.groupedNum }}</view>
 					<view class="info">
 						<view class="left">
 							<view class="">
 								<text class="u-font-24">拼团到手</text>
-								<text class="u-font-32 font-bold"> ¥{{item.groupPrice}}</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>
+								<text class="">¥{{ item.originalPrice }}</text>
 							</view>
 						</view>
 						<view class="right">
@@ -77,614 +69,590 @@
 			</view>
 		</view>
 
-		<view class="orders" v-else-if="tabs.sel==1">
-			<view class="item" v-for="(item,index) in list" :key="index" @click="toOrderDetail(item)">
+		<view class="orders" v-else-if="tabs.sel == 1">
+			<view class="item" v-for="(item, index) in list" :key="index" @click="toOrderDetail(item)">
 				<view class="u-flex u-col-center u-row-between">
-					<text class="numbers">{{item.groupPeopleNum}}人团</text>
+					<text class="numbers">{{ item.groupPeopleNum }}人团</text>
 					<statusVue :status="item.status"></statusVue>
 				</view>
 				<view class="u-m-t-32 u-flex">
 					<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="u-m-t-34 price">¥{{item.payAmount}}</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>
+						<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">
 						<text class="title">可核销门店：</text>
-						<text class="stitle">{{item.shopName}}</text>
+						<text class="stitle">{{ item.shopName }}</text>
 					</view>
 					<view class="u-flex u-m-t-32 u-col-center">
-						<text class="title ">门店地址：</text>
-						<text class="stitle">{{item.shopAddress}}</text>
+						<text class="title">门店地址：</text>
+						<text class="stitle">{{ item.shopAddress }}</text>
 					</view>
-					<view class="u-flex u-m-t-32 u-col-center" v-if="item.groupEndTime&&item.wareGroupStatus=='success'">
+					<view class="u-flex u-m-t-32 u-col-center" v-if="item.groupEndTime && item.wareGroupStatus == 'success'">
 						<text class="title">成团时间：</text>
-						<text class="stitle ">{{item.groupEndTime}}</text>
+						<text class="stitle">{{ item.groupEndTime }}</text>
 					</view>
 					<view class="u-flex u-m-t-32 u-col-center" v-if="showTime(item)">
 						<text class="title">剩余成团时间：</text>
-						<text class="stitle price">{{returnTime(item)}}</text>
+						<text class="stitle price">{{ returnTime(item) }}</text>
 					</view>
 				</view>
 				<view class="btns" v-if="showBtns(item)">
-					<template v-if="item.status=='待核销'">
-						<view class="btn " @click.stop="lookCode(item)">查看券码</view>
+					<template v-if="item.status == '待核销'">
+						<view class="btn" @click.stop="lookCode(item)">查看券码</view>
 						<button class="btn black" @click.stop="refund(item)">申请退款</button>
 					</template>
-					<template v-else-if="item.status=='退款中'">
-						<view class="btn " @click.stop="lookCode(item)">查看券码</view>
+					<template v-else-if="item.status == '退款中'">
+						<view class="btn" @click.stop="lookCode(item)">查看券码</view>
 						<view class="btn black" @click.stop="cancelRefund(item)">取消退款</view>
 					</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)"
-							v-if="showShare(item)">邀请好友</button>
+						<view class="btn" @click.stop="refund(item)" v-if="canRefund(item)">申请退款</view>
+						<button open-type="share" class="btn black" @click.stop="share(item)" v-if="showShare(item)">邀请好友</button>
 					</template>
-
 				</view>
 			</view>
-
 		</view>
 
-
-
 		<LookQrcode v-model="modalData.show" :qrcode="qrcode"></LookQrcode>
 	</view>
 </template>
 
 <script setup>
-	import {
-		APIusershopInfodetail
-	} from '@/common/api/member.js'
-	import {
-		back
-	} from '@/utils/uniapp.js'
-	import LookQrcode from "@/components/look-qrcode/look-qrcode.vue";
-	import {
-		wxShare
-	} from '@/utils/share.js'
-	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'
+import { APIusershopInfodetail } from '@/common/api/member.js';
+import { back } from '@/utils/uniapp.js';
+import LookQrcode from '@/components/look-qrcode/look-qrcode.vue';
+import { wxShare } from '@/utils/share.js';
+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 false
+function canRefund(item) {
+	if (canRefundStatus.includes(item.status)) {
+		return true;
 	}
-	const modalData = reactive({
-		show: false,
+	return false;
+}
+const modalData = reactive({
+	show: false
+});
+const qrcode = ref('');
+
+function lookCode(item) {
+	qrcode.value = item.verifyCode;
+	modalData.show = true;
+}
+
+const imgs = {
+	bg: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/d21f2dfd7bec44618f2d5e4b88372b08.png',
+	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 steps = ['发起拼团', '邀请好友', '成团优惠'];
+
+const topStyle = {
+	backgroundImage: 'url(' + imgs.bg + ')'
+};
+const tabs = reactive({
+	list: ['活动列表', '我的拼团'],
+	sel: 0
+});
+const orders = reactive({
+	list: [
+		{
+			name: '全部',
+			value: ''
+		},
+		{
+			name: '待成团',
+			value: '待成团'
+		},
+		{
+			name: '待核销',
+			value: '待核销'
+		},
+		{
+			name: '已核销',
+			value: '已核销'
+		},
+		{
+			name: '退款',
+			value: '退款'
+		}
+	],
+	sel: 0
+});
+
+const query = reactive({
+	page: 1,
+	size: 10,
+	wareName: '',
+	groupPeopleNum: '',
+	shopId: uni.cache.get('shopId')
+});
+
+const list = ref([]);
+const isEnd = ref(false);
+
+const status = computed(() => {
+	return orders.list[orders.sel].value;
+});
+
+watch(
+	() => status.value,
+	() => {
+		refresh();
+	}
+);
+
+function getData() {
+	if (tabs.sel == 0) {
+		Api.warePage(query).then((res) => {
+			const newArr = res.records || [];
+			if (query.page == 1) {
+				list.value = newArr;
+			} else {
+				list.value.push(...newArr);
+			}
+			isEnd.value = query.page >= res.totalPage * 1 ? true : false;
+		});
+		return;
+	}
+	if (tabs.sel == 1) {
+		const { page, size, shopId } = query;
+		Api.record({
+			page,
+			size,
+			shopId,
+			status: status.value
+		}).then((res) => {
+			const newArr = (res.records || []).map((v) => {
+				const wareJson = JSON.parse(v.wareJson);
+				wareJson.wareImgs = wareJson.wareImgs.split(',').filter((v) => v);
+				return {
+					...v,
+					goodsImg: wareJson.wareImgs[0],
+					wareJson
+				};
+			});
+
+			if (query.page == 1) {
+				list.value = newArr;
+			} else {
+				list.value.push(...newArr);
+			}
+			console.log(list.value);
+			isEnd.value = query.page >= res.totalPage * 1 ? true : false;
+		});
+		return;
+	}
+}
+
+function toDetail(item) {
+	uni.navigateTo({
+		url: '/groupBuying/goodsDetail/goodsDetail?wareId=' + item.id + '&shopId=' + item.shopId
 	});
-	const qrcode = ref("");
+}
 
-	function lookCode(item) {
-		qrcode.value = item.verifyCode
-		modalData.show = true;
+function toOrderDetail(item) {
+	uni.navigateTo({
+		url: '/groupBuying/detail/index?detailId=' + item.id + '&shopId=' + item.shopId
+	});
+}
+
+function returnCoverImg(item) {
+	if (!item.wareImgs) {
+		return '';
 	}
+	const arr = item.wareImgs.split(',');
+	return arr[0];
+}
 
-	const imgs = {
-		bg: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/d21f2dfd7bec44618f2d5e4b88372b08.png',
-		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'
-	}
+function refresh() {
+	query.page = 1;
+	isEnd.value = false;
+	getData();
+}
 
-	const shopInfo = ref({})
-
-	const steps = ['发起拼团', '邀请好友', '成团优惠']
-
-	const topStyle = {
-		backgroundImage: 'url(' + imgs.bg + ')'
-	}
-	const tabs = reactive({
-		list: ['活动列表', '我的拼团'],
-		sel: 0
-	})
-	const orders = reactive({
-		list: [{
-				name: '全部',
-				value: ''
-			},
-			{
-				name: '待成团',
-				value: '待成团'
-			},
-			{
-				name: '待核销',
-				value: '待核销'
-			},
-			{
-				name: '已核销',
-				value: '已核销'
-			},
-			{
-				name: '退款',
-				value: '退款'
-			},
-		],
-		sel: 0
-	})
-
-	const query = reactive({
-		page: 1,
-		size: 10,
-		wareName: '',
-		groupPeopleNum: '',
-		shopId: uni.cache.get('shopId'),
-	})
-
-	const list = ref([])
-	const isEnd = ref(false)
-
-	const status = computed(() => {
-		return orders.list[orders.sel].value
-	})
-
-	watch(() => status.value, () => {
-		refresh()
-	})
-
-	function getData() {
-		if (tabs.sel == 0) {
-			Api.warePage(query).then(res => {
-				const newArr = res.records || []
-				if (query.page == 1) {
-					list.value = newArr
-				} else {
-					list.value.push(...newArr)
-				}
-				isEnd.value = query.page >= res.totalPage * 1 ? true : false
-			})
-			return
-		}
-		if (tabs.sel == 1) {
-			const {
-				page,
-				size,
-				shopId
-			} = query
-			Api.record({
-				page,
-				size,
-				shopId,
-				status: status.value,
-			}).then(res => {
-				const newArr = (res.records || []).map(v => {
-					const wareJson = JSON.parse(v.wareJson)
-					wareJson.wareImgs = wareJson.wareImgs.split(',').filter(v => v)
-					return {
-						...v,
-						goodsImg: wareJson.wareImgs[0],
-						wareJson,
+function refund(item) {
+	uni.showModal({
+		title: '提示',
+		content: '是否申请退款？',
+		showCancel: true,
+		success(res) {
+			if (res.confirm) {
+				Api.applyRefund({
+					recordId: item.id,
+					orderNo: item.orderNo
+				}).then((res) => {
+					if (res) {
+						uni.showToast({
+							title: '申请成功'
+						});
+						setTimeout(() => {
+							refresh();
+						}, 1000);
 					}
-				})
-
-				if (query.page == 1) {
-					list.value = newArr
-				} else {
-					list.value.push(...newArr)
-				}
-				console.log(list.value)
-				isEnd.value = query.page >= res.totalPage * 1 ? true : false
-			})
-			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 ''
-		}
-		const arr = item.wareImgs.split(',')
-		return arr[0]
-	}
-
-	function refresh() {
-		query.page = 1
-		isEnd.value = false
-		getData()
-	}
-
-	function refund(item) {
-		uni.showModal({
-			title: '提示',
-			content: '是否申请退款？',
-			showCancel: true,
-			success(res) {
-				if (res.confirm) {
-					Api.applyRefund({
-						recordId: item.id,
-						orderNo: item.orderNo,
-					}).then(res => {
-						if (res) {
-							uni.showToast({
-								title: '申请成功'
-							})
-							setTimeout(() => {
-								refresh()
-							}, 1000)
-						}
-					})
-				}
+				});
 			}
-		})
-	}
+		}
+	});
+}
 
-	function cancelRefund(item) {
-		uni.showModal({
-			title: '提示',
-			content: '是否取消退款？',
-			showCancel: true,
-			success(res) {
-				if (res.confirm) {
-					Api.cancelRefund({
-						recordId: item.id,
-						orderNo: item.orderNo,
-					}).then(res => {
-						if (res) {
-							uni.showToast({
-								title: '取消成功'
-							})
-							setTimeout(() => {
-								refresh()
-							}, 1000)
-						}
-					})
-				}
+function cancelRefund(item) {
+	uni.showModal({
+		title: '提示',
+		content: '是否取消退款？',
+		showCancel: true,
+		success(res) {
+			if (res.confirm) {
+				Api.cancelRefund({
+					recordId: item.id,
+					orderNo: item.orderNo
+				}).then((res) => {
+					if (res) {
+						uni.showToast({
+							title: '取消成功'
+						});
+						setTimeout(() => {
+							refresh();
+						}, 1000);
+					}
+				});
 			}
-		})
-	}
-	watch(() => tabs.sel, (newval) => {
-		orders.sel = 0
-		refresh()
-	})
-
-	function showBtns(item) {
-		if (item.status == '已退款') {
-			return false
 		}
-		return true
+	});
+}
+watch(
+	() => tabs.sel,
+	(newval) => {
+		orders.sel = 0;
+		refresh();
 	}
+);
 
-	function showShare(item) {
-		if (item.status == '待成团') {
-			return true
-		}
-		return false
+function showBtns(item) {
+	if (item.status == '已退款') {
+		return false;
 	}
+	return true;
+}
 
-	function showTime(item) {
-		if (item.status == '待成团') {
-			return true
-		}
-		return false
+function showShare(item) {
+	if (item.status == '待成团') {
+		return true;
 	}
+	return false;
+}
 
-
-	let shareItem = null
-
-	function share(item) {
-		shareItem = item
+function showTime(item) {
+	if (item.status == '待成团') {
+		return true;
 	}
+	return false;
+}
 
-	onShareAppMessage(() => {
-		console.log('onShareAppMessage')
-		console.log(shareItem)
-		const query = `groupOrderNo=${shareItem.groupOrderNo}&shopId=${shareItem.shopId}`
-		return wxShare({
-			title: shareItem.wareJson.wareName,
-			imageUrl: shareItem.goodsImg,
-			path: '/groupBuying/detail/index' + '?' + query,
-			query,
-		})
-	})
-	onShow(getData)
-	onLoad((opt) => {
-		const shopId=opt.shopId||uni.cache.get('shopId')
-		query.shopId=shopId
-		uni.cache.set('shopId',query.shopId)
-		console.log('opt',opt);
-		APIusershopInfodetail({
-			shopId: shopId
-		}).then(res => {
-			console.log(res);
-			shopInfo.value = res.shopInfo
-			uni.cache.set('shopInfo', res.shopInfo)
-			uni.cache.set('shopId', res.shopInfo.id)
-		})
-	})
+let shareItem = null;
 
-	let timer = null
-	let nowTime = ref(Date.now())
-	timer = setInterval(() => {
-		nowTime.value = Date.now()
-	}, 1000)
+function share(item) {
+	shareItem = item;
+}
 
-	function returnTime(item) {
-		nowTime.value
-		return getRemainingHMS(item)
-	}
+onShareAppMessage(() => {
+	console.log('onShareAppMessage');
+	console.log(shareItem);
+	const query = `groupOrderNo=${shareItem.groupOrderNo}&shopId=${shareItem.shopId}`;
+	return wxShare({
+		title: shareItem.wareJson.wareName,
+		imageUrl: shareItem.goodsImg,
+		path: '/groupBuying/detail/index' + '?' + query,
+		query
+	});
+});
+onShow(getData);
+onLoad((opt) => {
+	const shopId = opt.shopId || uni.cache.get('shopId');
+	query.shopId = shopId;
+	uni.cache.set('shopId', query.shopId);
+	console.log('opt', opt);
+	APIusershopInfodetail({
+		shopId: shopId
+	}).then((res) => {
+		console.log(res);
+		shopInfo.value = res.shopInfo;
+		uni.cache.set('shopInfo', res.shopInfo);
+		uni.cache.set('shopId', res.shopInfo.id);
+	});
+});
+
+let timer = null;
+let nowTime = ref(Date.now());
+timer = setInterval(() => {
+	nowTime.value = Date.now();
+}, 1000);
+
+function returnTime(item) {
+	nowTime.value;
+	return getRemainingHMS(item);
+}
 </script>
 
 <style lang="scss" scoped>
-	.top {
-		height: 422rpx;
-		background-size: cover;
+.top {
+	height: 422rpx;
+	background-size: cover;
 
-		.info {
-			padding: 32rpx 30rpx 0 30rpx;
-			color: #fff;
-			font-size: 32rpx;
-			font-weight: 700;
-		}
-
-		.map {
-			width: 48rpx;
-			height: 48rpx;
-		}
+	.info {
+		padding: 32rpx 30rpx 0 30rpx;
+		color: #fff;
+		font-size: 32rpx;
+		font-weight: 700;
 	}
 
-	.steps {
+	.map {
+		width: 48rpx;
+		height: 48rpx;
+	}
+}
+
+.steps {
+	display: flex;
+	padding: 20rpx 20rpx;
+	gap: 20rpx;
+	border-radius: 14rpx 14rpx 0 0;
+	background: linear-gradient(90deg, #fff5e6 0%, #ffd2ca 100%);
+	align-items: center;
+
+	.step {
 		display: flex;
-		padding: 20rpx 20rpx;
-		gap: 20rpx;
-		border-radius: 14rpx 14rpx 0 0;
-		background: linear-gradient(90deg, #FFF5E6 0%, #FFD2CA 100%);
 		align-items: center;
+	}
 
-		.step {
-			display: flex;
-			align-items: center;
-		}
+	.index {
+		border-radius: 60rpx;
+		color: #fff;
+		width: 44rpx;
+		height: 44rpx;
+		line-height: 44rpx;
+		text-align: center;
+		background: #e55626;
+	}
 
-		.index {
-			border-radius: 60rpx;
-			color: #fff;
-			width: 44rpx;
-			height: 44rpx;
-			line-height: 44rpx;
-			text-align: center;
-			background: #E55626;
-		}
+	.text {
+		color: #5a352f;
+		margin-left: 10rpx;
+		margin-right: 22rpx;
+		white-space: nowrap;
+	}
 
-		.text {
-			color: #5A352F;
-			margin-left: 10rpx;
-			margin-right: 22rpx;
+	.icon {
+		color: rgba(90, 53, 47, 0.42);
+	}
+
+	.icon1 {
+		color: #5a352f;
+	}
+}
+
+.lists {
+	padding: 18rpx 10rpx;
+
+	.item {
+		display: flex;
+		padding: 32rpx 16rpx;
+		border-radius: 32rpx;
+		background: #fff;
+		margin-bottom: 14rpx;
+
+		.numbers {
+			background: #4c2828;
+			padding: 8rpx 18rpx;
+			border-radius: 10rpx;
+			font-weight: 700;
+			color: #faeac6;
 			white-space: nowrap;
 		}
 
-		.icon {
-			color: rgba(90, 53, 47, 0.42);
+		.name {
+			max-width: 334rpx;
 		}
 
-		.icon1 {
-			color: #5A352F;
+		.members {
+			margin-top: 26rpx;
+			background: #fdf1cb;
+			padding: 4rpx 18rpx;
+			border-radius: 10rpx 10rpx 10rpx 0;
+			width: fit-content;
+			font-size: 24rpx;
+			font-weight: 700;
+			color: #ed5a2e;
 		}
-	}
 
-	.lists {
-		padding: 18rpx 10rpx;
-
-		.item {
+		.info {
+			background-image: url(https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/604c3f917daa41af9239145196c6d3f3.png);
+			width: 410rpx;
+			height: 102rpx;
+			background-size: cover;
+			transform: translateY(-10rpx);
 			display: flex;
-			padding: 32rpx 16rpx;
-			border-radius: 32rpx;
-			background: #FFF;
-			margin-bottom: 14rpx;
 
-			.numbers {
-				background: #4C2828;
-				padding: 8rpx 18rpx;
-				border-radius: 10rpx;
-				font-weight: 700;
-				color: #FAEAC6;
-				white-space: nowrap;
+			.left {
+				width: 306rpx;
+				color: #fff;
+				padding: 16rpx 22rpx;
 			}
 
-			.name {
-				max-width: 334rpx;
-			}
+			.right {
+				padding-left: 16rpx;
+				margin-top: 30rpx;
 
-			.members {
-				margin-top: 26rpx;
-				background: #FDF1CB;
-				padding: 4rpx 18rpx;
-				border-radius: 10rpx 10rpx 10rpx 0;
-				width: fit-content;
-				font-size: 24rpx;
-				font-weight: 700;
-				color: #ED5A2E;
-			}
-
-			.info {
-				background-image: url(https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/604c3f917daa41af9239145196c6d3f3.png);
-				width: 410rpx;
-				height: 102rpx;
-				background-size: cover;
-				transform: translateY(-10rpx);
-				display: flex;
-
-				.left {
-					width: 306rpx;
-					color: #fff;
-					padding: 16rpx 22rpx;
-				}
-
-				.right {
-					padding-left: 16rpx;
-					margin-top: 30rpx;
-
-					.pin {
-						width: 76rpx;
-						height: 54rpx;
-					}
+				.pin {
+					width: 76rpx;
+					height: 54rpx;
 				}
 			}
 		}
 	}
+}
 
-	.filters {
-		padding: 16rpx 28rpx;
-		border-radius: 6rpx 6rpx 16rpx 16rpx;
-		background: #FFF;
-	}
+.filters {
+	padding: 16rpx 28rpx;
+	border-radius: 6rpx 6rpx 16rpx 16rpx;
+	background: #fff;
+}
+
+.tabs {
+	display: flex;
+	justify-content: space-between;
+	font-size: 24rpx;
+	color: #999;
+	padding: 32rpx 88rpx;
 
 	.tabs {
-		display: flex;
-		justify-content: space-between;
-		font-size: 24rpx;
+		transition: all 0.3s linear;
+	}
+
+	.active {
+		color: #ed5a2e;
+		font-size: 32rpx;
+		font-weight: 700;
+		font-weight: 700;
+	}
+}
+
+.translateY20 {
+	transform: translateY(-20rpx);
+}
+
+.orderStatus {
+	padding: 26rpx 28rpx;
+	justify-content: space-between;
+	height: 100rpx;
+
+	.orderState {
 		color: #999;
-		padding: 32rpx 88rpx;
+		transition: all 0.3s linear;
 
-		.tabs {
-			transition: all .3s linear;
-		}
-
-		.active {
-			color: #ED5A2E;
+		&.active {
+			color: #000;
 			font-size: 32rpx;
 			font-weight: 700;
+		}
+	}
+}
+
+.orders {
+	padding: 0 26rpx 36rpx;
+
+	.item {
+		padding: 32rpx 24rpx;
+		border-radius: 16rpx;
+		background: #fff;
+		margin-bottom: 32rpx;
+
+		.numbers {
+			background-color: #ed5a2e;
+			padding: 16rpx 30rpx;
+			border-radius: 12rpx;
+			font-size: 32rpx;
+			color: #fff;
 			font-weight: 700;
+			line-height: 36rpx;
 		}
-	}
 
-	.translateY20 {
-		transform: translateY(-20rpx);
-	}
+		.price {
+			color: #ed5a2e;
+			font-weight: 700;
+			line-height: 36rpx;
+			font-size: 40rpx;
+		}
 
-	.orderStatus {
-		padding: 26rpx 28rpx;
-		justify-content: space-between;
-		height: 100rpx;
+		.info {
+			padding: 16rpx 34rpx;
+			flex-direction: column;
+			align-items: flex-start;
+			border-radius: 8rpx;
+			background: #f8f8f8;
 
-		.orderState {
-			color: #999;
-			transition: all .3s linear;
+			.title {
+				min-width: 208rpx;
+				padding-right: 8rpx;
+				box-sizing: border-box;
+			}
 
-			&.active {
-				color: #000;
-				font-size: 32rpx;
-				font-weight: 700;
+			.stitle {
+				color: #666;
+
+				&.price {
+					font-size: 32rpx;
+					color: #ed5a2e;
+					font-weight: 700;
+				}
 			}
 		}
-	}
 
-	.orders {
-		padding: 0 26rpx 36rpx;
+		.btns {
+			margin-top: 28rpx;
+			display: flex;
+			justify-content: flex-end;
+			gap: 34rpx;
 
-		.item {
-			padding: 32rpx 24rpx;
-			border-radius: 16rpx;
-			background: #FFF;
-			margin-bottom: 32rpx;
+			.btn {
+				line-height: 1;
+				margin: 0;
+				padding: 12rpx 14rpx;
+				border-radius: 10rpx;
+				border: 2rpx solid #d9d9d9;
+				background: #fff;
+				font-size: 28rpx;
 
-			.numbers {
-				background-color: #ED5A2E;
-				padding: 16rpx 30rpx;
-				border-radius: 12rpx;
-				font-size: 32rpx;
-				color: #fff;
-				font-weight: 700;
-				line-height: 36rpx;
-			}
-
-
-
-			.price {
-				color: #ED5A2E;
-				font-weight: 700;
-				line-height: 36rpx;
-				font-size: 40rpx;
-			}
-
-			.info {
-				padding: 16rpx 34rpx;
-				flex-direction: column;
-				align-items: flex-start;
-				border-radius: 8rpx;
-				background: #F8F8F8;
-
-				.title {
-					min-width: 208rpx;
-					padding-right: 8rpx;
-					box-sizing: border-box;
-				}
-
-				.stitle {
-					color: #666;
-
-					&.price {
-						font-size: 32rpx;
-						color: #ed5a2e;
-						font-weight: 700;
-					}
-				}
-
-			}
-
-			.btns {
-				margin-top: 28rpx;
-				display: flex;
-				justify-content: flex-end;
-				gap: 34rpx;
-
-				.btn {
-					line-height: 1;
-					margin: 0;
-					padding: 12rpx 14rpx;
-					border-radius: 10rpx;
-					border: 2rpx solid #D9D9D9;
-					background: #FFF;
-					font-size: 28rpx;
-
-					&.black {
-						border-color: #343030;
-						background-color: #343030;
-						color: #fff;
-					}
+				&.black {
+					border-color: #343030;
+					background-color: #343030;
+					color: #fff;
 				}
 			}
 		}
 	}
+}
 
-
-	.copy {
-		width: 28rpx;
-		height: 28rpx;
-	}
-</style>
\ No newline at end of file
+.copy {
+	width: 28rpx;
+	height: 28rpx;
+}
+</style>
diff --git a/groupBuying/success/index.vue b/groupBuying/success/index.vue
index fe6a867..930cd6f 100644
--- a/groupBuying/success/index.vue
+++ b/groupBuying/success/index.vue
@@ -1,10 +1,8 @@
 <template>
-
 	<view>
-		<template v-if="item.status=='待核销'">
+		<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="支付成功"
-					@leftClick="uni.navigateBack()"></up-navbar>
+				<up-navbar bg-color="#F8F8F8" :fixed="true" :placeholder="true" title="支付成功" @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">
@@ -12,69 +10,62 @@
 						<view class="u-font-36 font-bold u-m-t-16">拼团成功</view>
 					</view>
 
-					<view class="shop ">
+					<view class="shop">
 						<view class="u-flex">
-							<text style="min-width: 180rpx;" class="color-666">可核销门店：</text>
-							<text>{{item.shopName}}</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>{{item.shopAddress}}</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">
+						<view class="u-flex-1 u-p-l-16">
 							<view class="u-flex u-col-center u-row-between">
 								<view class="u-flex tuan-members">
 									<image :src="imgs.pin" class="pin" mode=""></image>
-									<text class="">{{item.groupPeopleNum}}人团</text>
+									<text class="">{{ item.groupPeopleNum }}人团</text>
 								</view>
 							</view>
 							<view class="u-m-t-16 u-flex u-col-center">
-								<view style="width: 356rpx;">
-									<view class="font-bold" v-if="item.wareJson">{{item.wareJson
-			.wareName}}</view>
-									<view class="u-flex u-m-t-10 u-col-center ">
+								<view style="width: 356rpx">
+									<view class="font-bold" v-if="item.wareJson">{{ item.wareJson.wareName }}</view>
+									<view class="u-flex u-m-t-10 u-col-center">
 										<view class="price">
 											<text class="u-font-30">¥</text>
-											<text class="u-font-48 font-bold">{{item.wareGroupPrice}} </text>
+											<text class="u-font-48 font-bold">{{ item.wareGroupPrice }}</text>
 										</view>
 										<view class="old-price u-m-l-32">
 											<text>¥</text>
-											<text>{{item.wareOriginalPrice}} </text>
+											<text>{{ item.wareOriginalPrice }}</text>
 										</view>
 									</view>
 								</view>
-								<view class="u-p-l-16 color-333">
-									数量：{{item.num}}
-								</view>
+								<view class="u-p-l-16 color-333">数量：{{ item.num }}</view>
 							</view>
 						</view>
 					</view>
 
-
 					<view class="members">
 						<view class="list">
-							<view class="item" v-for="(user,index) in item.users" :key="index">
+							<view class="item" v-for="(user, index) in item.users" :key="index">
 								<view class="box">
-									<view class="u-flex  relative">
+									<view class="u-flex relative">
 										<up-avatar size="140rpx" :src="user.userAvatar"></up-avatar>
 										<view class="u-flex u-row-center absolute">
-											<text class="tuanzhang" v-if="index==0">团长</text>
+											<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 class="u-line-1 u-m-t-16 color-000 text-center">{{ user.userName }}</view>
 								</view>
-
 							</view>
 
 							<view class="item" v-if="false">
 								<view class="box">
-									<view class="u-flex  relative">
+									<view class="u-flex relative">
 										<view class="add-box u-flex u-row-center">
 											<up-icon color="#D9D9D9" name="plus"></up-icon>
 											<button open-type="share" class="share" @click="share(item)">分享</button>
@@ -83,22 +74,17 @@
 									<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;">
-							<text class="u-m-r-18">{{showOrder?'收起':'展开'}}</text>
-							<view class="guodu" :class="{rotate:!showOrder}">
+						<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>
 							</view>
 						</view>
@@ -107,116 +93,114 @@
 					<view class="u-m-t-16" v-if="showOrder">
 						<view class="u-flex u-row-between item">
 							<view class="color-666">商品总额</view>
-							<view class="">¥{{item.payAmount}}</view>
+							<view class="">¥{{ item.payAmount }}</view>
 						</view>
 						<view class="u-flex u-row-between item">
 							<view class="color-666">实付金额</view>
-							<view class="">¥{{item.payAmount}}</view>
+							<view class="">¥{{ item.payAmount }}</view>
 						</view>
 						<view class="u-flex u-row-between item">
 							<view class="color-666">订单号</view>
-							<view class="">{{item.orderNo}}</view>
+							<view class="">{{ item.orderNo }}</view>
 						</view>
 						<view class="u-flex u-row-between item">
 							<view class="color-666">支付时间</view>
-							<view class="">{{item.payTime}}</view>
+							<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>
 				</view>
 			</view>
 		</template>
-		<template v-if="item.status=='待成团'">
+		<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="支付成功"
-						left-icon-color="#fff" @leftClick="uni.navigateBack()" title-color="#fff"></up-navbar>
-					<view class="u-flex info u-col-center">
-					</view>
+					<up-navbar
+						bg-color="transparent"
+						:fixed="false"
+						: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=='待成团'">
+					<view class="time" v-if="item.status == '待成团'">
 						<text class="color-666">剩余成团时间：</text>
 						<view class="u-font-32">
-							<text class="number">{{returnNum(0)}}</text>
+							<text class="number">{{ returnNum(0) }}</text>
 							<text class="gap">：</text>
-							<text class="number">{{returnNum(1)}}</text>
+							<text class="number">{{ returnNum(1) }}</text>
 							<text class="gap">：</text>
-							<text class="number">{{returnNum(2)}}</text>
+							<text class="number">{{ returnNum(2) }}</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">
+						<view class="u-flex-1 u-p-l-16">
 							<view class="u-flex u-col-center u-row-between">
 								<view class="u-flex tuan-members">
 									<image :src="imgs.pin" class="pin" mode=""></image>
-									<text class="">{{item.groupPeopleNum}}人团</text>
+									<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 class="font-bold u-line-1" v-if="item.wareJson">{{item.wareJson
-			.wareName}}</view>
-									<view class="u-flex u-m-t-10 u-col-center ">
+								<view style="max-width: 356rpx">
+									<view class="font-bold u-line-1" v-if="item.wareJson">{{ item.wareJson.wareName }}</view>
+									<view class="u-flex u-m-t-10 u-col-center">
 										<view class="price">
 											<text class="u-font-30">¥</text>
-											<text class="u-font-48 font-bold">{{item.wareGroupPrice}} </text>
+											<text class="u-font-48 font-bold">{{ item.wareGroupPrice }}</text>
 										</view>
 										<view class="old-price u-m-l-32">
 											<text>¥</text>
-											<text>{{item.wareOriginalPrice}} </text>
+											<text>{{ item.wareOriginalPrice }}</text>
 										</view>
 									</view>
 								</view>
-								<view class="u-p-l-16 color-333 no-wrap">
-									数量：{{item.num}}
-								</view>
+								<view class="u-p-l-16 color-333 no-wrap">数量：{{ item.num }}</view>
 							</view>
 						</view>
 					</view>
 
 					<view class="shop-box">
-						<view class="shop ">
+						<view class="shop">
 							<view class="u-flex">
-								<text style="min-width: 180rpx;" class="color-666">可核销门店：</text>
-								<text>{{item.shopName}}</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>{{item.shopAddress}}</text>
+								<text style="min-width: 180rpx" class="color-666">门店地址：</text>
+								<text>{{ item.shopAddress }}</text>
 							</view>
 						</view>
 					</view>
 
 					<view class="members">
 						<view class="list">
-							<view class="item" v-for="(user,index) in item.users" :key="index">
+							<view class="item" v-for="(user, index) in item.users" :key="index">
 								<view class="box">
-									<view class="u-flex  relative">
+									<view class="u-flex relative">
 										<up-avatar size="140rpx" :src="user.userAvatar"></up-avatar>
 										<view class="u-flex u-row-center absolute">
-											<text class="tuanzhang" v-if="index==0">团长</text>
+											<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 class="u-line-1 u-m-t-16 color-000 text-center">{{ user.userName }}</view>
 								</view>
-
 							</view>
 
 							<view class="item">
 								<view class="box">
-									<view class="u-flex  relative">
+									<view class="u-flex relative">
 										<view class="add-box u-flex u-row-center">
 											<up-icon color="#D9D9D9" name="plus"></up-icon>
 											<button open-type="share" class="share" @click="share(item)">分享</button>
@@ -226,10 +210,10 @@
 								</view>
 							</view>
 						</view>
-						<view class="u-flex u-row-center" v-if="item.status=='待成团'">
-							<view class="pin-btn">邀请好友参团
+						<view class="u-flex u-row-center" v-if="item.status == '待成团'">
+							<view class="pin-btn">
+								邀请好友参团
 								<button open-type="share" class="share">邀请好友参团</button>
-
 							</view>
 						</view>
 					</view>
@@ -238,9 +222,9 @@
 						<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;">
-								<text class="u-m-r-18">{{showOrder?'收起':'展开'}}</text>
-								<view class="guodu" :class="{rotate:!showOrder}">
+							<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>
 								</view>
 							</view>
@@ -249,101 +233,99 @@
 						<view class="u-m-t-16" v-if="showOrder">
 							<view class="u-flex u-row-between item">
 								<view class="color-666">商品总额</view>
-								<view class="">¥{{item.payAmount}}</view>
+								<view class="">¥{{ item.payAmount }}</view>
 							</view>
 							<view class="u-flex u-row-between item">
 								<view class="color-666">实付金额</view>
-								<view class="">¥{{item.payAmount}}</view>
+								<view class="">¥{{ item.payAmount }}</view>
 							</view>
 							<view class="u-flex u-row-between item">
 								<view class="color-666">订单号</view>
-								<view class="">{{item.orderNo}}</view>
+								<view class="">{{ item.orderNo }}</view>
 							</view>
 							<view class="u-flex u-row-between item">
 								<view class="color-666">支付时间</view>
-								<view class="">{{item.payTime}}</view>
+								<view class="">{{ item.payTime }}</view>
 							</view>
 						</view>
-
 					</view>
 				</view>
-
 			</view>
 		</template>
-		<template v-if="item.status=='已退款'">
+		<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="订单详情"
-						left-icon-color="#fff" @leftClick="uni.navigateBack()" title-color="#fff"></up-navbar>
-					<view class="u-flex info u-col-center">
-					</view>
+					<up-navbar
+						bg-color="transparent"
+						:fixed="false"
+						: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=='待成团'">
+					<view class="time" v-if="item.status == '待成团'">
 						<text class="color-666">剩余成团时间：</text>
 						<view class="u-font-32">
-							<text class="number">{{returnNum(0)}}</text>
+							<text class="number">{{ returnNum(0) }}</text>
 							<text class="gap">：</text>
-							<text class="number">{{returnNum(1)}}</text>
+							<text class="number">{{ returnNum(1) }}</text>
 							<text class="gap">：</text>
-							<text class="number">{{returnNum(2)}}</text>
+							<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-1 u-p-l-16">
 							<view class="u-flex u-col-center u-row-between">
 								<view class="u-flex tuan-members">
 									<image :src="imgs.pin" class="pin" mode=""></image>
-									<text class="">{{item.groupPeopleNum}}人团</text>
+									<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 class="font-bold u-line-1" v-if="item.wareJson">{{item.wareJson
-					.wareName}}</view>
-									<view class="u-flex u-m-t-10 u-col-center ">
+								<view style="max-width: 356rpx">
+									<view class="font-bold u-line-1" v-if="item.wareJson">{{ item.wareJson.wareName }}</view>
+									<view class="u-flex u-m-t-10 u-col-center">
 										<view class="price">
 											<text class="u-font-30">¥</text>
-											<text class="u-font-48 font-bold">{{item.wareGroupPrice}} </text>
+											<text class="u-font-48 font-bold">{{ item.wareGroupPrice }}</text>
 										</view>
 										<view class="old-price u-m-l-32">
 											<text>¥</text>
-											<text>{{item.wareOriginalPrice}} </text>
+											<text>{{ item.wareOriginalPrice }}</text>
 										</view>
 									</view>
 								</view>
-								<view class="u-p-l-16 color-333 no-wrap">
-									数量：{{item.num}}
-								</view>
+								<view class="u-p-l-16 color-333 no-wrap">数量：{{ item.num }}</view>
 							</view>
 						</view>
 					</view>
 
 					<view class="shop-box">
-						<view class="shop ">
+						<view class="shop">
 							<view class="u-flex">
-								<text style="min-width: 180rpx;" class="color-666">可核销门店：</text>
-								<text>{{item.shopName}}</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>{{item.shopAddress}}</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;">
-								<text class="u-m-r-18">{{showOrder?'收起':'展开'}}</text>
-								<view class="guodu" :class="{rotate:!showOrder}">
+							<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>
 								</view>
 							</view>
@@ -352,583 +334,573 @@
 						<view class="u-m-t-16" v-if="showOrder">
 							<view class="u-flex u-row-between item">
 								<view class="color-666">商品总额</view>
-								<view class="">¥{{item.payAmount}}</view>
+								<view class="">¥{{ item.payAmount }}</view>
 							</view>
 							<view class="u-flex u-row-between item">
 								<view class="color-666">实付金额</view>
-								<view class="">¥{{item.payAmount}}</view>
+								<view class="">¥{{ item.payAmount }}</view>
 							</view>
 							<view class="u-flex u-row-between item">
 								<view class="color-666">订单号</view>
-								<view class="">{{item.orderNo}}</view>
+								<view class="">{{ item.orderNo }}</view>
 							</view>
 							<view class="u-flex u-row-between item">
 								<view class="color-666">支付时间</view>
-								<view class="">{{item.payTime}}</view>
+								<view class="">{{ item.payTime }}</view>
 							</view>
 						</view>
-
 					</view>
 				</view>
-
 			</view>
 		</template>
-
-
 	</view>
-
 </template>
 
 <script setup>
-	import statusVue from '@/groupBuying/components/status.vue'
-	import * as Api from '@/common/api/order/gbOrder.js'
-	import {
-		wxShare
-	} from '@/utils/share.js'
-	import {
-		computed,
-		reactive
-	} from 'vue'
-	import {
-		getRemainingHMS
-	} from '@/utils/countdown.js'
+import { shareMixin, handleMixinOnLoad, returnQuery } from '@/utils/share.js';
+import statusVue from '@/groupBuying/components/status.vue';
+import * as Api from '@/common/api/order/gbOrder.js';
+import { wxShare } from '@/utils/share.js';
+import { 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'
-	}
+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 topStyle = {
-		backgroundImage: 'url(' + imgs.bg + ')'
-	}
-	const showOrder = ref(true)
+function copyText(text) {
+	uni.setClipboardData({
+		data: text,
+		success() {}
+	});
+}
+const query = reactive({
+	shopId: '',
+	detailId: ''
+});
 
-	function copyText(text) {
-		uni.setClipboardData({
-			data: text,
-			success() {}
-		})
-	}
-	const query = reactive({
-		shopId: '',
-		detailId: '',
-	})
+function init(opt) {
+	console.log(opt);
+	Object.assign(query, opt);
+	getDetail();
+}
+const item = reactive({});
 
-	function init(opt) {
-		console.log(opt)
-		Object.assign(query, opt)
-		getDetail()
-	}
-	const item = reactive({})
-
-	function getDetail() {
-		try {
-			Api.recordDetail(query).then(res => {
-				if (!res) {
-					uni.showModal({
-						title: '提示',
-						content: '当前商品已下架或者不存在',
-						showCancel: false,
-						success(res) {
-							uni.redirectTo({
-								url: '/groupBuying/index/index'
-							})
-						}
-
-					})
-					return
-				}
-				console.log(res, 'res')
-				const wareJson = JSON.parse(res.wareJson)
-				wareJson.wareImgs = wareJson.wareImgs.split(',').filter(v => v)
-				res.wareJson = wareJson;
-				res.goodsImg = wareJson.wareImgs[0];
-				Object.assign(item, res)
-				console.log('item', item)
-			})
-		} catch (err) {
-			console.log('err', err)
-
-		}
-
-
-	}
-	onLoad(init)
-
-	let timer = null
-	let nowTime = ref(Date.now())
-	timer = setInterval(() => {
-		nowTime.value = Date.now()
-	}, 1000)
-
-	const returnTime = computed(() => {
-		nowTime.value
-		return getRemainingHMS(item)
-	})
-
-	function returnNum(index) {
-		return returnTime.value.split(':')[index]
-	}
-
-
-	function refund(item) {
-		uni.showModal({
-			title: '提示',
-			content: '是否申请退款？',
-			showCancel: true,
-			success(res) {
-				if (res.confirm) {
-					Api.applyRefund({
-						recordId: item.id,
-						orderNo: item.orderNo,
-					}).then(res => {
-						if (res) {
-							uni.showToast({
-								title: '申请成功'
-							})
-							setTimeout(() => {
-								getDetail()
-							}, 1000)
-						}
-					})
-				}
+function getDetail() {
+	try {
+		Api.recordDetail(query).then((res) => {
+			if (!res) {
+				uni.showModal({
+					title: '提示',
+					content: '当前商品已下架或者不存在',
+					showCancel: false,
+					success(res) {
+						uni.redirectTo({
+							url: '/groupBuying/index/index'
+						});
+					}
+				});
+				return;
 			}
-		})
+			console.log(res, 'res');
+			const wareJson = JSON.parse(res.wareJson);
+			wareJson.wareImgs = wareJson.wareImgs.split(',').filter((v) => v);
+			res.wareJson = wareJson;
+			res.goodsImg = wareJson.wareImgs[0];
+			Object.assign(item, res);
+			console.log('item', item);
+		});
+	} catch (err) {
+		console.log('err', err);
 	}
+}
+onLoad(async (opt) => {
+	await handleMixinOnLoad(opt);
+	init(opt);
+});
 
-	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,
-		})
-	})
+let timer = null;
+let nowTime = ref(Date.now());
+timer = setInterval(() => {
+	nowTime.value = Date.now();
+}, 1000);
 
+const returnTime = computed(() => {
+	nowTime.value;
+	return getRemainingHMS(item);
+});
 
-	function toOrderDetail(item) {
-		uni.navigateTo({
-			url: '/groupBuying/detail/index?detailId=' + item.id + '&shopId=' + item.shopId
-		})
-	}
+function returnNum(index) {
+	return returnTime.value.split(':')[index];
+}
+
+function refund(item) {
+	uni.showModal({
+		title: '提示',
+		content: '是否申请退款？',
+		showCancel: true,
+		success(res) {
+			if (res.confirm) {
+				Api.applyRefund({
+					recordId: item.id,
+					orderNo: item.orderNo
+				}).then((res) => {
+					if (res) {
+						uni.showToast({
+							title: '申请成功'
+						});
+						setTimeout(() => {
+							getDetail();
+						}, 1000);
+					}
+				});
+			}
+		}
+	});
+}
+
+onShareAppMessage(async (res) => {
+	let query = await returnQuery();
+	return {
+		title: item.wareJson.wareName,
+		imageUrl: item.goodsImg,
+		path: '/groupBuying/detail/index' + '?' + 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>
 
 <style lang="scss" scoped>
-	.top {
-		height: 422rpx;
-		background-size: cover;
+.top {
+	height: 422rpx;
+	background-size: cover;
 
-		.info {
-			padding: 32rpx 30rpx 0 30rpx;
+	.info {
+		padding: 32rpx 30rpx 0 30rpx;
+		color: #fff;
+		font-size: 32rpx;
+		font-weight: 700;
+	}
+}
+
+.bottom {
+	background-color: #fff;
+	padding: 0 28rpx;
+
+	.time {
+		padding: 18rpx 24rpx;
+		background: #fff4e2;
+		display: flex;
+		align-items: center;
+		border-radius: 16rpx 16rpx 0 0;
+
+		.number {
+			padding: 6rpx;
+			border-radius: 16rpx;
+			background: #ed5a2e;
 			color: #fff;
 			font-size: 32rpx;
+			margin-left: 18rpx;
+			margin-right: 18rpx;
+		}
+
+		.gap {
+			font-size: 32rpx;
+		}
+	}
+
+	.goods {
+		background-color: #fff;
+		padding: 22rpx 24rpx 0;
+		border-radius: 0 0 16rpx 16rpx;
+		margin-top: 32rpx;
+
+		.pin {
+			width: 60rpx;
+			height: 38rpx;
+		}
+
+		.tuan-members {
+			padding: 0 16rpx 0 0;
+			border-radius: 0 6rpx 6rpx 0;
+			background: #4c2828;
+			color: #f5d9ad;
 			font-weight: 700;
 		}
 
+		.price {
+			color: #ed5a2e;
+		}
 
+		.old-price {
+			color: #666666;
+			text-decoration-line: line-through;
+		}
 	}
 
-	.bottom {
+	.u-font-48 {
+		font-size: 48rpx;
+	}
+
+	.shop-box {
+		background: #fff;
+		padding: 32rpx 30rpx 28rpx 30rpx;
+		border-radius: 0 0 16rpx 16rpx;
+	}
+
+	.copy {
+		width: 22rpx;
+		height: 22rpx;
+		margin-left: 22rpx;
+	}
+
+	.shop {
+		border-radius: 8rpx;
+		background: #f8f8f8;
+		padding: 16rpx 34rpx;
+	}
+
+	.relative {
+		position: relative;
+	}
+
+	.members {
+		padding: 26rpx 24rpx;
+		border-radius: 16rpx;
+		margin-top: 32rpx;
 		background-color: #fff;
-		padding: 0 28rpx;
 
-		.time {
-			padding: 18rpx 24rpx;
-			background: #FFF4E2;
+		.list {
 			display: flex;
-			align-items: center;
-			border-radius: 16rpx 16rpx 0 0;
-
-			.number {
-				padding: 6rpx;
-				border-radius: 16rpx;
-				background: #ED5A2E;
-				color: #fff;
-				font-size: 32rpx;
-				margin-left: 18rpx;
-				margin-right: 18rpx;
-			}
-
-			.gap {
-				font-size: 32rpx;
-			}
 		}
 
-		.goods {
-			background-color: #fff;
-			padding: 22rpx 24rpx 0;
-			border-radius: 0 0 16rpx 16rpx;
-			margin-top: 32rpx;
+		.item {
+			width: calc(100% / 3);
+			display: flex;
+			margin-bottom: 32rpx;
 
-			.pin {
-				width: 60rpx;
-				height: 38rpx;
-			}
+			.add-box {
+				width: 140rpx;
+				height: 140rpx;
+				border: 2rpx dashed #d9d9d9;
+				border-radius: 50%;
+				overflow: hidden;
+				position: relative;
 
-			.tuan-members {
-				padding: 0 16rpx 0 0;
-				border-radius: 0 6rpx 6rpx 0;
-				background: #4C2828;
-				color: #f5d9ad;
-				font-weight: 700;
-			}
-
-			.price {
-				color: #ed5a2e;
-			}
-
-			.old-price {
-				color: #666666;
-				text-decoration-line: line-through;
-			}
-		}
-
-		.u-font-48 {
-			font-size: 48rpx;
-		}
-
-		.shop-box {
-			background: #fff;
-			padding: 32rpx 30rpx 28rpx 30rpx;
-			border-radius: 0 0 16rpx 16rpx;
-		}
-
-		.copy {
-			width: 22rpx;
-			height: 22rpx;
-			margin-left: 22rpx;
-		}
-
-		.shop {
-			border-radius: 8rpx;
-			background: #F8F8F8;
-			padding: 16rpx 34rpx;
-		}
-
-		.relative {
-			position: relative;
-		}
-
-		.members {
-			padding: 26rpx 24rpx;
-			border-radius: 16rpx;
-			margin-top: 32rpx;
-			background-color: #fff;
-
-			.list {
-				display: flex;
-			}
-
-			.item {
-				width: calc(100% / 3);
-				display: flex;
-				margin-bottom: 32rpx;
-
-				.add-box {
-					width: 140rpx;
-					height: 140rpx;
-					border: 2rpx dashed #D9D9D9;
-					border-radius: 50%;
-					overflow: hidden;
-					position: relative;
-
-					.share {
-						position: absolute;
-						left: 0;
-						right: 0;
-						top: 0;
-						bottom: 0;
-						opacity: 0;
-					}
-				}
-
-				// &:nth-of-type(2n) {
-				// 	justify-content: center;
-				// }
-
-				&:nth-of-type(3n) {
-					justify-content: flex-end;
-				}
-
-				.box {
-					display: flex;
-					flex-direction: column;
-				}
-
-				.absolute {
-					bottom: 0;
-					display: flex;
-					justify-content: center;
+				.share {
+					position: absolute;
 					left: 0;
 					right: 0;
-				}
-
-				.tuanzhang {
-					padding: 8rpx 18rpx;
-					border-radius: 20rpx;
-					background: #ED5A2E;
-					color: #fff;
+					top: 0;
 					bottom: 0;
+					opacity: 0;
 				}
 			}
-		}
 
+			// &:nth-of-type(2n) {
+			// 	justify-content: center;
+			// }
 
-	}
+			&:nth-of-type(3n) {
+				justify-content: flex-end;
+			}
 
-	.btns {
-		position: fixed;
-		left: 87rpx;
-		right: 87rpx;
-		bottom: 0;
-		padding-bottom: 60rpx;
-		display: flex;
-		gap: 40rpx;
+			.box {
+				display: flex;
+				flex-direction: column;
+			}
 
-		.btn {
-			flex: 1;
-			padding: 16rpx 28rpx;
-			border-radius: 200rpx;
-			text-align: center;
-			font-size: 32rpx;
-			line-height: 1;
-			margin: 0;
-			justify-content: center;
-			border: 2rpx solid #E8AD7B;
-			background: #FFF;
-			color: #E8AD7B;
+			.absolute {
+				bottom: 0;
+				display: flex;
+				justify-content: center;
+				left: 0;
+				right: 0;
+			}
 
-			&.main {
-				background-color: #E8AD7B;
+			.tuanzhang {
+				padding: 8rpx 18rpx;
+				border-radius: 20rpx;
+				background: #ed5a2e;
 				color: #fff;
+				bottom: 0;
 			}
 		}
 	}
+}
 
-	.guodu {
-		transition: all .3s;
-	}
+.btns {
+	position: fixed;
+	left: 87rpx;
+	right: 87rpx;
+	bottom: 0;
+	padding-bottom: 60rpx;
+	display: flex;
+	gap: 40rpx;
 
-	.pin-btn {
-		padding: 14rpx 60rpx;
+	.btn {
+		flex: 1;
+		padding: 16rpx 28rpx;
 		border-radius: 200rpx;
 		text-align: center;
 		font-size: 32rpx;
+		line-height: 1;
+		margin: 0;
 		justify-content: center;
-		border: 2rpx solid #E8AD7B;
-		background: #E8AD7B;
-		color: #fff;
-		position: relative;
+		border: 2rpx solid #e8ad7b;
+		background: #fff;
+		color: #e8ad7b;
 
-		.share {
-			position: absolute;
-			left: 0;
-			right: 0;
-			top: 0;
-			bottom: 0;
-			opacity: 0;
+		&.main {
+			background-color: #e8ad7b;
+			color: #fff;
+		}
+	}
+}
+
+.guodu {
+	transition: all 0.3s;
+}
+
+.pin-btn {
+	padding: 14rpx 60rpx;
+	border-radius: 200rpx;
+	text-align: center;
+	font-size: 32rpx;
+	justify-content: center;
+	border: 2rpx solid #e8ad7b;
+	background: #e8ad7b;
+	color: #fff;
+	position: relative;
+
+	.share {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		opacity: 0;
+	}
+}
+
+.rotate {
+	transform: rotate(-90deg);
+}
+
+.order {
+	padding: 32rpx 28rpx;
+	border-radius: 16rpx;
+	margin: 14rpx 30rpx 30rpx 30rpx;
+	background-color: #fff;
+
+	.item {
+		padding: 16rpx 0;
+	}
+}
+
+.refund {
+	padding: 18rpx 164rpx;
+	border-radius: 0 0 16rpx 16rpx;
+	background: #fff4e2;
+	font-weight: 700;
+	margin-bottom: 32rpx;
+}
+
+.success-icon {
+	width: 102rpx;
+	height: 102rpx;
+}
+
+.bg-fff {
+	background-color: #fff;
+}
+
+.bottom1 {
+	margin: 0 28rpx;
+	padding: 0;
+	transform: translateY(-160rpx);
+	background-color: transparent;
+
+	.time {
+		padding: 18rpx 24rpx;
+		background: #fff4e2;
+		display: flex;
+		align-items: center;
+		border-radius: 16rpx 16rpx 0 0;
+
+		.number {
+			padding: 6rpx;
+			border-radius: 16rpx;
+			background: #ed5a2e;
+			color: #fff;
+			font-size: 32rpx;
+			margin-left: 18rpx;
+			margin-right: 18rpx;
+		}
+
+		.gap {
+			font-size: 32rpx;
 		}
 	}
 
-	.rotate {
-		transform: rotate(-90deg);
+	.goods {
+		background-color: #fff;
+		padding: 32rpx 24rpx 0;
+		border-radius: 0;
+		margin-top: 0;
+
+		.pin {
+			width: 60rpx;
+			height: 38rpx;
+		}
+
+		.tuan-members {
+			padding: 0 16rpx 0 0;
+			border-radius: 0 6rpx 6rpx 0;
+			background: #4c2828;
+			color: #f5d9ad;
+			font-weight: 700;
+		}
+
+		.price {
+			color: #ed5a2e;
+		}
+
+		.old-price {
+			color: #666666;
+		}
+	}
+
+	.u-font-48 {
+		font-size: 48rpx;
+	}
+
+	.shop-box {
+		background: #fff;
+		padding: 32rpx 30rpx 28rpx 30rpx;
+		border-radius: 0 0 16rpx 16rpx;
+	}
+
+	.copy {
+		width: 22rpx;
+		height: 22rpx;
+		margin-left: 22rpx;
+	}
+
+	.shop {
+		border-radius: 8rpx;
+		background: #f8f8f8;
+		padding: 16rpx 34rpx;
+	}
+
+	.relative {
+		position: relative;
+	}
+
+	.members {
+		padding: 26rpx 24rpx;
+		border-radius: 16rpx;
+		margin-top: 32rpx;
+		background-color: #fff;
+
+		.list {
+			display: flex;
+			flex-wrap: wrap;
+		}
+
+		.item {
+			width: calc(100% / 3);
+			display: flex;
+
+			.add-box {
+				width: 140rpx;
+				height: 140rpx;
+				border: 2rpx dashed #d9d9d9;
+				border-radius: 50%;
+				overflow: hidden;
+				position: relative;
+
+				.share {
+					position: absolute;
+					left: 0;
+					right: 0;
+					top: 0;
+					bottom: 0;
+					opacity: 0;
+				}
+			}
+
+			&:nth-of-type(3n-1) {
+				justify-content: center;
+			}
+
+			&:nth-of-type(3n) {
+				justify-content: flex-end;
+			}
+
+			.box {
+				display: flex;
+				flex-direction: column;
+			}
+
+			.absolute {
+				bottom: 0;
+				display: flex;
+				justify-content: center;
+				left: 0;
+				right: 0;
+			}
+
+			.tuanzhang {
+				padding: 8rpx 18rpx;
+				border-radius: 20rpx;
+				background: #ed5a2e;
+				color: #fff;
+				bottom: 0;
+			}
+		}
 	}
 
 	.order {
 		padding: 32rpx 28rpx;
 		border-radius: 16rpx;
-		margin: 14rpx 30rpx 30rpx 30rpx;
+		margin: 0;
+		margin-top: 32rpx;
 		background-color: #fff;
 
 		.item {
 			padding: 16rpx 0;
 		}
 	}
-
-	.refund {
-		padding: 18rpx 164rpx;
-		border-radius: 0 0 16rpx 16rpx;
-		background: #FFF4E2;
-		font-weight: 700;
-		margin-bottom: 32rpx;
-	}
-
-	.success-icon {
-		width: 102rpx;
-		height: 102rpx;
-	}
-
-	.bg-fff {
-		background-color: #fff;
-	}
-
-	.bottom1 {
-		margin: 0 28rpx;
-		padding: 0;
-		transform: translateY(-160rpx);
-		background-color: transparent;
-
-		.time {
-			padding: 18rpx 24rpx;
-			background: #FFF4E2;
-			display: flex;
-			align-items: center;
-			border-radius: 16rpx 16rpx 0 0;
-
-			.number {
-				padding: 6rpx;
-				border-radius: 16rpx;
-				background: #ED5A2E;
-				color: #fff;
-				font-size: 32rpx;
-				margin-left: 18rpx;
-				margin-right: 18rpx;
-			}
-
-			.gap {
-				font-size: 32rpx;
-			}
-		}
-
-		.goods {
-			background-color: #fff;
-			padding: 32rpx 24rpx 0;
-			border-radius: 0;
-			margin-top: 0;
-
-			.pin {
-				width: 60rpx;
-				height: 38rpx;
-			}
-
-			.tuan-members {
-				padding: 0 16rpx 0 0;
-				border-radius: 0 6rpx 6rpx 0;
-				background: #4C2828;
-				color: #f5d9ad;
-				font-weight: 700;
-			}
-
-			.price {
-				color: #ed5a2e;
-			}
-
-			.old-price {
-				color: #666666;
-			}
-		}
-
-		.u-font-48 {
-			font-size: 48rpx;
-		}
-
-		.shop-box {
-			background: #fff;
-			padding: 32rpx 30rpx 28rpx 30rpx;
-			border-radius: 0 0 16rpx 16rpx;
-		}
-
-		.copy {
-			width: 22rpx;
-			height: 22rpx;
-			margin-left: 22rpx;
-		}
-
-		.shop {
-			border-radius: 8rpx;
-			background: #F8F8F8;
-			padding: 16rpx 34rpx;
-		}
-
-		.relative {
-			position: relative;
-		}
-
-		.members {
-			padding: 26rpx 24rpx;
-			border-radius: 16rpx;
-			margin-top: 32rpx;
-			background-color: #fff;
-
-			.list {
-				display: flex;
-				flex-wrap: wrap;
-			}
-
-			.item {
-				width: calc(100% / 3);
-				display: flex;
-
-
-				.add-box {
-					width: 140rpx;
-					height: 140rpx;
-					border: 2rpx dashed #D9D9D9;
-					border-radius: 50%;
-					overflow: hidden;
-					position: relative;
-
-					.share {
-						position: absolute;
-						left: 0;
-						right: 0;
-						top: 0;
-						bottom: 0;
-						opacity: 0;
-					}
-				}
-
-				&:nth-of-type(3n-1) {
-					justify-content: center;
-				}
-
-				&:nth-of-type(3n) {
-					justify-content: flex-end;
-				}
-
-				.box {
-					display: flex;
-					flex-direction: column;
-				}
-
-				.absolute {
-					bottom: 0;
-					display: flex;
-					justify-content: center;
-					left: 0;
-					right: 0;
-				}
-
-				.tuanzhang {
-					padding: 8rpx 18rpx;
-					border-radius: 20rpx;
-					background: #ED5A2E;
-					color: #fff;
-					bottom: 0;
-				}
-			}
-		}
-
-		.order {
-			padding: 32rpx 28rpx;
-			border-radius: 16rpx;
-			margin: 0;
-			margin-top: 32rpx;
-			background-color: #fff;
-
-			.item {
-				padding: 16rpx 0;
-			}
-		}
-	}
-</style>
\ No newline at end of file
+}
+</style>
diff --git a/pages.json b/pages.json
index 3189a1a..0e89a0e 100644
--- a/pages.json
+++ b/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"
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 379cecf..e462d78 100644
--- a/pages/index/index.vue
+++ b/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>
 			<!-- 今日上线 -->
@@ -133,424 +134,438 @@
 </template>
 
 <script setup>
-import CouponModal from '@/components/coupon-modal.vue';
-import { ref, computed, onMounted, reactive, onBeforeUnmount, watch, getCurrentInstance, nextTick } from 'vue';
-import { onLoad, onReady, onShow, onReachBottom, onPageScroll } from '@dcloudio/uni-app';
-// 获取全局属性
-const { proxy } = getCurrentInstance();
-import pageLoading from './components/pageLoading.vue';
-import swipers from './components/swiper.vue'; //引入轮播
-import advertisement from './components/advertisement.vue'; //广告
-import diamond from './components/diamond.vue'; //金刚区
-import todaylist from './components/todaylist.vue'; //今日上线
-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 { 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({
-	showBack: true, //左边返回键
-	rightText: '', //右边文字
-	showSearch: true, //true是标题其他事文字
-	title: '我的页面',
-	isTransparent: false,
-	hasPlaceholder: false //是否要占位符
-});
-// 显示
-const showindex = ref('index');
-//计算广告图片的重合尺寸是位移
-const getStyle = (e) => {
-	if (e > hometoplist.freeBannerList.length / 2) {
-		var right = hometoplist.freeBannerList.length - e;
-		return {
-			transform: 'scale(' + 1 + ') translate(-' + right * 20 + '%,0px)',
-			zIndex: 9999 - right,
-			opacity: 1
-		};
-	} else {
-		return {
-			transform: 'scale(' + 1 + ') translate(' + e * 20 + '%,0px)',
-			zIndex: 9999 - e,
-			opacity: 1
-		};
-	}
-};
-const advertisementStyle = ref([]);
-const refbannervo = ref(null);
-//数据
-const hometoplist = reactive({});
-// 首页上面数据
-const hometop = async () => {
-	try {
-		let res = await APIhomehomePageUp();
-		Object.assign(hometoplist, res);
-		hometoplist.freeBannerList.forEach((item, index) => {
-			advertisementStyle.value.push(getStyle(index));
-		});
-		// 数据加载完后获取dom 高度
-		setTimeout(() => {
-			const query = uni.createSelectorQuery().select('#fourcontent');
-			query
-				.boundingClientRect((rect) => {
-					if (rect) {
-						elementTop.value = rect.top - store.height;
-					}
-				})
-				.exec();
-		}, 500);
-	} catch (e) {}
-};
-// 下面初始数据
-const formhomelist = reactive({
-	//筛选
-	address: '', //地址
-	categoryId: '1', //品类
-	orderType: '1', //1.理我最近 2.销量优先 3.价格优先
-	distanceType: '1000', //附近1KM 1选中 0不选中
-	page: 1, //页数
-	size: 10, //页容量
-	status: 'loadmore',
-	name: '1',
-	list: []
-});
-// 使用 reactive 创建响应式对象
-const timeData = ref({});
-
-// 定义 onChange 方法
-const onChange = (e) => {
-	timeData.value = e;
-};
-const onLoadhome = async () => {
-	try {
-		let res = await APIhome(formhomelist);
-		var dates = new Date().getTime();
-		res.records.forEach((item, index) => {
-			var leftTime = item.endTime - dates; //计算两日期之间相差的毫秒数
-			if (leftTime >= 0) {
-				let d = Math.floor(leftTime / 1000 / 60 / 60 / 24);
-				let h = Math.floor((leftTime / 1000 / 60 / 60) % 24);
-				let m = Math.floor((leftTime / 1000 / 60) % 60);
-				let s = Math.floor((leftTime / 1000) % 60);
-				item.end_times = {
-					d: d,
-					h: h,
-					m: m,
-					s: s
-				};
-			} else {
-				item.end_times = 0;
-			}
-		});
-		if ((res.totalPage == 0 || res.totalPage == 1) && res.totalRow <= 10) {
-			console.log(res);
-			formhomelist.status = 'nomore';
-			formhomelist.list = res.records;
-			if (formhomelist.page == 1 && res.records.length == 0) {
-				formhomelist.list = [];
-			}
-			return false;
+	import CouponModal from '@/components/coupon-modal.vue';
+	import {
+		ref,
+		computed,
+		onMounted,
+		reactive,
+		onBeforeUnmount,
+		watch,
+		getCurrentInstance,
+		nextTick
+	} from 'vue';
+	import {
+		onLoad,
+		onReady,
+		onShow,
+		onReachBottom,
+		onPageScroll
+	} from '@dcloudio/uni-app';
+	// 获取全局属性
+	const {
+		proxy
+	} = getCurrentInstance();
+	import pageLoading from './components/pageLoading.vue';
+	import swipers from './components/swiper.vue'; //引入轮播
+	import advertisement from './components/advertisement.vue'; //广告
+	import diamond from './components/diamond.vue'; //金刚区
+	import todaylist from './components/todaylist.vue'; //今日上线
+	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 {
+		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({
+		showBack: true, //左边返回键
+		rightText: '', //右边文字
+		showSearch: true, //true是标题其他事文字
+		title: '我的页面',
+		isTransparent: false,
+		hasPlaceholder: false //是否要占位符
+	});
+	// 显示
+	const showindex = ref('index');
+	//计算广告图片的重合尺寸是位移
+	const getStyle = (e) => {
+		if (e > hometoplist.freeBannerList.length / 2) {
+			var right = hometoplist.freeBannerList.length - e;
+			return {
+				transform: 'scale(' + 1 + ') translate(-' + right * 20 + '%,0px)',
+				zIndex: 9999 - right,
+				opacity: 1
+			};
 		} else {
-			formhomelist.status = 'loading';
-			if (formhomelist.page == 1) {
-				formhomelist.list = res.records;
-			} else {
-				formhomelist.list = [...formhomelist.list, ...res.records];
-			}
-			formhomelist.page = ++formhomelist.page;
-			if (formhomelist.page > res.totalPage) {
-				formhomelist.status = 'nomore';
-			} else {
-				formhomelist.status = 'loading';
-			}
+			return {
+				transform: 'scale(' + 1 + ') translate(' + e * 20 + '%,0px)',
+				zIndex: 9999 - e,
+				opacity: 1
+			};
 		}
-	} catch (e) {}
-};
-// /筛选数据处理
-const init_fn = async () => {
-	formhomelist.list = [];
-	Object.assign(formhomelist, {
-		address: uni.cache.get('getLocationstorage').address, //地址
-		lng: uni.cache.get('getLocationstorage').lng,
-		lat: uni.cache.get('getLocationstorage').lat,
-		type: '', //品类
-		// orderBy: 0, //1.理我最近 2.销量优先 3.价格优先
-		other: '', //附近1KM 1选中 0不选中
+	};
+	const advertisementStyle = ref([]);
+	const refbannervo = ref(null);
+	//数据
+	const hometoplist = reactive({});
+	// 首页上面数据
+	const hometop = async () => {
+		try {
+			let res = await APIhomehomePageUp();
+			Object.assign(hometoplist, res);
+			hometoplist.freeBannerList.forEach((item, index) => {
+				advertisementStyle.value.push(getStyle(index));
+			});
+			// 数据加载完后获取dom 高度
+			setTimeout(() => {
+				const query = uni.createSelectorQuery().select('#fourcontent');
+				query
+					.boundingClientRect((rect) => {
+						if (rect) {
+							elementTop.value = rect.top - store.height;
+						}
+					})
+					.exec();
+			}, 500);
+		} catch (e) {}
+	};
+	// 下面初始数据
+	const formhomelist = reactive({
+		//筛选
+		address: '', //地址
+		categoryId: '1', //品类
+		orderType: '1', //1.理我最近 2.销量优先 3.价格优先
+		distanceType: '1000', //附近1KM 1选中 0不选中
 		page: 1, //页数
 		size: 10, //页容量
-		status: 'loadmore'
+		status: 'loadmore',
+		name: '1',
+		list: []
 	});
-	onLoadhome();
-};
+	// 使用 reactive 创建响应式对象
+	const timeData = ref({});
 
-const orderVIP = ref({
-	shopExtendList: ''
-});
-
-// 弹出层处理
-const showproductlist = ref(false);
-// 定义方法
-const openproductlist = (e) => {
-	hometoplist.menuList[viewHistoryindex.value].name = e; //下标更改name
-	showproductlist.value = !showproductlist.value;
-};
-
-// 存储每个元素距离顶部的距离
-const elementTop = ref(0);
-// 存储是否吸顶的状态
-const isSticky = ref(true);
-//下标
-const viewHistoryindex = ref(null);
-// 点击滑动元素
-const viewHistory = async (item, index) => {
-	if (isSticky) {
-		uni.pageScrollTo({
-			scrollTop: elementTop.value,
-			duration: 300
+	// 定义 onChange 方法
+	const onChange = (e) => {
+		timeData.value = e;
+	};
+	const onLoadhome = async () => {
+		try {
+			let res = await APIhome(formhomelist);
+			var dates = new Date().getTime();
+			res.records.forEach((item, index) => {
+				var leftTime = item.endTime - dates; //计算两日期之间相差的毫秒数
+				if (leftTime >= 0) {
+					let d = Math.floor(leftTime / 1000 / 60 / 60 / 24);
+					let h = Math.floor((leftTime / 1000 / 60 / 60) % 24);
+					let m = Math.floor((leftTime / 1000 / 60) % 60);
+					let s = Math.floor((leftTime / 1000) % 60);
+					item.end_times = {
+						d: d,
+						h: h,
+						m: m,
+						s: s
+					};
+				} else {
+					item.end_times = 0;
+				}
+			});
+			if ((res.totalPage == 0 || res.totalPage == 1) && res.totalRow <= 10) {
+				console.log(res);
+				formhomelist.status = 'nomore';
+				formhomelist.list = res.records;
+				if (formhomelist.page == 1 && res.records.length == 0) {
+					formhomelist.list = [];
+				}
+				return false;
+			} else {
+				formhomelist.status = 'loading';
+				if (formhomelist.page == 1) {
+					formhomelist.list = res.records;
+				} else {
+					formhomelist.list = [...formhomelist.list, ...res.records];
+				}
+				formhomelist.page = ++formhomelist.page;
+				if (formhomelist.page > res.totalPage) {
+					formhomelist.status = 'nomore';
+				} else {
+					formhomelist.status = 'loading';
+				}
+			}
+		} catch (e) {}
+	};
+	// /筛选数据处理
+	const init_fn = async () => {
+		formhomelist.list = [];
+		Object.assign(formhomelist, {
+			address: uni.cache.get('getLocationstorage').address, //地址
+			lng: uni.cache.get('getLocationstorage').lng,
+			lat: uni.cache.get('getLocationstorage').lat,
+			type: '', //品类
+			// orderBy: 0, //1.理我最近 2.销量优先 3.价格优先
+			other: '', //附近1KM 1选中 0不选中
+			page: 1, //页数
+			size: 10, //页容量
+			status: 'loadmore'
 		});
-	}
-	// 是否有弹出层
-	if (item.isChild) {
-		showproductlist.value = showproductlist.value ? (viewHistoryindex.value == index ? false : true) : !showproductlist.value;
-	}
-	viewHistoryindex.value = index;
-};
-// 滑动
-onPageScroll((res) => {
-	isSticky.value = res.scrollTop > elementTop.value ? true : false;
-	uni.$u.debounce((store.scrollTop = res.scrollTop), 500);
-});
+		onLoadhome();
+	};
 
-const indexsRef = ref(null);
+	const orderVIP = ref({
+		shopExtendList: ''
+	});
 
-onShow(async () => {
-	try {
-		await storeuser.getLocation();
-		proxy.$isResolve();
-		const shopId = uni.cache.get('shopId');
-		if (shopId) {
-			indexsRef.value.updateData();
+	// 弹出层处理
+	const showproductlist = ref(false);
+	// 定义方法
+	const openproductlist = (e) => {
+		hometoplist.menuList[viewHistoryindex.value].name = e; //下标更改name
+		showproductlist.value = !showproductlist.value;
+	};
+
+	// 存储每个元素距离顶部的距离
+	const elementTop = ref(0);
+	// 存储是否吸顶的状态
+	const isSticky = ref(true);
+	//下标
+	const viewHistoryindex = ref(null);
+	// 点击滑动元素
+	const viewHistory = async (item, index) => {
+		if (isSticky) {
+			uni.pageScrollTo({
+				scrollTop: elementTop.value,
+				duration: 300
+			});
 		}
-	} catch (error) {}
-	await proxy.$onLaunched;
-	if (uni.cache.get('shopId')) {
-		showindex.value = 'shopIndex';
-		await storeuser.actionsproductqueryProduct();
-		await nextTick();
-		orderVIP.value = uni.cache.get('orderVIP');
-	} else {
-		showindex.value = 'index';
-		hometop();
-		init_fn();
-		// 获取初始定位高度
+		// 是否有弹出层
+		if (item.isChild) {
+			showproductlist.value = showproductlist.value ? (viewHistoryindex.value == index ? false : true) : !
+				showproductlist.value;
+		}
+		viewHistoryindex.value = index;
+	};
+	// 滑动
+	onPageScroll((res) => {
+		isSticky.value = res.scrollTop > elementTop.value ? true : false;
+		uni.$u.debounce((store.scrollTop = res.scrollTop), 500);
+	});
+
+	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();
+			shopId.value = uni.cache.get('shopId');
+			if (shopId.value) {
+				indexsRef.value.updateData();
+			}
+		} catch (error) {}
+		await proxy.$onLaunched;
+		if (shopId.value) {
+			showindex.value = 'shopIndex';
+			await storeuser.actionsproductqueryProduct();
+			await nextTick();
+			orderVIP.value = uni.cache.get('orderVIP');
+		} else {
+			showindex.value = 'index';
+			hometop();
+			init_fn();
+			// 获取初始定位高度
+		}
+
+		shopInfo.value = uni.cache.get('shopInfo');
 	}
-});
 
-const showPageLoading = ref(true);
+	const showPageLoading = ref(true);
 
-const getUnReadMsgCount = async () => {
-	let res = await getUnReadCountReq()
+	const getUnReadMsgCount = async () => {
+		let res = await getUnReadCountReq()
+
+		let badge = Number(res)
+		if (badge > 0) {
+			uni.setTabBarBadge({
+				index: 2,
+				text: badge.toString()
+			})
+		} else {
+			uni.removeTabBarBadge({
+				index: 2
+			})
+		}
+	}
+
+
+
+	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);
+	})
 	
-	let badge = Number(res)
-	if (badge > 0) {
-		uni.setTabBarBadge({
-			index: 2,
-			text: badge.toString()
-		})
-	} else {
-		uni.removeTabBarBadge({
-			index: 2
-		})
-	}
-}
 
-onMounted(async () => {
-	setTimeout(() => {
-		showPageLoading.value = false;
-		
-		getUnReadMsgCount();
-	}, 800);
-});
 
-onReachBottom(() => {
-	onLoadhome();
-});
-
-// 页面离开时清除定时器
-// onBeforeUnmount(() => {
-// 	if (refbannervo.value) {
-// 		refbannervo.value.clearTimer();
-// 	}
-// });
+	// 页面离开时清除定时器
+	// onBeforeUnmount(() => {
+	// 	if (refbannervo.value) {
+	// 		refbannervo.value.clearTimer(); 
+	// 	}
+	// });
 </script>
 
 <style lang="scss" scoped>
-.content {
-	background: #f9f9f9;
-
-	.fourcontent {
-		position: sticky;
-		padding: 32rpx 0;
-		overflow-x: auto;
-		flex-wrap: nowrap;
+	.content {
 		background: #f9f9f9;
-		z-index: 99;
-		left: 0;
 
-		.flex-between {
-			margin: 0 32rpx;
-		}
-
-		.componentsclass {
-			margin-top: 32rpx;
-			left: 0;
-			position: relative;
-			width: 100%;
-			height: 100vh;
-			transition-duration: 350ms;
-			transition-timing-function: ease-out;
-			z-index: 10075;
-			background-color: rgba(0, 0, 0, 0.5);
-		}
-
-		.fourcontent_item {
+		.fourcontent {
+			position: sticky;
+			padding: 32rpx 0;
+			overflow-x: auto;
 			flex-wrap: nowrap;
-			margin-left: 20rpx;
-			padding: 10rpx 24rpx;
-			background: #ffffff;
-			border-radius: 8rpx 8rpx 8rpx 8rpx;
+			background: #f9f9f9;
+			z-index: 99;
+			left: 0;
 
-			text {
-				width: max-content;
+			.flex-between {
+				margin: 0 32rpx;
 			}
-		}
 
-		.fourcontent_itemactev {
-			background: #fee06a;
-		}
+			.componentsclass {
+				margin-top: 32rpx;
+				left: 0;
+				position: relative;
+				width: 100%;
+				height: 100vh;
+				transition-duration: 350ms;
+				transition-timing-function: ease-out;
+				z-index: 10075;
+				background-color: rgba(0, 0, 0, 0.5);
+			}
 
-		// .fourcontent_item:nth-child(1) {
-		// 	margin-left: 0;
-		// }
-	}
+			.fourcontent_item {
+				flex-wrap: nowrap;
+				margin-left: 20rpx;
+				padding: 10rpx 24rpx;
+				background: #ffffff;
+				border-radius: 8rpx 8rpx 8rpx 8rpx;
 
-	.fivecontent {
-		padding: 0 28rpx;
-		height: 100vh;
-
-		.fivecontent_item:nth-child(1) {
-			margin-top: 0;
-		}
-
-		.fivecontent_item {
-			margin-top: 32rpx;
-			padding: 24rpx 32rpx;
-			width: 100%;
-			background: #ffffff;
-			border-radius: 18rpx 18rpx 18rpx 18rpx;
-
-			.fivecontent_item_nav {
-				image {
-					width: 60rpx;
-					height: 60rpx;
-					border-radius: 8rpx;
-				}
-
-				.fivecontent_item_nav_left {
-					flex: auto;
-					margin-left: 12rpx;
-
-					.fivecontent_item_nav_lefttop {
-						font-family: Source Han Sans CN, Source Han Sans CN;
-						font-weight: 400;
-						font-size: 24rpx;
-						color: #666666;
-					}
-
-					.fivecontent_item_nav_lefttopstart {
-						margin-top: 8rpx;
-
-						.fivecontent_item_nav_leftlang {
-							margin-left: 12rpx;
-							width: max-content;
-							padding: 4rpx 10rpx;
-							background: #fff9e1;
-							border-radius: 4rpx 4rpx 4rpx 4rpx;
-
-							.fivecontent_item_nav_leftlangtext {
-								margin-left: 6rpx;
-								font-family: Source Han Sans CN, Source Han Sans CN;
-								font-weight: 400;
-								font-size: 16rpx;
-								color: #f9a511;
-							}
-
-							.fivecontent_item_nav_leftlangimage {
-								width: 10.82rpx;
-								height: 14.06rpx;
-							}
-						}
-
-						.fivecontent_item_nav_leftlang:nth-child(1) {
-							margin-left: 0;
-						}
-					}
+				text {
+					width: max-content;
 				}
 			}
 
-			.fivecontent_item_box {
-				margin-top: 20rpx;
-				border-top: 2rpx solid #e5e5e5;
-				padding-top: 14rpx;
+			.fourcontent_itemactev {
+				background: #fee06a;
+			}
 
-				.fivecontent_item_boxitem {
+			// .fourcontent_item:nth-child(1) {
+			// 	margin-left: 0;
+			// }
+		}
+
+		.fivecontent {
+			padding: 0 28rpx;
+			height: 100vh;
+
+			.fivecontent_item:nth-child(1) {
+				margin-top: 0;
+			}
+
+			.fivecontent_item {
+				margin-top: 32rpx;
+				padding: 24rpx 32rpx;
+				width: 100%;
+				background: #ffffff;
+				border-radius: 18rpx 18rpx 18rpx 18rpx;
+
+				.fivecontent_item_nav {
 					image {
-						width: 192rpx;
-						height: 192rpx;
-						border-radius: 12rpx;
+						width: 60rpx;
+						height: 60rpx;
+						border-radius: 8rpx;
 					}
 
-					.fivecontent_item_boxitemleft {
-						margin-left: 24rpx;
-						flex: 1;
+					.fivecontent_item_nav_left {
+						flex: auto;
+						margin-left: 12rpx;
 
-						.fivecontent_item_boxitemleftone {
-							width: 100%;
-
-							text {
-								font-family: Source Han Sans CN, Source Han Sans CN;
-								// font-weight: 700;
-								font-size: 24rpx;
-								color: #999999;
-							}
-
-							view {
-								// width: 300rpx;
-								overflow: hidden;
-								text-overflow: ellipsis;
-								white-space: nowrap; //溢出不换行white-space:nowrap; //溢出不换行
-								font-family: Source Han Sans CN, Source Han Sans CN;
-								font-weight: 500;
-								font-size: 32rpx;
-								color: #333333;
-							}
+						.fivecontent_item_nav_lefttop {
+							font-family: Source Han Sans CN, Source Han Sans CN;
+							font-weight: 400;
+							font-size: 24rpx;
+							color: #666666;
 						}
 
-						.flexstartboxfttow {
-							.fivecontent_item_boxitemlefttow {
-								margin-left: 16rpx;
-								margin-top: 8rpx;
+						.fivecontent_item_nav_lefttopstart {
+							margin-top: 8rpx;
+
+							.fivecontent_item_nav_leftlang {
+								margin-left: 12rpx;
 								width: max-content;
 								padding: 4rpx 10rpx;
 								background: #fff9e1;
 								border-radius: 4rpx 4rpx 4rpx 4rpx;
 
-								.fivecontent_item_boxitemlefttowtext {
+								.fivecontent_item_nav_leftlangtext {
 									margin-left: 6rpx;
 									font-family: Source Han Sans CN, Source Han Sans CN;
 									font-weight: 400;
@@ -558,140 +573,209 @@ onReachBottom(() => {
 									color: #f9a511;
 								}
 
-								.fivecontent_item_boxitemlefttowimage {
+								.fivecontent_item_nav_leftlangimage {
 									width: 10.82rpx;
 									height: 14.06rpx;
 								}
 							}
 
-							.fivecontent_item_boxitemlefttow:nth-child(1) {
+							.fivecontent_item_nav_leftlang:nth-child(1) {
 								margin-left: 0;
-								background: #ffd6d7;
-								border-radius: 4rpx 4rpx 4rpx 4rpx;
 							}
 						}
+					}
+				}
 
-						.indexboxitemleftthere {
-							position: relative;
-							margin-top: 30rpx;
-							padding-left: 16rpx;
-							width: 100%;
-							background: url(https://czg-qr-order.oss-cn-beijing.aliyuncs.com/index/qinggou.png) no-repeat;
-							background-size: 100% 100%;
+				.fivecontent_item_box {
+					margin-top: 20rpx;
+					border-top: 2rpx solid #e5e5e5;
+					padding-top: 14rpx;
 
-							.indexboxitemleftthereabsolute {
-								position: absolute;
-								top: 14rpx;
-								right: 12rpx;
-								font-family: Source Han Sans CN, Source Han Sans CN;
-								font-weight: bold;
-								font-size: 24rpx;
-								color: #ffffff;
+					.fivecontent_item_boxitem {
+						image {
+							width: 192rpx;
+							height: 192rpx;
+							border-radius: 12rpx;
+						}
+
+						.fivecontent_item_boxitemleft {
+							margin-left: 24rpx;
+							flex: 1;
+
+							.fivecontent_item_boxitemleftone {
+								width: 100%;
+
+								text {
+									font-family: Source Han Sans CN, Source Han Sans CN;
+									// font-weight: 700;
+									font-size: 24rpx;
+									color: #999999;
+								}
+
+								view {
+									// width: 300rpx;
+									overflow: hidden;
+									text-overflow: ellipsis;
+									white-space: nowrap; //溢出不换行white-space:nowrap; //溢出不换行
+									font-family: Source Han Sans CN, Source Han Sans CN;
+									font-weight: 500;
+									font-size: 32rpx;
+									color: #333333;
+								}
 							}
 
-							.indexboxitemlefttheretext {
-								// width: 100%;
-								margin-top: 12rpx;
+							.flexstartboxfttow {
+								.fivecontent_item_boxitemlefttow {
+									margin-left: 16rpx;
+									margin-top: 8rpx;
+									width: max-content;
+									padding: 4rpx 10rpx;
+									background: #fff9e1;
+									border-radius: 4rpx 4rpx 4rpx 4rpx;
 
-								display: flex;
-								justify-content: center;
-								align-items: center;
+									.fivecontent_item_boxitemlefttowtext {
+										margin-left: 6rpx;
+										font-family: Source Han Sans CN, Source Han Sans CN;
+										font-weight: 400;
+										font-size: 16rpx;
+										color: #f9a511;
+									}
+
+									.fivecontent_item_boxitemlefttowimage {
+										width: 10.82rpx;
+										height: 14.06rpx;
+									}
+								}
+
+								.fivecontent_item_boxitemlefttow:nth-child(1) {
+									margin-left: 0;
+									background: #ffd6d7;
+									border-radius: 4rpx 4rpx 4rpx 4rpx;
+								}
+							}
+
+							.indexboxitemleftthere {
+								position: relative;
+								margin-top: 30rpx;
+								padding-left: 16rpx;
+								width: 100%;
+								background: url(https://czg-qr-order.oss-cn-beijing.aliyuncs.com/index/qinggou.png) no-repeat;
+								background-size: 100% 100%;
+
+								.indexboxitemleftthereabsolute {
+									position: absolute;
+									top: 14rpx;
+									right: 12rpx;
+									font-family: Source Han Sans CN, Source Han Sans CN;
+									font-weight: bold;
+									font-size: 24rpx;
+									color: #ffffff;
+								}
+
+								.indexboxitemlefttheretext {
+									// width: 100%;
+									margin-top: 12rpx;
 
-								.fivecontent_item_boxitemlefthere_one {
 									display: flex;
 									justify-content: center;
 									align-items: center;
 
-									.flex_startone {
+									.fivecontent_item_boxitemlefthere_one {
+										display: flex;
+										justify-content: center;
+										align-items: center;
+
+										.flex_startone {
+											font-family: Source Han Sans CN, Source Han Sans CN;
+											font-weight: 500;
+											font-size: 16rpx;
+											color: #ff7127;
+										}
+
+										.flex_starttow {
+											font-family: Source Han Sans CN, Source Han Sans CN;
+											font-weight: 500;
+											font-size: 24rpx;
+											color: #ff7127;
+										}
+									}
+
+									.fivecontent_item_boxitemlefthere_tow {
+										margin-left: 4rpx;
+										padding: 2rpx 10rpx;
+										border-radius: 4rpx 4rpx 4rpx 4rpx;
+										border: 2rpx solid #ff7127;
 										font-family: Source Han Sans CN, Source Han Sans CN;
 										font-weight: 500;
 										font-size: 16rpx;
 										color: #ff7127;
 									}
 
-									.flex_starttow {
+									.fivecontent_item_boxitemlefthere_there {
+										margin-left: 6rpx;
+										line-height: 24rpx;
 										font-family: Source Han Sans CN, Source Han Sans CN;
-										font-weight: 500;
-										font-size: 24rpx;
-										color: #ff7127;
+										font-weight: 400;
+										font-size: 16rpx;
+										color: #999999;
+										text-decoration-line: line-through;
 									}
 								}
 
-								.fivecontent_item_boxitemlefthere_tow {
-									margin-left: 4rpx;
-									padding: 2rpx 10rpx;
-									border-radius: 4rpx 4rpx 4rpx 4rpx;
-									border: 2rpx solid #ff7127;
-									font-family: Source Han Sans CN, Source Han Sans CN;
-									font-weight: 500;
-									font-size: 16rpx;
-									color: #ff7127;
-								}
+								.indexboxitemleftthere_countdown {
+									width: 100%;
+									padding-right: 7rpx;
+									margin-top: 2rpx;
 
-								.fivecontent_item_boxitemlefthere_there {
-									margin-left: 6rpx;
-									line-height: 24rpx;
-									font-family: Source Han Sans CN, Source Han Sans CN;
-									font-weight: 400;
-									font-size: 16rpx;
-									color: #999999;
-									text-decoration-line: line-through;
-								}
-							}
+									.indexboxitemleftthere_countdowntext {
+										font-family: Source Han Sans CN, Source Han Sans CN;
+										font-weight: 400;
+										font-size: 24rpx;
+										color: #999999;
+										padding-bottom: 8rpx;
+									}
 
-							.indexboxitemleftthere_countdown {
-								width: 100%;
-								padding-right: 7rpx;
-								margin-top: 2rpx;
+									.indexboxitemleftthere_countdowntexts {
+										font-family: Roboto, Roboto;
+										font-weight: 400;
+										color: #333333;
+										font-family: Source Han Sans CN, Source Han Sans CN;
+										font-weight: bold;
+										font-size: 16rpx;
+										color: #ffffff;
 
-								.indexboxitemleftthere_countdowntext {
-									font-family: Source Han Sans CN, Source Han Sans CN;
-									font-weight: 400;
-									font-size: 24rpx;
-									color: #999999;
-									padding-bottom: 8rpx;
-								}
-
-								.indexboxitemleftthere_countdowntexts {
-									font-family: Roboto, Roboto;
-									font-weight: 400;
-									color: #333333;
-									font-family: Source Han Sans CN, Source Han Sans CN;
-									font-weight: bold;
-									font-size: 16rpx;
-									color: #ffffff;
-
-									.time {
-										@include flex;
-										align-items: center;
-
-										&__custom {
-											margin-top: 4rpx;
-											width: 22rpx;
-											height: 22rpx;
-											border-radius: 4rpx;
-											/* #ifndef APP-NVUE */
-											display: flex;
-											/* #endif */
-											justify-content: center;
+										.time {
+											@include flex;
 											align-items: center;
 
-											&__item {
-												color: #fff;
-												font-size: 14rpx;
-												text-align: center;
+											&__custom {
+												margin-top: 4rpx;
+												width: 22rpx;
+												height: 22rpx;
+												border-radius: 4rpx;
+												/* #ifndef APP-NVUE */
+												display: flex;
+												/* #endif */
+												justify-content: center;
+												align-items: center;
+
+												&__item {
+													color: #fff;
+													font-size: 14rpx;
+													text-align: center;
+												}
 											}
-										}
 
-										&__doc {
-											color: #fff;
-											padding: 0px 4rpx;
-										}
+											&__doc {
+												color: #fff;
+												padding: 0px 4rpx;
+											}
 
-										&__item {
-											color: #606266;
-											font-size: 15rpx;
-											margin-right: 4rpx;
+											&__item {
+												color: #606266;
+												font-size: 15rpx;
+												margin-right: 4rpx;
+											}
 										}
 									}
 								}
@@ -702,5 +786,4 @@ onReachBottom(() => {
 			}
 		}
 	}
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/index/indexs.vue b/pages/index/indexs.vue
index 0cfbdc8..77794c3 100644
--- a/pages/index/indexs.vue
+++ b/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>
@@ -118,516 +120,535 @@
 </template>
 
 <script setup>
-import attractPopup from '@/components/attract-popup.vue';
-import { homeData } from '@/common/api/market/index.js';
-import { getMemberConfig, getRechargeConfig } from '@/common/api/index/index.js';
-import { ref, reactive, defineProps, defineEmits, onMounted } from 'vue';
-import { isJsonArrayString } from '@/utils/util.js';
+	import attractPopup from '@/components/attract-popup.vue';
+	import {
+		homeData
+	} from '@/common/api/market/index.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);
+	const attractPopupRef = ref(null);
 
-const imgs = {
-	recharge: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/2f22c0ced494497e8d6f981832b191c9.png',
-	share: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/bcb8d461e96d445ba40256079da775b3.png',
-	vip: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/cfc3bf5ba12747c6ada4d5a388aceca3.png',
-	orderFood: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/7c54a22d56f44813bf3f76c1a82a34f3.png',
-	big_orderFood: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/b3c7f6139eff4a7d81482cf533ec79fa.png',
-	takeout: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/3623cbf425d845a993acb4309404a7b9.png',
-	groupBuying: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/117745e0f3db48b489f9d4e5c5967043.png',
-	points: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/df0758f7b86449f89f882e50226e17c7.png',
-	code: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/044dcaf913054f03a9db7983f048b1e6.png',
-	defaultAvatar: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/b98d2c7110e847f996e8d7ba4342f0a5.png',
-	taocan: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/1eb9aa9b865b47b39ab9d7ac404601a9.png'
-};
-// 定义接收的属性
-const props = defineProps({
-	shopExtend: {
-		type: Array,
-		default: []
-	}
-});
-
-function toGroupBuying() {
-	uni.navigateTo({
-		url: '/groupBuying/index/index'
-	});
-}
-
-function toFenxiao() {
-	uni.navigateTo({
-		url: '/distribution/shop-detail/index?shopId=' + uni.cache.get('shopId')
-	});
-}
-
-function toIntegralMall() {
-	uni.navigateTo({
-		url: '/scoreShop/index/index?shopId=' + uni.cache.get('shopId')
-	});
-}
-
-import { productStore } from '@/stores/user.js';
-import { onShow } from '@dcloudio/uni-app';
-
-// 显示弹窗
-const popupShow = ref(false);
-const scanCodehandle = (i) => {
-	popupShow.value = true;
-};
-
-// 预点单
-function beforehandOrderHandle() {
-	popupShow.value = false;
-	uni.cache.set('dinersNum', 1);
-	uni.cache.set('tableCode', shopUserInfo.id);
-	uni.navigateTo({
-		url: '/pages/product/index?type=beforehand'
-	});
-}
-
-// 扫码点餐
-async function scanOrderHandle() {
-	popupShow.value = false;
-	const store = productStore();
-	await store.scanCodeactions();
-}
-
-function toTaocan() {
-	uni.navigateTo({
-		url: '/userPackage/index/index'
-	});
-}
-
-const memberindex = (url) => {
-	uni.pro.navigateTo(url, {
-		shopId: uni.cache.get('shopId'),
-		type: 'index'
-	});
-};
-const shopUserInfo = reactive({});
-Object.assign(shopUserInfo, uni.cache.get('shopUserInfo') || {});
-
-function tomember() {
-	if (isMember.value) {
-		const shopId = uni.cache.get('shopId');
-		if (!shopUserInfo.isVip) {
-			uni.navigateTo({
-				url: '/user/vip/buy-vip?shopId=' + shopId
-			});
-			return;
+	const imgs = {
+		recharge: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/2f22c0ced494497e8d6f981832b191c9.png',
+		share: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/bcb8d461e96d445ba40256079da775b3.png',
+		vip: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/cfc3bf5ba12747c6ada4d5a388aceca3.png',
+		orderFood: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/7c54a22d56f44813bf3f76c1a82a34f3.png',
+		big_orderFood: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/b3c7f6139eff4a7d81482cf533ec79fa.png',
+		takeout: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/3623cbf425d845a993acb4309404a7b9.png',
+		groupBuying: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/117745e0f3db48b489f9d4e5c5967043.png',
+		points: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/df0758f7b86449f89f882e50226e17c7.png',
+		code: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/044dcaf913054f03a9db7983f048b1e6.png',
+		defaultAvatar: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/b98d2c7110e847f996e8d7ba4342f0a5.png',
+		taocan: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/1eb9aa9b865b47b39ab9d7ac404601a9.png'
+	};
+	// 定义接收的属性
+	const props = defineProps({
+		shopExtend: {
+			type: Array,
+			default: []
 		}
-		uni.navigateTo({
-			url: '/user/vip/vip?shopId=' + shopId
-		});
-	} else {
-		uni.showToast({
-			title: '暂未开放',
-			icon: 'none'
-		});
-	}
-}
-
-function toCharge() {
-	if (isCharge.value) {
-		const shopId = uni.cache.get('shopId');
-		uni.navigateTo({
-			url: '/pages/user/member/czzx?shopId=' + shopId
-		});
-	} else {
-		uni.showToast({
-			title: '暂未开放',
-			icon: 'none'
-		});
-	}
-}
-const getQueryString = (url, name) => {
-	//解码
-	var reg = new RegExp('(^|&|/?)' + name + '=([^&|/?]*)(&|/?|$)', 'i');
-	var r = url.substr(1).match(reg);
-	if (r != null) {
-		return r[2];
-	}
-	return null;
-};
-
-// 获取会员配置
-const isMember = ref(0);
-const isCharge = ref(0);
-async function getVipConfig() {
-	try {
-		const res1 = await getMemberConfig({
-			shopId: uni.cache.get('shopId')
-		});
-		const res2 = await getRechargeConfig({
-			shopId: uni.cache.get('shopId')
-		});
-
-		isMember.value = +res1.memberConfig.isOpen;
-		isCharge.value = +res2.isEnable;
-	} catch (error) {
-		console.log(error);
-	}
-}
-
-const allConfig = reactive({
-	takeout: 0,
-	group: 0,
-	pointsMall: 0,
-	distribution: 0,
-	couponNum: 0,
-	pointNum: 0
-});
-
-function getHomeData() {
-	homeData().then((res) => {
-		Object.assign(allConfig, res);
-		imgs.defaultAvatar = res.userAvatar ? res.userAvatar : imgs.defaultAvatar;
 	});
-}
-onMounted(() => {
-	updateData();
-});
 
-function updateData() {
+	function toGroupBuying() {
+		uni.navigateTo({
+			url: '/groupBuying/index/index'
+		});
+	}
+
+	function toFenxiao() {
+		uni.navigateTo({
+			url: '/distribution/shop-detail/index?shopId=' + uni.cache.get('shopId')
+		});
+	}
+
+	function toIntegralMall() {
+		uni.navigateTo({
+			url: '/scoreShop/index/index?shopId=' + uni.cache.get('shopId')
+		});
+	}
+
+	import {
+		productStore
+	} from '@/stores/user.js';
+	import {
+		onShow
+	} from '@dcloudio/uni-app';
+
+	// 显示弹窗
+	const popupShow = ref(false);
+	const scanCodehandle = (i) => {
+		popupShow.value = true;
+	};
+
+	// 预点单
+	function beforehandOrderHandle() {
+		popupShow.value = false;
+		uni.cache.set('dinersNum', 1);
+		uni.cache.set('tableCode', shopUserInfo.id);
+		uni.navigateTo({
+			url: '/pages/product/index?type=beforehand'
+		});
+	}
+
+	// 扫码点餐
+	async function scanOrderHandle() {
+		popupShow.value = false;
+		const store = productStore();
+		await store.scanCodeactions();
+	}
+
+	function toTaocan() {
+		uni.navigateTo({
+			url: '/userPackage/index/index'
+		});
+	}
+
+	const memberindex = (url) => {
+		uni.pro.navigateTo(url, {
+			shopId: uni.cache.get('shopId'),
+			type: 'index'
+		});
+	};
+	const shopUserInfo = reactive({});
 	Object.assign(shopUserInfo, uni.cache.get('shopUserInfo') || {});
-	getVipConfig();
-	getHomeData();
-}
-defineExpose({
-	updateData
-});
+
+	function tomember() {
+		if (isMember.value) {
+			const shopId = uni.cache.get('shopId');
+			if (!shopUserInfo.isVip) {
+				uni.navigateTo({
+					url: '/user/vip/buy-vip?shopId=' + shopId
+				});
+				return;
+			}
+			uni.navigateTo({
+				url: '/user/vip/vip?shopId=' + shopId
+			});
+		} else {
+			uni.showToast({
+				title: '暂未开放',
+				icon: 'none'
+			});
+		}
+	}
+
+	function toCharge() {
+		if (isCharge.value) {
+			const shopId = uni.cache.get('shopId');
+			uni.navigateTo({
+				url: '/pages/user/member/czzx?shopId=' + shopId
+			});
+		} else {
+			uni.showToast({
+				title: '暂未开放',
+				icon: 'none'
+			});
+		}
+	}
+	const getQueryString = (url, name) => {
+		//解码
+		var reg = new RegExp('(^|&|/?)' + name + '=([^&|/?]*)(&|/?|$)', 'i');
+		var r = url.substr(1).match(reg);
+		if (r != null) {
+			return r[2];
+		}
+		return null;
+	};
+
+	// 获取会员配置
+	const isMember = ref(0);
+	const isCharge = ref(0);
+	async function getVipConfig() {
+		try {
+			const res1 = await getMemberConfig({
+				shopId: uni.cache.get('shopId')
+			});
+			const res2 = await getRechargeConfig({
+				shopId: uni.cache.get('shopId')
+			});
+
+			isMember.value = +res1.memberConfig.isOpen;
+			isCharge.value = +res2.isEnable;
+		} catch (error) {
+			console.log(error);
+		}
+	}
+
+	const allConfig = reactive({
+		takeout: 0,
+		group: 0,
+		pointsMall: 0,
+		distribution: 0,
+		couponNum: 0,
+		pointNum: 0
+	});
+
+	function getHomeData() {
+		homeData().then((res) => {
+			Object.assign(allConfig, res);
+			imgs.defaultAvatar = res.userAvatar ? res.userAvatar : imgs.defaultAvatar;
+		});
+	}
+	onMounted(() => {
+		updateData();
+	});
+
+	function updateData() {
+		Object.assign(shopUserInfo, uni.cache.get('shopUserInfo') || {});
+		getVipConfig();
+		getHomeData();
+	}
+	defineExpose({
+		updateData
+	});
+
+
+	
 </script>
 
 <style scoped lang="scss">
-page {
-	background: #f6f8fa;
-}
+	page {
+		background: #f6f8fa;
+	}
 
-.swiper {
-	width: 100%;
-	height: 100%;
-
-	.swiper-item {
+	.swiper {
 		width: 100%;
 		height: 100%;
 
-		.swiper-bg {
+		.swiper-item {
 			width: 100%;
 			height: 100%;
+
+			.swiper-bg {
+				width: 100%;
+				height: 100%;
+			}
 		}
 	}
-}
 
-.content {
-	.contentbox {
-		position: relative;
-		width: 100%;
-		height: 430rpx;
-
-		.bg {
+	.content {
+		.contentbox {
+			position: relative;
 			width: 100%;
-			height: 100%;
-			position: absolute;
-			top: 0;
-			left: 0;
-			z-index: -1;
-		}
+			height: 430rpx;
 
-		.contentboxitem {
-			position: absolute;
-			bottom: 0;
-			width: 90%;
-			left: 50%;
-			transform: translate(-50%, 50%);
-			padding: 38rpx 0 26rpx 0;
-			background: rgba(255, 255, 255, 0.98);
-			box-shadow: 0rpx 6rpx 12rpx 2rpx rgba(0, 0, 0, 0.16);
-			border-radius: 20rpx 20rpx 20rpx 20rpx;
-
-			.contentboxitemleft {
-				width: 50%;
-				border-right: 2rpx solid #623618;
-
-				image {
-					width: 134rpx;
-					height: 134rpx;
-				}
-
-				.contentboxitemlefttextone {
-					margin-top: 10rpx;
-					font-family: Source Han Sans CN, Source Han Sans CN;
-					font-weight: 400;
-					font-size: 32rpx;
-					color: #333333;
-				}
-
-				.contentboxitemlefttexttow {
-					margin-top: 2rpx;
-					font-family: Source Han Sans CN, Source Han Sans CN;
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #999999;
-				}
+			.bg {
+				width: 100%;
+				height: 100%;
+				position: absolute;
+				top: 0;
+				left: 0;
+				z-index: -1;
 			}
 
-			.contentboxitemright {
-				width: 50%;
-				padding: 0 34rpx;
+			.contentboxitem {
+				position: absolute;
+				bottom: 0;
+				width: 90%;
+				left: 50%;
+				transform: translate(-50%, 50%);
+				padding: 38rpx 0 26rpx 0;
+				background: rgba(255, 255, 255, 0.98);
+				box-shadow: 0rpx 6rpx 12rpx 2rpx rgba(0, 0, 0, 0.16);
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
 
-				.contentboxitemright_item:nth-child(2) {
-					margin-top: 30rpx;
-				}
+				.contentboxitemleft {
+					width: 50%;
+					border-right: 2rpx solid #623618;
 
-				.contentboxitemright_item {
 					image {
-						width: 96rpx;
-						height: 96rpx;
+						width: 134rpx;
+						height: 134rpx;
 					}
 
-					.contentboxitemright_itembox {
-						width: 170rpx;
+					.contentboxitemlefttextone {
+						margin-top: 10rpx;
+						font-family: Source Han Sans CN, Source Han Sans CN;
+						font-weight: 400;
+						font-size: 32rpx;
+						color: #333333;
+					}
 
-						text:nth-child(1) {
-							font-family: Source Han Sans CN, Source Han Sans CN;
-							font-weight: 400;
-							font-size: 32rpx;
-							color: #333333;
+					.contentboxitemlefttexttow {
+						margin-top: 2rpx;
+						font-family: Source Han Sans CN, Source Han Sans CN;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #999999;
+					}
+				}
+
+				.contentboxitemright {
+					width: 50%;
+					padding: 0 34rpx;
+
+					.contentboxitemright_item:nth-child(2) {
+						margin-top: 30rpx;
+					}
+
+					.contentboxitemright_item {
+						image {
+							width: 96rpx;
+							height: 96rpx;
 						}
 
-						text:nth-child(2) {
-							margin-top: 2rpx;
-							font-family: Source Han Sans CN, Source Han Sans CN;
-							font-weight: 400;
-							font-size: 24rpx;
-							color: #999999;
+						.contentboxitemright_itembox {
+							width: 170rpx;
+
+							text:nth-child(1) {
+								font-family: Source Han Sans CN, Source Han Sans CN;
+								font-weight: 400;
+								font-size: 32rpx;
+								color: #333333;
+							}
+
+							text:nth-child(2) {
+								margin-top: 2rpx;
+								font-family: Source Han Sans CN, Source Han Sans CN;
+								font-weight: 400;
+								font-size: 24rpx;
+								color: #999999;
+							}
 						}
 					}
 				}
 			}
 		}
 	}
-}
 
-.popup-content {
-	width: 90vw;
-	background-color: #fff;
-	border-radius: 8px;
+	.popup-content {
+		width: 90vw;
+		background-color: #fff;
+		border-radius: 8px;
 
-	.header-wrap {
-		height: 64px;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		border-bottom: 1px solid #ececec;
-		padding: 0 28upx;
+		.header-wrap {
+			height: 64px;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			border-bottom: 1px solid #ececec;
+			padding: 0 28upx;
 
-		.t {
-			font-size: 32upx;
-			color: #333;
+			.t {
+				font-size: 32upx;
+				color: #333;
+			}
+
+			.close {
+				$size: 60upx;
+				width: $size;
+				height: $size;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
 		}
 
-		.close {
-			$size: 60upx;
-			width: $size;
-			height: $size;
+		.btn-content {
+			height: 86px;
 			display: flex;
 			align-items: center;
 			justify-content: center;
+			gap: 60upx;
+
+			.btn {
+				width: 248upx;
+			}
 		}
 	}
 
-	.btn-content {
-		height: 86px;
+	.menus {
 		display: flex;
-		align-items: center;
-		justify-content: center;
-		gap: 60upx;
+		padding: 32rpx 40rpx;
+		margin-top: 150rpx;
+		gap: 20rpx;
 
-		.btn {
-			width: 248upx;
+		.menu-item {
+			background-color: #fff;
+			border-radius: 16rpx;
+			text-align: center;
+			padding: 32rpx 28rpx;
+			box-shadow: 0rpx 6rpx 12rpx 2rpx rgba(0, 0, 0, 0.16);
+			flex: 1;
 		}
 	}
-}
 
-.menus {
-	display: flex;
-	padding: 32rpx 40rpx;
-	margin-top: 150rpx;
-	gap: 20rpx;
-
-	.menu-item {
-		background-color: #fff;
-		border-radius: 16rpx;
-		text-align: center;
-		padding: 32rpx 28rpx;
-		box-shadow: 0rpx 6rpx 12rpx 2rpx rgba(0, 0, 0, 0.16);
-		flex: 1;
-	}
-}
-
-.userInfo {
-	display: flex;
-	padding: 22rpx 24rpx;
-	margin: 0 4rpx;
-	align-items: center;
-	align-self: stretch;
-	border-radius: 24rpx;
-	background: #fff;
-	position: relative;
-	z-index: 99;
-	margin-top: -36rpx;
-
-	.vip {
-		background: #fa720a;
-		font-size: 24rpx;
-		color: #ffffff;
-		padding: 6rpx 10rpx;
-		margin-left: 10rpx;
-		border-radius: 20rpx 20rpx 20rpx 0;
-	}
-
-	.code {
-		width: 33px;
-		height: 33px;
-	}
-}
-
-.new-menus-box {
-	margin: 0 16rpx 0 16rpx;
-
-	.new-menus {
+	.userInfo {
 		display: flex;
-		background-color: #fff;
-		border-radius: 16rpx;
+		padding: 22rpx 24rpx;
+		margin: 0 4rpx;
 		align-items: center;
+		align-self: stretch;
+		border-radius: 24rpx;
+		background: #fff;
+		position: relative;
+		z-index: 99;
+		margin-top: -36rpx;
 
-		.icon {
-			width: 79px;
-			height: 79px;
+		.vip {
+			background: #fa720a;
+			font-size: 24rpx;
+			color: #ffffff;
+			padding: 6rpx 10rpx;
+			margin-left: 10rpx;
+			border-radius: 20rpx 20rpx 20rpx 0;
 		}
 
-		&.layout2 {
-			padding: 29px 0;
-
-			.diner,
-			.takeout {
-				flex: 1;
-				display: flex;
-				flex-direction: column;
-				justify-content: center;
-				align-items: center;
-			}
-
-			.line {
-				width: 2rpx;
-				height: 156rpx;
-				background: #ededed;
-			}
-
-			.takeout {
-			}
+		.code {
+			width: 33px;
+			height: 33px;
 		}
+	}
 
-		&.layout1 {
-			padding: 36rpx 40rpx;
-			justify-content: space-between;
+	.new-menus-box {
+		margin: 0 16rpx 0 16rpx;
+
+		.new-menus {
 			display: flex;
+			background-color: #fff;
+			border-radius: 16rpx;
 			align-items: center;
 
-			.big_img {
-				width: 330rpx;
-				height: 330rpx;
+			.icon {
+				width: 79px;
+				height: 79px;
+			}
+
+			&.layout2 {
+				padding: 29px 0;
+
+				.diner,
+				.takeout {
+					flex: 1;
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					align-items: center;
+				}
+
+				.line {
+					width: 2rpx;
+					height: 156rpx;
+					background: #ededed;
+				}
+
+				.takeout {}
+			}
+
+			&.layout1 {
+				padding: 36rpx 40rpx;
+				justify-content: space-between;
+				display: flex;
+				align-items: center;
+
+				.big_img {
+					width: 330rpx;
+					height: 330rpx;
+				}
+
+				.title {
+					font-size: 48rpx;
+				}
+
+				.desc {
+					margin-top: 20rpx;
+					font-size: 32rpx;
+					color: #999;
+				}
+			}
+		}
+	}
+
+	.groupBuying {
+		padding: 16rpx 38rpx;
+		border-top: 2rpx solid #ededed;
+		background-color: #fff;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+
+		.img {
+			width: 40px;
+			height: 40px;
+		}
+	}
+
+	.title {
+		color: #333333;
+		font-size: 36rpx;
+		font-weight: 700;
+	}
+
+	.desc {
+		margin-top: 16rpx;
+		font-size: 28rpx;
+		color: #999;
+	}
+
+	.points {
+		margin-top: 10px;
+		background-color: #fff;
+		padding: 16rpx 68rpx;
+		border-radius: 16rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+
+		.img {
+			width: 98px;
+			height: 98px;
+		}
+	}
+
+	.taocan {
+		.img {
+			width: 117px;
+			height: 117px;
+		}
+	}
+
+	.bottom_menus {
+		display: flex;
+		gap: 14rpx;
+		margin-top: 10px;
+
+		.item {
+			flex: 1;
+			display: flex;
+			padding: 20rpx;
+			flex-direction: column;
+			align-items: center;
+			border-radius: 18rpx;
+			background: #fff;
+
+			.img {
+				width: 39px;
+				height: 39px;
 			}
 
 			.title {
-				font-size: 48rpx;
+				font-size: 32rpx;
 			}
 
 			.desc {
-				margin-top: 20rpx;
-				font-size: 32rpx;
+				margin-top: 8rpx;
 				color: #999;
+				font-size: 24rpx;
+				white-space: nowrap;
 			}
 		}
 	}
-}
-
-.groupBuying {
-	padding: 16rpx 38rpx;
-	border-top: 2rpx solid #ededed;
-	background-color: #fff;
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-
-	.img {
-		width: 40px;
-		height: 40px;
-	}
-}
-
-.title {
-	color: #333333;
-	font-size: 36rpx;
-	font-weight: 700;
-}
-
-.desc {
-	margin-top: 16rpx;
-	font-size: 28rpx;
-	color: #999;
-}
-
-.points {
-	margin-top: 10px;
-	background-color: #fff;
-	padding: 16rpx 68rpx;
-	border-radius: 16rpx;
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-
-	.img {
-		width: 98px;
-		height: 98px;
-	}
-}
-
-.taocan {
-	.img {
-		width: 117px;
-		height: 117px;
-	}
-}
-
-.bottom_menus {
-	display: flex;
-	gap: 14rpx;
-	margin-top: 10px;
-
-	.item {
-		flex: 1;
-		display: flex;
-		padding: 20rpx;
-		flex-direction: column;
-		align-items: center;
-		border-radius: 18rpx;
-		background: #fff;
-
-		.img {
-			width: 39px;
-			height: 39px;
-		}
-
-		.title {
-			font-size: 32rpx;
-		}
-
-		.desc {
-			margin-top: 8rpx;
-			color: #999;
-			font-size: 24rpx;
-			white-space: nowrap;
-		}
-	}
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/order/index.vue b/pages/order/index.vue
index daef0bf..967ee12 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -70,7 +70,7 @@
 										v-else-if="item1.isTemporary &&item1.productName=='签子'"
 										src="https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/5/b97054debd83486ab7ad8e20ca6a360a.png"
 									></u-image>
-									<u-image width="112" height="112" radius="20"
+									<u-image width="56" height="56" radius="10"
 										:src="'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/table.png'"
 										mode="heightFix" v-else></u-image>
 									<text class="productName"> {{ item1.productName }} </text>
@@ -151,7 +151,7 @@
 				uni.cache.set("shopId", item.shopId);
 				uni.navigateTo({
 					url: "/pages/product/index?type=beforehand&order_id=" + item.id +
-						'&one_more_order=1',
+						'&one_more_order=1&shopId='+item.shopId,
 				});
 			}
 		})
diff --git a/pages/product/components/goods-modal.vue b/pages/product/components/goods-modal.vue
index 2b1ba2a..e5304cc 100644
--- a/pages/product/components/goods-modal.vue
+++ b/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">{{ goods.name }}</view>
+					<view class="shop_sku_name u-flex u-row-between">
+						<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],
-			sku_id: product.skuList[0].id,
-			id: product.id,
+			...product.skuList[0]||'',
+			sku_id: product.skuList[0].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;
 		}
 
diff --git a/pages/product/index.vue b/pages/product/index.vue
index 65902cc..02219c9 100644
--- a/pages/product/index.vue
+++ b/pages/product/index.vue
@@ -573,17 +573,13 @@
 		<Loading :isLoading="!useSocket.isConnected" />
 		<ModalList></ModalList>
 		<recommendGoodsModal v-if="isDataLoaded" @onBuyClick="onBuyClick"></recommendGoodsModal>
-	
-		<view
-		v-for="(item,index) in goodsModalList" :key="index"
-		>
-		<goodsModal :key="index" v-model="item.show" :goods="item.goods" @prveImgs="prveImgs" @close="goodsModalClose(index)"
-		@websocketsendMessage="websocketsendMessage"
-		@modalAdd="modalAdd"
-		:GoodsIDInCartNumMap="GoodsIDInCartNumMap"
-		></goodsModal>
+
+		<view 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"
+				@modalAdd="modalAdd" :GoodsIDInCartNumMap="GoodsIDInCartNumMap"></goodsModal>
 		</view>
-		
+
 		<xbSwiperPreview :visable="showPrveImg" :imgs="prveImgsList" @update:visable="updateShowPrveImg">
 		</xbSwiperPreview>
 		<!-- 显示选择人数popup -->
@@ -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 shopExtendShopTable = uni.cache.get('shopTable') || {}; // 兜底空对象
-	const shopExtendMap = shopExtendShopTable.shopExtendMap || {}; // 兜底空对象
-	// 最终声明：即使 shopinfo_bg 不存在，也兜底为空字符串/默认值
-	const shopExtend = ref(shopExtendMap.shopinfo_bg || '');
+	const shopExtend = ref('');
 
 	/**
 	 * 通用数据合集 end
@@ -874,11 +868,11 @@
 	 * 返回购物车对应的商品数量
 	 */
 	function returnGoodsImCartNum(goods) {
-		if(!goods){
+		if (!goods) {
 			return 0
 		}
 		if (GoodsIDInCartNumMap.value.hasOwnProperty(goods.id)) {
-			return  GoodsIDInCartNumMap.value[goods.id]
+			return GoodsIDInCartNumMap.value[goods.id]
 		}
 		return 0
 	}
@@ -1369,13 +1363,14 @@
 		let res = await APIminiAppinfo(item.id);
 		prveImgs(res.images);
 	}
-	
-	const goodsModalList=ref([])
-	
-	function goodsModalClose(index){
-		goodsModalList.value.splice(index,1)
+
+	const goodsModalList = ref([])
+
+	function goodsModalClose(index) {
+		goodsModalList.value.splice(index, 1)
 	}
-	function modalAdd(item){
+
+	function modalAdd(item) {
 		clickspecifications(item)
 	}
 
@@ -1395,8 +1390,8 @@
 
 		if (item.isSoldStock == 1 || (item.isSaleTime == 0 && !item.isSaleTimeshow)) {
 			return uni.showToast({
-				title:'商品已下架或不在可售时间内',
-				icon:'none'
+				title: '商品已下架或不在可售时间内',
+				icon: 'none'
 			});
 		}
 
@@ -1444,8 +1439,13 @@
 		specifications.item.amountcartNumber = 0;
 		// showShopsku.value = true;
 		goodsModalList.value.push({
-			show:true,
-			goods:specifications.item
+			show: true,
+			goods: {
+				...specifications.item,
+				/*过滤掉只有一个规格且下架的商品或者skuList为空的商品*/
+				relatedRecommendJson: (specifications.item.relatedRecommendJson || []).filter(v => v
+					.skuList && v.skuList.length)
+			}
 		})
 	};
 	// 判断商品是否在可售时间内
@@ -1681,20 +1681,20 @@
 	// 返回商品对应sku数据
 
 	function cartInit(arr) {
-	
+
 		const result = []
 		cartStore.carts = arr.map(v => {
 			const goods = cartStore.allGoodsArr.find(g => g.id == v.product_id)
 			const goodsSkuList = goods ? goods.skuList : []
 			const findSku = goodsSkuList.find(sku => sku.id == v.sku_id)
 			const memberPrice = findSku ? findSku.memberPrice : 0
-			const is_temporary=v.is_temporary||v.isTemporary
+			const is_temporary = v.is_temporary || v.isTemporary
 			const is_time_discount = limitUtils.canUseLimitTimeDiscount({
 					...v,
 					memberPrice
 				}, cartStore.limitTimeDiscount, shopInfo,
 				shopUserInfo.value, 'product_id');
-			if (!goods&&!is_temporary) {
+			if (!goods && !is_temporary) {
 				console.log('删除未匹配到的商品', {
 					id: v.id,
 					operate_type: "del",
@@ -1761,8 +1761,11 @@
 			if (Message.operate_type == 'init') {
 				// cartStore.limitTimeDiscount = Message.time_dis_info;
 				cartInit(Message.data)
-
-				uni.hideLoading();
+				try {
+					uni.hideLoading();
+				} catch (error) {
+					//TODO handle the exception
+				}
 				isLoading.value = false;
 
 				if (!socketInitFinished) {
@@ -2191,7 +2194,7 @@
 	// 列表请求
 	const productqueryProduct = async () => {
 		cartStore.goodsIsloading = false;
-		allGoodsArr.value=[]
+		allGoodsArr.value = []
 		try {
 			shopProductList.hots = await productminiApphotsquery();
 			shopProductList.productInfo = await APIgroupquery();
@@ -2234,7 +2237,7 @@
 			// console.log('allGoodsArr', allGoodsArr);
 			// console.log('shopProductList', shopProductList);
 			console.log('cartStore.carts', cartStore.carts)
-			cartStore.allGoodsArr=allGoodsArr.value
+			cartStore.allGoodsArr = allGoodsArr.value
 			if (cartStore.carts.length > 0) {
 				cartInit(cartStore.carts);
 			}
@@ -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({
-			shopId: uni.cache.get('shopId')
+
+		await handleMixinOnLoad({
+			...e,
+			shopId: e.shopId || uni.cache.get('shopId')
 		})
-		//获取店铺信息
-		const shopInfoRes = await APIusershopInfodetail({
-			shopId: uni.cache.get('shopId')
-		});
-		if (shopInfoRes && shopInfoRes.shopInfo) {
-			Object.assign(shopInfo, shopInfoRes.shopInfo);
-			uni.cache.set('shopInfo', shopInfoRes.shopInfo)
+		
+		if(userStore.shopUserInfo.shopExtendList){
+			shopExtend.value=userStore.shopUserInfo.shopExtendList.find(v=>v.autoKey=='shopinfo_bg')||''
 		}
 
-
-		if (userInfo && typeof userInfo === 'object') {
-			shopUserInfo.value = userInfo
-			uni.cache.set('shopUserInfo', userInfo)
+		// //获取用户信息
+		// const userInfo = await APIshopUserInfo({
+		// 	shopId: uni.cache.get('shopId')
+		// })
+		// //获取店铺信息
+		// 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(() => {
diff --git a/pages/user/member/czzx.vue b/pages/user/member/czzx.vue
index cf2712b..598a095 100644
--- a/pages/user/member/czzx.vue
+++ b/pages/user/member/czzx.vue
@@ -1,461 +1,498 @@
 <!-- 充值中心 -->
 <template>
-  <view class="container">
-    <up-navbar
-      bgColor="transparent"
-      title="充值中心"
-      @leftClick="back"
-    ></up-navbar>
-    <view class="header-wrap">
-      <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>
-      </view>
-      <view class="balance-wrap">
-        <view class="left">
-          <text class="i t">余额</text>
-          <text class="n t">{{ shopUserInfo.amount || 0 }}</text>
-        </view>
-        <view class="right">
-          <text class="t" @click="toduihuan">兑换码</text>
-          <text class="t" @click="toDetail">明细</text>
-          <text class="t" @click="toPwd">密码设置</text>
-        </view>
-      </view>
-      <view class="btm-wrap">
-        <view class=""> </view>
-      </view>
-    </view>
-    <view class="bottom">
-      <view class="u-flex u-flex-between">
-        <view class="u-flex">
-          <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">
-          <text>充值代表接受</text>
-          <text style="color: #ecb592">《用户隐私协议》</text>
-        </view>
-      </view>
-      <view class="list u-m-t-40">
-        <view
-          class="item color1"
-          @click="sel = index"
-          v-for="(item, index) in list"
-          :key="index"
-          :class="{ active: sel == index }"
-        >
-          <view class="">
-            <text>￥</text>
-            <text
-              class="font-700"
-              style="font-size: 48 u-flex-1rpx"
-              :class="{ color2: sel == index }"
-              >{{ item.amount }}</text
-            >
-          </view>
-          <view
-            class="font-12"
-            v-if="item.rewardAmount"
-            :class="{ color2: sel == index }"
-          >
-            <text>赠</text>
-            <text>￥</text>
-            <text class="font-14">{{ item.rewardAmount }}</text>
-          </view>
-          <view class="font-12" v-if="item.rewardPoints" style="color: #5f2e0f">
-            <text>送</text>
-            <text class="font-14">{{ item.rewardPoints }}</text>
-            <text class="">积分</text>
-          </view>
-          <view class="font-12 color-666" v-if="item.couponInfoList.length">
-            <text>送</text>
-            <text>{{ couponNum(item.couponInfoList) }}</text>
-            <text>张券</text>
-            <text
-              class="color2 u-m-l-8"
-              v-if="sel == index"
-              @click="lookCoupon(item)"
-              >查看</text
-            >
-          </view>
+	<view class="container">
+		<up-navbar bgColor="transparent" title="充值中心" @leftClick="back"></up-navbar>
+		<view class="header-wrap">
+			<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">
+					<text class="i t">余额</text>
+					<text class="n t">{{ shopUserInfo.amount || 0 }}</text>
+				</view>
+				<view class="right">
+					<text class="t" @click="toduihuan">兑换码</text>
+					<text class="t" @click="toDetail">明细</text>
+					<text class="t" @click="toPwd">密码设置</text>
+				</view>
+			</view>
+			<view class="btm-wrap">
+				<view class=""></view>
+			</view>
+		</view>
+		<view class="bottom">
+			<view class="u-flex u-flex-between">
+				<view class="u-flex">
+					<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">
+					<text>充值代表接受</text>
+					<text style="color: #ecb592">《用户隐私协议》</text>
+				</view>
+			</view>
+			<view class="list u-m-t-40">
+				<view class="item color1" @click="sel = index" v-for="(item, index) in list" :key="index" :class="{ active: sel == index }">
+					<view class="">
+						<text>￥</text>
+						<text class="font-700" style="font-size: 48 u-flex-1rpx" :class="{ color2: sel == index }">{{ item.amount }}</text>
+					</view>
+					<view class="font-12" v-if="item.rewardAmount" :class="{ color2: sel == index }">
+						<text>赠</text>
+						<text>￥</text>
+						<text class="font-14">{{ item.rewardAmount }}</text>
+					</view>
+					<view class="font-12" v-if="item.rewardPoints" style="color: #5f2e0f">
+						<text>送</text>
+						<text class="font-14">{{ item.rewardPoints }}</text>
+						<text class="">积分</text>
+					</view>
+					<view class="font-12 color-666" v-if="item.couponInfoList.length">
+						<text>送</text>
+						<text>{{ couponNum(item.couponInfoList) }}</text>
+						<text>张券</text>
+						<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">
-            <image class="image" src="/static/vip/sel.png" mode=""></image>
-          </view>
-        </view>
-      </view>
-      <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
-            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
-        >
-      </template>
+					<view class="sel u-flex" v-if="sel == index">
+						<image class="image" src="/static/vip/sel.png" mode=""></image>
+					</view>
+				</view>
+			</view>
+			<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 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>
+			</template>
 
-      <button
-        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>
-      <view class="u-m-t-36 color-999 font-12">
-        <view>充值说明</view>
-        <view class="u-m-t-16">
-          <text>适用门店</text>
-          <text class="color2 u-m-l-28" @click="toShopList"
-            >全国门店通用 {{ ">" }}
-          </text>
-        </view>
-        <view class="u-m-t-16">
-          <text>有效期限</text>
-          <text class="u-m-l-28">永久有效 </text>
-        </view>
-        <view class="u-m-t-16 u-flex u-flex-y-center">
-          <text class="no-wrap">注意事项</text>
-          <view class="u-m-l-28">
-            <view>1.储值完成后不支持自助退款，可联系商家处理</view>
-            <view> 2.余额不支持转赠，不可提现，长期有效</view>
-          </view>
-        </view>
-        <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 || "" }}
-          </text>
-        </view>
-      </view>
-    </view>
-    <CouponList
-      v-model="couponModel.show"
-      :list="couponModel.couponInfoList"
-    ></CouponList>
-  </view>
+			<button 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>
+			<view class="u-m-t-36 color-999 font-12">
+				<view>充值说明</view>
+				<view class="u-m-t-16">
+					<text>适用门店</text>
+					<text class="color2 u-m-l-28" @click="toShopList">全国门店通用 {{ '>' }}</text>
+				</view>
+				<view class="u-m-t-16">
+					<text>有效期限</text>
+					<text class="u-m-l-28">永久有效</text>
+				</view>
+				<view class="u-m-t-16 u-flex u-flex-y-center">
+					<text class="no-wrap">注意事项</text>
+					<view class="u-m-l-28">
+						<view>1.储值完成后不支持自助退款，可联系商家处理</view>
+						<view>2.余额不支持转赠，不可提现，长期有效</view>
+					</view>
+				</view>
+				<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 || '' }}
+					</text>
+				</view>
+			</view>
+		</view>
+		<CouponList v-model="couponModel.show" :list="couponModel.couponInfoList"></CouponList>
+	</view>
 </template>
 
 <script setup>
-import { APIusershopInfodetail, APIshopUserInfo } from "@/common/api/member.js";
-import CouponList from "@/components/coupon/list.vue";
-import * as rechargeApi from "@/common/api/market/recharge.js";
-import { recharge } from "@/common/api/order/index.js";
-import { joinMember } from "@/common/api/order/index.js";
-import { ref, onMounted, computed, reactive, watch } from "vue";
-import { onLoad, onShow } from "@dcloudio/uni-app";
-import { pay } from "@/utils/pay.js";
+import ymfShare from '@/components/ymf-components/ymf-share.vue';
+import { shareMixin, handleMixinOnLoad, returnQuery } from '@/utils/share.js';
+import { APIusershopInfodetail, APIshopUserInfo } from '@/common/api/member.js';
+import CouponList from '@/components/coupon/list.vue';
+import * as rechargeApi from '@/common/api/market/recharge.js';
+import { recharge } from '@/common/api/order/index.js';
+import { joinMember } from '@/common/api/order/index.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,
-  });
+	uni.navigateTo({
+		url: '/pages/user/member/czzx-shop-list?shopId=' + option.shopId
+	});
 }
 
 function toduihuan() {
-  uni.navigateTo({
-    url: "/user/exchange/index",
-  });
+	uni.navigateTo({
+		url: '/user/exchange/index'
+	});
 }
 
 function couponNum(list) {
-  return list.reduce((prve, cur) => {
-    return prve + cur.num;
-  }, 0);
+	return list.reduce((prve, cur) => {
+		return prve + cur.num;
+	}, 0);
 }
 const couponModel = reactive({
-  show: false,
-  couponInfoList: [],
+	show: false,
+	couponInfoList: []
 });
 
 function lookCoupon(item) {
-  couponModel.show = true;
-  couponModel.couponInfoList = item.couponInfoList;
+	couponModel.show = true;
+	couponModel.couponInfoList = item.couponInfoList;
 }
 async function buy() {
-  if (!state.isEnable) {
-    return uni.showToast({
-      title: "充值未开启，暂不能充值",
-      icon: "none",
-    });
-  }
-  if (!charge_money.value) {
-    return uni.showToast({
-      title: "请选择或者输入充值金额",
-      icon: "none",
-    });
-  }
-  const json = {
-    shopId: option.shopId,
-    shopUserId: shopUserInfo.id,
-  };
-  if (sel.value < 0) {
-    json.amount = `${money.value}`.trim() * 1;
-  } else {
-    json.rechargeDetailId = list.value[sel.value].id;
-    json.amount = list.value[sel.value].amount;
-  }
-  const res = await recharge(json);
-  if (!res) {
-    return uni.showToast({
-      title: "充值失败",
-      icon: "error",
-    });
-  }
-  const payRes = await pay(res);
-  console.log(payRes);
-  if (payRes) {
-    uni.showToast({
-      title: "充值成功",
-      icon: "none",
-    });
-    init();
-  }
+	if (!state.isEnable) {
+		return uni.showToast({
+			title: '充值未开启，暂不能充值',
+			icon: 'none'
+		});
+	}
+	if (!charge_money.value) {
+		return uni.showToast({
+			title: '请选择或者输入充值金额',
+			icon: 'none'
+		});
+	}
+	const json = {
+		shopId: option.shopId,
+		shopUserId: shopUserInfo.id
+	};
+	if (sel.value < 0) {
+		json.amount = `${money.value}`.trim() * 1;
+	} else {
+		json.rechargeDetailId = list.value[sel.value].id;
+		json.amount = list.value[sel.value].amount;
+	}
+	const res = await recharge(json);
+	if (!res) {
+		return uni.showToast({
+			title: '充值失败',
+			icon: 'error'
+		});
+	}
+	const payRes = await pay(res);
+	console.log(payRes);
+	if (payRes) {
+		uni.showToast({
+			title: '充值成功',
+			icon: 'none'
+		});
+		init();
+	}
 }
 
 function toDetail() {
-  uni.navigateTo({
-    url: "/pages/user/member/billDetails?type=1&shopId=" + option.shopId,
-  });
+	uni.navigateTo({
+		url: '/pages/user/member/billDetails?type=1&shopId=' + option.shopId
+	});
 }
 
 function toPwd() {
-  uni.navigateTo({
-    url: "/pages/user/member/setPassword?type=1&shopId=" + option.shopId,
-  });
+	uni.navigateTo({
+		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,
-  });
-  if (shopInfoRes) {
-    Object.assign(shopInfo, shopInfoRes.shopInfo);
-  }
-  const shopUserInfoRes = await APIshopUserInfo({
-    shopId: option.shopId,
-  });
-  if (shopUserInfoRes) {
-    Object.assign(shopUserInfo, shopUserInfoRes);
-  }
-  const res = await rechargeApi.config({
-    shopId: option.shopId,
-  });
-  if (res) {
-    Object.assign(state, res);
-    list.value = res.rechargeDetailList;
-  }
+	const shopInfoRes = await APIusershopInfodetail({
+		shopId: option.shopId
+	});
+	if (shopInfoRes) {
+		Object.assign(shopInfo, shopInfoRes.shopInfo);
+	}
+	const shopUserInfoRes = await APIshopUserInfo({
+		shopId: option.shopId
+	});
+	if (shopUserInfoRes) {
+		Object.assign(shopUserInfo, shopUserInfoRes);
+	}
+	const res = await rechargeApi.config({
+		shopId: option.shopId
+	});
+	if (res) {
+		Object.assign(state, res);
+		list.value = res.rechargeDetailList;
+	}
 }
 const charge_money = computed(() => {
-  if (sel.value < 0) {
-    if (money.value > 0) {
-      return money.value;
-    }
-    return "";
-  }
-  const item = list.value[sel.value];
-  if (item) {
-    return item.amount;
-  }
-  return "";
+	if (sel.value < 0) {
+		if (money.value > 0) {
+			return money.value;
+		}
+		return '';
+	}
+	const item = list.value[sel.value];
+	if (item) {
+		return item.amount;
+	}
+	return '';
 });
-onLoad((opt) => {
-  Object.assign(option, opt);
-  // init();
+
+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();
 });
 
 watch(
-  () => money.value,
-  (newval) => {
-    if (newval && newval > 0) {
-      sel.value = -1;
-    }
-  }
+	() => money.value,
+	(newval) => {
+		if (newval && newval > 0) {
+			sel.value = -1;
+		}
+	}
 );
 onShow(() => {
-  init();
+	init();
 });
 </script>
 
 <style scoped lang="scss">
 .color1 {
-  color: #5f2e0f;
+	color: #5f2e0f;
 }
 
 .color2 {
-  color: #ff6300;
+	color: #ff6300;
 }
 
 .buy-btn {
-  margin-top: 28rpx;
-  padding: 32rpx 32rpx;
-  color: #fff;
-  font-size: 16px;
-  font-weight: 700;
-  border-radius: 80rpx;
-  line-height: 1;
-  background: linear-gradient(98deg, #fe6d1100 40.64%, #ffd1b4 105.2%),
-    linear-gradient(259deg, #fe6d11 50.14%, #ffd1b4 114.93%);
-  box-shadow: 0 14rpx 30.4rpx 0 #fe8b435e;
-  &.disabled {
-    background: #eee;
-    box-shadow: none;
-    border: none;
-    color: #999;
-  }
+	margin-top: 28rpx;
+	padding: 32rpx 32rpx;
+	color: #fff;
+	font-size: 16px;
+	font-weight: 700;
+	border-radius: 80rpx;
+	line-height: 1;
+	background: linear-gradient(98deg, #fe6d1100 40.64%, #ffd1b4 105.2%), linear-gradient(259deg, #fe6d11 50.14%, #ffd1b4 114.93%);
+	box-shadow: 0 14rpx 30.4rpx 0 #fe8b435e;
+	&.disabled {
+		background: #eee;
+		box-shadow: none;
+		border: none;
+		color: #999;
+	}
 }
 
 .other {
-  background: #f6f6f6;
-  padding: 24rpx 16rpx;
-  margin-top: 40rpx;
+	background: #f6f6f6;
+	padding: 24rpx 16rpx;
+	margin-top: 40rpx;
 }
 
 .header-wrap {
-  width: 100%;
-  height: 530rpx;
-  box-sizing: border-box;
-  padding: calc(var(--status-bar-height) + 140rpx) 28rpx 28rpx;
-  position: relative;
+	width: 100%;
+	height: 530rpx;
+	box-sizing: border-box;
+	padding: calc(var(--status-bar-height) + 140rpx) 28rpx 28rpx;
+	position: relative;
 
-  .bg {
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    top: 0;
-    left: 0;
-  }
+	.bg {
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		top: 0;
+		left: 0;
+	}
 
-  .select-shop {
-    display: flex;
-    align-items: center;
-    position: relative;
+	.select-shop {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		position: relative;
 
-    .select-btn {
-      display: flex;
-      align-items: center;
-      gap: 12upx;
+		.select-btn {
+			display: flex;
+			align-items: center;
+			gap: 12upx;
 
-      .t {
-        color: #333;
-      }
-    }
-  }
+			.t {
+				color: #333;
+			}
+		}
+	}
 
-  .balance-wrap {
-    display: flex;
-    justify-content: space-between;
-    position: relative;
-    padding-top: 20rpx;
+	.balance-wrap {
+		display: flex;
+		justify-content: space-between;
+		position: relative;
+		padding-top: 20rpx;
 
-    .left {
-      display: flex;
-      align-items: center;
+		.left {
+			display: flex;
+			align-items: center;
 
-      .t {
-        color: #5e3110;
+			.t {
+				color: #5e3110;
 
-        &.i {
-          position: relative;
-          top: 10upx;
-          font-size: 28upx;
-        }
+				&.i {
+					position: relative;
+					top: 10upx;
+					font-size: 28upx;
+				}
 
-        &.n {
-          font-size: 64upx;
-          font-weight: bold;
-        }
-      }
-    }
+				&.n {
+					font-size: 64upx;
+					font-weight: bold;
+				}
+			}
+		}
 
-    .right {
-      display: flex;
-      flex-direction: column;
-      gap: 12upx;
+		.right {
+			display: flex;
+			flex-direction: column;
+			gap: 12upx;
 
-      .t {
-        color: #86491d;
-        font-size: 28upx;
-      }
-    }
-  }
+			.t {
+				color: #86491d;
+				font-size: 28upx;
+			}
+		}
+	}
 }
 
 .bottom {
-  background-color: rgba(255, 255, 255, 0.3);
-  padding: 40rpx 28rpx 0 28rpx;
-  transform: translateY(-140rpx);
-  border-radius: 74rpx 74rpx 0 0;
+	background-color: rgba(255, 255, 255, 0.3);
+	padding: 40rpx 28rpx 0 28rpx;
+	transform: translateY(-140rpx);
+	border-radius: 74rpx 74rpx 0 0;
 }
 
 .list {
-  display: grid;
-  grid-template-columns: repeat(3, 1fr);
-  column-gap: 20rpx;
-  row-gap: 22rpx;
+	display: grid;
+	grid-template-columns: repeat(3, 1fr);
+	column-gap: 20rpx;
+	row-gap: 22rpx;
 
-  .item {
-    padding: 36rpx 22rpx;
-    border-radius: 42rpx;
-    background: linear-gradient(180deg, #f5f5f5 58.54%, #fff 140.47%);
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    position: relative;
-    box-sizing: border-box;
-    border: 6rpx solid transparent;
-    transition: all 0.3s ease-in-out;
+	.item {
+		padding: 36rpx 22rpx;
+		border-radius: 42rpx;
+		background: linear-gradient(180deg, #f5f5f5 58.54%, #fff 140.47%);
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		position: relative;
+		box-sizing: border-box;
+		border: 6rpx solid transparent;
+		transition: all 0.3s ease-in-out;
 
-    &.active {
-      background: linear-gradient(180deg, #ffc29a -26.17%, #fff 64.06%);
-      border: 6rpx solid #fe6c0e;
-      box-shadow: 0 0 31rpx 2rpx #fe8b435e;
-    }
+		&.active {
+			background: linear-gradient(180deg, #ffc29a -26.17%, #fff 64.06%);
+			border: 6rpx solid #fe6c0e;
+			box-shadow: 0 0 31rpx 2rpx #fe8b435e;
+		}
 
-    .sel {
-      position: absolute;
-      bottom: 0;
-      left: 50%;
+		.sel {
+			position: absolute;
+			bottom: 0;
+			left: 50%;
 
-      transform: translateX(-50%) translateY(21rpx);
+			transform: translateX(-50%) translateY(21rpx);
 
-      .image {
-        width: 42rpx;
-        height: 42rpx;
-      }
-    }
-  }
+			.image {
+				width: 42rpx;
+				height: 42rpx;
+			}
+		}
+	}
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/scoreShop/detail/index.vue b/scoreShop/detail/index.vue
index 3ad9b36..66606d0 100644
--- a/scoreShop/detail/index.vue
+++ b/scoreShop/detail/index.vue
@@ -8,7 +8,7 @@
 		</template>
 		<template v-else>
 			<view @click="prveImg(item.goodsImageUrl)">
-				<image class="top-img" :src="item.goodsImageUrl" mode="aspectFill" ></image>
+				<image class="top-img" :src="item.goodsImageUrl" mode="aspectFill"></image>
 			</view>
 		</template>
 		<view class="sku">
@@ -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">
@@ -55,10 +58,10 @@
 
 		<view style="height: 140px"></view>
 		<view class="fixed-bottom u-flex u-row-center">
-			<view v-if="isCanExchange" class="btn" @click="exchangeClick" >
+			<view v-if="isCanExchange" class="btn" @click="exchangeClick">
 				{{returnBtmText}}
 			</view>
-			<view class="btn gray" v-else >
+			<view class="btn gray" v-else>
 				{{returnBtmText}}
 			</view>
 		</view>
@@ -84,7 +87,7 @@
 				</view>
 				<view class="goods-info">
 					<view class="u-flex">
-						
+
 						<image class="cover" v-if="item.goodsCategory!='优惠券'" :src="item.goodsImageUrl"></image>
 						<view v-else class="cover bg-fff">
 							<couponIcon :item="item.couponInfo" typeKey="couponType" />
@@ -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
@@ -135,10 +144,10 @@
 	const modalData = reactive({
 		show: false,
 	});
-	
-	function prveImg(url){
+
+	function prveImg(url) {
 		uni.previewImage({
-			urls:[url]
+			urls: [url]
 		})
 	}
 
@@ -304,16 +313,64 @@
 			return `单人兑换已达上限`
 		}
 	})
-	onLoad((opt) => {
-		const exchange_goods = uni.getStorageSync('exchange_goods')
-		if (exchange_goods.goodsDescription) {
-			exchange_goods.goodsDescription = JSON.parse(exchange_goods.goodsDescription)
+	async function getGoods() {
+		const res = await pointGoodsApi.pointsGoods({
+			id: options.id
+		})
+		if (res.goodsDescription) {
+			res.goodsDescription = JSON.parse(res.goodsDescription)
 		} else {
-			exchange_goods.goodsDescription = []
+			res.goodsDescription = []
 		}
-		const pointsUserData = uni.getStorageSync('pointsUser')
-		Object.assign(item, exchange_goods)
-		Object.assign(pointsUser, pointsUserData)
+		res.couponInfo=res.couponInfo||{}
+
+		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,11 +520,12 @@
 				height: 184rpx;
 				border-radius: 16rpx;
 				background: #d9d9d9;
-				&.bg-fff{
+
+				&.bg-fff {
 					background-color: #fff;
 				}
 			}
-			
+
 		}
 
 		.bottom {
@@ -487,7 +545,8 @@
 			font-size: 700;
 		}
 	}
-	.w-full{
+
+	.w-full {
 		width: 100%;
 	}
 </style>
\ No newline at end of file
diff --git a/scoreShop/index/components/goods-list.vue b/scoreShop/index/components/goods-list.vue
index 08c8b13..3ab17f1 100644
--- a/scoreShop/index/components/goods-list.vue
+++ b/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,
 		})
 	}
 
diff --git a/scoreShop/index/index.vue b/scoreShop/index/index.vue
index 268e5c9..0ed234b 100644
--- a/scoreShop/index/index.vue
+++ b/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">
-					<image :src="layout === 'block' ? imgs.layout_block : imgs.layout" class="layout" />
+				<view class="u-flex gap-20">
+					<view  @click="toggleLayout">
+						<image :src="layout === 'block' ? imgs.layout_block : imgs.layout" class="layout" />
+					</view>
+					<ymfShare size="40rpx" color="#9C571F"></ymfShare>
 				</view>
+				
 			</view>
 			<goodsList :pointsUser="pointsUser" :layout="layout" :list="list" @exchange="exchange"></goodsList>
 
@@ -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,9 +75,18 @@
 	}
 
 	function back() {
-		uni.navigateBack({
-			delta: 1,
-		});
+		const pages = getCurrentPages();
+		if (pages.length < 2) {
+			uni.switchTab({
+				url: '/pages/index/index'
+			})
+		} else {
+			uni.navigateBack({
+				delta: 1,
+			});
+		}
+
+
 	}
 
 	// function exchange(item) {
@@ -87,12 +101,13 @@
 	// }
 
 	function toDetail() {
-		if(!pointsUser.value||!pointsUser.value.id){
-			return 
+		if (!pointsUser.value || !pointsUser.value.id) {
+			return
 		}
-		
+
 		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(() => {
-		refresh()
+	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;
diff --git a/scoreShop/success/index.vue b/scoreShop/success/index.vue
index 1181482..d167a48 100644
--- a/scoreShop/success/index.vue
+++ b/scoreShop/success/index.vue
@@ -1,124 +1,130 @@
 <template>
-  <view class="min-page bg-f7 u-font-28 color-333">
-    <up-navbar
-      title="兑换成功"
-      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>
-        <view class="u-font-40 font-700">兑换成功</view>
-        <view class="u-font-32 font-700">{{item.pointsGoodsName}}</view>
-        <view class="u-m-t-14" v-if="item.goodsCategory!='优惠券'">需前往店铺自行兑换领取</view>
-        <view class="u-m-t-14" v-else>优惠券直接到账您的账户中</view>
-      </view>
-      <view class="info u-flex u-flex-col">
-        <view class="u-p-22">
-          <text class="color-666">兑换商品：</text>
-          <text>{{item.pointsGoodsName}}</text>
-        </view>
-        <view class="u-p-22">
-          <text class="color-666">兑换数量：</text>
-          <text>{{item.number}}份</text>
-        </view>
-        <view class="u-p-22">
-          <text class="color-666">消耗积分：</text>
-          <text>{{item.spendPoints}}</text>
-        </view>
-		<view class="u-p-22" v-if="item.extraPaymentAmount">
-		  <text class="color-666">支付金额：</text>
-		  <text>{{item.extraPaymentAmount}}</text>
+	<view class="min-page bg-f7 u-font-28 color-333">
+		<up-navbar title="兑换成功" 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>
+				<view class="u-font-40 font-700">兑换成功</view>
+				<view class="u-font-32 font-700">{{item.pointsGoodsName}}</view>
+				<view class="u-m-t-14" v-if="item.goodsCategory!='优惠券'">需前往店铺自行兑换领取</view>
+				<view class="u-m-t-14" v-else>优惠券直接到账您的账户中</view>
+			</view>
+			<view class="info u-flex u-flex-col">
+				<view class="u-p-22">
+					<text class="color-666">兑换商品：</text>
+					<text>{{item.pointsGoodsName}}</text>
+				</view>
+				<view class="u-p-22">
+					<text class="color-666">兑换数量：</text>
+					<text>{{item.number}}份</text>
+				</view>
+				<view class="u-p-22">
+					<text class="color-666">消耗积分：</text>
+					<text>{{item.spendPoints}}</text>
+				</view>
+				<view class="u-p-22" v-if="item.extraPaymentAmount">
+					<text class="color-666">支付金额：</text>
+					<text>{{item.extraPaymentAmount}}</text>
+				</view>
+				<view class="u-p-22">
+					<text class="color-666">下单时间：</text>
+					<text>{{item.createTime}}</text>
+				</view>
+				<view class="u-p-22">
+					<text class="color-666">订单号：</text>
+					<text>：{{item.orderNo}}</text>
+				</view>
+			</view>
+			<view class="u-flex bottom u-row-center">
+				<view class="back btn" @click="back">继续兑换</view>
+				<view class="look btn" @click="lookOrder">查看订单</view>
+			</view>
 		</view>
-        <view class="u-p-22">
-          <text class="color-666">下单时间：</text>
-          <text>{{item.createTime}}</text>
-        </view>
-        <view class="u-p-22">
-          <text class="color-666">订单号：</text>
-          <text>：{{item.orderNo}}</text>
-        </view>
-      </view>
-      <view class="u-flex bottom u-row-center">
-        <view class="back btn" @click="back">继续兑换</view>
-        <view class="look btn" @click="lookOrder">查看订单</view>
-      </view>
-    </view>
-  </view>
+	</view>
 </template>
 
 <script setup>
+	const imgs = {
+		bg: "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/2/b625560a5b75418c9e643841f8674a0c.png",
+		success: "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();
+		}
+	}
 
-const imgs = {
-  bg: "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/2/b625560a5b75418c9e643841f8674a0c.png",
-  success:
-    "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/2/c2f0865efb444de58ff0d8bb3a51d300.png",
-};
-function back() {
-  uni.navigateBack();
-}
-function lookOrder() {
- uni.redirectTo({
- 	url:'/scoreShop/order/index?shopId='+item.shopId
- })
-}
-const item=reactive({
-	
-})
-onLoad(opt=>{
-	const exchange_goods_success_data=uni.getStorageSync('exchange_goods_success')
-	Object.assign(item,exchange_goods_success_data)
-	
-})
+	function lookOrder() {
+		uni.redirectTo({
+			url: '/scoreShop/order/index?shopId=' + item.shopId
+		})
+	}
+	const item = reactive({
+
+	})
+	onLoad(opt => {
+		const exchange_goods_success_data = uni.getStorageSync('exchange_goods_success')
+		Object.assign(item, exchange_goods_success_data)
+
+	})
 </script>
 
 <style lang="scss" scoped>
-.content {
-  background: linear-gradient(180deg, #f5cd82 0%, rgba(247, 219, 165, 0) 100%);
-  height: 670rpx;
-  $color: #9c571f;
-  .bg {
-    width: 100%;
-    height: 586rpx;
-    background-size: cover;
-    display: flex;
-    flex-direction: column;
-    justify-content: flex-end;
-    align-items: center;
-    padding-bottom: 26rpx;
-    color: $color;
+	.content {
+		background: linear-gradient(180deg, #f5cd82 0%, rgba(247, 219, 165, 0) 100%);
+		height: 670rpx;
+		$color: #9c571f;
 
-    .success {
-      width: 310rpx;
-      height: 206rpx;
-    }
-  }
-  .info {
-    padding-left: 174rpx;
-    padding-right: 32rpx;
-  }
-}
-.bottom {
-  gap: 48rpx;
-  margin-top: 44rpx;
+		.bg {
+			width: 100%;
+			height: 586rpx;
+			background-size: cover;
+			display: flex;
+			flex-direction: column;
+			justify-content: flex-end;
+			align-items: center;
+			padding-bottom: 26rpx;
+			color: $color;
 
-  .btn {
-    padding: 14rpx 76rpx;
-    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;
-      color: #fff;
-    }
-  }
-}
-</style>
+			.success {
+				width: 310rpx;
+				height: 206rpx;
+			}
+		}
+
+		.info {
+			padding-left: 174rpx;
+			padding-right: 32rpx;
+		}
+	}
+
+	.bottom {
+		gap: 48rpx;
+		margin-top: 44rpx;
+
+		.btn {
+			padding: 14rpx 76rpx;
+			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;
+				color: #fff;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/src/auto-imports.d.ts b/src/auto-imports.d.ts
index e69ecf0..a974851 100644
--- a/src/auto-imports.d.ts
+++ b/src/auto-imports.d.ts
@@ -39,6 +39,7 @@ declare global {
   const onScopeDispose: typeof import('vue')['onScopeDispose']
   const onServerPrefetch: typeof import('vue')['onServerPrefetch']
   const onShareAppMessage: typeof import('@dcloudio/uni-app')['onShareAppMessage']
+  const onShareTimeline: typeof import('@dcloudio/uni-app')['onShareTimeline']
   const onShow: typeof import('@dcloudio/uni-app')['onShow']
   const onUnload: typeof import('@dcloudio/uni-app')['onUnload']
   const onUnmounted: typeof import('vue')['onUnmounted']
diff --git a/stores/carts-websocket.js b/stores/carts-websocket.js
index c79e699..95c6fc2 100644
--- a/stores/carts-websocket.js
+++ b/stores/carts-websocket.js
@@ -90,11 +90,13 @@ export const useWebSocket = defineStore('socketTask', () => {
 	let onMessage = () => {
 
 	}
-	function setOnMessage(onMessageBallBack){
-		onMessage=onMessageBallBack
+
+	function setOnMessage(onMessageBallBack) {
+		onMessage = onMessageBallBack
 	}
-	function chnageInitMessage(data){
-		initMessage=data
+
+	function chnageInitMessage(data) {
+		initMessage = data
 	}
 	// 连接 WebSocket
 	const connect = async (connectMsg, onMessageBallBack) => {
@@ -127,6 +129,8 @@ export const useWebSocket = defineStore('socketTask', () => {
 			url: uni.conf.baseUrlwws + '?' + Date.now(),
 			success: (res) => {
 				console.log('连接成功');
+				console.log('connectMsg', connectMsg);
+				console.log('initMessage', initMessage);
 				isConnected.value = true;
 				// 监听初始化成功在开启心跳
 				startHeartbeat();
@@ -233,7 +237,7 @@ export const useWebSocket = defineStore('socketTask', () => {
 
 	// 发送消息
 	const sendMessage = (data) => {
-		if(!data){
+		if (!data) {
 			return
 		}
 		if (isConnected.value && data) {
@@ -369,6 +373,8 @@ export const useWebSocket = defineStore('socketTask', () => {
 		initNetworkListener,
 		connect,
 		allowReconnect,
-		socketTask,setOnMessage,chnageInitMessage
+		socketTask,
+		setOnMessage,
+		chnageInitMessage
 	};
 })
\ No newline at end of file
diff --git a/stores/user.js b/stores/user.js
index f271a91..ebba0a2 100644
--- a/stores/user.js
+++ b/stores/user.js
@@ -49,7 +49,7 @@ export const Storelogin = defineStore("login", {
 									rawData: infoRes.rawData,
 									source: "wechat",
 								});
-								console.log('APIuserlogin',res);
+								console.log('APIuserlogin', res);
 								if (res) {
 									this.token = res.token;
 									this.miniAppOpenId = res.userInfo
@@ -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("获取经纬度");
@@ -185,11 +263,11 @@ export const productStore = defineStore("product", {
 			console.log("扫码内容", q);
 			// #ifdef H5
 			uni.navigateTo({
-				url:'/pages/product/index'
+				url: '/pages/product/index'
 			})
-			return  
+			return
 			// #endif
-		
+
 			return new Promise(async (resolve, reject) => {
 				if (q) {
 					console.log(q);
@@ -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();
-					uni.cache.set("shopUserInfo", res);
-					uni.cache.set("orderVIP", res);
-					uni.cache.set("ordershopUserInfo", res.shopInfo);
-					resolve(res);
+					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) => {
diff --git a/userPackage/goodsDetail/goodsDetail.vue b/userPackage/goodsDetail/goodsDetail.vue
index a35cbb7..6ee61b6 100644
--- a/userPackage/goodsDetail/goodsDetail.vue
+++ b/userPackage/goodsDetail/goodsDetail.vue
@@ -10,30 +10,30 @@
 
 		<view class="sku">
 			<view class="u-flex u-col-center">
-				<text class="price">¥{{item.price}}</text>
-				<text class="old-price">¥{{item.originPrice}}</text>
+				<text class="price">¥{{ item.price }}</text>
+				<text class="old-price">¥{{ item.originPrice }}</text>
 			</view>
 			<view>
-				<view class="u-m-t-16 text" v-if="item.limitBuyNum"> 限购{{item.limitBuyNum}}份 </view>
-				<view class="text u-m-t-10">已售：{{item.saleNum||0}}</view>
+				<view class="u-m-t-16 text" v-if="item.limitBuyNum">限购{{ item.limitBuyNum }}份</view>
+				<view class="text u-m-t-10">已售：{{ item.saleNum || 0 }}</view>
 			</view>
 		</view>
 		<view class="goods">
-			<view class="goods-name">{{item.packageName}}</view>
+			<view class="goods-name">{{ item.packageName }}</view>
 			<view class="u-m-t-20 color-666">
-				{{item.description}}
+				{{ item.description }}
 			</view>
 		</view>
 
 		<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="">{{item.shopName}}</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="">{{item.shopAddress}}</view>
+				<view class="color-666 no-wrap" style="min-width: 180rpx">门店地址：</view>
+				<view class="">{{ item.shopAddress }}</view>
 			</view>
 		</view>
 
@@ -41,76 +41,63 @@
 			<view class="bg-f7" style="height: 32rpx"></view>
 			<view class="groups">
 				<view class="color-000 u-m-b-28 u-font-32 font-700">立即拼团</view>
-				<view class="item u-flex" v-for="(item,index) in item.gbOrderList" :key="index">
+				<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 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 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">
 							<text class="color-666">剩余：</text>
-							<text class="main-color">{{getRemainingHMS(item)}}</text>
+							<text class="main-color">{{ getRemainingHMS(item) }}</text>
 						</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;">
-					<text class="u-m-r-18">{{showGroup?'收起':'展开'}}</text>
-					<view class="guodu" :class="{rotate:!showGroup}">
+				<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">
+				<view class="u-m-t-48" v-for="(item, index) in item.packageContent" :key="index">
 					<view class="font-bold">
-						<text class="">{{item.name}}</text>
-						<text class="u-m-l-30">{{item.packageProducts.length}}选{{item.num}}</text>
+						<text class="">{{ item.name }}</text>
+						<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"
-							:key="goodsIndex">
-							<text>{{goods.name}}</text>
+						<view class="u-flex u-m-t-24 u-row-between" v-for="(goods, goodsIndex) in item.packageProducts" :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>
+								<text class="color-666 u-m-r-42">x{{ goods.num }}</text>
+								<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="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;">
-					<text class="u-m-r-18">{{showDesc?'收起':'展开'}}</text>
-					<view class="guodu" :class="{rotate:!showDesc}">
+				<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">
@@ -118,90 +105,58 @@
 						<view class="u-flex-1 u-p-t-32 u-p-b-32">分享人数</view>
 						<view class="u-flex-1 u-p-t-32 u-p-b-32">购买价格（元）</view>
 					</view>
-					<view class="u-flex row" v-for="(step,index) in item.tieredDiscount" :key="index">
-						<view class="u-flex-1 u-p-t-32 u-p-b-32">{{step.peopleNum}}</view>
-						<view class="u-flex-1 u-p-t-32 u-p-b-32">¥{{step.price}}</view>
+					<view class="u-flex row" v-for="(step, index) in item.tieredDiscount" :key="index">
+						<view class="u-flex-1 u-p-t-32 u-p-b-32">{{ step.peopleNum }}</view>
+						<view class="u-flex-1 u-p-t-32 u-p-b-32">¥{{ step.price }}</view>
 					</view>
 				</view>
 
-				<view class="u-m-t-26" >
-					<view>
-						分享期限（小时）：{{item.expireHours}}
-					</view>
-					<view class="u-m-t-10">
-						规定期限内的助力才会被计入
-					</view>
-					<view class="u-m-t-40">
-						如何才是分享成功？被分享人只需要点击《助力》，提示助力成功后即可
-						
-						
-					</view>
-
+				<view class="u-m-t-26">
+					<view>分享期限（小时）：{{ item.expireHours }}</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;">
-					<text class="u-m-r-18">{{useDescShow?'收起':'展开'}}</text>
-					<view class="guodu" :class="{rotate:!useDescShow}">
+				<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>
-						1、可用时间段：{{canuseTime}}
-					</view>
-					<view v-if="item.otherDesc">
-						2、其他使用说明：{{item.otherDesc}}
-					</view>
+					<view>1、可用时间段：{{ canuseTime }}</view>
+					<view v-if="item.otherDesc">2、其他使用说明：{{ item.otherDesc }}</view>
 				</view>
-		
-				
 			</template>
-		
-		
-		
-		
 		</view>
 
-
-		<view class="goods-detail" v-if="item.goodsCategory!='优惠券'">
+		<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>
+				<image class="w-full" v-for="(item, index) in item.detailImages" :key="index" mode="widthFix" :src="item"></image>
 			</view>
 		</view>
 
 		<view style="height: 140px"></view>
-		<view class="fixed-bottom  ">
+		<view class="fixed-bottom">
 			<!-- <view v-if="isCanExchange" class="btn" @click="exchangeClick">
 				{{returnBtmText}}
 			</view> -->
 			<view v-if="isCanExchange" class="btn" @click="payExchange">
-				{{returnBtmText}}
+				{{ returnBtmText }}
 			</view>
-			<view class="btn gray u-m-t-32" @click="createOrder" v-if="item.tieredDiscount&&item.tieredDiscount.length>0">
-				发起助力
-			</view>
-
+			<view class="btn gray u-m-t-32" @click="createOrder" v-if="item.tieredDiscount && item.tieredDiscount.length > 0">发起助力</view>
 		</view>
 
-
-
 		<!-- 需要支付的弹窗 -->
 		<up-popup :show="popupData.show" mode="bottom" closeOnClickOverlay @close="popupData.show = false">
 			<view class="popup-content">
@@ -213,31 +168,29 @@
 						<image class="cover" :src="coverImgs[0]"></image>
 						<view class="u-flex u-flex-1 u-row-between u-p-l-16 u-col-center">
 							<view>
-								<view class="u-font-32 font-bold">{{item.packageName}}</view>
+								<view class="u-font-32 font-bold">{{ item.packageName }}</view>
 
-								<view class="u-m-t-12 color-666 u-line-2">{{item.otherDesc}}</view>
+								<view class="u-m-t-12 color-666 u-line-2">{{ item.otherDesc }}</view>
 							</view>
 							<view>
-								<view class="price">¥{{item.price}}</view>
-								<view class="old-price">¥{{item.originPrice}}</view>
-								<view class="limitBuyNum" v-if="item.limitBuyNum"> 限购{{item.limitBuyNum}} </view>
+								<view class="price">¥{{ item.price }}</view>
+								<view class="old-price">¥{{ item.originPrice }}</view>
+								<view class="limitBuyNum" v-if="item.limitBuyNum">限购{{ item.limitBuyNum }}</view>
 							</view>
 						</view>
 					</view>
-
 				</view>
 
-				<view class="bottom   u-flex u-row-between u-col-center">
+				<view class="bottom u-flex u-row-between u-col-center">
 					<view class="u-flex u-col-baseline">
 						<text class="color-666">合计：</text>
-						<text class=" price">{{totalPrice}}</text>
+						<text class="price">{{ totalPrice }}</text>
 					</view>
 					<view class="u-flex">
 						<up-icon name="minus-circle" size="20" color="#666" @click="changeNumber('-')"></up-icon>
-						<text class="u-m-l-20 u-m-r-20">{{number}}</text>
+						<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,636 +202,614 @@
 	</view>
 </template>
 <script setup>
-	import {
-		Storelogin
-	} from '@/stores/user.js';
-	const storelogin = Storelogin();
-	import {
-		computed,
-		reactive,
-		watch
-	} from "vue";
-	import dayjs from "dayjs";
-	import {
-		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",
-	};
-	const number = ref(1)
+import { shareMixin, handleMixinOnLoad, returnQuery } from '@/utils/share.js';
+import { Storelogin } from '@/stores/user.js';
+const storelogin = Storelogin();
+import { computed, reactive, watch } from 'vue';
+import dayjs from 'dayjs';
+import { 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'
+};
+const number = ref(1);
 
-	const showGroup = ref(true)
-	const showDesc = ref(true)
-	const useDescShow=ref(true)
+const showGroup = ref(true);
+const showDesc = ref(true);
+const useDescShow = ref(true);
 
-	import {
-		BigNumber
-	} from "bignumber.js";
-	const totalPrice = computed(() => {
-		if (!item.price) {
-			return 0;
-		}
-
-		return BigNumber(number.value).times(item.price).toNumber()
-	})
-
-	function changeNumber(step) {
-		if (step === '-') {
-			if (number.value == 1) {
-				return
-			}
-			number.value--
-			return
-		}
-		if (step === '+') {
-			if (item.limitBuyNum == -10086) {
-				number.value++
-				return
-			}
-			if (number.value >= item.limitBuyNum) {
-				return uni.showToast({
-					title: '最多可购买' + item.limitBuyNum + '份',
-					icon: 'none'
-				})
-			}
-			number.value++
-			return
-		}
+import { BigNumber } from 'bignumber.js';
+const totalPrice = computed(() => {
+	if (!item.price) {
+		return 0;
 	}
-	const modalData = reactive({
-		show: false,
+
+	return BigNumber(number.value).times(item.price).toNumber();
+});
+
+function changeNumber(step) {
+	if (step === '-') {
+		if (number.value == 1) {
+			return;
+		}
+		number.value--;
+		return;
+	}
+	if (step === '+') {
+		if (item.limitBuyNum == -10086) {
+			number.value++;
+			return;
+		}
+		if (number.value >= item.limitBuyNum) {
+			return uni.showToast({
+				title: '最多可购买' + item.limitBuyNum + '份',
+				icon: 'none'
+			});
+		}
+		number.value++;
+		return;
+	}
+}
+const modalData = reactive({
+	show: false
+});
+
+function prveImg(index) {
+	uni.previewImage({
+		urls: coverImgs.value,
+		current: index
 	});
+}
 
-	function prveImg(index) {
-		uni.previewImage({
-			urls: coverImgs.value,
-			current: index
-		})
-	}
+const popupData = reactive({
+	show: false,
+	item: null
+});
 
-	const popupData = reactive({
-		show: false,
-		item: null
-	});
+function exchangeClick() {
+	popupData.show = true;
+}
 
-	function exchangeClick() {
-		popupData.show = true
-
-	}
-
-	function fastBuy(item) {
-		popupData.item = item;
-		popupData.show = true
-	}
-	watch(() => popupData.show, (newval) => {
+function fastBuy(item) {
+	popupData.item = item;
+	popupData.show = true;
+}
+watch(
+	() => popupData.show,
+	(newval) => {
 		if (!newval) {
-			popupData.item = null
+			popupData.item = null;
 		}
-	})
-
-
-	function dingyue() {
-		return new Promise((revlove, reject) => {
-			uni.requestSubscribeMessage({
-				tmplIds: ['JGPAGmqcPEgWB6mvAl0SC5cMqr5H5Qjcim8JCpHAZd0',
-					'F4OyUhe_ZQ9BR731jlkaN2QXAUaA3HBZuUeVPfraSz0'
-				],
-				success(res) {},
-				complete() {
-					revlove()
-				}
-			})
-		})
-
 	}
-	
-	async function createOrder(){
-		Api.createOrder({
-			packageId:item.id,
-			shopId: item.shopId,
-		}).then(res=>{
-			if(res){
-				uni.redirectTo({
-					url:'/userPackage/order/detail?orderId='+res
-				})
-			}else{
-				uni.showToast({
-					title:'发起助力失败',
-					icon:'none'
-				})
+);
+
+function dingyue() {
+	return new Promise((revlove, reject) => {
+		uni.requestSubscribeMessage({
+			tmplIds: ['JGPAGmqcPEgWB6mvAl0SC5cMqr5H5Qjcim8JCpHAZd0', 'F4OyUhe_ZQ9BR731jlkaN2QXAUaA3HBZuUeVPfraSz0'],
+			success(res) {},
+			complete() {
+				revlove();
 			}
-		})
-	}
+		});
+	});
+}
 
-	async function payExchange() {
-		uni.setStorageSync('group_buying_order', {
-			...item,
-			number: number.value,
-		})
-		uni.navigateTo({
-			url: '/userPackage/confirm-order/confirm-order'
-		})
-		return
-		await dingyue();
-		uni.showLoading({
-			title: '支付中……'
-		})
-		const openId = await getOpenId()
-		uni.hideLoading()
-		if (openId) {
-			Api.exchange({
-				paramId: item.id,
-				shopId: item.shopId,
-				number: number.value,
-				groupOrderNo: popupData.item ? popupData.item.groupOrderNo : '',
-				openId
-			}).then(orderRes => {
-				popupData.show = false;
-				pay(orderRes.payInfo).then(res => {
-					console.log(res)
-
-					if (res) {
-						uni.redirectTo({
-							url: '/groupBuying/success/index?detailId=' + orderRes.record
-								.id
-						})
-					} else {
-						uni.showToast({
-							title: '开团失败',
-							icon: 'none'
-						})
-					}
-
-				})
-
-			})
+async function createOrder() {
+	Api.createOrder({
+		packageId: item.id,
+		shopId: item.shopId
+	}).then((res) => {
+		if (res) {
+			uni.redirectTo({
+				url: '/userPackage/order/detail?orderId=' + res
+			});
 		} else {
 			uni.showToast({
-				title: '鉴权失败，兑换失败',
+				title: '发起助力失败',
 				icon: 'none'
-			})
+			});
 		}
+	});
+}
+
+async function payExchange() {
+	uni.setStorageSync('group_buying_order', {
+		...item,
+		number: number.value
+	});
+	uni.navigateTo({
+		url: '/userPackage/confirm-order/confirm-order'
+	});
+	return;
+	await dingyue();
+	uni.showLoading({
+		title: '支付中……'
+	});
+	const openId = await getOpenId();
+	uni.hideLoading();
+	if (openId) {
+		Api.exchange({
+			paramId: item.id,
+			shopId: item.shopId,
+			number: number.value,
+			groupOrderNo: popupData.item ? popupData.item.groupOrderNo : '',
+			openId
+		}).then((orderRes) => {
+			popupData.show = false;
+			pay(orderRes.payInfo).then((res) => {
+				console.log(res);
+
+				if (res) {
+					uni.redirectTo({
+						url: '/groupBuying/success/index?detailId=' + orderRes.record.id
+					});
+				} else {
+					uni.showToast({
+						title: '开团失败',
+						icon: 'none'
+					});
+				}
+			});
+		});
+	} else {
+		uni.showToast({
+			title: '鉴权失败，兑换失败',
+			icon: 'none'
+		});
 	}
+}
 
+const item = reactive({
+	goodsDescription: []
+});
 
-	const item = reactive({
-		goodsDescription: []
-	})
-
-	const isCanExchange = computed(() => {
-
-		if (item.quantity <= 0) {
-			return false
-		}
-		if (item.limitQuota && item.boughtCount >= item.limitQuota) {
-			return false
-		}
-		return true
-	})
-
-	const returnBtmText = computed(() => {
-		if (isCanExchange.value) {
-			return '立即购买'
-		}
-		if (pointsUser.pointBalance < item.requiredPoints) {
-			const num = item.requiredPoints - pointsUser.pointBalance
-			return `积分不足，还差${num}积分`
-		}
-		if (item.quantity <= 0) {
-			return `库存不足`
-		}
-		if (item.limitQuota && item.boughtCount >= item.limitQuota) {
-			return `单人兑换已达上限`
-		}
-	})
-
-
-	const query = reactive({
-		shopId: '',
-		id: '',
-	})
-
-
-	const coverImgs = ref([])
-
-	async function init(opt) {
-		// 获取小程序进入场景和参数
-		const launchOptions = uni.getLaunchOptionsSync();
-		console.log(launchOptions);
-		// 获取链接上的参数
-		const launchOptionsQuery = launchOptions.query;
-		console.log('launchOptionsQuery', launchOptionsQuery);
-		Object.assign(query, launchOptionsQuery)
-		console.log(opt)
-		Object.assign(query, opt)
-		console.log(query)
-		await storelogin.actionslogin()
-		getDetail()
+const isCanExchange = computed(() => {
+	if (item.quantity <= 0) {
+		return false;
 	}
-
-	function getDetail() {
-		Api.getPackageDetail(query).then(res => {
-			Object.assign(item, res)
-			console.log(item)
-			coverImgs.value = res.images
-			uni.cache.set('shopId', item.shopId)
-		})
+	if (item.limitQuota && item.boughtCount >= item.limitQuota) {
+		return false;
 	}
+	return true;
+});
 
-
-	/**
-	 * 计算剩余时间差（毫秒）
-	 * @param {Object} item - 包含groupEndTime的订单/拼团对象
-	 * @returns {number} 剩余时间（毫秒）
-	 */
-	function returnRemainingTime(item) {
-		if (!item?.groupEndTime) return 0; // 容错：无结束时间则返回0
-		return dayjs(item.groupEndTime).valueOf() - dayjs().valueOf();
+const returnBtmText = computed(() => {
+	if (isCanExchange.value) {
+		return '立即购买';
 	}
-
-	/**
-	 * 将毫秒差格式化为 HH:MM:SS（最多72小时）
-	 * @param {number} ms - 时间差（毫秒）
-	 * @returns {string} 格式化后的时分秒（如 09:09:09、72:00:00、00:00:00）
-	 */
-	function formatTimeToHMS(ms) {
-		// 边界1：已过期/无剩余时间 → 显示00:00:00
-		if (ms <= 0) return '00:00:00';
-
-		// 边界2：超过72小时 → 按72小时算（72*60*60*1000 = 259200000毫秒）
-		const maxMs = 72 * 60 * 60 * 1000;
-		const validMs = Math.min(ms, maxMs);
-
-		// 转换为总秒数（取整，避免小数）
-		const totalSeconds = Math.floor(validMs / 1000);
-
-		// 拆解小时、分钟、秒
-		const hours = Math.floor(totalSeconds / 3600);
-		const remainingSeconds = totalSeconds % 3600;
-		const minutes = Math.floor(remainingSeconds / 60);
-		const seconds = remainingSeconds % 60;
-
-		// 补零（确保两位数，如 9 → 09）
-		const pad = (num) => String(num).padStart(2, '0');
-		return `${pad(hours)}:${pad(minutes)}:${pad(seconds)}`;
+	if (pointsUser.pointBalance < item.requiredPoints) {
+		const num = item.requiredPoints - pointsUser.pointBalance;
+		return `积分不足，还差${num}积分`;
 	}
-
-
-	let timer = null
-	let nowTime = ref(Date.now())
-	timer = setInterval(() => {
-		nowTime.value = Date.now()
-	}, 1000)
-
-	// 组合使用：获取格式化后的剩余时间
-	function getRemainingHMS(item) {
-		nowTime.value
-		const ms = returnRemainingTime(item);
-		return formatTimeToHMS(ms);
+	if (item.quantity <= 0) {
+		return `库存不足`;
 	}
-
-
-	function returnNeedPerpole(data) {
-		return data.groupPeopleNum - data.currentPeopleNum
+	if (item.limitQuota && item.boughtCount >= item.limitQuota) {
+		return `单人兑换已达上限`;
 	}
+});
 
+const query = reactive({
+	shopId: '',
+	id: ''
+});
 
-	onLoad(init)
-	// #ifdef MP-WEIXIN
-	uni.showShareMenu()
-	// #endif
-	onShareAppMessage(() => {
-		const query = `id=${item.id}&shopId=${item.shopId}`
-		return wxShare({
-			title: item.wareName,
-			imageUrl: coverImgs.value[0],
-			path: '/userPackage/goodsDetail/goodsDetail' + '?' + query,
-			query,
-		})
-	})
-	
-	const canuseTime=computed(()=>{
-		return item.useWeeks.join('、')+' '+item.useTimes
-	})
+const coverImgs = ref([]);
+
+async function init(opt) {
+	// 获取小程序进入场景和参数
+	const launchOptions = uni.getLaunchOptionsSync();
+	console.log(launchOptions);
+	// 获取链接上的参数
+	const launchOptionsQuery = launchOptions.query;
+	console.log('launchOptionsQuery', launchOptionsQuery);
+	Object.assign(query, launchOptionsQuery);
+	console.log(opt);
+	Object.assign(query, opt);
+	console.log(query);
+	await storelogin.actionslogin();
+	getDetail();
+}
+
+function getDetail() {
+	Api.getPackageDetail(query).then((res) => {
+		Object.assign(item, res);
+		console.log(item);
+		coverImgs.value = res.images;
+		uni.cache.set('shopId', item.shopId);
+	});
+}
+
+/**
+ * 计算剩余时间差（毫秒）
+ * @param {Object} item - 包含groupEndTime的订单/拼团对象
+ * @returns {number} 剩余时间（毫秒）
+ */
+function returnRemainingTime(item) {
+	if (!item?.groupEndTime) return 0; // 容错：无结束时间则返回0
+	return dayjs(item.groupEndTime).valueOf() - dayjs().valueOf();
+}
+
+/**
+ * 将毫秒差格式化为 HH:MM:SS（最多72小时）
+ * @param {number} ms - 时间差（毫秒）
+ * @returns {string} 格式化后的时分秒（如 09:09:09、72:00:00、00:00:00）
+ */
+function formatTimeToHMS(ms) {
+	// 边界1：已过期/无剩余时间 → 显示00:00:00
+	if (ms <= 0) return '00:00:00';
+
+	// 边界2：超过72小时 → 按72小时算（72*60*60*1000 = 259200000毫秒）
+	const maxMs = 72 * 60 * 60 * 1000;
+	const validMs = Math.min(ms, maxMs);
+
+	// 转换为总秒数（取整，避免小数）
+	const totalSeconds = Math.floor(validMs / 1000);
+
+	// 拆解小时、分钟、秒
+	const hours = Math.floor(totalSeconds / 3600);
+	const remainingSeconds = totalSeconds % 3600;
+	const minutes = Math.floor(remainingSeconds / 60);
+	const seconds = remainingSeconds % 60;
+
+	// 补零（确保两位数，如 9 → 09）
+	const pad = (num) => String(num).padStart(2, '0');
+	return `${pad(hours)}:${pad(minutes)}:${pad(seconds)}`;
+}
+
+let timer = null;
+let nowTime = ref(Date.now());
+timer = setInterval(() => {
+	nowTime.value = Date.now();
+}, 1000);
+
+// 组合使用：获取格式化后的剩余时间
+function getRemainingHMS(item) {
+	nowTime.value;
+	const ms = returnRemainingTime(item);
+	return formatTimeToHMS(ms);
+}
+
+function returnNeedPerpole(data) {
+	return data.groupPeopleNum - data.currentPeopleNum;
+}
+
+onLoad(async (opt) => {
+	await handleMixinOnLoad(opt);
+	init(opt);
+});
+
+// #ifdef MP-WEIXIN
+uni.showShareMenu();
+// #endif
+
+onShareAppMessage(async () => {
+	let query = await returnQuery();
+	const options = {
+		title: item.packageName,
+		imageUrl: coverImgs.value[0],
+		path: '/userPackage/goodsDetail/goodsDetail' + '?' + query,
+		query
+	};
+	console.log('onShareAppMessage===', options);
+	return options;
+});
+
+const canuseTime = computed(() => {
+	return item.useWeeks.join('、') + ' ' + item.useTimes;
+});
 </script>
 
 <style lang="scss" scoped>
-	$topHeight: 350rpx;
+$topHeight: 350rpx;
 
-	.top-img {
-		width: 750rpx;
-		height: $topHeight;
+.top-img {
+	width: 750rpx;
+	height: $topHeight;
+}
+
+.top {
+	margin: 14rpx 18rpx;
+	background-size: cover;
+	height: $topHeight;
+	box-sizing: border-box;
+	padding-left: 70rpx;
+	padding-top: 95rpx;
+
+	.name {
+		color: #000000;
+		font-size: 36rpx;
+		font-weight: 700;
 	}
 
-	.top {
-		margin: 14rpx 18rpx;
-		background-size: cover;
-		height: $topHeight;
-		box-sizing: border-box;
-		padding-left: 70rpx;
-		padding-top: 95rpx;
+	.info {
+		color: #333333;
+		font-size: 48rpx;
+		font-weight: 700;
+		margin-top: 62rpx;
+	}
+}
 
-		.name {
-			color: #000000;
-			font-size: 36rpx;
-			font-weight: 700;
-		}
+.sku {
+	display: flex;
+	justify-content: space-between;
+	padding: 20rpx 36rpx;
+	align-items: center;
+	background: linear-gradient(90deg, #ff4a63 0%, #fd1f48 100%);
 
-		.info {
-			color: #333333;
-			font-size: 48rpx;
-			font-weight: 700;
-			margin-top: 62rpx;
-		}
+	.price {
+		color: #fff;
+		font-weight: 700;
+		font-size: 40rpx;
 	}
 
-	.sku {
-		display: flex;
-		justify-content: space-between;
-		padding: 20rpx 36rpx;
-		align-items: center;
-		background: linear-gradient(90deg, #ff4a63 0%, #fd1f48 100%);
+	.old-price {
+		margin-left: 16rpx;
+		color: #e7e7e7;
+		opacity: 0.85;
+		font-weight: 700;
+		text-decoration: line-through;
+	}
+
+	.text {
+		color: #fff;
+		font-size: 28rpx;
+	}
+}
+
+.goods {
+	padding: 20rpx 28rpx;
+	background: #fff;
+
+	.goods-name {
+		font-size: 32rpx;
+		font-weight: 700;
+		color: #333;
+	}
+}
+
+.desc {
+	padding: 32rpx 28rpx;
+	background-color: #fff;
+}
+
+.goods-detail {
+	padding: 32rpx;
+
+	.title {
+		position: relative;
+		padding: 0 22rpx;
+
+		&::before {
+			content: '';
+			display: block;
+			position: absolute;
+			right: 100%;
+			width: 70rpx;
+			height: 2rpx;
+			top: 50%;
+			transform: translateY(-50%);
+			background: linear-gradient(90deg, #f7f8f9 0%, #c9cbcc 100%);
+		}
+
+		&::after {
+			left: 100%;
+			content: '';
+			position: absolute;
+			top: 50%;
+			transform: translateY(-50%);
+			display: block;
+			width: 70rpx;
+			height: 2rpx;
+			background: linear-gradient(90deg, #c9cbcc 0%, #f7f8f9 100%);
+		}
+	}
+}
+
+.fixed-bottom {
+	position: fixed;
+	left: 98rpx;
+	right: 98rpx;
+	padding-bottom: 30px;
+	padding-top: 32rpx;
+	bottom: 0;
+	z-index: 10;
+
+	.btn {
+		padding: 22rpx;
+		border-radius: 200rpx;
+		font-size: 32rpx;
+		color: #fff;
+		width: 556rpx;
+		text-align: center;
+		background-color: #e8ad7b;
+		border: 1px solid transparent;
+
+		&.gray {
+			background: #fff;
+			color: #e8ad7b;
+			border-color: #e8ad7b;
+		}
+	}
+}
+
+.waring {
+	background-color: rgba(255, 204, 0, 0.09);
+	padding: 32rpx 24rpx;
+	color: #ff8d28;
+}
+
+.popup-content {
+	font-size: 28rpx;
+	min-height: 300px;
+
+	.popup-content-top {
+		padding: 32rpx 28rpx;
+		border-bottom: 1px solid #ededed;
+	}
+
+	.goods-info {
+		padding: 32rpx 28rpx;
+		border-bottom: 1px solid #ededed;
+
+		.cover {
+			width: 184rpx;
+			height: 184rpx;
+			border-radius: 16rpx;
+			background: #d9d9d9;
+
+			&.bg-fff {
+				background-color: #fff;
+			}
+		}
 
 		.price {
-			color: #fff;
+			font-size: 32rpx;
 			font-weight: 700;
-			font-size: 40rpx;
+			color: #ed5a2e;
+			line-height: 46rpx;
 		}
 
 		.old-price {
-			margin-left: 16rpx;
-			color: #E7E7E7;
-			opacity: .85;
-			font-weight: 700;
-			text-decoration: line-through;
+			font-size: 32rpx;
+			color: #999;
+			text-decoration-line: line-through;
+			line-height: 48rpx;
 		}
 
-		.text {
-			color: #fff;
-			font-size: 28rpx;
+		.limitBuyNum {
+			color: #666;
+			line-height: 42rpx;
 		}
 	}
 
-	.goods {
-		padding: 20rpx 28rpx;
-		background: #fff;
+	.bottom {
+		padding: 20rpx;
+		border-bottom: 1px solid #ededed;
 
-		.goods-name {
+		.price {
+			color: #ed5a2e;
 			font-size: 32rpx;
 			font-weight: 700;
-			color: #333;
 		}
 	}
 
-
-
-	.desc {
-		padding: 32rpx 28rpx;
-		background-color: #fff;
+	.btn {
+		display: flex;
+		padding: 22rpx 214rpx;
+		align-items: flex-start;
+		gap: 20rpx;
+		border-radius: 66rpx;
+		background: #e8ad7b;
+		font-size: 32rpx;
+		color: #fff;
+		font-size: 700;
 	}
+}
 
-	.goods-detail {
-		padding: 32rpx;
+.w-full {
+	width: 100%;
+}
 
-		.title {
-			position: relative;
-			padding: 0 22rpx;
+.groups {
+	padding: 28rpx 22rpx;
+	background-color: #fff;
 
-			&::before {
-				content: "";
-				display: block;
-				position: absolute;
-				right: 100%;
-				width: 70rpx;
-				height: 2rpx;
-				top: 50%;
-				transform: translateY(-50%);
-				background: linear-gradient(90deg, #f7f8f9 0%, #c9cbcc 100%);
-			}
+	.item {
+		padding: 28rpx 0;
+		border-bottom: 2rpx solid #ededed;
 
-			&::after {
-				left: 100%;
-				content: "";
-				position: absolute;
-				top: 50%;
-				transform: translateY(-50%);
-				display: block;
-				width: 70rpx;
-				height: 2rpx;
-				background: linear-gradient(90deg, #c9cbcc 0%, #f7f8f9 100%);
-			}
-		}
-	}
-
-	.fixed-bottom {
-		position: fixed;
-		left: 98rpx;
-		right: 98rpx;
-		padding-bottom: 30px;
-		padding-top: 32rpx;
-		bottom: 0;
-		z-index: 10;
-
-		.btn {
-			padding: 22rpx;
-			border-radius: 200rpx;
-			font-size: 32rpx;
-			color: #fff;
-			width: 556rpx;
-			text-align: center;
-			background-color: #E8AD7B;
-			border: 1px solid transparent;
-
-			&.gray {
-				background: #fff;
-				color: #E8AD7B;
-				border-color: #E8AD7B;
-			}
-		}
-	}
-
-	.waring {
-		background-color: rgba(255, 204, 0, 0.09);
-		padding: 32rpx 24rpx;
-		color: #ff8d28;
-	}
-
-	.popup-content {
-		font-size: 28rpx;
-		min-height: 300px;
-
-		.popup-content-top {
-			padding: 32rpx 28rpx;
-			border-bottom: 1px solid #ededed;
+		&:last-child {
+			border-bottom: none;
 		}
 
-		.goods-info {
-			padding: 32rpx 28rpx;
-			border-bottom: 1px solid #ededed;
-
-			.cover {
-				width: 184rpx;
-				height: 184rpx;
-				border-radius: 16rpx;
-				background: #d9d9d9;
-
-				&.bg-fff {
-					background-color: #fff;
-				}
-			}
-
-			.price {
-				font-size: 32rpx;
-				font-weight: 700;
-				color: #ed5a2e;
-				line-height: 46rpx;
-			}
-
-			.old-price {
-				font-size: 32rpx;
-				color: #999;
-				text-decoration-line: line-through;
-				line-height: 48rpx;
-			}
-
-			.limitBuyNum {
-				color: #666;
-				line-height: 42rpx;
-			}
-
-		}
-
-		.bottom {
-			padding: 20rpx;
-			border-bottom: 1px solid #ededed;
-
-			.price {
-				color: #ed5a2e;
-				font-size: 32rpx;
-				font-weight: 700;
-			}
+		.main-color {
+			color: #ed5a2e;
 		}
 
 		.btn {
-			display: flex;
-			padding: 22rpx 214rpx;
-			align-items: flex-start;
-			gap: 20rpx;
-			border-radius: 66rpx;
+			padding: 8rpx 26rpx;
+			border-radius: 36rpx;
 			background: #e8ad7b;
-			font-size: 32rpx;
+			font-weight: 700;
 			color: #fff;
-			font-size: 700;
 		}
 	}
+}
 
-	.w-full {
-		width: 100%;
-	}
+.share-box {
+	top: 0;
+	position: absolute;
+	right: 0;
+	padding: 4rpx 30rpx;
+	border-radius: 0 0 0 24rpx;
+	color: #ed5a2e;
+	font-weight: 700;
+	background: #fff;
+	overflow: hidden;
 
-	.groups {
-		padding: 28rpx 22rpx;
-		background-color: #fff;
-
-		.item {
-			padding: 28rpx 0;
-			border-bottom: 2rpx solid #EDEDED;
-
-			&:last-child {
-				border-bottom: none;
-			}
-
-			.main-color {
-				color: #ed5a2e;
-			}
-
-			.btn {
-				padding: 8rpx 26rpx;
-				border-radius: 36rpx;
-				background: #E8AD7B;
-				font-weight: 700;
-				color: #fff;
-			}
-		}
-	}
-
-	.share-box {
-		top: 0;
+	.share {
 		position: absolute;
+		left: 0;
 		right: 0;
-		padding: 4rpx 30rpx;
-		border-radius: 0 0 0 24rpx;
-		color: #ed5a2e;
+		top: 0;
+		bottom: 0;
+		opacity: 0;
+	}
+}
+
+.goods-group {
+	padding: 32rpx 46rpx;
+	background-color: #fff;
+
+	.name {
 		font-weight: 700;
-		background: #FFF;
-		overflow: hidden;
-
-		.share {
-			position: absolute;
-			left: 0;
-			right: 0;
-			top: 0;
-			bottom: 0;
-			opacity: 0;
-		}
+		font-size: 32rpx;
 	}
 
-	.goods-group {
-		padding: 32rpx 46rpx;
-		background-color: #fff;
+	.rotate {
+		transform: rotate(-90deg);
+	}
+}
 
-		.name {
-			font-weight: 700;
-			font-size: 32rpx;
-		}
+.desc {
+	padding: 32rpx 46rpx;
+	background-color: #fff;
+	margin-top: 32rpx;
 
-		.rotate {
-			transform: rotate(-90deg);
-		}
+	.name {
+		font-weight: 700;
+		font-size: 32rpx;
 	}
 
-	.desc {
-		padding: 32rpx 46rpx;
-		background-color: #fff;
-		margin-top: 32rpx;
+	.table {
+		border: 2rpx solid #ededed;
+		border-radius: 8rpx;
+		margin: 0 52rpx;
 
-		.name {
-			font-weight: 700;
-			font-size: 32rpx;
+		.header {
+			background: #f8f8f88f;
 		}
 
-		.table {
-			border: 2rpx solid #EDEDED;
-			border-radius: 8rpx;
-			margin: 0 52rpx;
+		.row {
+			border-top: 2rpx solid #ededed;
 
-			.header {
-				background: #f8f8f88f;
-			}
-
-			.row {
-				border-top: 2rpx solid #EDEDED;
-
-				&:first-child {
-					border-top: none;
-				}
+			&:first-child {
+				border-top: none;
 			}
 		}
-
-		.rotate {
-			transform: rotate(-90deg);
-		}
 	}
 
-	.guodu {
-		transition: all .3s;
+	.rotate {
+		transform: rotate(-90deg);
 	}
-</style>
\ No newline at end of file
+}
+
+.guodu {
+	transition: all 0.3s;
+}
+</style>
diff --git a/userPackage/order/detail.vue b/userPackage/order/detail.vue
index a73ae05..c5023bc 100644
--- a/userPackage/order/detail.vue
+++ b/userPackage/order/detail.vue
@@ -1,171 +1,169 @@
 <template>
 	<view class="min-page bg-f7 color-333 u-font-28 relative" x>
 		<view class="top" :style="topStyle">
-			<up-navbar bg-color="transparent" :fixed="false" :placeholder="false" :title="title" left-icon-color="#fff"
-				@leftClick="back('/userPackage/index/index')" title-color="#fff"></up-navbar>
-			<view class="u-flex info u-col-center">
-			</view>
+			<up-navbar
+				bg-color="transparent"
+				:fixed="false"
+				:placeholder="false"
+				:title="title"
+				left-icon-color="#fff"
+				@leftClick="back('/userPackage/index/index')"
+				title-color="#fff"
+			></up-navbar>
+			<view class="u-flex info u-col-center"></view>
 		</view>
 		<view class="bottom">
-			<view class="time u-flex u-row-center" v-if="item.status=='ing'">
+			<view class="time u-flex u-row-center" v-if="item.status == 'ing'">
 				<text class="color-666">剩余助力时间：</text>
 				<view class="u-font-32">
-					<text class="number">{{returnNum(0)}}</text>
+					<text class="number">{{ returnNum(0) }}</text>
 					<text class="gap">：</text>
-					<text class="number">{{returnNum(1)}}</text>
+					<text class="number">{{ returnNum(1) }}</text>
 					<text class="gap">：</text>
-					<text class="number">{{returnNum(2)}}</text>
+					<text class="number">{{ returnNum(2) }}</text>
 				</view>
 			</view>
 			<view class="goods u-flex u-col-center" @click="toDetail(item.packageInfo)">
 				<view class="img-box">
 					<up-image width="174rpx" height="174rpx" radius="14rpx" :src="item.goodsImg"></up-image>
-					<view class="tag" v-if="item.packageInfo&&item.packageInfo.tieredDiscount.length">
-						阶梯优惠</view>
+					<view class="tag" v-if="item.packageInfo && item.packageInfo.tieredDiscount.length">阶梯优惠</view>
 				</view>
-				<view class=" u-flex-1 u-p-l-16 u-flex u-col-center u-row-between">
-					<view v-if="item&&item.packageInfo" style="max-width: 326rpx;">
-						<view class="font-bold u-font-32 u-line-2">{{item.packageInfo
-.packageName}}</view>
-
-						<view class="u-m-t-10 color-666 u-line-1">{{item.packageInfo.description}}</view>
+				<view class="u-flex-1 u-p-l-16 u-flex u-col-center u-row-between">
+					<view v-if="item && item.packageInfo" style="max-width: 326rpx">
+						<view class="font-bold u-font-32 u-line-2">{{ item.packageInfo.packageName }}</view>
 
+						<view class="u-m-t-10 color-666 u-line-1">{{ item.packageInfo.description }}</view>
 					</view>
 					<view>
-						<template v-if="item.id&&item.isMyself">
+						<template v-if="item.id && item.isMyself">
 							<statusVue :status="item.status"></statusVue>
 						</template>
-						<template v-if="item.id&&!item.isMyself&&item.canHelp">
+						<template v-if="item.id && !item.isMyself && item.canHelp">
 							<statusVue :status="item.status"></statusVue>
 						</template>
 
-
 						<!-- 阶梯 -->
 						<view v-if="isHasDiscount(item.packageInfo)" class="u-m-t-16">
-							<template v-if="item.status=='ing'||item.status=='timeout'">
-								<view class=" main-color">
-									当前到手
-								</view>
-								<view class=" font-bold price main-color">
-									<text class="u-font-26"> ¥</text>
-									<text class="u-font-40">{{nowPrice}}</text>
-								</view>
-								<view class=" main-color old-price" v-if="item.packageInfo">
-									¥{{item.packageInfo.originPrice}}
+							<template v-if="item.status == 'ing' || item.status == 'timeout'">
+								<view class="main-color">当前到手</view>
+								<view class="font-bold price main-color">
+									<text class="u-font-26">¥</text>
+									<text class="u-font-40">{{ nowPrice }}</text>
 								</view>
+								<view class="main-color old-price" v-if="item.packageInfo">¥{{ item.packageInfo.originPrice }}</view>
 							</template>
 							<template v-else>
 								<template v-if="item.finalPrice">
-									<view class=" font-bold price main-color">
-										<text class="u-font-26"> ¥</text>
-										<text class="u-font-40">{{item.finalPrice}}</text>
-									</view>
-									<view class=" main-color old-price" v-if="item.packageInfo">
-										¥{{item.packageInfo.originPrice}}
+									<view class="font-bold price main-color">
+										<text class="u-font-26">¥</text>
+										<text class="u-font-40">{{ item.finalPrice }}</text>
 									</view>
+									<view class="main-color old-price" v-if="item.packageInfo">¥{{ item.packageInfo.originPrice }}</view>
 								</template>
 								<template v-else>
-									<view class=" font-bold price main-color" v-if="item.packageInfo">
-										<text class="u-font-26"> ¥</text>
-										<text class="u-font-40">{{item.packageInfo.price}}</text>
-									</view>
-									<view class="main-color old-price" v-if="item.packageInfo">
-										¥{{item.packageInfo.originPrice}}
+									<view class="font-bold price main-color" v-if="item.packageInfo">
+										<text class="u-font-26">¥</text>
+										<text class="u-font-40">{{ item.packageInfo.price }}</text>
 									</view>
+									<view class="main-color old-price" v-if="item.packageInfo">¥{{ item.packageInfo.originPrice }}</view>
 								</template>
 							</template>
-
 						</view>
 						<template v-else>
-							<view class=" font-bold price main-color" v-if="item.finalPrice">
-								<text class="u-font-26"> ¥</text>
-								<text class="u-font-40">{{item.finalPrice}}</text>
-							</view>
-							<view class=" main-color old-price" v-if="item.packageInfo">
-								¥{{item.packageInfo.originPrice}}
+							<view class="font-bold price main-color" v-if="item.finalPrice">
+								<text class="u-font-26">¥</text>
+								<text class="u-font-40">{{ item.finalPrice }}</text>
 							</view>
+							<view class="main-color old-price" v-if="item.packageInfo">¥{{ item.packageInfo.originPrice }}</view>
 						</template>
-
-
 					</view>
 				</view>
 			</view>
 			<template v-if="item.status">
-				<view class="refund" v-if="item.status=='refunding'&&item.isMyself">已申请退款，需等待商家审核</view>
-				<view class="refund" v-else-if="returnTime==='00:00:00'&&!item.isMyself">当前订单已失效</view>
-				<view class="refund" v-else-if="item.status!='ing'&&!item.isMyself">当前订单已失效</view>
+				<view class="refund" v-if="item.status == 'refunding' && item.isMyself">已申请退款，需等待商家审核</view>
+				<view class="refund" v-else-if="returnTime === '00:00:00' && !item.isMyself">当前订单已失效</view>
+				<view class="refund" v-else-if="item.status != 'ing' && !item.isMyself">当前订单已失效</view>
 			</template>
 
 			<view class="shop-box">
-				<view class="u-flex u-row-center u-flex-col u-col-center"
-					v-if="(item.status=='wait_verify'||item.status=='refunding')&&item.isMyself">
+				<view class="u-flex u-row-center u-flex-col u-col-center" v-if="(item.status == 'wait_verify' || item.status == 'refunding') && item.isMyself">
 					<up-qrcode :val="item.verifyCode" :size="104"></up-qrcode>
 					<view class="u-flex u-m-t-22 u-m-b-18 u-col-center">
-						<text>{{item.verifyCode}}</text>
-						<image @click="copyText(item.verifyCode)" class="copy" src="/userPackage/static/image/copy.png">
-						</image>
+						<text>{{ item.verifyCode }}</text>
+						<image @click="copyText(item.verifyCode)" class="copy" src="/userPackage/static/image/copy.png"></image>
 					</view>
 				</view>
 
-				<view class="shop ">
+				<view class="shop">
 					<view class="u-flex">
-						<text style="min-width: 180rpx;" class="color-666">可核销门店：</text>
-						<text>{{item.shopName}}</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>{{item.shopAddress}}</text>
+						<text style="min-width: 180rpx" class="color-666">门店地址：</text>
+						<text>{{ item.shopAddress }}</text>
 					</view>
 				</view>
 			</view>
 
 			<view class="desc" v-if="isHasDiscount(item.packageInfo)">
 				<view class="u-flex u-row-between" v-if="item.isMyself">
-					<view class="name">已成功分享{{item.shareNum||0}}人</view>
+					<view class="name">已成功分享{{ item.shareNum || 0 }}人</view>
 
-
-					<view class="u-flex color-666" style="align-items: baseline;" v-if="item.status=='ing'" @click="uni.navigateTo({
-						url:'/userPackage/members/members?recordId='+item.id
-					})">
-						<text>查看全部</text>
-						<up-icon name="arrow-right"></up-icon>
-					</view>
-				</view>
-				
-				<view class="u-flex u-row-between" v-if="!item.isMyself&&item.status=='ing'">
-					<view class="name">已成功分享{{item.shareNum||0}}人</view>
-				
-					<view class="u-flex color-666" style="align-items: baseline;" v-if="item.status=='ing'" @click="uni.navigateTo({
-						url:'/userPackage/members/members?recordId='+item.id
-					})">
+					<view
+						class="u-flex color-666"
+						style="align-items: baseline"
+						v-if="item.status == 'ing'"
+						@click="
+							uni.navigateTo({
+								url: '/userPackage/members/members?recordId=' + item.id
+							})
+						"
+					>
 						<text>查看全部</text>
 						<up-icon name="arrow-right"></up-icon>
 					</view>
 				</view>
 
+				<view class="u-flex u-row-between" v-if="!item.isMyself && item.status == 'ing'">
+					<view class="name">已成功分享{{ item.shareNum || 0 }}人</view>
 
-				<template v-if="item.status=='ing'&&item.isMyself">
+					<view
+						class="u-flex color-666"
+						style="align-items: baseline"
+						v-if="item.status == 'ing'"
+						@click="
+							uni.navigateTo({
+								url: '/userPackage/members/members?recordId=' + item.id
+							})
+						"
+					>
+						<text>查看全部</text>
+						<up-icon name="arrow-right"></up-icon>
+					</view>
+				</view>
+
+				<template v-if="item.status == 'ing' && item.isMyself">
 					<view class="u-m-t-32 progress-box">
-						<view class="progress" :style="{width:progressPercent+'%'}"></view>
+						<view class="progress" :style="{ width: progressPercent + '%' }"></view>
 					</view>
 					<view class="u-m-t-12 u-flex u-row-between">
-						<text class="color-666">已分享{{item.shareNum||0}}人</text>
-						<view class="share-text" v-if="maxNum*1&&minPrice*1">
-							<text v-if="progressPercent<100">分享{{maxNum}}人，</text>
-							<text class="font-bold u-font-32">{{minPrice}}元</text>
+						<text class="color-666">已分享{{ item.shareNum || 0 }}人</text>
+						<view class="share-text" v-if="maxNum * 1 && minPrice * 1">
+							<text v-if="progressPercent < 100">分享{{ maxNum }}人，</text>
+							<text class="font-bold u-font-32">{{ minPrice }}元</text>
 							<text>即可购买</text>
 						</view>
 					</view>
 
 					<view class="u-flex u-row-between u-m-t-24">
 						<view class="name">分享说明</view>
-						<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}">
+						<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">
@@ -174,24 +172,16 @@
 								<view class="u-flex-1 u-p-t-32 u-p-b-32">分享人数</view>
 								<view class="u-flex-1 u-p-t-32 u-p-b-32">购买价格（元）</view>
 							</view>
-							<view class="u-flex row" v-for="(step,index) in item.packageInfo.tieredDiscount"
-								:key="index">
-								<view class="u-flex-1 u-p-t-32 u-p-b-32">{{step.peopleNum}}</view>
-								<view class="u-flex-1 u-p-t-32 u-p-b-32">¥{{step.price}}</view>
+							<view class="u-flex row" v-for="(step, index) in item.packageInfo.tieredDiscount" :key="index">
+								<view class="u-flex-1 u-p-t-32 u-p-b-32">{{ step.peopleNum }}</view>
+								<view class="u-flex-1 u-p-t-32 u-p-b-32">¥{{ step.price }}</view>
 							</view>
 						</view>
 
 						<view class="u-m-t-26">
-							<view v-if="item.packageInfo">
-								分享期限（小时）：{{item.packageInfo.expireHours}}
-							</view>
-							<view class="u-m-t-10">
-								规定期限内的助力才会被计入
-							</view>
-							<view class="u-m-t-40">
-								如何才是分享成功？被分享人只需要点击《助力》，提示助力成功后即可
-							</view>
-
+							<view v-if="item.packageInfo">分享期限（小时）：{{ item.packageInfo.expireHours }}</view>
+							<view class="u-m-t-10">规定期限内的助力才会被计入</view>
+							<view class="u-m-t-40">如何才是分享成功？被分享人只需要点击《助力》，提示助力成功后即可</view>
 						</view>
 					</template>
 				</template>
@@ -199,13 +189,12 @@
 				<template v-if="!item.isMyself">
 					<view class="u-flex u-row-between u-m-t-24">
 						<view class="name">分享说明</view>
-						<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}">
+						<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">
@@ -214,146 +203,123 @@
 								<view class="u-flex-1 u-p-t-32 u-p-b-32">分享人数</view>
 								<view class="u-flex-1 u-p-t-32 u-p-b-32">购买价格（元）</view>
 							</view>
-							<view class="u-flex row" v-for="(step,index) in item.packageInfo.tieredDiscount"
-								:key="index">
-								<view class="u-flex-1 u-p-t-32 u-p-b-32">{{step.peopleNum}}</view>
-								<view class="u-flex-1 u-p-t-32 u-p-b-32">¥{{step.price}}</view>
+							<view class="u-flex row" v-for="(step, index) in item.packageInfo.tieredDiscount" :key="index">
+								<view class="u-flex-1 u-p-t-32 u-p-b-32">{{ step.peopleNum }}</view>
+								<view class="u-flex-1 u-p-t-32 u-p-b-32">¥{{ step.price }}</view>
 							</view>
 						</view>
 
 						<view class="u-m-t-26">
-							<view v-if="item.packageInfo">
-								分享期限（小时）：{{item.packageInfo.expireHours}}
-							</view>
-							<view class="u-m-t-10">
-								规定期限内的助力才会被计入
-							</view>
-							<view class="u-m-t-40">
-								如何才是分享成功？被分享人只需要点击《助力》，提示助力成功后即可
-							</view>
-
+							<view v-if="item.packageInfo">分享期限（小时）：{{ item.packageInfo.expireHours }}</view>
+							<view class="u-m-t-10">规定期限内的助力才会被计入</view>
+							<view class="u-m-t-40">如何才是分享成功？被分享人只需要点击《助力》，提示助力成功后即可</view>
 						</view>
 					</template>
 				</template>
-
 			</view>
 
-
-			<template v-if=" isShowOrder(item) ">
+			<template v-if="isShowOrder(item)">
 				<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;">
-							<text class="u-m-r-18">{{showOrder?'收起':'展开'}}</text>
-							<view class="guodu" :class="{rotate:!showOrder}">
+						<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>
 							</view>
 						</view>
 					</view>
 					<view class="u-m-t-16" v-if="showOrder">
-
 						<view class="u-flex u-row-between item" v-if="item.finalPrice">
 							<view class="color-666">实付金额</view>
-							<view class="">¥{{item.finalPrice}}</view>
+							<view class="">¥{{ item.finalPrice }}</view>
 						</view>
 						<view class="u-flex u-row-between item">
 							<view class="color-666">订单号</view>
-							<view class="">{{item.orderNo}}</view>
+							<view class="">{{ item.orderNo }}</view>
 						</view>
 						<view class="u-flex u-row-between item">
 							<view class="color-666">支付时间</view>
-							<view class="">{{item.payTime}}</view>
+							<view class="">{{ item.payTime }}</view>
 						</view>
 
 						<view class="u-flex u-row-between item" v-if="item.verifyTime">
 							<view class="color-666">核销时间</view>
-							<view class="">{{item.verifyTime}}</view>
+							<view class="">{{ item.verifyTime }}</view>
 						</view>
 					</view>
-
 				</view>
 			</template>
-
-
-
 		</view>
-		<view style="height: 100px;"></view>
+		<view style="height: 100px"></view>
 
-		<view class="btns" v-if="item&&item.id">
+		<view class="btns" v-if="item && item.id">
 			<template v-if="item.isMyself">
-				<template v-if="item.status=='ing'">
+				<template v-if="item.status == 'ing'">
 					<view class="btn" @click="cancel(item)">取消活动</view>
 					<!-- <view class="btn" @click="fastBuy(item)">立即购买</view> -->
 					<view class="btn" @click="payExchange(item)">立即购买</view>
 
 					<button class="btn main" open-type="share" @click.stop="share(item)">分享</button>
-
 				</template>
 
-				<template v-if="item.status=='timeout'">
+				<template v-if="item.status == 'timeout'">
 					<view class="btn" @click="cancel(item)">取消活动</view>
 					<view class="btn" @click="payExchange(item)">立即购买</view>
 				</template>
 
-				<template v-if="item.status=='wait_verify'">
-					<view class="btn " @click.stop="refund(item)">申请退款</view>
+				<template v-if="item.status == 'wait_verify'">
+					<view class="btn" @click.stop="refund(item)">申请退款</view>
 				</template>
-				<template v-if="item.status=='refunding'">
+				<template v-if="item.status == 'refunding'">
 					<button class="btn main" @click.stop="cancelRefund(item)">取消退款</button>
 				</template>
-
 			</template>
-			
-			
-			<template v-else-if="item.status=='ing'&&returnTime!='00:00:00'&&item.canHelp">
+
+			<template v-else-if="item.status == 'ing' && returnTime != '00:00:00' && item.canHelp">
 				<button class="btn main" @click.stop="help(item)">立即助力</button>
 			</template>
 
-			<view class="btn" v-if="!item.isMyself&& !item.canHelp&&item.status=='ing'">已经助力过了</view>
-
+			<view class="btn" v-if="!item.isMyself && !item.canHelp && item.status == 'ing'">已经助力过了</view>
 		</view>
 
-
 		<!-- 需要支付的弹窗 -->
 		<up-popup :show="popupData.show" mode="bottom" closeOnClickOverlay @close="popupData.show = false">
 			<view class="popup-content">
 				<view class="popup-content-top u-flex u-row-right">
 					<up-icon name="close" bold="" @click="popupData.show = false"></up-icon>
 				</view>
-				<view class="goods-info" v-if="item&&item.packageInfo">
+				<view class="goods-info" v-if="item && item.packageInfo">
 					<view class="u-flex">
 						<image class="cover" :src="item.goodsImg"></image>
 						<view class="u-flex u-flex-1 u-row-between u-p-l-16 u-col-center">
-							<view style="max-width: 340rpx;">
+							<view style="max-width: 340rpx">
 								<view class="u-font-32 font-bold u-line-1" v-if="item && item.packageInfo">
-									{{item.packageInfo.packageName}}
+									{{ item.packageInfo.packageName }}
 								</view>
 
-								<view class="u-m-t-12 color-666 u-line-2">{{item.packageInfo.wareDetail}}</view>
+								<view class="u-m-t-12 color-666 u-line-2">{{ item.packageInfo.wareDetail }}</view>
 							</view>
 							<view>
-								<view class="price">¥{{nowPrice}}</view>
-								<view class="old-price">¥{{item.packageInfo.originPrice}}</view>
-								<view class="limitBuyNum" v-if="item.packageInfo.limitBuyNum">
-									限购{{item.packageInfo.limitBuyNum}} </view>
+								<view class="price">¥{{ nowPrice }}</view>
+								<view class="old-price">¥{{ item.packageInfo.originPrice }}</view>
+								<view class="limitBuyNum" v-if="item.packageInfo.limitBuyNum">限购{{ item.packageInfo.limitBuyNum }}</view>
 							</view>
 						</view>
 					</view>
-
 				</view>
 
-				<view class="popup-content-bottom   u-flex u-row-between u-col-center">
+				<view class="popup-content-bottom u-flex u-row-between u-col-center">
 					<view class="u-flex u-col-baseline">
 						<text class="color-666">合计：</text>
-						<text class=" price">{{totalPrice}}</text>
+						<text class="price">{{ totalPrice }}</text>
 					</view>
 					<view class="u-flex">
 						<up-icon name="minus-circle" size="20" color="#666" @click="changeNumber('-')"></up-icon>
-						<text class="u-m-l-20 u-m-r-20">{{number}}</text>
+						<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">
@@ -362,764 +328,755 @@
 			</view>
 		</up-popup>
 		<!-- 兑换确认弹窗end -->
-
 	</view>
 </template>
 
 <script setup>
-	import {
-		Storelogin
-	} from '@/stores/user.js';
-	const storelogin = Storelogin();
-	import {
-		back
-	} from '@/utils/uniapp.js'
-	import statusVue from '@/userPackage/components/status.vue'
-	import * as Api from '@/common/api/market/package.js'
-	import {
-		wxShare
-	} from '@/utils/share.js'
-	import {
-		computed,
-		reactive
-	} from 'vue'
-	import {
-		getRemainingHMS
-	} from '@/utils/countdown.js'
-	const item = reactive({
-		status: ''
-	})
+import { shareMixin, handleMixinOnLoad, returnQuery } from '@/utils/share.js';
+import { Storelogin } from '@/stores/user.js';
+const storelogin = Storelogin();
+import { back } from '@/utils/uniapp.js';
+import statusVue from '@/userPackage/components/status.vue';
+import * as Api from '@/common/api/market/package.js';
+import { wxShare } from '@/utils/share.js';
+import { computed, reactive } from 'vue';
+import { getRemainingHMS } from '@/utils/countdown.js';
+const item = reactive({
+	status: ''
+});
 
-	// 判断是否有阶梯优惠
-	function isHasDiscount(item) {
-		if (!item) {
-			return false
-		}
-		return item.tieredDiscount && item.tieredDiscount.length
+// 判断是否有阶梯优惠
+function isHasDiscount(item) {
+	if (!item) {
+		return false;
 	}
+	return item.tieredDiscount && item.tieredDiscount.length;
+}
 
+const canShowOrderStatus = ['wait_verify', 'finish', 'refunding', 'refund'];
 
-	const canShowOrderStatus = ['wait_verify', 'finish', 'refunding', 'refund']
-
-	function isShowOrder(item) {
-		if (!item.status) {
-			return false
-		}
-		return item.isMyself && canShowOrderStatus.includes(item.status)
+function isShowOrder(item) {
+	if (!item.status) {
+		return false;
 	}
+	return item.isMyself && canShowOrderStatus.includes(item.status);
+}
 
+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'
+};
+const popupData = reactive({
+	show: false,
+	item: null
+});
+const showOrder = ref(true);
+const showDesc = ref(true);
 
-	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'
-	}
-	const popupData = reactive({
-		show: false,
-		item: null
+const number = ref(1);
+
+import { BigNumber } from 'bignumber.js';
+
+function toDetail(item) {
+	uni.navigateTo({
+		url: '/userPackage/goodsDetail/goodsDetail?id=' + item.id + '&shopId=' + item.shopId
 	});
-	const showOrder = ref(true)
-	const showDesc = ref(true)
+}
 
-	const number = ref(1)
-
-	import {
-		BigNumber
-	} from "bignumber.js";
-
-	function toDetail(item) {
-		uni.navigateTo({
-			url: '/userPackage/goodsDetail/goodsDetail?id=' + item.id + '&shopId=' + item.shopId
-		})
-	}
-
-	function changeNumber(step) {
-		if (step === '-') {
-			if (number.value == 1) {
-				return
-			}
-			number.value--
-			return
+function changeNumber(step) {
+	if (step === '-') {
+		if (number.value == 1) {
+			return;
 		}
-		if (step === '+') {
-			if (item.packageInfo.limitBuyNum == -10086) {
-				number.value++
-				return
-			}
-			if (number.value >= item.packageInfo.limitBuyNum) {
-				return uni.showToast({
-					title: '最多可购买' + item.packageInfo.limitBuyNum + '份',
-					icon: 'none'
-				})
-			}
-			number.value++
-			return
+		number.value--;
+		return;
+	}
+	if (step === '+') {
+		if (item.packageInfo.limitBuyNum == -10086) {
+			number.value++;
+			return;
 		}
-	}
-
-	function fastBuy() {
-		popupData.show = true
-	}
-
-	function help(item) {
-		Api.help({
-			orderId: item.id
-		}).then(res => {
-			if (res) {
-				uni.showToast({
-					title: '助力成功'
-				})
-				setTimeout(() => {
-					getDetail()
-				}, 1000)
-			}
-		})
-	}
-
-	async function payExchange() {
-		uni.setStorageSync('group_buying_order', {
-			...item,
-			...item.packageInfo,
-			shopAddress: item.shopAddress,
-			shopName: item.shopName,
-			number: number.value,
-			price: nowPrice.value,
-			paramId: item.id
-		})
-		uni.navigateTo({
-			url: '/userPackage/confirm-order/confirm-order'
-		})
-
-	}
-
-
-
-	const canRefundStatus = ['待成团', '待核销']
-
-	function canRefund(item) {
-		if (canRefundStatus.includes(item.status)) {
-			return true
+		if (number.value >= item.packageInfo.limitBuyNum) {
+			return uni.showToast({
+				title: '最多可购买' + item.packageInfo.limitBuyNum + '份',
+				icon: 'none'
+			});
 		}
-		return false
+		number.value++;
+		return;
 	}
+}
 
-	const topStyle = {
-		backgroundImage: 'url(' + imgs.bg + ')'
-	}
+function fastBuy() {
+	popupData.show = true;
+}
 
-	function copyText(text) {
-		uni.setClipboardData({
-			data: text,
-			success() {}
-		})
-	}
-	const query = reactive({
-		shopId: '',
-		detailId: '',
-	})
-
-	async function init(opt) {
-		// 获取小程序进入场景和参数
-		const launchOptions = uni.getLaunchOptionsSync();
-		console.log(launchOptions);
-		// 获取链接上的参数
-		const launchOptionsQuery = launchOptions.query;
-		console.log('launchOptionsQuery', launchOptionsQuery);
-		Object.assign(query, launchOptionsQuery)
-		console.log(opt)
-		Object.assign(query, opt)
-		console.log(query)
-		if(query.shopId){
-			uni.cache.set('shopId', query.shopId)
+function help(item) {
+	Api.help({
+		orderId: item.id
+	}).then((res) => {
+		if (res) {
+			uni.showToast({
+				title: '助力成功'
+			});
+			setTimeout(() => {
+				getDetail();
+			}, 1000);
 		}
-	}
+	});
+}
 
-	function refund(item) {
-		uni.showModal({
-			title: '提示',
-			content: '是否申请退款？',
-			showCancel: true,
-			success(res) {
-				if (res.confirm) {
-					Api.applyRefund({
-						recordId: item.id,
-						orderNo: item.orderNo,
-					}).then(res => {
-						if (res) {
-							uni.showToast({
-								title: '申请成功'
-							})
-							setTimeout(() => {
-								getDetail()
-							}, 1000)
-						}
-					})
-				}
-			}
-		})
-	}
+async function payExchange() {
+	uni.setStorageSync('group_buying_order', {
+		...item,
+		...item.packageInfo,
+		shopAddress: item.shopAddress,
+		shopName: item.shopName,
+		number: number.value,
+		price: nowPrice.value,
+		paramId: item.id
+	});
+	uni.navigateTo({
+		url: '/userPackage/confirm-order/confirm-order'
+	});
+}
 
-	function getDetail() {
-		Api.orderDetail(query).then(res => {
-			if(!res) {
-				uni.showModal({
-					title: '提示',
-					content: '记录不存在',
-					showCancel: false,
-					success() {
-						uni.redirectTo({
-							url: '/userPackage/index/index',
-						})
+const canRefundStatus = ['待成团', '待核销'];
+
+function canRefund(item) {
+	if (canRefundStatus.includes(item.status)) {
+		return true;
+	}
+	return false;
+}
+
+const topStyle = {
+	backgroundImage: 'url(' + imgs.bg + ')'
+};
+
+function copyText(text) {
+	uni.setClipboardData({
+		data: text,
+		success() {}
+	});
+}
+const query = reactive({
+	shopId: '',
+	detailId: ''
+});
+
+async function init(opt) {
+	// 获取小程序进入场景和参数
+	const launchOptions = uni.getLaunchOptionsSync();
+	console.log(launchOptions);
+	// 获取链接上的参数
+	const launchOptionsQuery = launchOptions.query;
+	console.log('launchOptionsQuery', launchOptionsQuery);
+	Object.assign(query, launchOptionsQuery);
+	console.log(opt);
+	Object.assign(query, opt);
+	console.log(query);
+	if (query.shopId) {
+		uni.cache.set('shopId', query.shopId);
+	}
+}
+
+function refund(item) {
+	uni.showModal({
+		title: '提示',
+		content: '是否申请退款？',
+		showCancel: true,
+		success(res) {
+			if (res.confirm) {
+				Api.applyRefund({
+					recordId: item.id,
+					orderNo: item.orderNo
+				}).then((res) => {
+					if (res) {
+						uni.showToast({
+							title: '申请成功'
+						});
+						setTimeout(() => {
+							getDetail();
+						}, 1000);
 					}
-				})
-				return
-			}
-			res.packageInfo = res.packageInfo;
-			res.goodsImg = res.packageInfo.images[0]
-			Object.assign(item, res)
-			console.log('item', item)
-			uni.cache.set('shopId', item.shopId)
-		})
-	}
-	onLoad(init)
-
-	onShow(async () => {
-		await storelogin.actionslogin()
-		getDetail()
-	})
-
-	let timer = null
-	let nowTime = ref(Date.now())
-	timer = setInterval(() => {
-		nowTime.value = Date.now()
-	}, 1000)
-
-	const returnTime = computed(() => {
-		nowTime.value
-		return getRemainingHMS(item, 'expireTime')
-	})
-
-	function returnNum(index) {
-		return returnTime.value.split(':')[index]
-	}
-
-
-	function cancel(item) {
-		uni.showModal({
-			title: '提示',
-			content: '是否取消活动？',
-			showCancel: true,
-			success(res) {
-				if (res.confirm) {
-					Api.cancel({
-						orderId: item.id,
-					}).then(res => {
-						if (res) {
-							uni.showToast({
-								title: '取消活动成功'
-							})
-							setTimeout(() => {
-								getDetail()
-							}, 1000)
-						}
-					})
-				}
-			}
-		})
-	}
-
-	function cancelRefund(item) {
-		uni.showModal({
-			title: '提示',
-			content: '是否取消退款？',
-			showCancel: true,
-			success(res) {
-				if (res.confirm) {
-					Api.cancelRefund({
-						recordId: item.id,
-						orderNo: item.orderNo,
-					}).then(res => {
-						if (res) {
-							uni.showToast({
-								title: '取消成功'
-							})
-							setTimeout(() => {
-								getDetail()
-							}, 1000)
-						}
-					})
-				}
-			}
-		})
-	}
-
-	let shareItem = null
-
-	function share(item) {
-		shareItem = item
-	}
-	onShareAppMessage(() => {
-		console.log('onShareAppMessage')
-		console.log(shareItem)
-		const query = `orderId=${shareItem.id}&shopId=${shareItem.shopId}`
-		return wxShare({
-			title: shareItem.packageInfo.packageName,
-			imageUrl: shareItem.goodsImg,
-			path: '/userPackage/order/detail' + '?' + query,
-			query,
-		})
-	})
-
-	const title = computed(() => {
-		if (!item.isMyself) {
-			return '助力好友'
-		}
-		return '订单详情'
-	})
-
-
-
-	const nowStep = computed(() => {
-		let nowStepItem = null
-		if (!item.packageInfo) {
-			return nowStepItem
-		}
-		if (!item.packageInfo.tieredDiscount.length) {
-			return nowStepItem
-		}
-		for (let i in item.packageInfo.tieredDiscount) {
-			const nowItem = item.packageInfo.tieredDiscount[i]
-			const nextItem = item.packageInfo.tieredDiscount[i + 1]
-			if (!nextItem) {
-				if (item.shareNum >= nowItem.peopleNum) {
-					nowStepItem = nowItem
-				}
-			} else {
-				if (item.shareNum >= nowItem.peopleNum && item.shareNum < nextItem.peopleNum) {
-					nowStepItem = nowItem
-				}
+				});
 			}
 		}
-		return nowStepItem
-	})
+	});
+}
 
+function getDetail() {
+	Api.orderDetail(query).then((res) => {
+		if (!res) {
+			uni.showModal({
+				title: '提示',
+				content: '记录不存在',
+				showCancel: false,
+				success() {
+					uni.redirectTo({
+						url: '/userPackage/index/index'
+					});
+				}
+			});
+			return;
+		}
+		res.packageInfo = res.packageInfo;
+		res.goodsImg = res.packageInfo.images[0];
+		Object.assign(item, res);
+		console.log('item', item);
+		uni.cache.set('shopId', item.shopId);
+	});
+}
 
-	const progressPercent = computed(() => {
-		if (!item.packageInfo) {
-			return 0
-		}
-		if (!item.packageInfo.tieredDiscount.length) {
-			return 0
-		}
-		if (!nowStep.value) {
-			return 0
-		}
-		const index = item.packageInfo.tieredDiscount.findIndex(v => v.peopleNum==nowStep.value.peopleNum)
-		if (index != -1) {
-			const percent= (index + 1) / item.packageInfo.tieredDiscount.length * 100
-			return percent>=100?100:percent;
-		}else{
-			return 0
-		}
-	})
-	const nowPrice = computed(() => {
-		if (!item.packageInfo) {
-			return 0
-		}
-		if (!item.packageInfo.tieredDiscount.length) {
-			return 0
-		}
-		return nowStep.value ? nowStep.value.price : item.packageInfo.price
-	})
+onShareAppMessage(async () => {
+	let query = await returnQuery();
+	const options = {
+		title: item.packageInfo.packageName,
+		imageUrl: item.goodsImg,
+		path: '/userPackage/order/detail' + '?' + query,
+		query
+	};
+	console.log('onShareAppMessage===', options);
+	return options;
+});
 
-	const totalPrice = computed(() => {
-		if (!item.packageInfo || !item.packageInfo.price) {
-			return 0;
-		}
-		return BigNumber(number.value).times(nowPrice.value).toNumber()
-	})
+onLoad(async (opt) => {
+	init(opt);
+	await handleMixinOnLoad(opt);
+});
 
-	const maxNum = computed(() => {
-		if (!item.packageInfo || item.packageInfo.tieredDiscount <= 0) {
-			return 0
+onShow(async () => {
+	await storelogin.actionslogin();
+	getDetail();
+});
+
+let timer = null;
+let nowTime = ref(Date.now());
+timer = setInterval(() => {
+	nowTime.value = Date.now();
+}, 1000);
+
+const returnTime = computed(() => {
+	nowTime.value;
+	return getRemainingHMS(item, 'expireTime');
+});
+
+function returnNum(index) {
+	return returnTime.value.split(':')[index];
+}
+
+function cancel(item) {
+	uni.showModal({
+		title: '提示',
+		content: '是否取消活动？',
+		showCancel: true,
+		success(res) {
+			if (res.confirm) {
+				Api.cancel({
+					orderId: item.id
+				}).then((res) => {
+					if (res) {
+						uni.showToast({
+							title: '取消活动成功'
+						});
+						setTimeout(() => {
+							getDetail();
+						}, 1000);
+					}
+				});
+			}
 		}
-		return item.packageInfo.tieredDiscount[item.packageInfo.tieredDiscount.length - 1].peopleNum
-	})
-	const minPrice = computed(() => {
-		if (!item.packageInfo || item.packageInfo.tieredDiscount <= 0) {
-			return 0
+	});
+}
+
+function cancelRefund(item) {
+	uni.showModal({
+		title: '提示',
+		content: '是否取消退款？',
+		showCancel: true,
+		success(res) {
+			if (res.confirm) {
+				Api.cancelRefund({
+					recordId: item.id,
+					orderNo: item.orderNo
+				}).then((res) => {
+					if (res) {
+						uni.showToast({
+							title: '取消成功'
+						});
+						setTimeout(() => {
+							getDetail();
+						}, 1000);
+					}
+				});
+			}
 		}
-		return item.packageInfo.tieredDiscount[item.packageInfo.tieredDiscount.length - 1].price
-	})
+	});
+}
+
+let shareItem = null;
+
+function share(item) {
+	shareItem = item;
+}
+// onShareAppMessage(() => {
+// 	console.log('onShareAppMessage');
+// 	console.log(shareItem);
+// 	const query = `orderId=${shareItem.id}&shopId=${shareItem.shopId}`;
+// 	return wxShare({
+// 		title: shareItem.packageInfo.packageName,
+// 		imageUrl: shareItem.goodsImg,
+// 		path: '/userPackage/order/detail' + '?' + query,
+// 		query
+// 	});
+// });
+
+const title = computed(() => {
+	if (!item.isMyself) {
+		return '助力好友';
+	}
+	return '订单详情';
+});
+
+const nowStep = computed(() => {
+	let nowStepItem = null;
+	if (!item.packageInfo) {
+		return nowStepItem;
+	}
+	if (!item.packageInfo.tieredDiscount.length) {
+		return nowStepItem;
+	}
+	for (let i in item.packageInfo.tieredDiscount) {
+		const nowItem = item.packageInfo.tieredDiscount[i];
+		const nextItem = item.packageInfo.tieredDiscount[i + 1];
+		if (!nextItem) {
+			if (item.shareNum >= nowItem.peopleNum) {
+				nowStepItem = nowItem;
+			}
+		} else {
+			if (item.shareNum >= nowItem.peopleNum && item.shareNum < nextItem.peopleNum) {
+				nowStepItem = nowItem;
+			}
+		}
+	}
+	return nowStepItem;
+});
+
+const progressPercent = computed(() => {
+	if (!item.packageInfo) {
+		return 0;
+	}
+	if (!item.packageInfo.tieredDiscount.length) {
+		return 0;
+	}
+	if (!nowStep.value) {
+		return 0;
+	}
+	const index = item.packageInfo.tieredDiscount.findIndex((v) => v.peopleNum == nowStep.value.peopleNum);
+	if (index != -1) {
+		const percent = ((index + 1) / item.packageInfo.tieredDiscount.length) * 100;
+		return percent >= 100 ? 100 : percent;
+	} else {
+		return 0;
+	}
+});
+const nowPrice = computed(() => {
+	if (!item.packageInfo) {
+		return 0;
+	}
+	if (!item.packageInfo.tieredDiscount.length) {
+		return 0;
+	}
+	return nowStep.value ? nowStep.value.price : item.packageInfo.price;
+});
+
+const totalPrice = computed(() => {
+	if (!item.packageInfo || !item.packageInfo.price) {
+		return 0;
+	}
+	return BigNumber(number.value).times(nowPrice.value).toNumber();
+});
+
+const maxNum = computed(() => {
+	if (!item.packageInfo || item.packageInfo.tieredDiscount <= 0) {
+		return 0;
+	}
+	return item.packageInfo.tieredDiscount[item.packageInfo.tieredDiscount.length - 1].peopleNum;
+});
+const minPrice = computed(() => {
+	if (!item.packageInfo || item.packageInfo.tieredDiscount <= 0) {
+		return 0;
+	}
+	return item.packageInfo.tieredDiscount[item.packageInfo.tieredDiscount.length - 1].price;
+});
 </script>
 
 <style lang="scss" scoped>
-	.top {
-		height: 422rpx;
-		background-size: cover;
+.top {
+	height: 422rpx;
+	background-size: cover;
 
-		.info {
-			padding: 32rpx 30rpx 0 30rpx;
+	.info {
+		padding: 32rpx 30rpx 0 30rpx;
+		color: #fff;
+		font-size: 32rpx;
+		font-weight: 700;
+	}
+}
+
+.bottom {
+	margin: 0 28rpx;
+	transform: translateY(-160rpx);
+	border-radius: 16rpx;
+	overflow: hidden;
+
+	.time {
+		padding: 18rpx 24rpx;
+		background: #fff4e2;
+		display: flex;
+		align-items: center;
+		border-radius: 16rpx 16rpx 0 0;
+
+		.number {
+			padding: 6rpx;
+			border-radius: 16rpx;
+			background: #ed5a2e;
 			color: #fff;
 			font-size: 32rpx;
+			margin-left: 18rpx;
+			margin-right: 18rpx;
+		}
+
+		.gap {
+			font-size: 32rpx;
+		}
+	}
+
+	.goods {
+		background-color: #fff;
+		padding: 22rpx 24rpx;
+
+		.main-color {
+			color: #eb532a;
+		}
+
+		.pin {
+			width: 60rpx;
+			height: 38rpx;
+		}
+
+		.tuan-members {
+			padding: 0 16rpx 0 0;
+			border-radius: 0 6rpx 6rpx 0;
+			background: #4c2828;
+			color: #f5d9ad;
 			font-weight: 700;
 		}
 
+		.price {
+			color: #ed5a2e;
+		}
 
+		.old-price {
+			color: #999;
+			text-decoration: line-through;
+		}
 	}
 
-	.bottom {
-		margin: 0 28rpx;
-		transform: translateY(-160rpx);
+	.u-font-48 {
+		font-size: 48rpx;
+	}
+
+	.shop-box {
+		background: #fff;
+		padding: 32rpx 30rpx 28rpx 30rpx;
+		border-radius: 0 0 16rpx 16rpx;
+	}
+
+	.copy {
+		width: 22rpx;
+		height: 22rpx;
+		margin-left: 22rpx;
+	}
+
+	.shop {
+		border-radius: 8rpx;
+		background: #f8f8f8;
+		padding: 16rpx 34rpx;
+	}
+
+	.relative {
+		position: relative;
+	}
+
+	.members {
+		padding: 26rpx 24rpx;
 		border-radius: 16rpx;
-		overflow: hidden;
+		margin-top: 32rpx;
+		background-color: #fff;
 
-		.time {
-			padding: 18rpx 24rpx;
-			background: #FFF4E2;
+		.list {
 			display: flex;
-			align-items: center;
-			border-radius: 16rpx 16rpx 0 0;
-
-			.number {
-				padding: 6rpx;
-				border-radius: 16rpx;
-				background: #ED5A2E;
-				color: #fff;
-				font-size: 32rpx;
-				margin-left: 18rpx;
-				margin-right: 18rpx;
-			}
-
-			.gap {
-				font-size: 32rpx;
-			}
+			flex-wrap: wrap;
 		}
 
-		.goods {
-			background-color: #fff;
-			padding: 22rpx 24rpx;
+		.item {
+			width: calc(100% / 3);
+			display: flex;
+			margin-bottom: 32rpx;
 
-			.main-color {
-				color: #EB532A;
-			}
+			.add-box {
+				width: 140rpx;
+				height: 140rpx;
+				border: 2rpx dashed #d9d9d9;
+				border-radius: 50%;
+				overflow: hidden;
+				position: relative;
 
-			.pin {
-				width: 60rpx;
-				height: 38rpx;
-			}
-
-			.tuan-members {
-				padding: 0 16rpx 0 0;
-				border-radius: 0 6rpx 6rpx 0;
-				background: #4C2828;
-				color: #f5d9ad;
-				font-weight: 700;
-			}
-
-			.price {
-				color: #ed5a2e;
-			}
-
-			.old-price {
-				color: #999;
-				text-decoration: line-through;
-			}
-		}
-
-		.u-font-48 {
-			font-size: 48rpx;
-		}
-
-		.shop-box {
-			background: #fff;
-			padding: 32rpx 30rpx 28rpx 30rpx;
-			border-radius: 0 0 16rpx 16rpx;
-		}
-
-		.copy {
-			width: 22rpx;
-			height: 22rpx;
-			margin-left: 22rpx;
-		}
-
-		.shop {
-			border-radius: 8rpx;
-			background: #F8F8F8;
-			padding: 16rpx 34rpx;
-		}
-
-		.relative {
-			position: relative;
-		}
-
-		.members {
-			padding: 26rpx 24rpx;
-			border-radius: 16rpx;
-			margin-top: 32rpx;
-			background-color: #fff;
-
-			.list {
-				display: flex;
-				flex-wrap: wrap;
-			}
-
-			.item {
-				width: calc(100% / 3);
-				display: flex;
-				margin-bottom: 32rpx;
-
-				.add-box {
-					width: 140rpx;
-					height: 140rpx;
-					border: 2rpx dashed #D9D9D9;
-					border-radius: 50%;
-					overflow: hidden;
-					position: relative;
-
-					.share {
-						position: absolute;
-						left: 0;
-						right: 0;
-						top: 0;
-						bottom: 0;
-						opacity: 0;
-					}
-				}
-
-				&:nth-of-type(3n-1) {
-					justify-content: center;
-				}
-
-				&:nth-of-type(3n) {
-					justify-content: flex-end;
-				}
-
-				.box {
-					display: flex;
-					flex-direction: column;
-				}
-
-				.absolute {
-					bottom: 0;
-					display: flex;
-					justify-content: center;
+				.share {
+					position: absolute;
 					left: 0;
 					right: 0;
-				}
-
-				.tuanzhang {
-					padding: 8rpx 18rpx;
-					border-radius: 20rpx;
-					background: #ED5A2E;
-					color: #fff;
+					top: 0;
 					bottom: 0;
+					opacity: 0;
 				}
 			}
-		}
 
-		.order {
-			padding: 32rpx 28rpx;
-			border-radius: 16rpx;
-			margin-top: 32rpx;
-			background-color: #fff;
-
-			.item {
-				padding: 16rpx 0;
+			&:nth-of-type(3n-1) {
+				justify-content: center;
 			}
-		}
-	}
 
-	.btns {
-		position: fixed;
-		left: 28rpx;
-		right: 28rpx;
-		bottom: 0;
-		padding-bottom: 60rpx;
-		display: flex;
-		gap: 40rpx;
+			&:nth-of-type(3n) {
+				justify-content: flex-end;
+			}
 
-		.btn {
-			flex: 1;
-			padding: 16rpx 28rpx;
-			border-radius: 200rpx;
-			text-align: center;
-			font-size: 32rpx;
-			line-height: 1;
-			margin: 0;
-			justify-content: center;
-			border: 2rpx solid #E8AD7B;
-			background: #FFF;
-			color: #E8AD7B;
+			.box {
+				display: flex;
+				flex-direction: column;
+			}
 
-			&.main {
-				background-color: #E8AD7B;
+			.absolute {
+				bottom: 0;
+				display: flex;
+				justify-content: center;
+				left: 0;
+				right: 0;
+			}
+
+			.tuanzhang {
+				padding: 8rpx 18rpx;
+				border-radius: 20rpx;
+				background: #ed5a2e;
 				color: #fff;
+				bottom: 0;
 			}
 		}
 	}
 
-	.guodu {
-		transition: all .3s;
-	}
+	.order {
+		padding: 32rpx 28rpx;
+		border-radius: 16rpx;
+		margin-top: 32rpx;
+		background-color: #fff;
 
-	.pin-btn {
-		padding: 22rpx 60rpx;
+		.item {
+			padding: 16rpx 0;
+		}
+	}
+}
+
+.btns {
+	position: fixed;
+	left: 28rpx;
+	right: 28rpx;
+	bottom: 0;
+	padding-bottom: 60rpx;
+	display: flex;
+	gap: 40rpx;
+
+	.btn {
+		flex: 1;
+		padding: 16rpx 28rpx;
 		border-radius: 200rpx;
 		text-align: center;
 		font-size: 32rpx;
+		line-height: 1;
+		margin: 0;
 		justify-content: center;
-		border: 2rpx solid #E8AD7B;
-		background: #E8AD7B;
+		border: 2rpx solid #e8ad7b;
+		background: #fff;
+		color: #e8ad7b;
+
+		&.main {
+			background-color: #e8ad7b;
+			color: #fff;
+		}
+	}
+}
+
+.guodu {
+	transition: all 0.3s;
+}
+
+.pin-btn {
+	padding: 22rpx 60rpx;
+	border-radius: 200rpx;
+	text-align: center;
+	font-size: 32rpx;
+	justify-content: center;
+	border: 2rpx solid #e8ad7b;
+	background: #e8ad7b;
+	color: #fff;
+	margin-top: 32rpx;
+}
+
+.rotate {
+	transform: rotate(-90deg);
+}
+
+.refund {
+	padding: 18rpx 164rpx;
+	border-radius: 0 0 16rpx 16rpx;
+	background: #fff4e2;
+	font-weight: 700;
+	margin-bottom: 32rpx;
+	text-align: center;
+}
+
+.popup-content {
+	font-size: 28rpx;
+	min-height: 300px;
+
+	.popup-content-top {
+		padding: 32rpx 28rpx;
+		border-bottom: 1px solid #ededed;
+	}
+
+	.goods-info {
+		padding: 32rpx 28rpx;
+		border-bottom: 1px solid #ededed;
+
+		.cover {
+			width: 184rpx;
+			height: 184rpx;
+			border-radius: 16rpx;
+			background: #d9d9d9;
+
+			&.bg-fff {
+				background-color: #fff;
+			}
+		}
+
+		.price {
+			font-size: 32rpx;
+			font-weight: 700;
+			color: #ed5a2e;
+			line-height: 46rpx;
+		}
+
+		.old-price {
+			font-size: 32rpx;
+			color: #999;
+			text-decoration-line: line-through;
+			line-height: 48rpx;
+		}
+
+		.limitBuyNum {
+			color: #666;
+			line-height: 42rpx;
+		}
+	}
+
+	.popup-content-bottom {
+		padding: 20rpx;
+		border-bottom: 1px solid #ededed;
+
+		.price {
+			color: #ed5a2e;
+			font-size: 32rpx;
+			font-weight: 700;
+		}
+	}
+
+	.btn {
+		display: flex;
+		padding: 22rpx 214rpx;
+		align-items: flex-start;
+		gap: 20rpx;
+		border-radius: 66rpx;
+		background: #e8ad7b;
+		font-size: 32rpx;
 		color: #fff;
-		margin-top: 32rpx;
+		font-size: 700;
+	}
+}
+
+.desc {
+	padding: 32rpx 46rpx;
+	background-color: #fff;
+	margin-top: 32rpx;
+
+	.name {
+		font-weight: 700;
+		font-size: 32rpx;
+	}
+
+	.table {
+		border: 2rpx solid #ededed;
+		border-radius: 8rpx;
+		margin: 0 52rpx;
+
+		.header {
+			background: #f8f8f88f;
+		}
+
+		.row {
+			border-top: 2rpx solid #ededed;
+
+			&:first-child {
+				border-top: none;
+			}
+		}
 	}
 
 	.rotate {
 		transform: rotate(-90deg);
 	}
+}
 
-	.refund {
-		padding: 18rpx 164rpx;
-		border-radius: 0 0 16rpx 16rpx;
-		background: #FFF4E2;
-		font-weight: 700;
-		margin-bottom: 32rpx;
-		text-align: center;
-	}
+.progress-box {
+	background: rgba(255, 209, 191, 0.52);
+	$height: 10rpx;
+	height: $height;
+	border-radius: $height;
+	overflow: hidden;
 
-	.popup-content {
-		font-size: 28rpx;
-		min-height: 300px;
-
-		.popup-content-top {
-			padding: 32rpx 28rpx;
-			border-bottom: 1px solid #ededed;
-		}
-
-		.goods-info {
-			padding: 32rpx 28rpx;
-			border-bottom: 1px solid #ededed;
-
-			.cover {
-				width: 184rpx;
-				height: 184rpx;
-				border-radius: 16rpx;
-				background: #d9d9d9;
-
-				&.bg-fff {
-					background-color: #fff;
-				}
-			}
-
-			.price {
-				font-size: 32rpx;
-				font-weight: 700;
-				color: #ed5a2e;
-				line-height: 46rpx;
-			}
-
-			.old-price {
-				font-size: 32rpx;
-				color: #999;
-				text-decoration-line: line-through;
-				line-height: 48rpx;
-			}
-
-			.limitBuyNum {
-				color: #666;
-				line-height: 42rpx;
-			}
-
-		}
-
-		.popup-content-bottom {
-			padding: 20rpx;
-			border-bottom: 1px solid #ededed;
-
-			.price {
-				color: #ed5a2e;
-				font-size: 32rpx;
-				font-weight: 700;
-			}
-		}
-
-		.btn {
-			display: flex;
-			padding: 22rpx 214rpx;
-			align-items: flex-start;
-			gap: 20rpx;
-			border-radius: 66rpx;
-			background: #e8ad7b;
-			font-size: 32rpx;
-			color: #fff;
-			font-size: 700;
-		}
-	}
-
-	.desc {
-		padding: 32rpx 46rpx;
-		background-color: #fff;
-		margin-top: 32rpx;
-
-		.name {
-			font-weight: 700;
-			font-size: 32rpx;
-		}
-
-		.table {
-			border: 2rpx solid #EDEDED;
-			border-radius: 8rpx;
-			margin: 0 52rpx;
-
-			.header {
-				background: #f8f8f88f;
-			}
-
-			.row {
-				border-top: 2rpx solid #EDEDED;
-
-				&:first-child {
-					border-top: none;
-				}
-			}
-		}
-
-		.rotate {
-			transform: rotate(-90deg);
-		}
-	}
-
-	.progress-box {
-		background: rgba(255, 209, 191, 0.52);
-		$height: 10rpx;
+	.progress {
 		height: $height;
+		background: #eb532a;
+		transition: all 0.3s;
 		border-radius: $height;
-		overflow: hidden;
-
-		.progress {
-			height: $height;
-			background: #EB532A;
-			transition: all 0.3s;
-			border-radius: $height;
-		}
 	}
+}
 
-	.img-box {
-		position: relative;
+.img-box {
+	position: relative;
 
-		.tag {
-			position: absolute;
-			left: 0;
-			top: 0;
-			padding: 8rpx 18rpx;
-			border-radius: 16rpx 0;
-			background: #4C2828;
-			color: #faeac6;
-			font-size: 700;
-		}
+	.tag {
+		position: absolute;
+		left: 0;
+		top: 0;
+		padding: 8rpx 18rpx;
+		border-radius: 16rpx 0;
+		background: #4c2828;
+		color: #faeac6;
+		font-size: 700;
 	}
+}
 
-	.share-text {
-		color: #ED5A2E;
-	}
-</style>
\ No newline at end of file
+.share-text {
+	color: #ed5a2e;
+}
+</style>
diff --git a/utils/share.js b/utils/share.js
index c98a91b..8666384 100644
--- a/utils/share.js
+++ b/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
 	}
-}
\ No newline at end of file
+}
+
+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
+		});
+	}
+};
\ No newline at end of file
diff --git a/vite.config.js b/vite.config.js
index b43d49c..540a99f 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -15,6 +15,7 @@ module.exports = defineConfig({
 				{
 					"@dcloudio/uni-app": [
 						"onShareAppMessage",
+						"onShareTimeline",
 						"onLoad",
 						"onShow",
 						"onHide",