首页调整

src/apis/user.js

@@ -9,3 +9,12 @@ export function getRoleList() {
 		method: 'post',
 	})
 }
+
+//切换用户角色列表
+export function exchangePopedom(params) {
+	return request({
+		url: '/mobile/personInfoApi/exchangePopedom',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}

src/projects/business/views/Master/Home.vue

@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<common @asynCallBack="asynCallBack"></common>
+		<common ref="common" @asynCallBack="asynCallBack"></common>
 		<top-header :pageTitle="pageTitle" headerClass="vongi-bar"></top-header>
 
 		<div class="mui-content margin49">
@@ -96,38 +96,34 @@
 					</li>
 				</ul>
 			</div>
-			<div class="vongi-index-floor kfz">
+			<div class="vongi-index-floor">
 				<h4 class="vongi-floor-title">功能推荐区</h4>
 				<div class="vongi-index-inter flew-sp">
 					<div class="mui-col-xs-6">
-						<div class="vongi-floor-padded">
+						<router-link :to="{name:'MasterMineEditInfo'}" class="vongi-floor-padded">
 							<div class="mui-media-body">
 								<h4 class="mui-ellipsis">关联健康码</h4>
 								<p class="mui-ellipsis">出行更便捷</p>
 							</div>
 							<img class="mui-media-object mui-pull-right" src="~$project/assets/img/cicon15.png" width="54" />
-						</div>
-
+						</router-link>
 					</div>
 					<div class="mui-col-xs-6">
-						<div class="vongi-floor-padded">
+						<router-link :to="{name:'MasterMineEditInfo'}" class="vongi-floor-padded">
 							<div class="mui-media-body">
 								<h4 class="mui-ellipsis">上传登记照</h4>
 								<p class="mui-ellipsis">打卡快人一步</p>
 							</div>
 							<img class="mui-media-object mui-pull-right" src="~$project/assets/img/cicon18.png" width="54" />
-						</div>
+						</router-link>
 					</div>
 					<div class="mui-col-xs-12">
 						<div class="vongi-floor-padded">
-							<a href="" class="text-list">
-								<h5 class="mui-ellipsis">9月园区活动通知</h5><span>9月20日</span>
-							</a>
-							<a href="" class="text-list">
-								<h5 class="mui-ellipsis">9月园区活动通知9月园区活动通知9月园区活动通知9月园区活动通知9月园区活动通知</h5><span>9月20日</span>
-							</a>
+							<router-link :to="{name:'CommonNotice'}" v-for="(item,index) in noticeList" :key="index" class="text-list">
+								<h5 class="mui-ellipsis" v-text="item.title"></h5><span v-text="item.createTime.substr(5)"></span>
+							</router-link>
 						</div>
-						<a href="" class="vongi-link"><span class="mui-icon mui-icon-forward"></span></a>
+						<router-link :to="{name:'CommonNotice'}" class="vongi-link"><span class="mui-icon mui-icon-forward"></span></router-link>
 					</div>
 					<div class="mui-col-xs-12">
 						<div id="slider" class="mui-slider">
@@ -193,6 +189,7 @@
 
 <script>
 	require('$project/assets/js/mui.picker.min.js');
+	import * as API_Notice from '@/apis/Common/notice'
 	import * as API_User from '$project/apis/user'
 	import Common from '$project/components/Common.vue'
 	import Loading from '$project/components/Loading.vue'
@@ -215,6 +212,8 @@
 				isLoading: false,
 
 				roleList: [],
+
+				noticeList: [],
 			}
 		},
 		created() {
@@ -251,7 +250,34 @@
 			},
 			//切换角色
 			switchRole(id) {
+				this.isLoading = true;
+				API_User.exchangePopedom({
+					id: id
+				}).then(response => {
+					this.isLoading = false;
 
+					this.$refs.common.getDataByOpenId();
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
+			//获取最新二条通知消息
+			getLastNotice() {
+				this.isLoading = true;
+				API_Notice.getNoticeList({
+					pageIndex: 1,
+					pageSize: 2,
+				}).then(response => {
+					let data = response.data;
+					if (data.length > 0) {
+						this.noticeList = data.slice(0, 1);
+					}
+					this.isLoading = false;
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
 			},
 			asynCallBack() {
 
@@ -260,6 +286,8 @@
 		mounted() {
 			//获取用户角色列表
 			this.getRoleList();
+			//获取最新二条通知消息
+			this.getLastNotice();
 
 			var gallery = mui('.mui-slider');
 			var slider = gallery.slider({

src/projects/business/views/Master/Mine/EditInfo.vue

@@ -65,7 +65,7 @@
 		},
 		data() {
 			return {
-				pageTitle: '修改个人中心',
+				pageTitle: '修改个人信息',
 
 				isLoading: false,
 

src/projects/business/views/Master/Mine/Message.vue

@@ -118,7 +118,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-                person_popedom: 'person_popedom',
+				person_popedom: 'person_popedom',
 			})
 		}
 	}