养老场景页修改

.env.production

@@ -2,7 +2,7 @@ NODE_ENV=production
 VUE_APP_NODE_NAME=production
 OUT_PUT_NAME=prod
 VUE_APP_LOCAL_STORAGE_PREFIX=prod
-VUE_APP_BACKEND_URL=http://wisdomhouse.sudaonline.net/
+VUE_APP_BACKEND_URL=http://xpgjapi.xiaoxinda.com/
 #小鹏管家微信appid
 VUE_APP_WXAPPID=wx7e70eb62a8459869
 VUE_APP_AUTH=

config/project.js

@@ -1 +1 @@
-exports.name = 'home'
+exports.name = 'pension'

src/projects/pension/router/master.js

@@ -33,9 +33,9 @@ const routesMaster = [
 			},
 			//主页长者模式
 			{
-				path: 'bigFontHome',
-				name: 'MasterBigFontHome',
-				component: () => import('../views/Master/BigFontHome.vue'),
+				path: 'homeBigFont',
+				name: 'MasterHomeBigFont',
+				component: () => import('../views/Master/HomeBigFont.vue'),
 				meta: {
 					requireAuth: false,
 					role: [],

src/projects/pension/views/Master/BigFontHome.vue

@@ -1,79 +0,0 @@
-<template>
-<div>
-    <div class="mui-content vongi-color vongi-ylindex">
-			<ul class="mui-table-view vongi-ylfuwu">
-				<li class="mui-table-view-cell mui-col-xs-6">
-					<div class="vongi-color-block block-green">
-						<div class="mui-h1 iconfont icon-weibiaoti--"></div>
-						<div class="mui-media-body">健康档案</div>
-					</div>
-				</li>
-				<li class="mui-table-view-cell mui-col-xs-6">
-					<div class="vongi-color-block block-blue">
-						<div class="mui-h1 iconfont icon-dingwei1"></div>
-						<div class="mui-media-body">行动轨迹</div>
-					</div>
-				</li>
-				<li class="mui-table-view-cell mui-col-xs-6">
-					<div class="vongi-color-block block-yellow">
-						<div class="mui-h1 iconfont icon-xin1"></div>
-						<div class="mui-media-body">养老服务</div>
-					</div>
-				</li>
-				<li class="mui-table-view-cell mui-col-xs-6">
-					<div class="vongi-color-block block-light">
-						<div class="mui-h1 iconfont icon-dianhua2"></div>
-						<div class="mui-media-body">亲情号码</div>
-					</div>
-				</li>
-				<li class="mui-table-view-cell mui-col-xs-6">
-					<div class="vongi-color-block block-blue">
-						<div class="mui-h1 iconfont icon-jiankong_o"></div>
-						<div class="mui-media-body">视频看护</div>
-					</div>
-				</li>
-				<li class="mui-table-view-cell mui-col-xs-6">
-					<div class="vongi-color-block block-violet">
-						<div class="mui-h1 iconfont icon-icon-"></div>
-						<div class="mui-media-body">我的二维码</div>
-					</div>
-				</li>
-				<li class="mui-table-view-cell mui-col-xs-6">
-					<div class="vongi-color-block block-pink">
-						<div class="mui-h1 iconfont icon-yao"></div>
-						<div class="mui-media-body">吃药提醒</div>
-					</div>
-				</li>
-				<li class="mui-table-view-cell mui-col-xs-6">
-					<div class="vongi-color-block block-greene">
-						<div class="mui-h1 iconfont icon-medical-treatment"></div>
-						<div class="mui-media-body">医疗记录</div>
-					</div>
-				</li>
-				
-				<li class="mui-table-view-cell mui-col-xs-6">
-					<div class="vongi-color-block block-yellowe">
-						<div class="mui-h1 iconfont icon-B"></div>
-						<div class="mui-media-body">切换身份</div>
-					</div>
-				</li>
-				<li class="mui-table-view-cell mui-col-xs-6">
-					<div class="vongi-color-block block-grew">
-						<div class="mui-h1 iconfont icon-tuichu2"></div>
-						<div class="mui-media-body">退出长者模式</div>
-					</div>
-				</li>
-			</ul>
-		</div>
-</div>
-</template>
-
-<script>
-</script>
-
-<style scoped src="$project/assets/css/pension.css"></style>
-<style scoped src="$project/assets/css/xpwyfyy.css"></style>
-<style src="$project/assets/css/iconfont.css"></style>
-<style>
-</style>
-

src/projects/pension/views/Master/ExchangeRole.vue

@@ -1,45 +1,109 @@
 <template>
-<div>
-    <header class="mui-bar mui-bar-nav">
-			<h1 class="mui-title">切换身份</h1>
-			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
-		</header>
+	<div>
+		<common ref="common" @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
+
 		<div class="mui-content vongi-qqhm vongi-fklist vongi-ylqhsf">
 			<ul class="mui-table-view openfyy-list ">
-				<li class="mui-table-view-cell">
-					<a href="#" class="mui-radio">
-						<div class="mui-col-xs-10  mui-pull-left flew-items">
-							<div class="mui-media-object mui-pull-left "><img src="~$project/assets/img/02.jpg" width="50" /></div>
-							<div class="mui-media-body">
-								<h1>赵大宝</h1>
-								<p class='mui-ellipsis mui-h3'>长者  居家养老</p>
-							</div>
-						</div>
-						<input name="radio1" type="radio" checked>
-					</a>
-				</li>
-				<li class="mui-table-view-cell">
-					<a href="#" class="mui-radio">
+				<li v-for="(item,index) in roleList" class="mui-table-view-cell">
+					<a @click="switchRole(item.id)" class="mui-radio">
 						<div class="mui-col-xs-10  mui-pull-left flew-items">
 							<div class="mui-media-object mui-pull-left "><img src="~$project/assets/img/02.jpg" width="50" /></div>
 							<div class="mui-media-body">
-								<h1>父亲的智能手表</h1>
-								<p class='mui-ellipsis mui-h3'>JP01351704</p>
+								<h1 v-text="item.companyName"></h1>
+								<p class='mui-ellipsis mui-h3' v-text="item.personRoleName"></p>
 							</div>
 						</div>
 						<input name="radio1" type="radio" checked>
 					</a>
 				</li>
-			</ul>	
+			</ul>
 		</div>
-</div>
+	</div>
 </template>
 
 <script>
+	import * as API_User from '$project/apis/user'
+	import Common from '$project/components/Common.vue'
+	import Loading from '$project/components/Loading.vue'
+	import TopHeader from '$project/components/TopHeader.vue'
+	import NavMenu from '@/components/NavMenu.vue'
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	export default {
+		name: 'MasterExchangeRole',
+		components: {
+			Common,
+			Loading,
+			TopHeader,
+			NavMenu
+		},
+		data() {
+			return {
+				isLoading: false,
+
+				roleList: [],
+
+				pageTitle: '切换身份',
+			}
+		},
+		created() {},
+		methods: {
+			//获取用户角色列表
+			getRoleList() {
+				this.isLoading = true;
+				API_User.getRoleList().then(response => {
+					this.isLoading = false;
+
+					this.roleList = response.list;
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
+			//切换角色
+			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);
+				})
+			},
+
+			asynCallBack() {
+				//获取用户角色列表
+				this.getRoleList();
+
+			},
+		},
+		mounted() {},
+		destroyed() {
+
+		},
+		computed: {
+			...mapGetters({
+				openId: 'wx_openid',
+				token: 'token',
+				person_data: 'person_data',
+				person_popedom: 'person_popedom',
+				menu_list: 'menu_list',
+				common_menu_list: 'common_menu_list',
+				persion_home_model: 'persion_home_model'
+			})
+		}
+	}
 </script>
 
 <style scoped src="$project/assets/css/pension.css"></style>
 <style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style src="$project/assets/css/iconfont.css"></style>
 <style>
-</style>
+</style>

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

@@ -163,6 +163,7 @@
 		mapGetters,
 		mapMutations
 	} from 'vuex'
