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

.env.development

@@ -2,7 +2,7 @@ NODE_ENV=devlopment
 VUE_APP_NODE_NAME=devlopment
 OUT_PUT_NAME=dev
 VUE_APP_LOCAL_STORAGE_PREFIX=dev
-VUE_APP_BACKEND_URL=http://192.168.33.120:8086/jp-housekeeper-server/
+VUE_APP_BACKEND_URL=https://ykt-test.xiaoxinda.com/jp-housekeeper-server/
 #小鹏管家微信appid
 VUE_APP_WXAPPID=wx7e70eb62a8459869
 VUE_APP_AUTH=

src/assets/css/mui.min.css

@@ -2416,9 +2416,9 @@ input[type=url],
 input[type=week],
 select,
 textarea {
-	line-height: 43px;
+	line-height: 1.5;
 	width: 100%;
-	padding: 0 15px;
+	padding: 10px 15px;
 	-webkit-user-select: text;
 	border:0;
 	border-radius: 3px;

src/assets/css/xpwyfyy.css

@@ -1309,7 +1309,7 @@ h3 {
 	display: flex;
 	z-index: 9999;
 	margin: 0;
-	position: fixed;
+	position: absolute;
 	width: 100%;
 	-webkit-box-shadow: 0 1px 6px #ccc;
 	box-shadow: 0 1px 6px #ccc;
@@ -1521,6 +1521,7 @@ h3 {
 	border-radius: 30px;
 	-webkit-box-shadow: 0 1px 6px #ccc;
 	box-shadow: 0 1px 6px #ccc;
+	z-index: 99999;
 }
 
 .vongi-archives-search a {
@@ -2352,3 +2353,35 @@ h3 {
 .vongi-clasadmin .vongi-btn button{
 	border-radius: 7px;
 }
+.vongi-zc .mui-media-object{
+	max-width:48px;
+	height:48px;
+	line-height: 48px;
+	border-radius: 50%;
+	overflow: hidden;
+	display: flex;
+}
+.vongi-zc .mui-media-object img{
+	object-fit: cover;
+	min-width:100%;
+	height: 100%;
+}
+.vongi-zc .mui-table-view-cell a{
+	display: flex;
+	align-items: center;
+}
+.vongi-editme .mui-input-row textarea{
+	width:100%;
+	padding:0 15px 10px;
+}
+
+.vongi-over .mui-slider-item{
+	overflow: scroll;
+}
+.vongi-over .mui-scroll{
+	margin-bottom:60px;
+}
+.vongi-over-hei{
+	min-height: 100%;
+	   
+}

src/projects/business/apis/Common/device.js

@@ -9,3 +9,23 @@ export function listOfDevice(params) {
 		method: 'post',
 	})
 }
+
+//获取开门列表
+export function getDoorList() {
+	return request({
+		url: '/mobile/guestInfoRecordApi/openByMobilePhoneList',
+		data: Qs.stringify({}),
+		method: 'post',
+	})
+}
+
+//手机开门
+export function openDoor(id) {
+	return request({
+		url: '/mobile/guestInfoRecordApi/openByMobilePhone',
+		data: Qs.stringify({
+			id: id
+		}),
+		method: 'post',
+	})
+}

src/projects/business/router/common.js

@@ -123,8 +123,8 @@ const routesCommon = [
 						}
 					},
 				],
-			}
-
+			},
+			
 		],
 	}
 ]

src/projects/business/router/master.js

@@ -806,9 +806,43 @@ const routesMaster = [
 							form: true
 						}
 					},
+					//注册审核
+					{
+						path: 'registerExamine',
+						name: 'MasterCompanyRegisterExamine',
+						component: () => import('../views/Master/Company/RegisterExamine.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '注册审核',
+							mode: true
+						}
+					},
 				]
 			},
 
+
+			//活动
+			{
+				path: 'activity',
+				component: () => import('../views/Layout.vue'),
+				children: [
+					//活动审批
+					{
+						path: 'examineList',
+						name: 'MasterActivityExamine',
+						component: () => import('@/views/Master/Activity/ExamineList.vue'),
+						meta: {
+							requireAuth: true,
+							role: [],
+							title: '活动审批',
+							mode: true
+						}
+					},
+				],
+			}
+
+
 		],
 	},
 ]

src/projects/business/views/Common/Device/OpenDoor.vue

@@ -1,42 +1,118 @@
 <template>
-	<div id="app">
-		<header class="mui-bar mui-bar-nav vongi-bar">
-			<h1 class="mui-title">手机开门</h1>
-		</header>
+	<div>
+		<common @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
+
 		<div class="mui-content">
 			<div class="vongi-opendoor">
 				<div class="flew-items">
 					<div class="mui-col-xs-3">
 						<div class="vongi-opendoor-img">
