Merge remote-tracking branch 'origin/master'

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/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/home/views/Register/Business/Step1.vue

@@ -24,6 +24,38 @@
 					</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>
 </template>

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>