+	import * as types from '$project/store/mutation-types'
 	export default {
 		name: 'Master',
 		components: {
@@ -255,6 +256,17 @@
 			requirePic(file) {
 				return require('$project/assets/img/' + file);
 			},
+			//设置判断首页模式
+			setHomeModel() {
+				if (!this.persion_home_model) {
+					this.set_persion_home_model('normal');
+				}
+				if (this.persion_home_model != 'normal') {
+					this.$router.push({
+						name: 'MasterHomeBigFont'
+					})
+				}
+			},
 			asynCallBack() {
 				//获取用户角色列表
 				this.getRoleList();
@@ -262,8 +274,14 @@
 				this.prefetchNotice();
 
 			},
+			...mapMutations({
+				set_persion_home_model: types.SET_PERSION_HOME_MODEL,
+			})
 		},
 		mounted() {
+			//设置判断首页模式
+			this.setHomeModel();
+
 			var gallery = mui('.mui-slider');
 			var slider = gallery.slider({
 				interval: 2000, //自动轮播周期，若为0则不自动播放，默认为0；
@@ -291,6 +309,7 @@
 				person_popedom: 'person_popedom',
 				menu_list: 'menu_list',
 				common_menu_list: 'common_menu_list',
+				persion_home_model: 'persion_home_model'
 			})
 		}
 	}

