From 78a4d77d9bf060b3f4cf0b8466bc0b3ba89495e0 Mon Sep 17 00:00:00 2001
From: zmt <mate163@163.com>
Date: Mon, 14 Feb 2022 15:12:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=B3=A8=E5=85=A5vuex=20getters?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nxTemp/store/index.js         |  6 ++++--
 pages.json                    |  2 +-
 pages/index/index.vue         | 34 ++++++++++++++++++++++++++--------
 pages/message/center_list.vue |  6 +++---
 4 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/nxTemp/store/index.js b/nxTemp/store/index.js
index 48444d7..a5abb56 100644
--- a/nxTemp/store/index.js
+++ b/nxTemp/store/index.js
@@ -6,13 +6,15 @@ const files = require.context("./modules", false, /\.js$/);
 let modules = {
 	state: {},
 	mutations: {},
-	actions: {}
+	actions: {},
+	getters:{}
 };
 
 files.keys().forEach((key) => {
   Object.assign(modules.state, files(key)["state"]);
   Object.assign(modules.mutations, files(key)["mutations"]);
-  Object.assign(modules.actions, files(key)["actions"]);
+  Object.assign(modules.actions, files(key)["actions"]);
+  Object.assign(modules.getters, files(key)["getters"]);
 });
 const store = new Vuex.Store(modules);
 export default store;
diff --git a/pages.json b/pages.json
index be4c76c..54f1c82 100644
--- a/pages.json
+++ b/pages.json
@@ -124,7 +124,7 @@
 		"list": [
 			{
 				"name": "登录页面", //模式名称
-				"path": "pages/login/login", //启动页面，必选
+				"path": "pages/index/index", //启动页面，必选
 				"query": "" //启动参数，在页面的onLoad函数里面得到
 			}
 		]
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8f021b6..1b493aa 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -18,9 +18,9 @@
 			<image src="../../static/images/index/arrow_right.png" mode=""></image>
 		</view>
 		
-		<view class="item flex_row flex_start bg-white padding solid-bottom" @click="jumpPage('eventList')">
+		<view class="item flex_row flex_start bg-white padding solid-bottom" @click="clickEvent">
 			<image src="../../static/images/index/index_cup.png" mode=""></image>
-			<view class="text-m text-left">活动赛事</view>
+			<view class="text-m text-left">活动赛事{{hasLogin}}+{{userInfo.mobile}}</view>
 			<image src="../../static/images/index/arrow_right.png" mode=""></image>
 		</view>
 		
@@ -32,19 +32,20 @@
 	</view>
 </template>
 <script>
-	import { mapState } from 'vuex'
+	import { mapState,mapActions,mapGetters } from 'vuex'
 	export default {
 		data() {
 			return {
 				address:"",
-				login:true
+				login:false
 			};
 		},
 		computed:{
 			...mapState(['userInfo']),
-			getUserInfo(){
-				return this.$store.state.userInfo.mobile
-			}
+			...mapGetters(['hasLogin']),
+			// hasLogin(){
+			// 	return this.$store.getters.hasLogin
+			// }
 		},
 		onLoad(parms) {
 			
@@ -52,10 +53,27 @@
 		onUnload() {
 			
 		},
-		methods: {
+		methods: {
+			...mapActions(['getUserInfo']),
 			jumpPage(name){
 				this.$Router.push({name:name})
 				// this.$Router.pushTab('/pages/login/login')
+			},
+			clickEvent(){
+				let that = this
+				if(this.login)this.jumpPage('eventList');
+				else {
+					uni.showModal({
+					    title: '提示',
+					    content: '需要登录后才能查看,是否跳转去登录界面?',
+					    success: function (res) {
+					        if (res.confirm) {
+								that.jumpPage('login');
+					        } else if (res.cancel) {
+					        }
+					    }
+					});
+				}
 			},
 		}
 	}
diff --git a/pages/message/center_list.vue b/pages/message/center_list.vue
index eab2294..289af8f 100644
--- a/pages/message/center_list.vue
+++ b/pages/message/center_list.vue
@@ -2,7 +2,7 @@
 	<view class="content flex_col flex_start">
 		
 		<!-- item -->
-		<view class="item flex_col flex_start_y bg-white padding " v-for="i in 3">
+		<view class="item flex_col flex_start_y bg-white padding " v-for="i in 3" @click="jumpPage('messageDetail')">
 			<view class="title flex_row flex_start">
 				<view class="text-m text-left">消息中心</view>
 				<view class="bandage"></view>
@@ -28,8 +28,8 @@
 			
 		},
 		methods: {
-			jumpPage(){
-				this.$Router.push({name:"login"})
+			jumpPage(name){
+				this.$Router.push({name:name})
 			},
 		}
 	}