Merge branch 'master' of http://47.92.161.104:10080/wgl/jp-xpgj

.env.development

@@ -6,4 +6,4 @@ VUE_APP_BACKEND_URL=https://ykt-test.xiaoxinda.com/jp-housekeeper-server/
 #小鹏管家微信appid
 VUE_APP_WXAPPID=wx7e70eb62a8459869
 VUE_APP_AUTH=
-VUE_APP_VERSION=2.0.1
+VUE_APP_VERSION=2.0.2

.env.production

@@ -6,4 +6,4 @@ VUE_APP_BACKEND_URL=http://xpgjapi.xiaoxinda.com/
 #小鹏管家微信appid
 VUE_APP_WXAPPID=wx7e70eb62a8459869
 VUE_APP_AUTH=
-VUE_APP_VERSION=2.0.1
+VUE_APP_VERSION=2.0.2

.env.test

@@ -6,4 +6,4 @@ VUE_APP_BACKEND_URL=https://ykt-test.xiaoxinda.com/jp-housekeeper-server/
 #小鹏管家微信appid
 VUE_APP_WXAPPID=wx7e70eb62a8459869
 VUE_APP_AUTH=
-VUE_APP_VERSION=2.0.1
+VUE_APP_VERSION=2.0.2

config/project.js

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

src/assets/css/xpwyfyy.css

@@ -2677,3 +2677,7 @@ h3 {
 	display: flex;
 	height: 100%;
 }
+.vongi-spkh-show img{
+	width: 100%;
+	display: flex;
+}

src/components/Common.vue

@@ -17,9 +17,6 @@
 	} from 'vuex'
 	import * as types from '$project/store/mutation-types'
 	import * as Dictionaries from '$project/utils/dictionaries'