src/projects/pension/views/Master/HomeBigFont.vue

@@ -0,0 +1,162 @@
+<template>
+	<div>
+		<div class="mui-content vongi-color vongi-ylindex">
+			<ul class="mui-table-view vongi-ylfuwu">
+				<li class="mui-table-view-cell mui-col-xs-6">
+					<div class="vongi-color-block block-green">
+						<router-link :to="{name:'MasterHealthArchives'}">
+							<div class="mui-h1 iconfont icon-weibiaoti--"></div>
+							<div class="mui-media-body">健康档案</div>
+						</router-link>
+					</div>
+				</li>
+				<li class="mui-table-view-cell mui-col-xs-6 kfz">
+					<div class="vongi-color-block block-blue">
+						<a>
+							<div class="mui-h1 iconfont icon-dingwei1"></div>
+							<div class="mui-media-body">行动轨迹</div>
+						</a>
+					</div>
+				</li>
+				<li class="mui-table-view-cell mui-col-xs-6 kfz">
+					<div class="vongi-color-block block-yellow">
+						<a>
+							<div class="mui-h1 iconfont icon-xin1"></div>
+							<div class="mui-media-body">养老服务</div>
+						</a>
+					</div>
+				</li>
+				<li class="mui-table-view-cell mui-col-xs-6 kfz">
+					<div class="vongi-color-block block-light">
+						<a>
+							<div class="mui-h1 iconfont icon-dianhua2"></div>
+							<div class="mui-media-body">亲情号码</div>
+						</a>
+					</div>
+				</li>
+				<li class="mui-table-view-cell mui-col-xs-6 kfz">
+					<div class="vongi-color-block block-blue">
+						<a>
+							<div class="mui-h1 iconfont icon-jiankong_o"></div>
+							<div class="mui-media-body">视频看护</div>
+						</a>
+					</div>
+				</li>
+				<li class="mui-table-view-cell mui-col-xs-6 kfz">
+					<div class="vongi-color-block block-violet">
+						<a>
+							<div class="mui-h1 iconfont icon-icon-"></div>
+							<div class="mui-media-body">我的二维码</div>
+						</a>
+					</div>
+				</li>
+				<li class="mui-table-view-cell mui-col-xs-6 kfz">
+					<div class="vongi-color-block block-pink">
+						<a>
+							<div class="mui-h1 iconfont icon-yao"></div>
+							<div class="mui-media-body">吃药提醒</div>
+						</a>
+					</div>
+				</li>
+				<li class="mui-table-view-cell mui-col-xs-6 kfz">
+					<div class="vongi-color-block block-greene">
+						<a>
+							<div class="mui-h1 iconfont icon-medical-treatment"></div>
+							<div class="mui-media-body">医疗记录</div>
+						</a>
+					</div>
+				</li>
+
+				<li class="mui-table-view-cell mui-col-xs-6">
+					<div class="vongi-color-block block-yellowe">
+						<router-link :to="{name:'MasterExchangeRole'}">
+							<div class="mui-h1 iconfont icon-B"></div>
+							<div class="mui-media-body">切换身份</div>
+						</router-link>
+					</div>
+				</li>
+				<li class="mui-table-view-cell mui-col-xs-6">
+					<div class="vongi-color-block block-grew">
+						<a @click="outModel">
+							<div class="mui-h1 iconfont icon-tuichu2"></div>
+							<div class="mui-media-body">退出长者模式</div>
+						</a>
+					</div>
+				</li>
+			</ul>
+		</div>
+	</div>
+</template>
+
+<script>
+	require('$project/assets/js/mui.picker.min.js');
+	import Common from '$project/components/Common.vue'
+	import Loading from '$project/components/Loading.vue'
+	import TopHeader from '$project/components/TopHeader.vue'
+	import NavMenu from '@/components/NavMenu.vue'
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	import * as types from '$project/store/mutation-types'
+	export default {
+		name: 'MasterHomeBigFont',
+		components: {
+			Common,
+			Loading,
+			TopHeader,
+			NavMenu
+		},
+		data() {
+			return {
+				isLoading: false,
+			}
+		},
+		created() {},
+		methods: {
+			//退出当前模式
+			outModel() {
+				this.set_persion_home_model('normal');
+				this.$router.push({
+					name: 'Master'
+				})
+			},
+			asynCallBack() {
+
+			},
+			...mapMutations({
+				set_persion_home_model: types.SET_PERSION_HOME_MODEL,
+			})
+		},
+		mounted() {
+			var gallery = mui('.mui-slider');
+			var slider = gallery.slider({
+				interval: 2000, //自动轮播周期，若为0则不自动播放，默认为0；
+				bounce: true //是否启用回弹
+			});
+		},
+		destroyed() {
+
+		},
+		computed: {
+			...mapGetters({
+				openId: 'wx_openid',
+				token: 'token',
+				person_data: 'person_data',
+				person_popedom: 'person_popedom',
+				menu_list: 'menu_list',
+				common_menu_list: 'common_menu_list',
+				persion_home_model: 'persion_home_model'
+			})
+		}
+	}
+</script>
+
+<style scoped src="$project/assets/css/pension.css"></style>
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
+<style scoped>
+	.vongi-ylfuwu a {
+		color: #fff;
+	}
+</style>

