增加全民股东弹窗页面

App.vue

@@ -1,3 +1,4 @@
+
 <script setup>
 	import {
 		useCartsStore

common/api/account/index.js

@@ -0,0 +1,11 @@
+// 引入 request 文件
+import request from '@/common/api/request.js'
+import {prveUrl} from './config.js'
+
+export const shopUserConfirm = (data) => {
+	return request({
+		url: prveUrl + '/user/shopUser/confirm',
+		method: 'post',
+		data: data
+	})
+}

common/api/market/distribution.js

@@ -163,4 +163,13 @@ export const autoBindInviteUser = (data) => {
     method: "post",
     data: data,
   });
+};
+
+// 全民股东界面-进入过标识
+export const distributionEditIn = (data) => {
+  return request({
+    url: prveUrl + "/user/distribution/editIn",
+    method: "get",
+    data: data,
+  });
 };

common/api/market/index.js

@@ -1,6 +1,8 @@
 // 引入 request 文件
 import request from '@/common/api/request.js'
-import {prveUrl} from './config.js'
+import {
+	prveUrl
+} from './config.js'
 
 export const consumeDiscount = (data) => {
 	return request({
@@ -16,3 +18,11 @@ export const homeData = (data) => {
 		data: data
 	})
 }
+
+// 清除所有分销绑定关系
+export const distributionClear = (data) => {
+	return request({
+		url: prveUrl + '/user/distribution/clean',
+		method: 'get'
+	})
+}

common/api/market/share.js

@@ -0,0 +1,26 @@
+// 引入 request 文件
+import request from "@/common/api/request.js";
+import { prveUrl } from "./config.js";
+
+export const carousel = (data) => {
+  return request({
+    url: prveUrl + "/user/carousel",
+    method: "get",
+    data: data,
+  });
+};
+export const shareClaim = (data) => {
+  return request({
+    url: prveUrl + "/user/shareClaim",
+    method: "POST",
+    data: data,
+  });
+};
+export const shareConfig = (data) => {
+  return request({
+    url: prveUrl + "/user/share",
+    method: "get",
+    data: data,
+  });
+};
+

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

components/popup-distribution-group-code.vue

@@ -0,0 +1,141 @@
+<!-- 私域引流 -->
+<template>
+	<u-popup :show="show" mode="center" :safeAreaInsetBottom="false">
+		<view class="new_preview">
+			<view class="header">{{ shopInfo.shopName }}</view>
+			<view class="content">
+				<view class="title">{{ group.title }}</view>
+				<view class="img_wrap">
+					<image class="img" :show-menu-by-longpress="true" :src="group.groupUrl" @click=""></image>
+				</view>
+				<view class="intro">
+					{{ group.content }}
+				</view>
+				<view class="foot">
+					如果长按不能识别，可截图或保存二维码图片至相册，通过微信扫码入群。
+				</view>
+			</view>
+			<view class="close" @click="closeHandle">
+				<u-icon name="close" color="#fff" size="14"></u-icon>
+			</view>
+		</view>
+	</u-popup>
+</template>
+
+<script setup>
+import dayjs from 'dayjs';
+import { ref, onMounted } from 'vue';
+import { centerConfig,distributionEditIn } from '@/common/api/market/distribution.js';
+import { checkArrayElementsExist } from '@/utils/util.js';
+
+const shopInfo = defineModel('shopInfo');
+
+const props = defineProps({
+	type: {
+		type: String,
+		default: 'home' // 调用的位置 home首页 order支付成功后
+	},
+	group:{
+		type:Object,
+		default:()=>{}
+	}
+});
+
+const show = defineModel(false) ;
+function closeHandle() {
+	const shopUserInfo=uni.cache.get('shopUserInfo')
+	distributionEditIn({
+		shopUserId:shopUserInfo.id
+	})
+	show.value = false;
+}
+
+
+
+
+onMounted(() => {
+	shopInfo.value = uni.cache.get('shopInfo');
+});
+</script>
+
+<style scoped lang="scss">
+.new_preview {
+	--bg: #3f3b37;
+	--color: #f6dfc4;
+	--borderColor: #f6dfc45b;
+	width: 90vw;
+	background-color: var(--bg);
+	border-radius: 4px;
+	position: relative;
+	.close {
+		--size: 70upx;
+		width: var(--size);
+		height: var(--size);
+		border-radius: 50%;
+		background-color: var(--bg);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: absolute;
+		bottom: calc(var(--size) * -1 - 20upx);
+		left: 50%;
+		margin-left: calc(var(--size) / 2 * -1);
+	}
+
+	.header {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 16px;
+		color: var(--color);
+		height: 50px;
+		border-bottom: 1px dashed var(--borderColor);
+	}
+
+	.content {
+		padding-bottom: 14px;
+
+		.title {
+			font-size: 14px;
+			color: var(--color);
+			height: 50px;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+
+		.img_wrap {
+			display: flex;
+			justify-content: center;
+
+			.img {
+				--size: 220px;
+				width: var(--size);
+				height: var(--size);
+				border-radius: 4px;
+			}
+		}
+
+		.intro {
+			height: 40px;
+			font-size: 14px;
+			color: var(--color);
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			padding: 0 14px;
+		}
+
+		.foot {
+			height: 40px;
+			color: var(--borderColor);
+			font-size: 14px;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			padding: 0 14px;
+			text-align: center;
+		}
+	}
+}
+</style>

components/registermember.vue

@@ -0,0 +1,540 @@
+<template>
+	<!-- 店铺详情 -->
+	<u-popup :show="show" :round="20" overlayOpacity="0.8" mode="bottom" @close="showClose" height="500">
+		<view class="register-member-wrap">
+			<view class="register-title">欢迎加入{{shopUserInfo.shopName?shopUserInfo.shopName:'本店'}}</view>
+			<!-- <view class="register-tip">请完善个人信息完成会员注册</view> -->
+			<view class="register-tip">请先完成股东信息提交</view>
+			
+			
+			<view class="register-content">
+				<view class="reg-head">
+					<view class="reg-head-img">
+						<!-- #ifdef MP-WEIXIN || H5 -->
+						<button class="reg-head-img" type="default" open-type="chooseAvatar"
+							@chooseavatar="onChooseAvatar">
+							<image class="reg-head-img"
+								:src="userHeadImg || 'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/menber/head_default.png'"
+								mode="aspectFill"></image>
+						</button>
+						<!-- #endif -->
+						<!-- #ifdef MP-ALIPAY -->
+						<button class="reg-head-img" @click="onChooseAvatar">
+							<image class="reg-head-img"
+								:src="userHeadImg || 'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/menber/head_default.png'"
+								mode="aspectFill"></image>
+						</button>
+						<!-- #endif -->
+
+					</view>
+				</view>
+				<view class="reg-cell">
+					<view class="lable">昵称<text style="color: #CD1A1A;">*</text></view>
+					<u-input class="value" v-model="formInfo.nickName" fontSize="14px" type="text" input-align="left"
+						placeholder="请输入昵称" :custom-style="{border:'none'}"
+						placeholderStyle="color:#999;font-size: 28rpx" />
+				</view>
+				<view class="reg-cell" @click="calendarShow = true">
+					<view class="lable">生日</view>
+					<view class="value" :style="{color: formInfo.birthDay ? '#333' : '#999'}">
+						{{ formInfo.birthDay || '请选择日期'}}
+					</view>
+					<!-- <u-calendar  @close="calendarShow = false" monthNum="99" minDate="1945-01-01" maxDate="2055-12-12" :show="calendarShow" mode="single" @confirm="confirmCalendar"></u-calendar> -->
+					<!-- <u-picker :show="calendarShow" ref="uPicker" :columns="columns" @confirm="confirm" @change="changeHandler"></u-picker> -->
+					<!-- <picker :show="calendarShow" mode="date"></picker> -->
+					<up-datetime-picker mode="date" @cancel="calendarShow = false" :show="calendarShow"
+						:minDate="-2208988800000" v-model="value1" itemHeight="66" visibleItemCount="5"
+						@confirm="confirmTime"></up-datetime-picker>
+					<up-icon name="arrow-down-fill" color="#000" size="10"></up-icon>
+				</view>
+				<view class="reg-cell">
+					<view class="lable">性别<text style="color: #CD1A1A;">*</text></view>
+					<up-radio-group v-model="formInfo.sex" active-color="#E3AD7F">
+						<up-radio  :name="1" label="男"></up-radio>
+						<up-radio  :name="0" label="女"></up-radio>
+					</up-radio-group>
+				</view>
+				<view class="reg-cell">
+					<view class="lable">手机号</view>
+					<up-input class="value" v-model="formInfo.telephone" fontSize="14px" type="text" input-align="left"
+						readonly placeholder="获取手机号" :custom-style="{border:'none'}"
+						placeholder-style="color:#999;font-size: 28rpx" />
+					<!-- #ifdef MP-WEIXIN || H5 -->
+					<button class="getPhone" size="10" open-type="getPhoneNumber" @getphonenumber="getPhone">
+					<!-- #endif -->
+						<!-- #ifdef MP-ALIPAY -->
+						<button class="getPhone" size="10" open-type="getAuthorize" scope='phoneNumber'
+							@getAuthorize="getPhone">
+						<!-- #endif -->
+							<view class="text">{{'获取手机号'}}</view>
+						</button>
+				</view>
+				<view class="agreement">
+					<view class="agreement_tip">我已阅读并同意以下内容</view>
+					<view class="agreement_item" @click="isProtocol = !isProtocol">
+						<up-checkbox-group>
+							<up-checkbox :checked="isProtocol" shape="circle" activeColor="#E3AD7F"
+								@change="radioChange" size="15" iconSize="10"></up-checkbox>
+						</up-checkbox-group>
+						<text @click.stop="viewProtocol(1)" class="agreement_item_text">用户协议/隐私条款</text>
+					</view>
+					<!-- <view class="agreement_item">
+						<u-checkbox-group>
+							<u-checkbox shape="circle" activeColor="#E3AD7F" @change="radioChange" size="30"></u-checkbox>
+						</u-checkbox-group>
+						<text class="agreement_item_text">隐私条款</text>
+					</view> -->
+				</view>
+				<view class="register_btn" @tap="$u.debounce(registerMember, 500)">确认提交</view>
+			</view>
+		</view>
+	</u-popup>
+</template>
+
+<script setup>
+	import {
+		defineProps,
+		reactive,
+		ref,
+		defineEmits,
+		watch,
+		watchEffect
+	} from 'vue';
+
+	import {
+		APIshopUser,
+		APIshopUserInfo
+	} from '@/common/api/member.js'
+	import {
+		shopUserConfirm
+	} from '@/common/api/account/index.js'
+	import {
+		APIuserphone
+	} from '@/common/api/api.js'
+
+	const props = defineProps({
+		shopUserInfo: {
+			type: Object,
+			default: () => ({})
+		},
+		detailtype: {
+			type: String,
+			default: ''
+		},
+		shopId: {
+			type: String,
+			default: ''
+		},
+	});
+	const show=defineModel(false)
+	// 定义事件发射器
+	const emits = defineEmits(['emitsmemberOpen','update']);
+
+	// 定义要触发的事件
+
+	const formInfo = reactive({
+		nickName: "",
+		telephone: "",
+		birthDay: "",
+		sex:1,
+	})
+	const userHeadImg = ref('')
+	
+	watchEffect(()=>{
+		formInfo.nickName= `${props.shopUserInfo.nickName}`.trim() ==='微信用户' ? '' :(props.shopUserInfo.nickName||'')
+		formInfo.telephone=props.shopUserInfo.phone||''
+		formInfo.birthDay=props.shopUserInfo.birthDay||''
+		formInfo.sex=props.shopUserInfo.sex||1
+		userHeadImg.value=props.shopUserInfo.headImg||''
+	})
+	const value1 = Number(new Date())
+
+	const calendarShow = ref(false)
+
+	// 用户图片
+
+
+	//显示隐藏
+	const isProtocol = ref(false)
+
+	const init = async () => {
+
+		// if (uni.cache.get('shopUserInfo') && props.shopId||uni.cache.get('shopId') == uni.cache.get('shopUserInfo').id) {
+		// 	shopUserInfo = uni.cache.get('shopUserInfo');
+		// } else {
+		// 	let res = await this.api.shopUserInfo({
+		// 		"shopId": props.shopId||uni.cache.get('shopId'),
+		// 		"userId": uni.cache.get('userInfo').id,
+		// 	})
+		// 	if (res.code == 0) {
+		// 		shopUserInfo = res.data;
+		// 	}
+		// }
+		// memberOpen.value = shopUserInfo.isVip == 0 ? true : false;
+		// userHeadImg.value = shopUserInfo.headImg;
+		// formInfo.nickName = shopUserInfo.nickName && shopUserInfo.nickName != '微信用户' ? shopUserInfo
+		// 	.nickName : '';
+		// formInfo.telephone = shopUserInfo.telephone;
+		// formInfo.birthDay = shopUserInfo.birthDay
+
+	}
+
+	// 返回
+	const showClose = () => {
+		// uni.navigateBack()
+		show.value=false
+	}
+
+	// 
+	const radioChange = (n) => {
+		isProtocol.value = n;
+	}
+
+	// 查看协议
+	const viewProtocol = () => {
+		wx.openPrivacyContract({
+			success: () => {}, // 打开成功
+			fail: () => {}, // 打开失败
+			complete: () => {}
+		})
+	}
+
+	//上传头像
+	const onChooseAvatar = (e) => {
+		//#ifdef MP-WEIXIN
+		let avatarUrl = e.detail.avatarUrl
+		uni.uploadFile({
+			url: uni.conf.baseUrl + '/account/user/common/upload',
+			filePath: avatarUrl,
+			header: {
+				shopId: props.shopId||uni.cache.get('shopId'),
+				token: uni.cache.get('token') || '',
+				'content-type': 'multipart/form-data'
+			},
+			fileType: 'image',
+			name: "file",
+			formData: {
+				file: avatarUrl,
+			},
+			success: (uploadFileRes) => {
+				let {
+					data
+				} = JSON.parse(uploadFileRes.data)
+				userHeadImg.value = data
+			},
+			fail: (res) => {
+				console.log(res)
+			}
+		});
+		// #endif
+		//#ifdef MP-ALIPAY
+		uni.chooseImage({
+			count: 1, // 默认9，设置图片的数量
+			sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
+			sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
+			success: function(res) {
+				// 成功选择图片后
+				let avatarUrl = res.tempFilePaths[0]; // 获取文件路径
+
+				my.uploadFile({
+					url: uni.conf.baseUrl + '/account/user/common/upload',
+					filePath: avatarUrl,
+					header: {
+						environment: 'app',
+						type: 'android',
+						version: '1.7.3',
+						'content-type': 'multipart/form-data'
+					},
+					fileType: 'image',
+					name: "file",
+					formData: {
+						file: avatarUrl,
+					},
+					success: (uploadFileRes) => {
+						let {
+							data
+						} = JSON.parse(uploadFileRes.data)
+						userHeadImg.value = data
+					},
+					fail: (res) => {
+						console.log(res)
+					}
+				});
+			},
+			fail: (res) => {
+				console.log(res)
+			}
+		});
+		// #endif
+	}
+
+
+	// 确定生日
+	const confirmTime = (e) => {
+		calendarShow.value = false;
+		formInfo.birthDay = getDate(e.value);
+	}
+
+	// 获取手机号
+	const getPhone = (d) => {
+		// #ifdef MP-WEIXIN
+		if (d.detail.iv) {
+			uni.login({
+				provider: 'weixin',
+				success: async (data) => {
+					let res = await APIuserphone({
+						code: data.code,
+						encryptedData: d.detail.encryptedData,
+						iv: d.detail.iv,
+						source: "wechar"
+					})
+					formInfo.telephone = res
+				}
+			})
+		}
+		// #endif
+		// #ifdef MP-ALIPAY
+		// 支付宝小程序环境
+		my.getAuthCode({
+			scopes: 'auth_user',
+			success: (res) => {
+				console.log(res)
+				my.getPhoneNumber({
+					success: async (data) => {
+						let res = await APIuserphone({
+							encryptedData: JSON.parse(data.response).response,
+							source: "alipay"
+						})
+						formInfo.telephone = res
+						// console.log(this.phonetitle)
+					}
+				});
+			}
+		});
+		// #endif
+	}
+
+	// 格式化时间戳
+	const getDate = (time) => {
+		const date = new Date(time);
+		// const date = new Date();
+		let year = date.getFullYear();
+		let month = date.getMonth() + 1;
+		let day = date.getDate();
+
+
+		month = month > 9 ? month : '0' + month;
+		day = day > 9 ? day : '0' + day;
+		return `${year}-${month}-${day}`;
+	}
+
+
+	const registerMember = async () => {
+		if (formInfo.nickName == "" || formInfo.nickName == null) {
+			uni.showToast({
+				title: '请输入会员昵称',
+				icon: 'none'
+			});
+			return;
+		}
+
+		if (formInfo.telephone == "" || formInfo.telephone == null) {
+			uni.showToast({
+				title: '请获取手机号',
+				icon: 'none'
+			});
+			return;
+		}
+		if (!isProtocol.value) {
+			uni.showToast({
+				title: '请勾选协议',
+				icon: 'none'
+			});
+			return;
+		}
+		let idSet = new Set(
+		  props.shopUserInfo.shopConfirm 
+		    ? props.shopUserInfo.shopConfirm.split(',') 
+		    : []
+		);
+		
+		const shopIdToAdd = props.shopId || uni.cache.get('shopId');
+		if (shopIdToAdd) {
+		  idSet.add(shopIdToAdd);
+		}
+		let idArr = Array.from(idSet).filter(v=>v!=='');
+		const submitForm={
+			// id: uni.cache.get('userInfo').id,
+			shopId: props.shopId||uni.cache.get('shopId'),
+			nickName: formInfo.nickName,
+			headImg: userHeadImg.value,
+			phone: formInfo.telephone,
+			birthDay: formInfo.birthDay,
+			sex:formInfo.sex,
+			shopConfirm:idArr.join(',')
+		}
+		// await APIshopUser(submitForm)
+		await shopUserConfirm({
+			id:props.shopUserInfo.id,
+			shopId: props.shopId||uni.cache.get('shopId'),
+			nickName: formInfo.nickName,
+			headImg: userHeadImg.value,
+			phone: formInfo.telephone,
+			birthDay: formInfo.birthDay,
+			sex:formInfo.sex,
+			shopConfirm:idArr.join(',')
+		})
+		let APIshopUserInfores = await APIshopUserInfo({
+			shopId: props.shopId||uni.cache.get('shopId')
+		})
+		uni.cache.set('orderVIP', APIshopUserInfores)
+		uni.cache.set('ordershopUserInfo', APIshopUserInfores.shopInfo)
+		
+		uni.showToast({
+			title:props.shopUserInfo.phone? '修改成功': '注册成功',
+			icon: 'none'
+		})
+		emits('update',APIshopUserInfores)
+		show.value=false
+		// 定义自定义事件
+		// setTimeout(() => {
+		// 	uni.navigateBack()
+		// }, 1500)
+		emits('emitsmemberOpen',submitForm);
+
+	}
+</script>
+
+<style lang="scss" scoped>
+	.u-datetime-picker {
+		height: 300px !important;
+	}
+
+	.register-member-wrap {
+		padding: 64rpx 24rpx;
+		display: flex;
+		flex-direction: column;
+
+		.register-title {
+			font-weight: bold;
+			font-size: 36rpx;
+			color: #333333;
+			margin-bottom: 16rpx;
+		}
+
+		.register-tip {
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #999999;
+		}
+
+		.register-content {
+			display: flex;
+			flex-direction: column;
+
+			.reg-head {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin-top: 64rpx;
+
+				.reg-head-img {
+					width: 120rpx;
+					height: 120rpx;
+					border-radius: 50%;
+					padding: 0;
+					position: relative;
+				}
+
+				.reg-head-edit {
+					width: 24rpx;
+					height: 24rpx;
+					position: absolute;
+					bottom: 0;
+					right: 14rpx;
+				}
+			}
+
+			.reg-cell {
+				display: flex;
+				align-items: center;
+				padding: 20rpx 0;
+				border-bottom: 2rpx solid #E5E5E5;
+
+				.lable {
+					width: 120rpx;
+					font-weight: 500;
+					font-size: 28rpx;
+					color: #333333;
+				}
+
+				.value {
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #333;
+					padding: 12rpx 0 12rpx 18rpx;
+				}
+
+				.u-input {
+					input {
+						font-size: 28rpx !important;
+					}
+				}
+
+				.getPhone {
+					background-color: none;
+					border: 2rpx solid #E3AD7F;
+					color: #E3AD7F;
+					font-size: 24rpx;
+					padding: 5rpx 30rpx;
+					// #ifdef MP-ALIPAY
+					padding-top: 0;
+					display: initial;
+					height: 70rpx;
+					line-height: 70rpx;
+					box-sizing: border-box;
+					border-radius: 5rpx;
+					// #endif
+				}
+			}
+
+			.agreement {
+				display: flex;
+				flex-direction: column;
+				margin-top: 48rpx;
+
+				.agreement_tip {
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #666666;
+				}
+
+				.agreement_item {
+					display: flex;
+					padding-top: 32rpx;
+					padding-bottom: 16rpx;
+					align-items: center;
+
+					.agreement_item_text {
+						font-weight: 500;
+						font-size: 24rpx;
+						color: #E3AD7F;
+					}
+				}
+			}
+
+			.register_btn {
+				width: 572rpx;
+				height: 90rpx;
+				line-height: 90rpx;
+				text-align: center;
+				background: #E3AD7F;
+				border-radius: 48rpx 48rpx 48rpx 48rpx;
+				font-weight: 500;
+				font-size: 36rpx;
+				color: #FFFFFF;
+				margin: 30rpx auto 0 auto;
+			}
+		}
+	}
+</style>

components/ymf-components/ymf-share-popup.vue

@@ -0,0 +1,224 @@
+<template>
+	<view class="ynf-share">
+		<up-popup :show="show" mode="center" bg-color="transparent">
+			<view >
+				<view class="bg" v-if="config.sharerCoupon" :style="returnBg('bg')">
+					<view class="title">邀请奖励</view>
+					<view class="desc">邀请1人，即可得超值优惠券{{config.sharerCouponNum}}张</view>
+					<view class="u-flex u-row-center">
+						<view class="coupon" :style="returnBg('coupon')">
+							<template v-if="config.sharerCoupon.couponType==1">
+								<view class="font-bold text-center color">
+									<text class="fuhao">¥</text>
+									<text>{{config.sharerCoupon.fullAmount}}-{{config.sharerCoupon.discountAmount}}</text>
+								</view>
+							</template>
+							<template v-if="config.sharerCoupon.couponType==2">
+								<view class="font-bold text-center color">
+									<text>{{config.sharerCoupon.discountNum}}件</text>
+								</view>
+							</template>
+							<template v-if="config.sharerCoupon.couponType==3">
+								<view class="font-bold text-center color">
+									<text>{{config.sharerCoupon.discountRate/10}}折</text>
+								</view>
+							</template>
+							<template v-if="config.sharerCoupon.couponType==3">
+								<view class="font-bold text-center color">
+									<text>{{config.sharerCoupon.discountRate/10}}折</text>
+								</view>
+							</template>
+							<template v-if="config.sharerCoupon.couponType==4">
+								<view class="font-bold text-center color">
+									<text>第二件半价</text>
+								</view>
+							</template>
+							<template v-if="config.sharerCoupon.couponType==6">
+								<view class="font-bold text-center color">
+									<text>买一送一</text>
+								</view>
+							</template>
+							<view class="font-bold name">{{config.sharerCoupon.title}}</view>
+						</view>
+					</view>
+					<view class="u-flex u-row-center u-m-t-44">
+						<ymf-share>
+							<view class="share-btn" :style="returnBg('btn')"></view>
+						</ymf-share>
+					</view>
+				</view>
+				<view class="u-flex u-row-center u-m-t-30">
+					<view class="close-box u-flex u-col-center u-row-center" @click="close">
+						<up-icon name="close" size="36rpx" color="#000" :bold="true"></up-icon>
+					</view>
+				</view>
+			</view>
+		</up-popup>
+	</view>
+</template>
+
+<script setup>
+
+	import {
+		shareConfig,
+	} from '@/common/api/market/share.js'
+	import {returnPageTags} from '@/utils/share.js'
+	
+	import {
+		productStore
+	} from '@/stores/user.js';
+	
+	const userStore = productStore();
+
+	
+	const show = defineModel(false)
+	const imgs = {
+		btn: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/2/14ca8d88516b4739b4020b10d95a33c2.png',
+		coupon: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/2/4ccffb7cf8414cd19f0a10c6cf45b45b.png',
+		bg: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/2/1ac6490c4efd4290abe7ca7f6d8e6eb2.png'
+	}
+
+	function returnBg(key) {
+		return {
+			backgroundImage: 'url(' + imgs[key] + ')'
+		}
+	}
+	// watch(() => show.value, (newval)=>{
+	// 	if(newval){
+	// 		getData()
+	// 	}
+	// })
+
+	function close() {
+		show.value = false
+	}
+	const config = reactive({})
+	async function getData(id) {
+		const pages = getCurrentPages();
+		const currentPage = pages[pages.length - 1];
+		const currentPath = currentPage.route;
+		const currentOptions = currentPage.options;
+		const  path = `/${currentPath}`;
+		
+		const shopId = id||currentOptions.shopId||uni.cache.get('shopId')
+		// console.log('分享组件挂载完毕:shopId',shopId);
+		if (!shopId) {
+			return
+		}
+		shareConfig({
+			shopId
+		}).then(res => {
+			// console.log('分享组件挂载完毕:shareConfig',res);
+			// console.log('分享组件挂载完毕:currentOptions',currentOptions);
+			if(res&& typeof res==='object'){
+				Object.assign(config,res)
+				const rewardSharePages=res.rewardSharePages.split(',')
+				const pTag = returnPageTags(path)
+				if( pTag&&rewardSharePages.includes(pTag)&&currentOptions.fromUserId&&res.isSharedUserPopup&&res.isEnabled){
+					show.value=true
+				}
+				// if(res.sharedUserCouponId&&res.sharedUserCouponNum){
+				// }
+			}
+		})
+	}
+	
+	watch(()=>userStore.shopInfo.id,(newval)=>{
+		if(newval){
+			// getData()
+			shareConfig({
+				shopId:newval
+			}).then(res => {
+				if(res){
+					Object.assign(config,res)
+				}
+			})
+		}
+	})
+	onMounted(() => {
+		console.log('分享组件挂载完毕！');
+		getData()
+	})
+</script>
+
+<style lang="scss">
+	.bg {
+		width: 710rpx;
+		background-size: cover;
+		min-height: 820rpx;
+		padding-top: 260rpx;
+		background-color: transparent;
+		padding-left: 26rpx;
+
+		.title {
+			font-weight: 700;
+			font-size: 74rpx;
+			text-align: center;
+			background-image: linear-gradient(to bottom, #FF7E2D, #FF270E);
+			/* 定义渐变色 */
+			-webkit-background-clip: text;
+			/* Webkit 浏览器前缀 */
+			background-clip: text;
+			/* 标准属性 */
+			color: transparent;
+			/* 使文本透明，显示背景渐变 */
+		}
+
+		.desc {
+			margin-top: 20rpx;
+			font-size: 28rpx;
+			font-weight: 700;
+			text-align: center;
+			color: #FF280F;
+		}
+
+	}
+
+	.coupon {
+		margin-top: 30rpx;
+		width: 436rpx;
+		height: 182rpx;
+		background-size: cover;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		font-size: 54rpx;
+		text-align: center;
+
+
+		.color {
+			background-image: linear-gradient(to bottom, #FFFFFB, #FFEBB0);
+			/* 定义渐变色 */
+			-webkit-background-clip: text;
+			/* Webkit 浏览器前缀 */
+			background-clip: text;
+			/* 标准属性 */
+			color: transparent;
+			/* 使文本透明，显示背景渐变 */
+		}
+
+		.fuhao {
+			font-size: 32rpx;
+		}
+
+		.name {
+			font-size: 36rpx;
+			color: #FFFFFB;
+		}
+	}
+
+	.close-box {
+		width: 74rpx;
+		height: 74rpx;
+		opacity: 0.82;
+		border-radius: 50%;
+		background: #fff;
+	}
+
+	.share-btn {
+		width: 262rpx;
+		height: 72rpx;
+		background-size: cover;
+	}
+</style>

components/ymf-components/ymf-share.vue

@@ -3,7 +3,7 @@
 		<slot v-if="$slots.default" name="default"></slot>
 		<up-icon v-else name="share-square" bold :color="color" :size="size"></up-icon>
 		<view class="absolute share-box">
-			<button open-type="share" @click="shareClick">分享</button>
+			<button open-type="share" @click.stop="shareClick">分享</button>
 		</view>
 	</view>
 </template>

distribution/index.vue

@@ -2,7 +2,7 @@
   <view>
     <up-navbar
       bg-color="transparent"
-      title="分销中心"
+      title="全民股东"
       @leftClick="back"
       :fixed="true"
     ></up-navbar>
@@ -102,7 +102,7 @@
           </view>
         </view>
         <view
-          v-if="state.activates.totalRow > 0"
+          v-if="state.activates.totalRow*1 > 0"
           class="u-flex justify-center font-12 color-666"
           style="align-items: baseline"
           @click="toShopList('activates')"
@@ -159,7 +159,7 @@
           </view>
         </view>
         <view
-          v-if="state.activates.totalRow > 0"
+          v-if="state.unActivates.totalRow*1 > 0"
           class="u-flex justify-center font-12 color-666"
           style="align-items: baseline"
           @click="toShopList('unActivates')"

distribution/shop-detail/components/bind-shangji.vue

@@ -19,7 +19,7 @@
             <view class="u-m-l-32 u-flex-1 border">
               <input placeholder="请输入上级邀请码" v-model="code" />
             </view>
-            <image src="/distribution/static/scan.svg" class="u-m-l-10" style="width: 60rpx; height: 60rpx;" @click="saoma"></image>
+            <!-- <image src="/distribution/static/scan.svg" class="u-m-l-10" style="width: 60rpx; height: 60rpx;" @click="saoma"></image> -->
           </view>
 
           <view class="u-m-t-32 u-flex u-col-center" style="gap: 54rpx">

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

@@ -3,7 +3,8 @@
 		<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">
+		<up-popup :duration="0" :show="show" bgColor="transparent" :safeAreaInsetBottom="false"
+			:closeOnClickOverlay="true" @close="close" mode="center">
 			<view class="box">
 				<view class="info">
 					<view class="u-flex justify-center">
@@ -25,12 +26,15 @@
               ref="wQrcode"
               @generate="(e) => qrcodeResult(e)"
             ></w-qrcode> -->
-						<up-image width="322rpx" height="322rpx" :src="code"></up-image>
+						<image :src="code" class="code"></image>
+						<!-- <up-image width="322rpx" mode="scaleToFill" 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>
+					<ymf-share>
+						<view class="confirm">微信分享</view>
+					</ymf-share>
 				</view>
 			</view>
 		</up-popup>
@@ -38,223 +42,252 @@
 </template>
 
 <script setup>
-import { shareMixin, handleMixinOnLoad, returnQuery } from '@/utils/share.js';
+	import {
-import ymfShare from '@/components/ymf-components/ymf-share.vue';
+		shareMixin,
-import wQrcode from '@/uni_modules/wmf-code/components/w-qrcode/w-qrcode.vue';
+		handleMixinOnLoad,
-import { desensitizePhone } from '@/utils/util.js';
+		returnQuery
-import { ref, onMounted, nextTick } from 'vue';
+	} 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 () => {
+	onMounted(async () => {
-	setTimeout(async () => {
+		setTimeout(async () => {
-		await nextTick();
+			await nextTick();
-		const query = await returnQuery();
+			const query = await returnQuery();
-		codeOptions.value.code = `https://cashier.sxczgkj.com/invite?${removeQAndAfter(query)}`;
+			codeOptions.value.code =
-		console.log('codeOptions.value', codeOptions.value);
+			`https://cashier.sxczgkj.com/invite?${removeQAndAfter(query)}`;
-	}, 500);
+			console.log('codeOptions.value', codeOptions.value);
-});
+		}, 500);
+	});
 
-/** 
+	/** 
- * 截取字符串，移除 &q 及后面的所有内容
+	 * 截取字符串，移除 &q 及后面的所有内容
- * @param {string} str - 原始字符串
+	 * @param {string} str - 原始字符串
- * @returns {string} 处理后的字符串
+	 * @returns {string} 处理后的字符串
- */
+	 */
-function removeQAndAfter(str) {
+	function removeQAndAfter(str) {
-	// 检查是否为空字符串
+		// 检查是否为空字符串
-	if (!str || typeof str !== 'string') {
+		if (!str || typeof str !== 'string') {
-		return str || '';
+			return str || '';
+		}
+
+		// 找到 &q 的起始位置
+		const qIndex = str.indexOf('&q');
+
+		// 如果找到 &q，截取前面的部分；否则返回原字符串
+		return qIndex !== -1 ? str.slice(0, qIndex) : str;
 	}
 
-	// 找到 &q 的起始位置
+	const props = defineProps({
-	const qIndex = str.indexOf('&q');
+		inviteCode: {
-
+			type: String,
-	// 如果找到 &q，截取前面的部分；否则返回原字符串
+			default: ''
-	return qIndex !== -1 ? str.slice(0, qIndex) : str;
+		},
-}
+		shopUserInfo: {
-
+			type: Object,
-const props = defineProps({
+			default: () => {}
-	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) {
+	const codeOptions = ref({
-	console.log('qrcodeResult', e);
+		padding: 10,
-	code.value = e.img.tempFilePath;
+		size: 200,
-	console.log('code', code.value);
+		code: ''
-}
+	});
 
-const show = defineModel({
+	function copyCode() {
-	type: Boolean,
+		uni.setClipboardData({
-	default: false
+			data: props.inviteCode,
-});
+			success: function() {
-const emits = defineEmits(['cancel', 'confirm']);
+				console.log('success');
-function close() {
+			}
-	show.value = false;
+		});
-	emits('cancel');
+	}
-}
+	const code = ref('');
-function save() {
-	show.value = false;
 
-	// 保存图片到相册
+	function qrcodeResult(e) {
-	uni.saveImageToPhotosAlbum({
+		console.log('qrcodeResult', e);
-		filePath: code.value,
+		code.value = e.img.tempFilePath;
-		success: function () {
+		console.log('code', code.value);
-			uni.showToast({
+	}
-				title: '保存成功',
+
-				icon: 'none'
+	const show = defineModel({
-			});
+		type: Boolean,
-		},
+		default: false
-		fail: function (err) {
+	});
-			console.log('保存失败原因：', err);
+	const emits = defineEmits(['cancel', 'confirm']);
-			// 判断是否为授权拒绝（微信小程序授权拒绝的特征）
+
-			if (err.errMsg.includes('auth deny') || err.errMsg.includes('authorize fail')) {
+	function close() {
-				// 弹出提示引导用户去设置页开启授权
+		show.value = false;
-				uni.showModal({
+		emits('cancel');
-					title: '授权提示',
+	}
-					content: '保存图片需要授权访问相册，请前往设置开启授权',
+
-					showCancel: true,
+	function save() {
-					cancelText: '取消',
+		show.value = false;
-					confirmText: '去设置',
+
-					success: function (res) {
+		// 保存图片到相册
-						if (res.confirm) {
+		uni.saveImageToPhotosAlbum({
-							// 跳转到微信小程序的授权设置页
+			filePath: code.value,
-							uni.openSetting({
+			success: function() {
-								success: function (settingRes) {
+				uni.showToast({
-									// 检查用户是否开启了相册授权
+					title: '保存成功',
-									if (settingRes.authSetting['scope.writePhotosAlbum']) {
+					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: '授权成功，可重新保存',
+											title: '打开设置失败',
-											icon: 'none'
-										});
-									} else {
-										uni.showToast({
-											title: '未开启授权，保存失败',
 											icon: 'none'
 										});
 									}
-								},
+								});
-								fail: function () {
+							}
-									uni.showToast({
-										title: '打开设置失败',
-										icon: 'none'
-									});
-								}
-							});
 						}
-					}
+					});
-				});
+				} else {
-			} else {
+					// 非授权问题的保存失败（如文件路径错误、系统问题等）
-				// 非授权问题的保存失败（如文件路径错误、系统问题等）
+					uni.showToast({
-				uni.showToast({
+						title: '保存失败',
-					title: '保存失败',
+						icon: 'none'
-					icon: 'none'
+					});
-				});
+				}
 			}
-		}
+		});
-	});
 
-	emits('confirm', code.value);
+		emits('confirm', code.value);
-}
+	}
 </script>
 
 <style lang="scss" scoped>
-:deep(.info .canvas) {
+	:deep(.info .canvas) {
-	opacity: 1;
+		opacity: 1;
-}
-.border {
-	border: 2rpx solid #d9d9d9;
-	padding: 18rpx;
-	border-radius: 4rpx;
-}
-.box {
-	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 {
+	.border {
-	padding: 14rpx 76rpx;
+		border: 2rpx solid #d9d9d9;
-	border-radius: 36rpx;
+		padding: 18rpx;
-	border: 2rpx solid #e8ad7b;
+		border-radius: 4rpx;
-	color: #e8ad7b;
-	font-size: 32rpx;
-	font-weight: 400;
-	white-space: nowrap;
-	line-height: 48rpx;
-}
-.confirm {
-	$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 {
+	.box {
-	line-height: 54rpx;
+		width: 638rpx;
-}
+		background-color: #fff;
-.w-qrcode {
+		border-radius: 16rpx;
-	position: fixed;
+		// overflow: hidden;
-	left: -9999px;
+		position: relative;
-	top: -9999px;
+
-	z-index: -1;
+		.title {
-}
+			color: #000000;
-</style>
+			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;
+	}
+
+	.confirm {
+		$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;
+	}
+
+	.w-qrcode {
+		position: fixed;
+		left: -9999px;
+		top: -9999px;
+		z-index: -1;
+	}
+	.code{
+		width: 322rpx;
+		height: 322rpx;
+	}
+</style>

groupBuying/goodsDetail/goodsDetail.vue

@@ -123,6 +123,9 @@
 			</view>
 		</up-popup>
 		<!-- 兑换确认弹窗end -->
+		
+		
+		<ymf-share-popup ></ymf-share-popup>
 	</view>
 </template>
 <script setup>
@@ -408,7 +411,7 @@ onShareAppMessage(async () => {
 		query
 	};
 	console.log('onShareAppMessage===', options);
-	return options; 
+	return wxShare(options); 
 });
 
 onLoad(async (opt) => {

groupBuying/index/index.vue

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

package.json

@@ -7,7 +7,7 @@
     "lodash": "^4.17.21",
     "pinia": "^2.3.1",
     "pinia-plugin-unistorage": "^0.1.2",
-    "ysk-utils": "^1.0.83"
+    "ysk-utils": "^1.0.85"
   },
   "devDependencies": {
     "unplugin-auto-import": "^0.16.7"

pages.json

@@ -2,7 +2,7 @@
 	"easycom": {
 		"autoscan": true,
 		"custom": {
-			"^my-(.*)": "@/components/ymf-components/ymf-$1.vue",
+			"^ymf-(.*)": "@/components/ymf-components/ymf-$1.vue",
 			"^u--(.*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue",
 			"^up-(.*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue",
 			"^u-([^-].*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue"
@@ -258,7 +258,7 @@
 			"pages": [{
 					"path": "index",
 					"style": {
-						"navigationBarTitleText": "分销中心",
+						"navigationBarTitleText": "全民股东",
 						"navigationStyle": "custom"
 					}
 				},
@@ -278,7 +278,7 @@
 				{
 					"path": "shop-detail/index",
 					"style": {
-						"navigationBarTitleText": "分销中心",
+						"navigationBarTitleText": "全民股东",
 						"navigationStyle": "custom"
 					}
 				},

pages/index/index.vue

@@ -130,6 +130,7 @@
 		<!-- <CouponModal></CouponModal> -->
 		<!-- 页面加载动画 -->
 		<pageLoading v-if="showPageLoading" />
+		
 	</view>
 </template>
 
@@ -378,6 +379,7 @@
 	async function onPageShow() {
 		try {
 			await storeuser.getLocation();
+			console.log('shopId.value',shopId.value);
 			proxy.$isResolve();
 			shopId.value = uni.cache.get('shopId');
 			if (shopId.value) {
@@ -385,6 +387,7 @@
 			}
 		} catch (error) {}
 		await proxy.$onLaunched;
+		console.log('shopId.value',shopId.value);
 		if (shopId.value) {
 			showindex.value = 'shopIndex';
 			await storeuser.actionsproductqueryProduct();

pages/index/indexs.vue

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

pages/product/index.vue

@@ -192,6 +192,29 @@
 					</scroll-view>
 				</view>
 				<view class="main">
+					<view class="u-p-r-32" v-if="carouselList.length">
+						<up-swiper indicator indicatorMode="line" height="188rpx" :list="carouselList"
+							keyName="imageUrl">
+							<template #default="scope">
+								<view class="relative">
+									<image :src="scope.item.imageUrl" mode="aspectFill"
+										style="width:600rpx;height: 188rpx;"></image>
+									<view class="absolute swiper-mask" @click.stop="swiperClick(scope.item)">
+										<view class="share-btn-box" v-if="showShare(scope.item)">
+											<ymf-share
+											@shareClick="shareBtnClick(scope.item)"
+											>
+												<view class="share-btn">分享</view>
+											</ymf-share>
+										</view>
+										
+									</view>
+								</view>
+
+							</template>
+						</up-swiper>
+					</view>
+
 					<view>
 						<view class="item main-item" v-for="(item, index) in shopProductList.productInfo" :key="index"
 							:id="'item-' + index">
@@ -616,6 +639,8 @@
 				</view>
 			</view>
 		</u-popup>
+
+		<ymf-share-popup ></ymf-share-popup>
 	</view>
 </template>
 
@@ -649,6 +674,11 @@
 	import {
 		APIproductqueryShop
 	} from '@/common/api/member.js';
+
+
+	import {
+		carousel
+	} from '@/common/api/market/share.js'
 	/**
 	 * api合集 end
 	 */
@@ -817,11 +847,7 @@
 
 
 
-	// 分步取值 + 每层兜底，避免某一环不存在导致 undefined
+	const shopExtend = ref('');
-	const shopExtendShopTable = uni.cache.get('shopTable') || {}; // 兜底空对象
-	const shopExtendMap = shopExtendShopTable.shopExtendMap || {}; // 兜底空对象
-	// 最终声明：即使 shopinfo_bg 不存在，也兜底为空字符串/默认值
-	const shopExtend = ref(shopExtendMap.shopinfo_bg || '');
 
 	/**
 	 * 通用数据合集 end
@@ -994,6 +1020,79 @@
 		uni.$u.debounce(mainScroll(res), 500);
 	});
 
+
+
+
+	/*商品区域轮播图 start*/
+	
+	const shareSwiperItem=ref(null)
+	function swiperClick(item) {
+		console.log('swiperClick',item);
+		shareSwiperItem.value=item
+		const pTag=returnPageTags(item.jumpPagePath)
+	
+		if(pTag==='pp-list'){
+			return uni.navigateTo({
+				url:item.jumpPagePath+'&shopId='+uni.cache.get('shopId')
+			})
+		}
+		if(pTag==='pp-detail'){
+			const url=item.jumpPagePath+'&shopId='+uni.cache.get('shopId')+'&'+item.extendParam
+			return uni.navigateTo({
+				url:url.replace('goodsId','id')
+			})
+		}
+		if(pTag==='gb-list'){
+			return uni.navigateTo({
+				url:item.jumpPagePath+'&shopId='+uni.cache.get('shopId')
+			})
+		}
+		if(pTag==='gb-detail'){
+			const url=item.jumpPagePath+'&shopId='+uni.cache.get('shopId')+'&'+item.extendParam
+			return uni.navigateTo({
+				url:url.replace('goodsId','wareId')
+			})
+		}
+		if(pTag==='dis'){
+			return uni.navigateTo({
+				url:item.jumpPagePath+'&shopId='+uni.cache.get('shopId')
+			})
+		}
+		if(pTag==='index'){
+			return uni.switchTab({
+				url:item.jumpPagePath+'&shopId='+uni.cache.get('shopId')
+			})
+		}
+		
+		if(pTag==='eat'){
+			if (item.extendParam) {
+				const id=item.extendParam.split('=')[1]
+				const item = allGoodsArr.value.find(v => v.id == id)
+				if (item) {
+					clickspecifications(item)
+				}
+			}
+		}
+		
+		if(pTag==='point'){
+			return uni.navigateTo({
+				url:item.jumpPagePath+'&shopId='+uni.cache.get('shopId')
+			})
+		}
+		if(pTag==='point-detail'){
+			const url=item.jumpPagePath+'&shopId='+uni.cache.get('shopId')+'&'+item.extendParam
+			return uni.navigateTo({
+				url:url.replace('goodsId','id')
+			})
+		}
+	}
+	function showShare(item){
+		if(item.isShareable&&item.isEnabled){
+			return true
+		}
+		return false
+	}
+	/*商品区域轮播图 end*/
 	// 点击详情
 	const showShopsku = ref(false);
 
@@ -1454,6 +1553,9 @@
 	};
 	// 判断商品是否在可售时间内
 	const isProductAvailable = async (sellDaysStr, startTimeStr, endTimeStr) => {
+		if(!sellDaysStr){
+			return false
+		}
 		// 将后端返回的字符串转换为数组
 		const sellDays = sellDaysStr.split(',');
 		const now = dayjs();
@@ -1765,8 +1867,11 @@
 			if (Message.operate_type == 'init') {
 				// cartStore.limitTimeDiscount = Message.time_dis_info;
 				cartInit(Message.data)
-
+				try {
-				uni.hideLoading();
+					uni.hideLoading();
+				} catch (error) {
+					//TODO handle the exception
+				}
 				isLoading.value = false;
 
 				if (!socketInitFinished) {
@@ -2399,7 +2504,7 @@
 
 					console.log('options.initMessage', options.initMessage)
 					const newTableCode = userStore.getQueryString(res.result, 'code');
-
+					console.log('newTableCode',newTableCode);
 					const shopInfoRes = await APIproductqueryShop({
 						tableCode: newTableCode
 					});
@@ -2457,7 +2562,7 @@
 		handleMixinOnLoad,
 		returnQuery,
 		jsonToUrl,
-		wxShare,
+		wxShare,returnPageTags,
 		returnCommonQuery
 	} from '@/utils/share.js'
 	// defineOptions({
@@ -2470,9 +2575,50 @@
 	function shareClick() {
 		isGoodsShare.value = true
 	}
+	
+	function getPage(pageStr){
+		
+	}
+	function shareBtnClick(item){
+		console.log('shareBtnClick',item);
+		shareSwiperItem.value=item
+	}
+	function swiperShare(queryJson){
+		console.log('shareSwiperItem',shareSwiperItem.value);
+		const pTag=returnPageTags(shareSwiperItem.value.jumpPagePath)
+		let query = jsonToUrl(queryJson)
+		query +=('&'+shareSwiperItem.value.extendParam) 
+		const shopName = uni.cache.get('shopInfo').shopName || ''
+		const path=shareSwiperItem.value.jumpPagePath?shareSwiperItem.value.jumpPagePath:'/pages/product/index?type=beforehand'
+		console.log('path',path);
+		const json={
+			imageUrl:shareSwiperItem.value.imageUrl,
+			path:  path+'&'+query,
+			title:shareSwiperItem.value.name+ (shopName ? `-${shopName}` : ''),
+		}
+		if(pTag==='pp-detail'){
+			json.path=json.path.replace('goodsId','id')
+		}
+		if(pTag==='gb-detail'){
+			json.path=json.path.replace('goodsId','wareId')
+		}
+		if(pTag==='point-detail'){
+			json.path=json.path.replace('goodsId','id')
+		}
+		if(pTag.includes('eat')){
+			if(shareSwiperItem.value.extendParam){
+				json.path=json.path.replace('goodsId','showGoodsId')
+			}
+		}
+		return wxShare(json)
+	}
+
 
 	async function onShare() {
 		const queryJson = await returnCommonQuery()
+		if(shareSwiperItem.value){
+			return swiperShare(queryJson)
+		}
 		let query = jsonToUrl(queryJson)
 		query += '&type=beforehand'
 		let json = {}
@@ -2487,11 +2633,7 @@
 			json.title = shopName
 			json.imageUrl = uni.cache.get('shopInfo').logo || ''
 		}
-		console.log('onShareAppMessage', {
+	
-			query,
-			...json,
-			path: '/pages/product/index' + '?' + query
-		});
 		return wxShare({
 			query,
 			...json,
@@ -2504,16 +2646,24 @@
 	onShareTimeline(onShare)
 
 	const pageOptions = reactive({})
+
+	const carouselList = ref([])
 	onLoad(async (e) => {
 		Object.assign(pageOptions, e)
 		if (e.type) {
 			orderType.value = e.type;
 		}
+
 		await handleMixinOnLoad({
 			...e,
 			shopId: e.shopId || uni.cache.get('shopId')
 		})
-		const userInfo = userStore.userInfo
+
+		if (userStore.shopUserInfo.shopExtendList) {
+			shopExtend.value = userStore.shopUserInfo.shopExtendList.find(v => v.autoKey == 'shopinfo_bg') ||
+				''
+		}
+
 		// //获取用户信息
 		// const userInfo = await APIshopUserInfo({
 		// 	shopId: uni.cache.get('shopId')
@@ -2523,11 +2673,13 @@
 		// 	shopId: uni.cache.get('shopId')
 		// });
 		Object.assign(shopInfo, userStore.shopInfo);
-
+		if (e.type == 'beforehand') {
-
+			uni.cache.set("tableCode", userStore.shopUserInfo.id);
-		if (userInfo && typeof userInfo === 'object') {
+			options.initMessage.table_code = userStore.shopUserInfo.id
-			shopUserInfo.value = userInfo
 		}
+		options.initMessage.shop_id = userStore.shopInfo.id
+		shopUserInfo.value = userStore.shopUserInfo
+
 		await productqueryProduct();
 
 		const extraInitPar = {}
@@ -2539,6 +2691,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,
@@ -2555,6 +2712,13 @@
 		// 满减活动
 		getDiscountActivity();
 
+		//分享轮播
+		carousel({
+			shopId: uni.cache.get('shopId')
+		}).then(res => {
+			carouselList.value = res
+		})
+
 		let res = await APIhistoryOrder({
 			tableCode: uni.cache.get('tableCode')
 		});
@@ -2660,6 +2824,7 @@
 	}
 	onHide(() => {
 		isGoodsShare.value = false
+		shareSwiperItem.value=null
 		closeSocket();
 	});
 	onUnload(() => {
@@ -3900,4 +4065,26 @@
 			}
 		}
 	}
+
+	.swiper-mask {
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		padding: 32rpx 28rpx;
+	}
+
+	.share-btn-box{
+		position: absolute;
+		right: 8rpx;
+		bottom: 14rpx;
+	}
+	.share-btn {
+
+		padding: 10rpx 32rpx;
+		border-radius: 50rpx;
+		background: #E3AD7F;
+		font-size: 24rpx;
+		color: #ffffff;
+	}
 </style>

pages/user/user.vue

@@ -232,7 +232,7 @@ const myFunList = ref([
 		icon: 'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/my_coupon.png'
 	},
 	{
-		name: '分销',
+		name: '全民股东',
 		type: 'fenxiao',
 		icon: '/static/icon/fenxiao.svg'
 	},

pnpm-lock.yaml

@@ -30,8 +30,8 @@ importers:
         specifier: ^0.1.2
         version: 0.1.2
       ysk-utils:
-        specifier: ^1.0.83
+        specifier: ^1.0.85
-        version: 1.0.83
+        version: 1.0.85
     devDependencies:
       unplugin-auto-import:
         specifier: ^0.16.7
@@ -50,13 +50,13 @@ packages:
     resolution: {integrity: sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/parser@7.28.5':
+  '@babel/parser@7.28.6':
-    resolution: {integrity: sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==}
+    resolution: {integrity: sha512-TeR9zWR18BvbfPmGbLampPMW+uW1NZnJlRuuHso8i87QZNq2JRF9i6RgxRqtEq+wQGsS19NNTWr2duhnE49mfQ==}
     engines: {node: '>=6.0.0'}
     hasBin: true
 
-  '@babel/types@7.28.5':
+  '@babel/types@7.28.6':
-    resolution: {integrity: sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==}
+    resolution: {integrity: sha512-0ZrskXVEHSWIqZM/sQZ4EV3jZJXRkio/WCxaqKZP1g//CEWEPSfeZFcms4XeKBCHU0ZKnIkdJeU/kF+eRp5lBg==}
     engines: {node: '>=6.9.0'}
 
   '@dcloudio/types@3.4.21':
@@ -357,8 +357,8 @@ packages:
   webpack-virtual-modules@0.6.2:
     resolution: {integrity: sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==}
 
-  ysk-utils@1.0.83:
+  ysk-utils@1.0.85:
-    resolution: {integrity: sha512-48KLQJXQtF8nLaaFHR1hAFx/QGS848fg7n37BpZEtwliD+D5ZHQFPOCZNaM68jiwDTWhNg41rHpZzhAUQXe+/Q==}
+    resolution: {integrity: sha512-HkbV4Jidi3G6DAuGAN972tClUYtC2zVoxo4crrxexfn0rZa8HjXatUfEbawHOeEzyl6G1CdC+160I2bKfxEBlA==}
 
 snapshots:
 
@@ -368,11 +368,11 @@ snapshots:
 
   '@babel/helper-validator-identifier@7.28.5': {}
 
-  '@babel/parser@7.28.5':
+  '@babel/parser@7.28.6':
     dependencies:
-      '@babel/types': 7.28.5
+      '@babel/types': 7.28.6
 
-  '@babel/types@7.28.5':
+  '@babel/types@7.28.6':
     dependencies:
       '@babel/helper-string-parser': 7.27.1
       '@babel/helper-validator-identifier': 7.28.5
@@ -408,7 +408,7 @@ snapshots:
 
   '@vue/compiler-core@3.5.22':
     dependencies:
-      '@babel/parser': 7.28.5
+      '@babel/parser': 7.28.6
       '@vue/shared': 3.5.22
       entities: 4.5.0
       estree-walker: 2.0.2
@@ -421,7 +421,7 @@ snapshots:
 
   '@vue/compiler-sfc@3.5.22':
     dependencies:
-      '@babel/parser': 7.28.5
+      '@babel/parser': 7.28.6
       '@vue/compiler-core': 3.5.22
       '@vue/compiler-dom': 3.5.22
       '@vue/compiler-ssr': 3.5.22
@@ -684,7 +684,7 @@ snapshots:
 
   webpack-virtual-modules@0.6.2: {}
 
-  ysk-utils@1.0.83:
+  ysk-utils@1.0.85:
     dependencies:
       bignumber.js: 9.3.1
       loadsh: 0.0.4

scoreShop/detail/index.vue

@@ -116,6 +116,8 @@
 			</view>
 		</up-popup>
 		<!-- 兑换确认弹窗end -->
+		
+		<ymf-share-popup ></ymf-share-popup>
 	</view>
 </template>
 <script setup>

scoreShop/index/index.vue

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

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

user/vip/buy-vip.vue

@@ -303,7 +303,7 @@
 			}
 			if (res.memberConfig.isSubmitInfo && (shopUserInfo.value.sex === null || shopUserInfo.value.sex ===
 					undefined || !shopUserInfo.value.nickName || !shopUserInfo.value.birthDay || !shopUserInfo.value
-					.phone)) {
+					.phone||shopUserInfo.value.nickName==='微信用户')) {
 				memberOpen.value = true;
 			}
 			conditionList.value = res.memberConfig.conditionList.map(v => {

userPackage/index/index.vue

@@ -167,6 +167,7 @@
 
 
 		<LookQrcode v-model="modalData.show" :qrcode="qrcode"></LookQrcode>
+		<ymf-share-popup ></ymf-share-popup>
 	</view>
 </template>
 
@@ -513,9 +514,9 @@
 		})
 	})
 
-	onLoad(() => {
+	onLoad((opt) => {
 		APIusershopInfodetail({
-			shopId: uni.cache.get('shopId')
+			shopId: uni.cache.get('shopId')||opt.shopId
 		}).then(res => {
 			console.log(res);
 			shopInfo.value = res.shopInfo

userPackage/order/detail.vue

@@ -538,7 +538,7 @@ onShareAppMessage(async () => {
 		query
 	};
 	console.log('onShareAppMessage===', options);
-	return options;
+	return wxShare(options);
 });
 
 onLoad(async (opt) => {

utils/share.js

@@ -2,6 +2,10 @@ import {
 	autoBindInviteUser,
 	autoGetInviteCode
 } from '@/common/api/market/distribution.js'
+
+import {
+	shareClaim
+} from '@/common/api/market/share.js'
 import {
 	APIshopUserInfo,
 	APIusershopInfodetail
@@ -10,8 +14,17 @@ import {
 	productStore
 } from '@/stores/user.js';
 const accountStore = productStore();
+// #ifdef MP-WEIXIN
 const accountInfo = wx.getAccountInfoSync();
 export const envVersion = accountInfo.miniProgram.envVersion;
+// #endif
+
+// #ifdef H5
+const accountInfo = {};
+export const envVersion = 'release'
+// #endif
+
+
 let type = 3;
 if (envVersion === 'trial') {
 	console.log('当前环境是体验版');
@@ -24,38 +37,78 @@ if (envVersion === 'trial') {
 	console.log('当前环境是开发版或其他');
 }
 
+export const pageTags = {
+	'/userPackage/index/index': 'pp-list', //套餐推广列表页
+	'/userPackage/goodsDetail/goodsDetail': 'pp-detail', //套餐推广商品详情页
+	'/groupBuying/index/index': 'gb-list', //商品拼团列表页
+	'/groupBuying/goodsDetail/goodsDetail': 'gb-detail', //商品拼团详情页
+	'/distribution/shop-detail/index': 'dis', //全民股东页面
+	'/pages/index/index': 'index', //店铺首页
+	'/pages/product/index': 'eat', //点餐页
+	'/pages/product/index?pTag=eat-detail': 'eat-detail', //点餐商品详情弹窗页
+	'/scoreShop/index/index':'point' ,//积分商品
+	'/scoreShop/detail/index':'point-detail' ,//积分商品详情
+}
 
+export function returnPageTags(page) {
+	for (let key in pageTags) {
+		if (page.includes(key)) {
+			if (page.includes('/pages/product/index')) {
+				if (page.includes('showGoodsId=')||page.includes('goodsId=')) {
+					return 'eat-detail'
+				} else {
+					return 'eat'
+				}
+			} else {
+				return pageTags[key]
+			}
+		}
+	}
+	return ''
+}
 /**
  * 绑定用户邀请关系（核心函数）
  * 功能说明：校验邀请码有效性，有效则调用自动绑定接口完成邀请关系绑定
  * @param {Object} args - 绑定邀请关系的入参对象
- * @param {number} [args.shopUserId] - 需要绑定邀请人的用户ID（integer <int64>，可选）
+ * @param {number} args.fromUserId - 需要绑定邀请人的用户ID（integer <int64>，必填）
- * @param {number} [args.shopId] - 店铺ID（integer <int64>，可选）
+ * @param {number} args.shopId - 店铺ID（integer <int64>，必填）
- * @param {string} args.inviteCode - 邀请人的邀请码（必填，非空校验通过后才会执行绑定逻辑）
+ * @param {string} args.pTag - 来源页面类型
  * @returns {void} 无返回值
  */
-export function bindInvite(args) {
+export async function bindInvite(args) {
 	// 解构入参对象，获取需要的核心参数
 	const {
-		shopUserId,
+		fromUserId,
 		shopId,
-		inviteCode
+		pTag,
 	} = args;
-
+	console.log('bindInvite',args);
-	// 校验邀请码有效性：若邀请码为空、null、undefined，则直接返回，不执行后续绑定逻辑
+	if (!fromUserId || !shopId) {
-	if (!inviteCode || inviteCode === null || inviteCode === undefined) {
 		return;
 	}
 
+	const shopUserInfo = uni.cache.get('shopUserInfo')
 	// 邀请码有效，调用自动绑定邀请人接口，传递绑定所需参数
-	autoBindInviteUser({
+	return await shareClaim({
-		id: shopUserId,
+		tagType: pTag || '',
 		shopId,
-		inviteCode
+		fromUserId: fromUserId,
+		toUserId: shopUserInfo.id
 	});
 }
 
 export function wxShare(par) {
+	const path = par.path
+	const pTag = returnPageTags(path)
+	if (pTag) {
+		par.path += '&pTag=' + pTag
+		par.query += '&pTag=' + pTag
+	}
+	console.log('pTag', pTag);
+	console.log('wxShare', {
+		...par,
+		type
+	});
 	return {
 		...par,
 		type
@@ -66,15 +119,15 @@ export async function returnCommonQuery() {
 	const shopId = uni.cache.get('shopId')
 	const shopUserInfo = uni.cache.get('shopUserInfo')
 	const shopInfo = uni.cache.get('shopInfo')
-	const inviteCode = await autoGetInviteCode({
+	// const inviteCode = await autoGetInviteCode({
-		shopId: shopId,
+	// 	shopId: shopId,
-		shopUserId: shopUserInfo.id
+	// 	fromUserId: shopUserInfo.id
-	})
+	// })
 
 	const queryJson = {
-		inviteCode: (inviteCode && inviteCode !== true) ? inviteCode : null,
+		// inviteCode: (inviteCode && inviteCode !== true) ? inviteCode : null,
 		shopId,
-		shopUserId: shopUserInfo.id,
+		fromUserId: shopUserInfo.id,
 	}
 	return Promise.resolve(queryJson)
 }
@@ -103,10 +156,10 @@ export async function returnQuery(query, showkeys) {
 	const shopId = uni.cache.get('shopId')
 	const shopUserInfo = uni.cache.get('shopUserInfo')
 	const shopInfo = uni.cache.get('shopInfo')
-	const inviteCode = await autoGetInviteCode({
+	// const inviteCode = await autoGetInviteCode({
-		shopId: shopId,
+	// 	shopId: shopId,
-		shopUserId: shopUserInfo.id
+	// 	fromUserId: shopUserInfo.id
-	})
+	// })
 
 	const pages = getCurrentPages();
 	const currentPage = pages[pages.length - 1];
@@ -116,9 +169,9 @@ export async function returnQuery(query, showkeys) {
 
 	let sharePath = `/${currentPath}`;
 	const queryJson = {
-		inviteCode: (inviteCode && inviteCode !== true) ? inviteCode : null,
+		// inviteCode: (inviteCode && inviteCode !== true) ? inviteCode : null,
 		shopId,
-		shopUserId: shopUserInfo.id,
+		fromUserId: shopUserInfo.id,
 		...query
 	}
 	for (const key in currentOptions) {
@@ -131,8 +184,8 @@ export async function returnQuery(query, showkeys) {
 		}
 	}
 	queryJson.shopId = shopId
-	queryJson.inviteCode = (inviteCode && inviteCode !== true) ? inviteCode : null
+	// queryJson.inviteCode = (inviteCode && inviteCode !== true) ? inviteCode : null
-	queryJson.shopUserId = shopUserInfo.id
+	queryJson.fromUserId = shopUserInfo.id
 
 	let result = ''
 	for (let key in queryJson) {
@@ -177,16 +230,9 @@ export async function handleMixinOnLoad(opt, vm) {
 		await accountStore.pageOnload()
 	}
 	uni.setStorageSync('loadFinsh', true)
-	// const shopId = uni.cache.get('shopId')
-	// const shopUserInfo = uni.cache.get('shopUserInfo')
-	// const shopInfo = uni.cache.get('shopInfo')
-	// const inviteCode = await autoGetInviteCode({
-	// 	shopId: shopId,
-	// 	shopUserId: shopUserInfo.id
-	// })
 
-	if (options.inviteCode) {
+	if (options.shopId) {
-		bindInvite(options)
+		return await bindInvite(options)
 	}
 }
 
@@ -220,36 +266,7 @@ export function returnIndexBg() {
 // 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')
@@ -261,10 +278,11 @@ export const shareMixin = {
 		let sharePath = `/${currentPath}`;
 
 
-		const query = await returnQuery()
+		let query = await returnQuery()
 		const indexBg = returnIndexBg()
 		console.log('indexBg', indexBg);
 		const imageUrl = indexBg || shopInfo.logo
+
 		// 全局默认配置（可被页面覆盖）
 		const defaultShareConfig = {
 			title: shopInfo.shopName,
@@ -311,9 +329,11 @@ export const shareMixin = {
 		let sharePath = `/${currentPath}`;
 
 
-		const query = await returnQuery()
+		let query = await returnQuery()
 		const indexBg = returnIndexBg()
 		const imageUrl = indexBg || shopInfo.logo
+
+
 		const defaultTimelineConfig = {
 			title: shopInfo.shopName,
 			path: sharePath + '?' + query,