-	import {
-		clear,
-	} from '../utils/storage'
 	export default {
 		name: 'Common',
 		components: {},
@@ -39,13 +36,6 @@
 			return {}
 		},
 		created() {
-			//更新版本号，清除本地数据
-			if (this.app_version != process.env.VUE_APP_VERSION) {
-				clear();
-				//写入当前版本号
-				this.set_app_version(process.env.VUE_APP_VERSION);
-			}
-
 			//公共组件的执行方法放在created中执行，父组件的create放在motuned中执行
 			if (isWeiXin()) {
 				if (this.checkOpenId) {

src/projects/business/App.vue

@@ -5,8 +5,29 @@
 </template>
 
 <script>
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	import {
+		clear,
+	} from '$project/utils/storage'
+	import * as types from '$project/store/mutation-types'
 	export default {
 		name: 'Home',
+		created() {
+			//更新版本号，清除本地数据
+			if (this.app_version != process.env.VUE_APP_VERSION) {
+				clear();
+				//写入当前版本号
+				this.set_app_version(process.env.VUE_APP_VERSION);
+			}
+		},
+		methods: {
+			...mapMutations({
+				set_app_version: types.SET_APP_VERSION,
+			})
+		},
 		mounted() {
 			mui('body').on('tap', '.kfz', function() {
 				mui.toast('开发中');
@@ -14,6 +35,11 @@
 			mui('body').on('tap', '.jump', function() {
 				document.location.href = this.href;
 			});
+		},
+		computed: {
+			...mapGetters({
+				app_version: 'app_version'
+			})
 		}
 	}
 </script>

src/projects/business/router/common.js

@@ -20,7 +20,7 @@ const routesCommon = [
 						name: 'CommonNotice',
 						component: () => import('../views/Common/Notice/Home.vue'),
 						meta: {
-							requireAuth: true,
+							requireAuth: false,
 							role: [],
 							title: '消息列表',
 						}
@@ -31,7 +31,7 @@ const routesCommon = [
 						name: 'CommonNoticeInfo',
 						component: () => import('../views/Common/Notice/Info.vue'),
 						meta: {
-							requireAuth: true,
+							requireAuth: false,
 							role: [],
 							title: '消息详情',
 						}
@@ -124,7 +124,7 @@ const routesCommon = [
 					},
 				],
 			},
-			
+
 		],
 	}
 ]

src/projects/business/router/master.js

@@ -199,7 +199,7 @@ const routesMaster = [
 						name: 'MasterGuestList',
 						component: () => import('../views/Master/Guest/List.vue'),
 						meta: {
-							requireAuth: false,
+							requireAuth: true,
 							role: [],
 							title: '访客列表',
 							mode: true
@@ -211,7 +211,7 @@ const routesMaster = [
 						name: 'MasterGuestGoto',
 						component: () => import('../views/Master/Guest/Goto.vue'),
 						meta: {
-							requireAuth: false,
+							requireAuth: true,
 							role: [],
 							title: '出入记录',
 							mode: true
@@ -269,7 +269,7 @@ const routesMaster = [
 								name: 'MasterPropertyComplaintList',
 								component: () => import('../views/Master/Property/Complaint/List.vue'),
 								meta: {
-									requireAuth: false,
+									requireAuth: true,
 									role: [],
 									title: '业主投诉',
 									mode: true
@@ -310,7 +310,7 @@ const routesMaster = [
 								name: 'MasterPropertyRepairList',
 								component: () => import('../views/Master/Property/Repair/List.vue'),
 								meta: {
-									requireAuth: false,
+									requireAuth: true,
 									role: [],
 									title: '报事报修列表',
 									mode: true
@@ -427,7 +427,7 @@ const routesMaster = [
 						name: 'MasterAttendanceSign',
 						component: () => import('../views/Master/Attendance/Sign.vue'),
 						meta: {
-							requireAuth: false,
+							requireAuth: true,
 							role: [],
 							title: '异地打卡',
 							mode: true
@@ -439,7 +439,7 @@ const routesMaster = [
 						name: 'MasterAttendanceList',
 						component: () => import('../views/Master/Attendance/List.vue'),
 						meta: {
-							requireAuth: false,
+							requireAuth: true,
 							role: [],
 							title: '考勤记录',
 							mode: true
@@ -474,7 +474,7 @@ const routesMaster = [
 						name: 'MasterAttendanceVerifyList',
 						component: () => import('../views/Master/Attendance/VerifyList.vue'),
 						meta: {
-							requireAuth: false,
+							requireAuth: true,
 							role: [],
 							title: '考勤补卡申请审核列表',
 							mode: true
@@ -497,7 +497,7 @@ const routesMaster = [
 						name: 'MasterAttendanceVerifyLeaveList',
 						component: () => import('../views/Master/Attendance/VerifyLeaveList.vue'),
 						meta: {
-							requireAuth: false,
+							requireAuth: true,
 							role: [],
 							title: '请假申请审核列表',
 							mode: true
@@ -520,7 +520,7 @@ const routesMaster = [
 						name: 'MasterAttendanceLeaveList',
 						component: () => import('../views/Master/Attendance/LeaveList.vue'),
 						meta: {
-							requireAuth: false,
+							requireAuth: true,
 							role: [],
 							title: '请假记录',
 							mode: true
@@ -556,7 +556,7 @@ const routesMaster = [
 						name: 'MasterAttendanceStatisticList',
 						component: () => import('../views/Master/Attendance/StatisticList.vue'),
 						meta: {
-							requireAuth: false,
+							requireAuth: true,
 							role: [],
 							title: '考勤统计列表',
 							mode: true
@@ -650,7 +650,7 @@ const routesMaster = [
 						name: 'MasterHealthReport',
 						component: () => import('../views/Master/Health/Report.vue'),
 						meta: {
-							requireAuth: false,
+							requireAuth: true,
 							role: [],
 							title: '疫情上报',
 							mode: true
@@ -662,7 +662,7 @@ const routesMaster = [
 						name: 'MasterHealthArchives',
 						component: () => import('../views/Master/Health/Archives.vue'),
 						meta: {
-							requireAuth: false,
+							requireAuth: true,
 							role: [],
 							title: '健康档案',
 							mode: true
@@ -674,7 +674,7 @@ const routesMaster = [
 						name: 'MasterHealthTemperatureRecord',
 						component: () => import('../views/Master/Health/TemperatureRecord.vue'),
 						meta: {
-							requireAuth: false,
+							requireAuth: true,
 							role: [],
 							title: '测温统计',
 							mode: true
@@ -686,7 +686,7 @@ const routesMaster = [
 						name: 'MasterHealthAbnormalRecord',
 						component: () => import('../views/Master/Health/AbnormalRecord.vue'),
 						meta: {
-							requireAuth: false,
+							requireAuth: true,
 							role: [],
 							title: '异常记录',
 							mode: true
@@ -698,7 +698,7 @@ const routesMaster = [
 						name: 'MasterHealthNoTemperatureRecord',
 						component: () => import('../views/Master/Health/NoTemperatureRecord.vue'),
 						meta: {
-							requireAuth: false,
+							requireAuth: true,
 							role: [],
 							title: '未测人员',
 							mode: true
@@ -710,7 +710,7 @@ const routesMaster = [
 						name: 'MasterHealthWall',
 						component: () => import('../views/Master/Health/Wall.vue'),
 						meta: {
-							requireAuth: false,
+							requireAuth: true,
 							role: [],
 							title: '健康公示',
 							mode: true
@@ -733,7 +733,7 @@ const routesMaster = [
 						name: 'MasterHealthWorker',
 						component: () => import('../views/Master/Health/Worker.vue'),
 						meta: {
-							requireAuth: false,
+							requireAuth: true,
 							role: [],
 							title: '职工台账',
 							mode: true
@@ -778,7 +778,7 @@ const routesMaster = [
 						name: 'MasterHealthGuestTemperature',
 						component: () => import('../views/Master/Health/GuestTemperature.vue'),
 						meta: {
-							requireAuth: false,
+							requireAuth: true,
 							role: [],
 							title: '访客测温',
 							mode: true
@@ -798,7 +798,7 @@ const routesMaster = [
 						name: 'MasterCompanyList',
 						component: () => import('../views/Master/Company/List.vue'),
 						meta: {
-							requireAuth: false,
+							requireAuth: true,
 							role: [],
 							title: '公司列表',
 							mode: true
@@ -810,7 +810,7 @@ const routesMaster = [
 						name: 'MasterCompanyAddPerson',
 						component: () => import('../views/Master/Company/AddPerson.vue'),
 						meta: {
-							requireAuth: false,
+							requireAuth: true,
 							role: [],
 							title: '添加人员',
 							mode: true
@@ -834,7 +834,7 @@ const routesMaster = [
 						name: 'MasterCompanyRegisterExamine',
 						component: () => import('../views/Master/Company/RegisterExamine.vue'),
 						meta: {
-							requireAuth: false,
+							requireAuth: true,
 							role: [],
 							title: '注册审核',
 							mode: true

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

@@ -19,28 +19,10 @@
 			<div class="vongi-icons">
 				<div class="vongi-index">
 					<ul class="mui-table-view mui-grid-view mui-grid-9 vongi-grid-head">
-						<li class="mui-table-view-cell mui-media mui-col-xs-3">
-							<router-link :to="{name:'CommonHealthCert'}">
-								<img src="~$project/assets/img/icon54.png" />
-								<div class="mui-media-body">健康证</div>
-							</router-link>
-						</li>
-						<li class="mui-table-view-cell mui-media mui-col-xs-3">
-							<router-link :to="{name:'CommonHealthTemperatureRecord'}">
-								<img src="~$project/assets/img/icon41.png" />
-								<div class="mui-media-body">测温记录</div>
-							</router-link>
-						</li>
-						<li class="mui-table-view-cell mui-media mui-col-xs-3">
-							<router-link :to="{name:'MasterAttendanceList'}">
-								<img src="~$project/assets/img/icon39.png" />
-								<div class="mui-media-body">考勤记录</div>
-							</router-link>
-						</li>
-						<li class="mui-table-view-cell mui-media mui-col-xs-3">
-							<router-link :to="{name:'MasterAttendanceLeaveList'}">
-								<img src="~$project/assets/img/icon.png" />
-								<div class="mui-media-body">请假</div>
+						<li v-for="(item,index) in common_menu_list" :class="'mui-table-view-cell mui-media mui-col-xs-3 '+(item.iconRoute?'':'kfz')">
+							<router-link :to="{name:item.iconRoute,query:item.iconParam}">
+								<img :src="requirePic(item.iconCommonPic)" />
+								<div class="mui-media-body" v-text="item.iconName"></div>
 							</router-link>
 						</li>
 					</ul>
@@ -83,7 +65,7 @@
 					</div>
 					<div v-if="noticeList.length" class="mui-col-xs-12">
 						<div class="vongi-floor-padded">
-							<router-link :to="{name:'CommonNotice',query:{type:1}}" v-for="(item,index) in noticeList" :key="index" :class="'text-list '+(item.readStatus?'red-after':'')">
+							<router-link :to="{name:'CommonNotice',query:{type:1}}" v-for="(item,index) in noticeList" :key="index" :class="'text-list '+(item.readStatus?'':'red-after')">
 								<h5 class="mui-ellipsis" v-text="item.title"></h5><span v-text="item.date"></span>
 							</router-link>
 						</div>

src/projects/pension/App.vue

@@ -5,8 +5,29 @@
 </template>
 
 <script>
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	import {
+		clear,
+	} from '$project/utils/storage'
+	import * as types from '$project/store/mutation-types'
 	export default {
 		name: 'Home',
+		created() {
+			//更新版本号，清除本地数据
+			if (this.app_version != process.env.VUE_APP_VERSION) {
+				clear();
+				//写入当前版本号
+				this.set_app_version(process.env.VUE_APP_VERSION);
+			}
+		},
+		methods: {
+			...mapMutations({
+				set_app_version: types.SET_APP_VERSION,
+			})
+		},
 		mounted() {
 			mui('body').on('tap', '.kfz', function() {
 				mui.toast('开发中');
@@ -14,6 +35,11 @@
 			mui('body').on('tap', '.jump', function() {
 				document.location.href = this.href;
 			});
+		},
+		computed: {
+			...mapGetters({
+				app_version: 'app_version'
+			})
 		}
 	}
 </script>

src/projects/pension/router/common.js

@@ -20,7 +20,7 @@ const routesCommon = [
 						name: 'CommonNotice',
 						component: () => import('../views/Common/Notice/Home.vue'),
 						meta: {
-							requireAuth: true,
+							requireAuth: false,
 							role: [],
 							title: '消息列表',
 						}
@@ -31,7 +31,7 @@ const routesCommon = [
 						name: 'CommonNoticeInfo',
 						component: () => import('../views/Common/Notice/Info.vue'),
 						meta: {
-							requireAuth: true,
+							requireAuth: false,
 							role: [],
 							title: '消息详情',
 						}

src/projects/pension/router/master.js

@@ -288,7 +288,6 @@ const routesMaster = [
 							requireAuth: false,
 							role: [],
 							title: '关联长者,已注册',
-							mode: true
 						}
 					},
 				],

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

@@ -19,30 +19,12 @@
 			<div class="vongi-icons">
 				<div class="vongi-index">
 					<ul class="mui-table-view mui-grid-view mui-grid-9 vongi-grid-head">
-						<li class="mui-table-view-cell mui-media mui-col-xs-3">
-							<router-link :to="{name:'MasterHealthArchives'}">
-								<img src="~$project/assets/img/icon21.png" />
-								<div class="mui-media-body">健康档案</div>
+						<li v-for="(item,index) in common_menu_list" :class="'mui-table-view-cell mui-media mui-col-xs-3 '+(item.iconRoute?'':'kfz')">
+							<router-link :to="{name:item.iconRoute,query:item.iconParam}">
+								<img :src="requirePic(item.iconCommonPic)" />
+								<div class="mui-media-body" v-text="item.iconName"></div>
 							</router-link>
 						</li>
-						<li class="mui-table-view-cell mui-media mui-col-xs-3 kfz">
-							<a>
-								<img src="~$project/assets/img/icon25.png" />
-								<div class="mui-media-body">养老服务</div>
-							</a>
-						</li>
-						<li class="mui-table-view-cell mui-media mui-col-xs-3 kfz">
-							<a>
-								<img src="~$project/assets/img/icon19.png" />
-								<div class="mui-media-body">活动轨迹</div>
-							</a>
-						</li>
-						<li class="mui-table-view-cell mui-media mui-col-xs-3">
-							<a>
-								<img src="~$project/assets/img/icon29.png" />
-								<div class="mui-media-body">视频看护</div>
-							</a>
-						</li>
 					</ul>
 				</div>
 				<ul class="mui-table-view mui-grid-view mui-grid-9">
@@ -83,7 +65,7 @@
 					</div>
 					<div v-if="noticeList.length" class="mui-col-xs-12">
 						<div class="vongi-floor-padded">
-							<router-link :to="{name:'CommonNotice',query:{type:1}}" v-for="(item,index) in noticeList" :key="index" class="text-list">
+							<router-link :to="{name:'CommonNotice',query:{type:1}}" v-for="(item,index) in noticeList" :key="index" :class="'text-list '+(item.readStatus?'':'red-after')">
 								<h5 class="mui-ellipsis" v-text="item.title"></h5><span v-text="item.date"></span>
 							</router-link>
 						</div>
@@ -321,4 +303,7 @@
 <style scoped src="$project/assets/css/pension.css"></style>
 <style src="$project/assets/css/mui.picker.min.css"></style>
 <style scoped>
-</style>
+	.red-after:after {
+		background: red;
+	}
+</style>

src/projects/pension/views/Master/Live/Show.vue

@@ -4,14 +4,16 @@
     <common @asynCallBack="asynCallBack"></common>
     <top-header :pageTitle="pageTitle"  :routeName="routeName"  ></top-header>
 
-    <div class="mui-content">
-        <div class="mui-content-padded">
-            <img src="~$project/assets/img/03.jpg" width="100%"/>
-        </div>
+    <div class="mui-content vongi-spkh-show margin60">
+        <img src="~$project/assets/img/show01.png" />
+        <img src="~$project/assets/img/show02.png" />
+        <img src="~$project/assets/img/show03.png" />
+        <img src="~$project/assets/img/show04.png" />
+        <img src="~$project/assets/img/show05.png" />
     </div>
     <div class="fyy-footer">
       <div class="bindfyy-btn">
-        <button type="submit" class="mui-btn mui-btn-pink"   @click="toPay()" v-text="paytext">开通服务</button>
+        <button type="submit" class="mui-btn mui-btn-pink"   @click="toPay()" v-text="paytext">立即开通</button>
       </div>
     </div>
     <loading :visible="isLoading"></loading>

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

@@ -45,11 +45,13 @@
 							<img src="~$project/assets/img/change.png" width="18" /> 切换为长者模式
 						</a>
 					</li>
-					<!-- <li class="mui-table-view-cell">
+				</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">
 							<img src="~$project/assets/img/set.png" width="18" /> 问题反馈
 						</router-link>
-					</li> -->
+					</li>
 					<li class="mui-table-view-cell">
 						<a href="tel:4008899619" class="">
 							<img src="~$project/assets/img/cicon33.png" width="18" /> 客服热线