src/projects/pension/views/Master/Mine/Center.vue

@@ -41,10 +41,15 @@
 				</ul>
 				<ul class="mui-table-view mui-table-view-chevron vongi-news">
 					<li class="mui-table-view-cell">
-						<router-link :to="{name:'MasterMineFeedback'}" class="mui-navigate-right">
+						<a @click="exchangeModel" class="mui-navigate-right">
 							<img src="~$project/assets/img/change.png" width="18" /> 切换为长者模式
-						</router-link>
+						</a>
 					</li>
+					<!-- <li class="mui-table-view-cell">
+						<router-link :to="{name:'MasterMineFeedback'}" class="mui-navigate-right">
+							<img src="~$project/assets/img/set.png" width="18" /> 问题反馈
+						</router-link>
+					</li> -->
 					<li class="mui-table-view-cell">
 						<a href="tel:4008899619" class="">
 							<img src="~$project/assets/img/cicon33.png" width="18" /> 客服热线
@@ -71,6 +76,7 @@
 		mapGetters,
 		mapMutations
 	} from "vuex";
+	import * as types from '$project/store/mutation-types'
 	export default {
 		name: "MasterMineCenter",
 		components: {
@@ -100,7 +106,17 @@
 					query: {},
 				});
 			},
+			//切换长者模式
+			exchangeModel() {
+				this.set_persion_home_model('big');
+				this.$router.push({
+					name: "MasterHomeBigFont"
+				});
+			},
 			asynCallBack() {},
