From 2e3ab7fbbb336cf11ed37b8b0a7871976d597564 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 22 四月 2026 20:06:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 small-program/store/index.js |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/small-program/store/index.js b/small-program/store/index.js
index 2987814..12b8d58 100644
--- a/small-program/store/index.js
+++ b/small-program/store/index.js
@@ -9,6 +9,7 @@
 const token = uni.getStorageSync('token');
 const openid = uni.getStorageSync('openid');
 const shopToken = uni.getStorageSync('shopToken');
+const shopInfo = uni.getStorageSync('shopInfo');
 
 const store = new Vuex.Store({
 	
@@ -19,6 +20,7 @@
 		token: token || '',
 		openid: openid || '',
 		shopToken: shopToken || '',
+		shopInfo: shopInfo || '',
 		userType: 0,	// 0:浼氬憳 1:闂ㄥ簵
 		
 		latitude: '',
@@ -40,9 +42,13 @@
 			uni.setStorageSync('token', val);
 		},
 		// 璁剧疆闂ㄥ簵token
-		setShopToken(state, val) {
-			state.shopToken = val
-			uni.setStorageSync('shopToken', val);
+		setShopToken(state, shopToken) {
+			state.shopToken = shopToken
+			uni.setStorageSync('shopToken', shopToken);
+		},
+		setShopInfo(state, shopInfo) {
+			state.shopInfo = shopInfo
+			uni.setStorageSync('shopInfo', shopInfo);
 		},
 		// 璁剧疆褰撳墠鐢ㄦ埛绫诲瀷
 		setUserType(state, val) {
@@ -61,12 +67,14 @@
 		},
 		// 璁剧疆缁忕含搴�
 		setPosition(state, obj) {
-			console.log('obj', obj)
 			state.latitude = obj.latitude
 			state.longitude = obj.longitude
 			state.address = obj.address
 			state.cityId = obj.cityId
-			console.log("鍦板潃璁剧疆瀹屾垚")
+		},
+		// 娓呴櫎鍩庡競id
+		clearCityId(state) {
+			state.cityId = ''
 		},
 		// 娓呴櫎缂撳瓨鏁版嵁
 		empty(state) {

--
Gitblit v1.9.3