-							<img src="~$project/assets/img/audit1.png" />
+							<img :src="person_data.faceImageUrl" />
 						</div>
-						门卫
+						{{person_popedom.personRoleName}}
 					</div>
 					<div class="mui-col-xs-9 mui-media-body">
-						湖北荆鹏软件集团有限公司
-						<h5>保卫科</h5>
+						{{person_data.position1}}
+						<h5 v-text="person_data.position2"></h5>
 					</div>
 				</div>
 				<div class="vongi-yuan vongi-yuan1"></div>
 				<div class="vongi-yuan vongi-yuan2"></div>
 			</div>
 			<div class="vongi-opendoor-bottom">
-				<div class="flew-sp">
-					A栋大厅玻璃门
-					<button class="mui-btn mui-btn-primary">开门</button>
-				</div>
-				<div class="flew-sp">
-					门房电控门
-					<button class="mui-btn mui-btn-primary">开门</button>
+				<div v-for="(item,index) in doorList" class="flew-sp">
+					{{item.name}}
+					<button class="mui-btn mui-btn-primary" @click="open(item.id)">开门</button>
 				</div>
 			</div>
 		</div>
+
+		<loading :visible="isLoading"></loading>
 	</div>
 </template>
 
 <script>
+	import * as API_Device from '@/apis/Common/device'
+
+	import Common from '$project/components/Common.vue'
+	import Loading from '$project/components/Loading.vue'
+	import TopHeader from '$project/components/TopHeader.vue'
+
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	export default {
+		name: 'CommonDeviceOpenDoor',
+		components: {
+			Common,
+			Loading,
+			TopHeader
+		},
+		data() {
+			return {
+				pageTitle: '手机开门',
+				doorList: [],
+				isLoading: false,
+				onNum: 0,
+				offNum: 0,
+			}
+		},
+		created() {},
+		methods: {
+			//获取列表
+			getDoorList() {
+				this.isLoading = true;
+				API_Device.getDoorList().then(response => {
+					this.isLoading = false;
+					this.doorList = response;
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
+			//开门
+			open(id) {
+				var _this = this;
+				var btnArray = ['否', '是'];
+				mui.confirm('确认开门？', '提示', btnArray, function(e) {
+					if (e.index == 1) {
+						_this.openDoor(id);
+					}
+				})
+			},
+			//开门操作
+			openDoor(id) {
+				this.isLoading = true;
+				API_Device.openDoor(id).then(response => {
+					this.isLoading = false;
+					mui.toast('开门成功');
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
+			asynCallBack() {
+
+			},
+		},
+		mounted() {
+			//获取列表
+			this.getDoorList();
+		},
+		destroyed() {},
+		computed: {
+			...mapGetters({
+				openId: 'wx_openid',
+				token: 'token',
+				person_data: 'person_data',
+				person_popedom: 'person_popedom',
+			})
+		}
+	}
 </script>
 
-<style src="$project/assets/css/xpgj.css"></style>
-<style>
+<style scoped src="$project/assets/css/xpgj.css"></style>
+<style scoped>
 </style>

src/projects/business/views/Master/Activity/ExamineList.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/business/views/Master/Attendance/VerifyLeaveList.vue

@@ -5,7 +5,7 @@
 		<top-header :pageTitle="pageTitle"></top-header>
 
 		<div class="mui-content vongi-wordcard-sp">
-			<div id="slider" class="mui-slider mui-fullscreen">
+			<div id="slider" class="mui-slider mui-fullscreen vongi-over">
 				<div id="sliderSegmentedControl" class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
 					<div class="mui-scroll">
 						<a class="mui-control-item " @click="reloadList(0)" :class="listForm.type=='0'?'mui-active':''">
@@ -18,7 +18,7 @@
 				</div>
 				<div class="mui-slider-group">
 					<div class="mui-slider-item mui-control-content mui-active">
-						<div id="scroll1" class="mui-scroll-wrapper">
+						<div id="scroll1" class="mui-scroll-wrapper vongi-over-hei">
 							<div class="mui-scroll">
 
 								<ul class="mui-table-view mui-table-view-chevron" v-if="listForm.type==1">
@@ -302,16 +302,4 @@
 		border: 1px solid #05c8af !important;
 	}
 
-	.vongi-wordcard-sp .fyy-bindfyy-btn {
-		position: fixed;
-		background-color: #eee;
-	}
-
-	.mui-scroll-wrapper {
-		overflow: scroll;
-	}
-
-	.mui-fullscreen .mui-segmented-control~.mui-slider-group {
-		bottom: 45px;
-	}
 </style>

src/projects/business/views/Master/Attendance/VerifyList.vue

@@ -4,7 +4,7 @@
 		<top-header :pageTitle="pageTitle"></top-header>
 
 		<div class="mui-content vongi-wordcard-sp">
-			<div id="slider" class="mui-slider mui-fullscreen">
+			<div id="slider" class="mui-slider mui-fullscreen vongi-over">
 				<div id="sliderSegmentedControl" class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
 					<div class="mui-scroll">
 						<a @click="reloadList(0)" :class="'mui-control-item '+(listForm.status==0?'mui-active':'')">
@@ -18,7 +18,7 @@
 				<div class="mui-slider-group">
 
 					<div v-show="listForm.status==0" class="mui-slider-item mui-control-content">
-						<div class="mui-scroll-wrapper">
+						<div class="mui-scroll-wrapper vongi-over-hei">
 							<div class="mui-scroll">
 								<form class="mui-input-group fyy-checkbox">
 									<div v-for="(item,index) in recordList" :key="item.id" class="mui-input-row mui-checkbox mui-left">
@@ -272,17 +272,5 @@
 		color: #05c8af !important;
 		border: 1px solid #05c8af !important;
 	}
-
-	.vongi-wordcard-sp .fyy-bindfyy-btn {
-		position: fixed;
-		background-color: #eee;
-	}
-
-	.mui-scroll-wrapper {
-		overflow: scroll;
-	}
-
-	.mui-fullscreen .mui-segmented-control~.mui-slider-group {
-		bottom: 45px;
-	}
+	
 </style>

src/projects/business/views/Master/Company/RegisterExamine.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/home/views/Register/Business/Step1.vue

@@ -1,6 +1,6 @@
 <template>
-<div>
-   <header class="mui-bar mui-bar-nav">
+	<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>
@@ -24,8 +24,40 @@
 					</div>
 				</form>
 			</div>
+			<!-- 状态 -->
+			<!-- <div class="vongi-zc vongi-fklist">
+				<div class="mui-content-padded">
+					<h5>请选择您的身份进行认证</h5>
+				</div>
+				<ul class="mui-table-view mui-table-view-chevron openfyy-list">
+					<li class="mui-table-view-cell mui-media">
+						<a class="mui-navigate-right" href="">
+							<div class="mui-media-object mui-pull-left">
+								<img src="~$project/assets/img/02.jpg">
+							</div>
+							<div class="mui-media-body">
+								<h4 class="mui-ellipsis">我是员工</h4>
+			                    <h6 class="mui-ellipsis">开启以下功能</h6>
+								<h5 class="mui-ellipsis">健康证、测温记录、考勤记录、请假</h5>
+							</div>
+						</a>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<a class="mui-navigate-right" href="">
+							<div class="mui-media-object mui-pull-left">
+								<img src="~$project/assets/img/02.jpg">
+							</div>
+							<div class="mui-media-body">
+								<h4 class="mui-ellipsis">我是员工</h4>
+			                    <h6 class="mui-ellipsis">开启以下功能</h6>
+								<h5 class="mui-ellipsis">健康证、测温记录、考勤记录、请假</h5>
+							</div>
+						</a>
+					</li>
+				</ul>
+			</div> -->
 		</div>
-</div>
+	</div>
 </template>
 
 <script>

src/projects/home/views/Register/Business/Step2.vue

@@ -10,7 +10,7 @@
 				<span class="mui-icon mui-icon-search"></span>
 			</div>
 			<div class="mui-content-padded fyy-date mui-clearfix">
-				<h5>荆州市</h5>
+				<h5>荆州市 > 沙市区</h5>
 			</div>
 			<div class="mui-row mui-fullscreen vongi-xzdw-city">
 				<div class="mui-col-xs-3">
@@ -32,7 +32,25 @@
 					</div>
 				</div>
 			</div>
+			
 		</div>
+		<!--搜索结果的状态-->
+		<!-- <div class="mui-content vongi-xzdw">			
+			<div class="mui-content-padded flew-items flew-sp">
+				<div class="vongi-xzdw-search mui-col-xs-10">
+					<input type="search" placeholder="请输入姓名">
+					<span class="mui-icon mui-icon-search"></span>
+				</div>
+				<a class="color4fc5f7">取消</a>
+			</div>
+			<ul class="mui-table-view vongi-xzyljg">
+				<li class="mui-table-view-cell mui-media">
+					<a href="javascript:;">
+						湖北荆鹏软件集团有限公司
+					</a>
+				</li>
+			</ul>
+		</div> -->
 </div>
 </template>
 

src/projects/home/views/Register/Pension/Step1.vue

@@ -22,8 +22,34 @@
 							请选择
 						</button>
 					</div>
+					<div class="mui-input-row">
+						<label>养老机构</label>
+						<button class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:50%">
+							金色家园老年公寓
+						</button>
+					</div>
 				</form>
 			</div>
+			<!-- 状态 -->
+			<!-- <div class="vongi-zc vongi-fklist">
+				<div class="mui-content-padded">
+					<h5>请选择您的身份进行认证</h5>
+				</div>
+				<ul class="mui-table-view mui-table-view-chevron openfyy-list">
+					<li class="mui-table-view-cell mui-media">
+						<a class="mui-navigate-right" href="">
+							<div class="mui-media-object mui-pull-left">
+								<img src="~$project/assets/img/02.jpg">
+							</div>
+							<div class="mui-media-body">
+								<h4 class="mui-ellipsis">我是长者</h4>
+			                    <h6 class="mui-ellipsis">开启以下功能</h6>
+								<h5 class="mui-ellipsis">健康证、测温记录、考勤记录、请假</h5>
+							</div>
+						</a>
+					</li>
+				</ul>
+			</div> -->
 		</div>
 </div>
 </template>

src/projects/home/views/Register/Pension/step2.vue

@@ -9,6 +9,14 @@
 				<input type="search" placeholder="请输入姓名">
 				<span class="mui-icon mui-icon-search"></span>
 			</div>
+			<!--搜索结果的状态-->
+			<!-- <div class="mui-content-padded flew-items flew-sp">
+				<div class="vongi-xzdw-search mui-col-xs-10">
+					<input type="search" placeholder="请输入姓名">
+					<span class="mui-icon mui-icon-search"></span>
+				</div>
+				<a class="color4fc5f7">取消</a>
+			</div> -->
 			<ul class="mui-table-view vongi-xzyljg">
 				<li class="mui-table-view-cell mui-media">
 					<a href="javascript:;">

src/projects/home/views/Register/Pension/step3.vue

@@ -17,7 +17,7 @@
 					</div>
 				</form>
 			</div>
-			<div class="mui-content-padded vongi-qingjiadt">
+			<div class="mui-content-padded vongi-qingjiadt vongi-editme">
 				<form class="mui-input-group">
 					<div class="mui-input-row">
 						<label>养老机构</label>
@@ -29,6 +29,11 @@
 							颐养楼-201
 						</button>
 					</div>
+					<!--居家养老状态-->
+					<!-- <div class="mui-input-row">
+						<label>家庭住址</label>
+						<textarea id="textarea" rows="5" placeholder="请输入"></textarea>
+					</div> -->
 				</form>
 			</div>
 			<div class="vongi-btn vongi-login-btn">

src/projects/home/views/Register/Residence/Step1.vue

@@ -24,6 +24,26 @@
 					</div>
 				</form>
 			</div>
+			<!-- 状态 -->
+			<!-- <div class="vongi-zc vongi-fklist">
+				<div class="mui-content-padded">
+					<h5>请选择您的身份进行认证</h5>
+				</div>
+				<ul class="mui-table-view mui-table-view-chevron openfyy-list">
+					<li class="mui-table-view-cell mui-media">
+						<a class="mui-navigate-right" href="">
+							<div class="mui-media-object mui-pull-left">
+								<img src="~$project/assets/img/02.jpg">
+							</div>
+							<div class="mui-media-body">
+								<h4 class="mui-ellipsis">我是业主</h4>
+			                    <h6 class="mui-ellipsis">开启以下功能</h6>
+								<h5 class="mui-ellipsis">健康证、测温记录、考勤记录、请假</h5>
+							</div>
+						</a>
+					</li>
+				</ul>
+			</div> -->
 		</div>
 </div>
 </template>

src/projects/home/views/Register/Residence/Step2.vue

@@ -10,7 +10,7 @@
 				<span class="mui-icon mui-icon-search"></span>
 			</div>
 			<div class="mui-content-padded fyy-date mui-clearfix">
-				<h5>荆州市</h5>
+				<h5>荆州市 >沙市区</h5>
 			</div>
 			<div class="mui-row mui-fullscreen vongi-xzdw-city">
 				<div class="mui-col-xs-3">
@@ -33,6 +33,23 @@
 				</div>
 			</div>
 		</div>
+		<!--搜索结果的状态-->
+		<!-- <div class="mui-content vongi-xzdw">			
+			<div class="mui-content-padded flew-items flew-sp">
+				<div class="vongi-xzdw-search mui-col-xs-10">
+					<input type="search" placeholder="请输入姓名">
+					<span class="mui-icon mui-icon-search"></span>
+				</div>
+				<a class="color4fc5f7">取消</a>
+			</div>
+			<ul class="mui-table-view vongi-xzyljg">
+				<li class="mui-table-view-cell mui-media">
+					<a href="javascript:;">
+						湖北荆鹏软件集团有限公司
+					</a>
+				</li>
+			</ul>
+		</div> -->
 </div>
 </template>