diff --git a/common/api/market/distribution.js b/common/api/market/distribution.js
index acfc46e..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) => {
diff --git a/common/config.js b/common/config.js
index 91fe54d..bc7c7ef 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,6 +1,6 @@
 // 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 = ''
 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 379cecf..c2a25f9 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('【页面】开始处理自身业务逻辑');
+			setTimeout(() => {
+				showPageLoading.value = false;
+				getUnReadMsgCount();
+			}, 800);
+			onPageShow()
+		} else {
+			onPageShow()
+		}
+
+	});
+
+	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/product/index.vue b/pages/product/index.vue
index 65902cc..7e63d5c 100644
--- a/pages/product/index.vue
+++ b/pages/product/index.vue
@@ -749,7 +749,7 @@
 		useCartStore
 	} from '@/stores/order.js';
 	import {
-		computed, provide
+		computed, provide, reactive
 	} from 'vue';
 	const cartStore = useCartStore();
 	/**
@@ -2436,28 +2436,51 @@
 			}
 		});
 	}
-
+	
+	
+	import {
+		shareMixin,
+		handleMixinOnLoad,returnQuery
+	} from '@/utils/share.js'
+	defineOptions({
+		mixins: [shareMixin],
+	});
+	
+	onShareAppMessage((res)=>{
+		let query=returnQuery()
+		query+='&type=beforehand'
+		return {
+			...res,
+			...query,
+			path: '/pages/product/index' + '?' + query,
+			query,
+		}
+	})
+	
+	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')
-		})
-		//获取店铺信息
-		const shopInfoRes = await APIusershopInfodetail({
-			shopId: uni.cache.get('shopId')
-		});
+		await handleMixinOnLoad(e)
+		const userInfo= userStore.userInfo
+		const shopInfoRes=userStore.shopInfo
+		// //获取用户信息
+		// const userInfo = await APIshopUserInfo({
+		// 	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 (userInfo && typeof userInfo === 'object') {
 			shopUserInfo.value = userInfo
-			uni.cache.set('shopUserInfo', userInfo)
 		}
 		await productqueryProduct();
 
diff --git a/stores/user.js b/stores/user.js
index f271a91..336729b 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,41 @@ 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() {
+			//登录
+			await this.actionslogin()
+			//获取会员信息
+			await this.actionsproductqueryProduct()
+			//获取店铺信息
+			await this.getShopInfo()
+		},
+		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/utils/share.js b/utils/share.js
index 3b3fd87..88e88af 100644
--- a/utils/share.js
+++ b/utils/share.js
@@ -1,7 +1,15 @@
 import {
-	autoBindInviteUser
+	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;
@@ -32,7 +40,7 @@ export function bindInvite(args) {
 		shopUserId,
 		shopId,
 		inviteCode
-	} = args; 
+	} = args;
 
 	// 校验邀请码有效性：若邀请码为空、null、undefined，则直接返回，不执行后续绑定逻辑
 	if (!inviteCode || inviteCode === null || inviteCode === undefined) {
@@ -52,4 +60,238 @@ export function wxShare(par) {
 		...par,
 		type
 	}
-}
\ No newline at end of file
+}
+
+export async function returnQuery(query) {
+	
+	
+	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)) {
+			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 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) {
+		bindInvite(options)
+	}
+}
+// utils/share.js
+export const shareMixin = {
+
+	// async onLoad(opt) {
+	// 	console.log('onLoad');
+	// 	const options = {}
+	// 	if (opt.q) {
+	// 		const q = decodeURIComponent(opt.q);
+	// 		const params = parseQueryString(q.split("?")[1]);
+	// 		Object.assign(options, params);
+	// 	} else {
+	// 		Object.assign(options, opt);
+	// 	}
+	// 	console.log('options', options);
+	// 	if (options.shopId) {
+	// 		uni.cache.set('shopId', options.shopId)
+	// 	}
+
+	// 	const shopId = uni.cache.get('shopId')
+	// 	const shopUserInfo = uni.cache.get('shopUserInfo')
+	// 	const shopInfo = uni.cache.get('shopInfo')
+	// 	const inviteCode = await autoGetInviteCode({
+	// 		shopId: shopId,
+	// 		shopUserId: shopUserInfo.id
+	// 	})
+
+	// 	uni.setStorageSync('loadFinsh',true)
+
+
+	// 	if (options.inviteCode) {
+	// 		bindInvite(options)
+	// 	}
+	// },
+	async onShareAppMessage(res) {
+		// const shopId = uni.cache.get('shopId')
+		// const shopUserInfo = uni.cache.get('shopUserInfo')
+		const shopInfo = uni.cache.get('shopInfo')
+		// const inviteCode = await autoGetInviteCode({
+		// 	shopId: shopId,
+		// 	shopUserId: shopUserInfo.id
+		// })
+		const pages = getCurrentPages();
+		const currentPage = pages[pages.length - 1];
+		const currentPath = currentPage.route;
+		const currentOptions = currentPage.options;
+
+		let sharePath = `/${currentPath}`;
+		// const queryJson = {
+		// 	inviteCode: (inviteCode && inviteCode !== true) ? inviteCode : null,
+		// 	shopId,
+		// 	shopUserId: shopUserInfo.id,
+		// }
+		// for (const key in currentOptions) {
+		// 	if (currentOptions.hasOwnProperty(key)) {
+		// 		queryJson[key] = encodeURIComponent(currentOptions[key])
+		// 	}
+		// }
+		// queryJson.shopId = shopId
+		// queryJson.inviteCode = (inviteCode && inviteCode !== true) ? inviteCode : null
+		// queryJson.shopUserId = shopUserInfo.id
+
+		const query = returnQuery()
+
+
+		// 全局默认配置（可被页面覆盖）
+		const defaultShareConfig = {
+			title: shopInfo.shopName,
+			path: sharePath + '?' + query,
+			imageUrl: shopInfo.logo,
+			query,
+			// desc: '描述',
+			success: (res) => {
+				console.log('分享好友成功', res);
+				// 可加埋点等统一逻辑
+			},
+			fail: (err) => {
+				console.error('分享好友失败', err);
+			}
+		};
+
+
+
+
+
+		// 页面自定义配置覆盖全局
+		const pageShareConfig = this.$options.shareConfig || {};
+		console.log('mixIn onShareAppMessage', {
+			...defaultShareConfig,
+			...pageShareConfig
+		})
+		return {
+			...defaultShareConfig,
+			...pageShareConfig
+		};
+	},
+
+
+	async onShareTimeline() {
+
+
+		// const shopId = uni.cache.get('shopId')
+		// const shopUserInfo = uni.cache.get('shopUserInfo')
+		const shopInfo = uni.cache.get('shopInfo')
+		// const inviteCode = await autoGetInviteCode({
+		// 	shopId: shopId,
+		// 	shopUserId: shopUserInfo.id
+		// })
+
+		const pages = getCurrentPages();
+		const currentPage = pages[pages.length - 1];
+		const currentPath = currentPage.route;
+		const currentOptions = currentPage.options;
+
+
+		let sharePath = `/${currentPath}`;
+		// const queryJson = {
+		// 	inviteCode: (inviteCode && inviteCode !== true) ? inviteCode : null,
+		// 	shopId,
+		// 	shopUserId: shopUserInfo.id,
+		// }
+		// for (const key in currentOptions) {
+		// 	if (currentOptions.hasOwnProperty(key)) {
+		// 		queryJson[key] = encodeURIComponent(currentOptions[key])
+		// 	}
+		// }
+		// queryJson.shopId = shopId
+		// queryJson.inviteCode = (inviteCode && inviteCode !== true) ? inviteCode : null
+		// queryJson.shopUserId = shopUserInfo.id
+
+		const query = returnQuery()
+
+		const defaultTimelineConfig = {
+			title: shopInfo.shopName,
+			path: sharePath + '?' + query,
+			imageUrl: shopInfo.logo,
+			query,
+		};
+
+		const pageTimelineConfig = this.$options.shareTimelineConfig || {};
+		return {
+			...defaultTimelineConfig,
+			...pageTimelineConfig
+		};
+	}
+};
\ No newline at end of file