diff --git a/main.js b/main.js
index 24ceff6..bc56f3e 100644
--- a/main.js
+++ b/main.js
@@ -4,23 +4,24 @@ import App from './App'
 import Vue from 'vue'
 import uView from "uview-ui";
 Vue.use(uView);
-// import share from './share.js'
-// Vue.mixin(share)
-
 Vue.config.productionTip = false
 App.mpType = 'app'
+import store from "@/store/index.js"
 const app = new Vue({
-    ...App
+	store,
+	...App
 })
 app.$mount()
 // #endif
 
 // #ifdef VUE3
-import { createSSRApp } from 'vue'
+import {
+	createSSRApp
+} from 'vue'
 export function createApp() {
-  const app = createSSRApp(App)
-  return {
-    app
-  }
+	const app = createSSRApp(App)
+	return {
+		app
+	}
 }
 // #endif
diff --git a/pages.json b/pages.json
index 487c989..03607ca 100644
--- a/pages.json
+++ b/pages.json
@@ -9,7 +9,7 @@
 				"navigationBarTitleText": "",
 				"navigationStyle": "custom"
 			}
-		},{
+		}, {
 			"path": "pages/medicine/medicine",
 			"style": {
 				"navigationBarTitleText": "健康咨询",
@@ -17,22 +17,21 @@
 				"navigationBarBackgroundColor": "#ffffff",
 				"disableScroll": true
 			}
-		},{
+		}, {
 			"path": "pages/integral/integral",
 			"style": {
 				"navigationBarTitleText": "积分",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff"
 			}
-		},{
-			"path" : "pages/confirmation/confirmation",
-			"style" :
-			{
+		}, {
+			"path": "pages/confirmation/confirmation",
+			"style": {
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationBarTitleText": "预约时间"
 			}
-		},{
+		}, {
 			"path": "pages/information/information",
 			"style": {
 				"navigationBarTitleText": "完善个人信息",
@@ -135,8 +134,7 @@
 				"navigationBarTitleText": "医路优品",
 				"navigationBarBackgroundColor": "#ffffff",
 				"onReachBottomDistance": 40, //距离底部多远时触发 单位为px
-				"enablePullDownRefresh": true, //设置参数为true
-				"navigationStyle": "custom"
+				"enablePullDownRefresh": true //设置参数为true
 			}
 		}, {
 			"path": "pages/CommodityOrder/CommodityOrder",
@@ -351,17 +349,15 @@
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff"
 			}
-		}
-	    ,{
-            "path" : "pages/Healthrecords/Healthrecords",
-            "style" :
-            {
-                "navigationBarTitleText": "健康档案",
+		}, {
+			"path": "pages/Healthrecords/Healthrecords",
+			"style": {
+				"navigationBarTitleText": "健康档案",
 				"navigationBarBackgroundColor": "#ffffff",
-                "enablePullDownRefresh": false
-            }
-        }
-    ],
+				"enablePullDownRefresh": false
+			}
+		}
+	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "",
@@ -380,12 +376,6 @@
 				"selectedIconPath": "static/homepagews.png",
 				"text": "首页"
 			},
