From 27102c451bd2707ab9936a08d734fd4a6cc08ad7 Mon Sep 17 00:00:00 2001
From: tk <szdot@live.com>
Date: Mon, 15 Jul 2024 15:37:06 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=09=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Afeat=20=E3=80=90=E4=B8=BB=09=E9=A2=98=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=E6=89=AB=E7=A0=81=E8=8E=B7=E5=8F=96=20shop=5Fid=20sit?=
 =?UTF-8?q?e=5Fid=20=E3=80=90=E6=8F=8F=09=E8=BF=B0=E3=80=91=EF=BC=9A=20=09?=
 =?UTF-8?q?[=E5=8E=9F=E5=9B=A0]=EF=BC=9A=E6=89=AB=E7=A0=81=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=AF=B9=E5=BA=94=E7=AB=99=E7=82=B9=E5=BE=97=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=20=09[=E8=BF=87=E7=A8=8B]=EF=BC=9A=20=09[=E5=BD=B1?=
 =?UTF-8?q?=E5=93=8D]=EF=BC=9A=20=E3=80=90=E7=BB=93=09=E6=9D=9F=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# 类型 包含:
# feat：新功能（feature）
# fix：修补bug
# docs：文档（documentation）
# style： 格式（不影响代码运行的变动）
# refactor：重构（即不是新增功能，也不是修改bug的代码变动）
# test：增加测试
# chore：构建过程或辅助工具的变动
---
 App.vue               |  9 +++++++--
 pages/index/index.vue |  3 ---
 store/index.js        | 12 ++++++++++--
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/App.vue b/App.vue
index e3f89ab..6015db8 100644
--- a/App.vue
+++ b/App.vue
@@ -1,7 +1,10 @@
 <script>
 	export default {
 		// 数据初始化
-		onLaunch: function() {
+		onLaunch: function(options) {
+			//从二维码获取站点id 商铺id
+			this.$store.commit('setShopId', options.query.s);
+			this.$store.commit('setSiteId', options.query.z);
 			//异步加载商铺信息
 			this.$store.dispatch('fetchShopCon')
 			//异步加载站点列表
@@ -21,7 +24,9 @@
 			})
 		},
 		// 当应用程序被带到前台或对用户可见时调用
-		onShow: function() {},
+		onShow: function() {
+			
+		},
 		// 当应用程序被隐藏或最小化时调用
 		onHide: function() {},
 		methods: {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 9004445..2c508b5 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -68,9 +68,6 @@
 			orderList() {
 				return this.$store.state.orderList.filter(item => item.main_status === '已付款')
 			}
-		},
-		onReady() {
-
 		},
 		onShow() {
 			//检查token 没有则进行无感登录
diff --git a/store/index.js b/store/index.js
index bff4b27..330fc71 100644
--- a/store/index.js
+++ b/store/index.js
@@ -19,8 +19,8 @@ const {
 const store = new Vuex.Store({
 	//全局状态
 	state: {
-		shop_id: "2dc23dcfecc05fb1", //商铺id
-		site_id: 1, //当前站点id
+		shop_id: null, //商铺id
+		site_id: null, //当前站点id
 		userInfo: {
 			name: null,
 			photo: null,
@@ -44,6 +44,14 @@ const store = new Vuex.Store({
 	},
 	//修改状态
 	mutations: {
+		//设置 二维码获取商铺id
+		setShopId(state, shop_id) {
+			state.shop_id = shop_id;
+		},
+		//设置 二维码获取站点id
+		setSiteId(state, site_id) {
+			state.site_id = site_id;
+		},
 		//设置 列表页 购物车折叠显隐
 		setCartShow(state, val) {
 			Vue.set(state, 'cartShow', val)