+			...mapMutations({
+				set_persion_home_model: types.SET_PERSION_HOME_MODEL,
+			})
 		},
 		mounted() {},
 		destroyed() {},
@@ -138,6 +154,7 @@
 				token: "token",
 				person_data: "person_data",
 				person_popedom: "person_popedom",
+				persion_home_model: 'persion_home_model'
 			}),
 		},
 	};

src/store/getters.js

@@ -18,4 +18,6 @@ export const register_form_data = state => state.register_form_data
 
 export const app_version = state => state.app_version
 
-export const common_menu_list = state => state.common_menu_list
+export const common_menu_list = state => state.common_menu_list
+
+export const persion_home_model = state => state.persion_home_model

src/store/mutation-types.js

@@ -9,4 +9,5 @@ export const SET_PERSON_TEMP = 'SET_PERSON_TEMP'
 export const SET_FUN_LIST = 'SET_FUN_LIST'
 export const SET_REGISTER_FORM_DATA = 'SET_REGISTER_FORM_DATA'
 export const SET_APP_VERSION = 'SET_APP_VERSION'
-export const SET_COMMON_MENU_LIST = 'SET_COMMON_MENU_LIST'
+export const SET_COMMON_MENU_LIST = 'SET_COMMON_MENU_LIST'
+export const SET_PERSION_HOME_MODEL = 'SET_PERSION_HOME_MODEL'

src/store/mutations.js

@@ -9,7 +9,8 @@ import {
 	setPersonTemp,
 	setFunList,
 	setRegisterFormData,
-	setAppVersion
+	setAppVersion,
+	setPersionHomeModel
 } from '../utils/storage'
 
 var storage_prefix = process.env.VUE_APP_LOCAL_STORAGE_PREFIX;
@@ -49,7 +50,7 @@ const mutations = {
 		setMenuList(storage_prefix, data)
 		state.menu_list = data
 	},
-	
+
 	[types.SET_COMMON_MENU_LIST](state, data) {
 		setCommonMenuList(storage_prefix, data)
 		state.common_menu_list = data
@@ -74,6 +75,11 @@ const mutations = {
 		setAppVersion(storage_prefix, data)
 		state.app_version = data
 	},
+
+	[types.SET_PERSION_HOME_MODEL](state, data) {
+		setPersionHomeModel(storage_prefix, data)
+		state.persion_home_model = data
+	},
 }
 
 export default mutations

src/store/state.js

@@ -8,7 +8,8 @@ import {
 	getPersonTemp,
 	getFunList,
 	getRegisterFormData,
-	getAppVersion
+	getAppVersion,
+	getPersionHomeModel
 } from '../utils/storage'
 
 var storage_prefix = process.env.VUE_APP_LOCAL_STORAGE_PREFIX;
@@ -27,6 +28,7 @@ const state = {
 	fun_list: getFunList(storage_prefix),
 	register_form_data: getRegisterFormData(storage_prefix),
 	app_version: getAppVersion(storage_prefix),
+	persion_home_model: getPersionHomeModel(storage_prefix),
 }
 
 export default state

src/utils/storage.js

@@ -88,4 +88,8 @@ export const getRegisterFormData = (channel) => get(channel + '_register_form_da
 
 export const setAppVersion = (channel, data) => set(channel + '_app_vesion', data)
 
-export const getAppVersion = (channel) => get(channel + '_app_vesion')
+export const getAppVersion = (channel) => get(channel + '_app_vesion')
+
+export const setPersionHomeModel = (channel, data) => set(channel + '_persion_home_model', data)
+
+export const getPersionHomeModel = (channel) => get(channel + '_persion_home_model')