-			{
-				"pagePath": "pages/shopping/shopping",
-				"iconPath": "static/shoping.png",
-				"selectedIconPath": "static/shopingw.png",
-				"text": "商城"
-			},
 			{
 				"pagePath": "pages/Personal/Personal",
 				"iconPath": "static/userw.png",
diff --git a/pages/diseasemanagement/diseasemanagement.vue b/pages/diseasemanagement/diseasemanagement.vue
index bf4feac..531c277 100644
--- a/pages/diseasemanagement/diseasemanagement.vue
+++ b/pages/diseasemanagement/diseasemanagement.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="app">
-		<!-- <u-tabs :list="tabList" :current="tabcurrent" @change="change"></u-tabs>
+		<u-tabs :list="tabList" :current="tabcurrent" @change="change"></u-tabs>
 		<view class="items">
 			<view class="item" @tap='godiseasemanagement'>
 				<image src="../../static/zbglzbgl.png" mode=""></image>
@@ -14,8 +14,8 @@
 					国家老年病中心
 				</view>
 			</view>
-		</view> -->
-		<view class="concent">
+		</view>
+	<!-- 	<view class="concent">
 			<view class="background">
 				<image src="/static/logo.png" mode=""></image>
 				<view>
@@ -28,7 +28,7 @@
 					</view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 	</view>
 </template>
 
diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue
index d34120e..f610e6e 100644
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@@ -49,6 +49,7 @@
 			</view>
 		</view>
 		<view class="Welfarecustomerservice">
+			<image class="shoping" src="../../static/shoping.png" mode="" @tap='goshopping'></image>
 			<image src="../../static/fuli.png" mode="" @tap='gomaterialbenefits'></image>
 			<image src="../../static/kefu.png" mode="" @tap='gocustomerservice'></image>
 		</view>
@@ -78,6 +79,10 @@
 </template>
 
 <script>
+	import {
+		mapState,
+		mapActions
+	} from "vuex";
 	import {
 		getPoserInfoListByType
 	} from '@/api/homepage/index.js'
@@ -96,9 +101,17 @@
 				informationCategorytotal: 0,
 				pageNum: 1,
 				pageSize: 5,
-				poster: '' //视频封面
+				poster: '', //视频封面
 			};
 		},
+		computed: {
+			//1.获取state数据的第一种方法
+			// getcount(){
+			//     return this.$store.state.count;
+			// },
+			//2.获取State的第二种方法---映射
+			// ...mapState(["name"])
+		},
 		onShow() {
 			this.pageNum = 1
 			this.swiperImgUrls = []
@@ -179,15 +192,21 @@
 			},
 			//专病管理
 			godiseasemanagement() {
-				uni.navigateTo({
-					url: '/pages/diseasemanagement/diseasemanagement'
-				})
+				// this.openPopup();
+				setTimeout(e => {
+					uni.navigateTo({
+						url: '/pages/diseasemanagement/diseasemanagement'
+					})
+				}, 0)
 			},
 			//健康咨询
 			gomedicine() {
-				uni.navigateTo({
-					url: '/pages/medicine/medicine'
-				})
+				// this.openPopup();
+				setTimeout(e => {
+					uni.navigateTo({
+						url: '/pages/medicine/medicine'
+					})
+				}, 0)
 			},
 			//跳转客服
 			gocustomerservice() {
@@ -197,9 +216,12 @@
 			},
 			//跳转护理站页面
 			gosite() {
-				uni.navigateTo({
-					url: '/pages/site/site'
-				})
+				// this.openPopup();
+				setTimeout(e => {
+					uni.navigateTo({
+						url: '/pages/site/site'
+					})
+				}, 0)
 			},
 			//健康常识
 			gohealth() {
@@ -208,10 +230,26 @@
 				})
 			},
 			//新人福利
+			// 第一种 直接映射
+			...mapActions(["openPopup"]),
 			gomaterialbenefits() {
-				uni.navigateTo({
-					url: '/pages/materialbenefits/materialbenefits'
-				})
+				// 第二种引入
+				// this.$store.dispatch("openPopup");
+				// this.openPopup();
+				setTimeout(e => {
+					uni.navigateTo({
+						url: '/pages/materialbenefits/materialbenefits'
+					})
+				}, 0)
+			},
+			//跳转商城
+			goshopping() {
+				// this.openPopup();
+				setTimeout(e => {
+					uni.navigateTo({
+						url: '/pages/shopping/shopping'
+					})
+				}, 0)
 			},
 		},
 		// onReachBottom() { //下滑加载
@@ -390,19 +428,29 @@
 			background-color: #fff;
 			width: 100%;
 			padding: 30rpx 0;
+			flex-wrap: wrap;
 			margin-bottom: 20rpx;
 
-			image:nth-child(1) {
-				margin: 0 5rpx 0 0;
+			image:nth-child(2) {
+				margin: 0 10rpx 0 0;
 			}
 
-			image:nth-child(2) {
-				margin: 0 0 0 5rpx;
+			image:nth-child(3) {
+				margin: 0 0 0 10rpx;
 			}
 
 			image {
-				width: 350rpx;
-				height: 200rpx;
+				width: 340rpx;
+				height: 195rpx;
+			}
+
+			image:nth-child(1) {
+				width: 700rpx;
+				height: 240rpx;
+			}
+
+			.shoping {
+				margin-bottom: 20rpx;
 			}
 		}
 
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 01e9c5e..63a917a 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -82,7 +82,7 @@
 							uni.navigateBack({
 								delta: 1
 							})
-						}, 1500)
+						}, 500)
 					} else {
 						this.$refs.uToast.show({
 							title: '登录失败',
diff --git a/pages/shopping/shopping.vue b/pages/shopping/shopping.vue
index f80c631..166db72 100644
--- a/pages/shopping/shopping.vue
+++ b/pages/shopping/shopping.vue
@@ -110,7 +110,7 @@
 
 <style lang="scss">
 	.app {
-		padding: 110rpx 0 0;
+		padding: 10rpx 0 0;
 		background-color: #fff;
 
 		.card {
diff --git a/pages/site/site.vue b/pages/site/site.vue
index 788001e..6a8e583 100644
--- a/pages/site/site.vue
+++ b/pages/site/site.vue
@@ -103,7 +103,7 @@
 			lengthlist(item) {
 				uni.showLoading({
 					title: '',
-					duration: 1000
+					duration: 500
 				});
 				setTimeout((e) => {
 					this.lengthlistshow = !this.lengthlistshow
@@ -113,7 +113,7 @@
 						this.nurseItemClassifyInfoList = this.nurseItemClassifyInfolistlength.slice(0, 7)
 					}
 					uni.hideLoading();
-				}, 1000)
+				}, 500)
 			},
 			//点击护理项目分类
 			tapitemclass(item) {
diff --git a/static/shoping.png b/static/shoping.png
index 93f8eaa..907b584 100644
Binary files a/static/shoping.png and b/static/shoping.png differ
diff --git a/static/shopingw.png b/static/shopingw.png
deleted file mode 100644
index 1ea4896..0000000
Binary files a/static/shopingw.png and /dev/null differ
diff --git a/store/index.js b/store/index.js
new file mode 100644
index 0000000..6c86d2d
--- /dev/null
+++ b/store/index.js
@@ -0,0 +1,47 @@
+import Vue from 'vue'
+
+import Vuex from 'vuex'
+
+Vue.use(Vuex)
+
+const store = new Vuex.Store({
+	state: {
+		//公共的变量，这里的变量不能随便修改，只能通过触发mutations的方法才能改变
+		name: '111',
+	},
+	mutations: {
+		//相当于同步的操作
+	},
+	actions: {
+		//相当于异步的操作,不能直接改变state的值，只能通过触发mutations的方法才能改变
+		// 是否设置过授权
+		openPopup(contxt) {
+			// 获取用户的当前设置，判断是否点击了“总是保持以上，不在询问”
+			wx.getSetting({
+				withSubscriptions: true, // 是否获取用户订阅消息的订阅状态，默认false不返回
+				success(res) {
+					console.log('res.authSetting', res.authSetting)
+					if (res.authSetting['scope.subscribeMessage']) {
+						console.log('用户点击了“总是保持以上，不再询问”')
+					} else {
+						console.log('用户没有点击“总是保持以上，不再询问”则每次都会调起订阅消息')
+						//因为没有选择总是保持，所以需要调起授权弹窗再次授权
+						wx.requestSubscribeMessage({
+							tmplIds: [
+								'-IxZeEkkXFhoSwGtBHbipKQ6kjEmkdTkswKeOypSsNQ',
+								'e1JRZaw1OfTz2b6X9DTqqaJtV4rXEt7uhwXoZLDb_eA',
+								'nUB9HRbqQXOVuTpkKBIHMgzWlNq6touzxf5QYBiMkbU'
+							],
+							success(res) {},
+							fail(err) {},
+							complete(scc) {
+								console.log(scc)
+							}
+						})
+					}
+				}
+			})
+		},
+	}
+})
+export default store