Merge remote-tracking branch 'origin/master'

src/assets/css/mui.min.css

@@ -2418,8 +2418,7 @@ select,
 textarea {
 	line-height: 38px;
 	width: 100%;
-	height: 50px;
-	padding: 10px 15px;
+	padding: 0 15px;
 	-webkit-user-select: text;
 	border:0;
 	border-radius: 3px;
@@ -2543,7 +2542,7 @@ select:focus {
 .mui-input-row label {
 	font-family: 'Helvetica Neue', Helvetica, sans-serif;
 	float: left;
-	width: 30%;
+	width: 35%;
 	padding: 11px 15px
 }
 
@@ -2551,7 +2550,7 @@ select:focus {
 .mui-input-row label~select,
 .mui-input-row label~textarea {
 	float: left;
-	width: 70%;
+	width: 65%;
 	margin-bottom: 0;
 	padding-left: 0;
 	border: 0
@@ -2740,7 +2739,7 @@ select:focus {
 
 .mui-input-row .mui-switch {
 	float: right;
-	margin-top: 10px;
+	margin-top: 6px;
 	margin-right: 15px
 }
 
@@ -3838,10 +3837,10 @@ body>.mui-progressbar {
 .mui-switch .mui-switch-handle {
 	position: absolute;
 	z-index: 1;
-	top: -1px;
-	left: -1px;
-	width: 28px;
-	height: 28px;
+	top: 0;
+	left: 0;
+	width: 26px;
+	height: 26px;
 	-webkit-transition: .2s ease-in-out;
 	transition: .2s ease-in-out;
 	-webkit-transition-property: -webkit-transform, width, left;

src/assets/css/xpwyfyy.css

@@ -371,7 +371,7 @@ body {
 	width: 70%;
 	padding: 0;
 	padding-right: 45px;
-	line-height: 50px;
+	line-height: 43px;
 	text-align: right;
 	background: 0;
 	border: 0;
@@ -379,10 +379,6 @@ body {
 	margin-bottom: 0
 }
 
-.mui-input-row {
-	position: relative;
-}
-
 .mui-input-row .iconfont {
 	position: absolute;
 	right: 15px;
@@ -413,6 +409,9 @@ body {
 	float: left;
 	width: 30%;
 }
+.fyy-view .mui-table-view-cell span{
+	display: flow-root;
+}
 
 .mui-table-view.fyy-view:before,
 .mui-table-view.fyy-view:after,
@@ -1674,7 +1673,7 @@ h3 {
 .mui-segmented-control.mui-scroll-wrapper .mui-control-item {
     color: #999;
 }
-.mui-scroll, .mui-scroll-wrapper, .mui-fullscreen .mui-segmented-control~.mui-slider-group, .mui-fullscreen {
+.mui-scroll, .mui-scroll-wrapper, .mui-fullscreen .mui-segmented-control~.mui-slider-group, .vongi-qingjiadt .mui-fullscreen {
     position: inherit;
 }
 .vongi-fkdat-name .flew{

src/projects/business/views/Guest/From/Add.vue

@@ -1,8 +1,68 @@
 <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 class="mui-content">			
+			<div class="mui-content-padded vongi-editme">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>受邀人<span class="colorfe616c">*</span></label>
+						<input type="text" class="mui-input-clear" placeholder="请输入姓名">
+					</div>
+					<div class="mui-input-row">
+						<label>手机号码<span class="colorfe616c">*</span></label>
+						<input type="text" class="mui-input-clear" placeholder="请输入手机号码">
+					</div>
+					<div class="mui-input-row">
+						<label>受邀单位<span class="colorfe616c">*</span></label>
+						<input type="text" class="mui-input-clear" placeholder="请输入单位名称">
+					</div>
+					<div class="mui-input-row">
+						<label>访问事由<span class="colorfe616c">*</span></label>
+						<input type="text" class="mui-input-clear" placeholder="请填写您的来访事由">
+					</div>
+				</form>
+			</div>
+			<div class="mui-content-padded vongi-editme">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>生效时间<span class="colorfe616c">*</span></label>					
+						<button id='showUserPicker' class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:65%">
+							2020-09-20 14:30:00
+						</button>						
+					</div>
+					<div class="mui-input-row">
+						<label>过期时间<span class="colorfe616c">*</span></label>					
+						<button id='showUserPicker' class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:65%">
+							2020-09-20 14:30:00
+						</button>						
+					</div>
+					<div class="mui-input-row">
+						<label style="width:50%">需要上传登记照</label>					
+						<div id="autoLogin" class="mui-switch mui-active">
+							<div class="mui-switch-handle"></div>
+						</div>						
+					</div>
+					<div class="mui-input-row">
+						<label style="width:40%">照片下发设备<span class="colorfe616c">*</span></label>					
+						<button id='showUserPicker' class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:60%">
+							共3台
+						</button>						
+					</div>
+				</form>
+			</div>
+		</div>
+		<div class="fyy-footer">
+			<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-primary ">发送短信邀请函</button></div>
+		</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style>
 </style>

src/projects/business/views/Guest/From/Device.vue

@@ -1,8 +1,41 @@
 <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 class="mui-content">
+			<div class="mui-content-padded">
+				<h5>请选择设备</h5>
+				<form class="mui-input-group">
+					<div class="mui-input-row mui-checkbox">
+						<label>A栋大堂正门人脸识别门禁</label>
+						<input name="checkbox1" value="Item 3" type="checkbox">
+					</div>
+					<div class="mui-input-row mui-checkbox">
+						<label>侧门门房人脸识别门禁</label>
+						<input name="checkbox1" value="Item 4" type="checkbox" checked>
+					</div>
+					<div class="mui-input-row mui-checkbox">
+						<label>8楼人脸识别门禁</label>
+						<input name="checkbox1" value="Item 3" type="checkbox">
+					</div>
+				</form>
+			</div>
+		</div>
+		<div class="fyy-footer">
+			<div class="bindfyy-btn">
+				<button type="button" class="mui-btn mui-btn-primary ">
+						保存
+					</button>
+			</div>
+		</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style>
-</style>
+</style>

src/projects/business/views/Guest/From/List.vue

@@ -1,8 +1,104 @@
 <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 class="mui-content margin60">
+			<div class="mui-content-padded">
+				<ul class="mui-table-view fyy-view">
+					<li class="mui-table-view-cell">
+						<label>受  邀 人：</label>
+						<span>刘成志<span class="mui-pull-right colorf8b155">待确认</span></span>
+					</li>
+					<li class="mui-table-view-cell">
+						<label>受邀单位：</label>
+						<span>湖北荆鹏软件集团有限公司</span>
+					</li>
+					<li class="mui-table-view-cell">
+						<label>拜访事宜：</label>
+						<span>业务洽谈</span>
+					</li>
+					<li class="mui-table-view-cell">
+						<label>拜访时间：</label>
+						<span>2020-09-28 15:00:00</span>
+					</li>
+				</ul>
+			</div>
+			<div class="mui-content-padded">
+				<ul class="mui-table-view fyy-view">
+					<li class="mui-table-view-cell">
+						<label>受  访 人：</label>
+						<span>刘成志<span class="mui-pull-right color55f868">已确认</span></span>
+					</li>
+					<li class="mui-table-view-cell">
+						<label>来访单位：</label>
+						<span>湖北荆鹏软件集团有限公司</span>
+					</li>
+					<li class="mui-table-view-cell">
+						<label>拜访事宜：</label>
+						<span>业务洽谈</span>
+					</li>
+					<li class="mui-table-view-cell">
+						<label>拜访时间：</label>
+						<span>2020-09-28 15:00:00</span>
+					</li>
+				</ul>
+			</div>
+			<div class="mui-content-padded">
+				<ul class="mui-table-view fyy-view">
+					<li class="mui-table-view-cell">
+						<label>受  访 人：</label>
+						<span>刘成志<span class="mui-pull-right colorfe616c">已拒绝</span></span>
+					</li>
+					<li class="mui-table-view-cell">
+						<label>来访单位：</label>
+						<span>湖北荆鹏软件集团有限公司</span>
+					</li>
+					<li class="mui-table-view-cell">
+						<label>拜访事宜：</label>
+						<span>业务洽谈</span>
+					</li>
+					<li class="mui-table-view-cell">
+						<label>拜访时间：</label>
+						<span>2020-09-28 15:00:00</span>
+					</li>
+				</ul>
+			</div>
+			<div class="mui-content-padded">
+				<ul class="mui-table-view fyy-view">
+					<li class="mui-table-view-cell">
+						<label>受  访 人：</label>
+						<span>刘成志<span class="mui-pull-right color999">已过期</span></span>
+					</li>
+					<li class="mui-table-view-cell">
+						<label>来访单位：</label>
+						<span>湖北荆鹏软件集团有限公司湖北荆鹏软件集团有限公司</span>
+					</li>
+					<li class="mui-table-view-cell">
+						<label>拜访事宜：</label>
+						<span>业务洽谈</span>
+					</li>
+					<li class="mui-table-view-cell">
+						<label>拜访时间：</label>
+						<span>2020-09-28 15:00:00</span>
+					</li>
+				</ul>
+			</div>
+		</div>
+		<div class="fyy-footer">
+			<div class="bindfyy-btn">
+				<button type="button" class="mui-btn mui-btn-primary ">
+						邀请访客
+					</button>
+			</div>
+		</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style>
-</style>
+</style>

src/projects/business/views/Guest/To/AddPartner.vue

@@ -1,8 +1,12 @@
 <template>
+<div>
+
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style>
 </style>

src/projects/business/views/Guest/To/Code.vue

@@ -1,8 +1,12 @@
 <template>
+<div>
+
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style>
-</style>
+</style>

src/projects/business/views/Guest/To/Info.vue

@@ -1,8 +1,12 @@
 <template>
+<div>
+
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style>
-</style>
+</style>

src/projects/home/views/User/Login.vue

@@ -6,7 +6,8 @@
 		<div class="mui-content">
 			<div class="mui-content-padded">
 				<div class="vongi-login-logo">
-					<img src="~$project/assets/img/logo.jpg" />
+					<img src="~$project/assets/img/logo_xiaopengguanjia.png" />
+					<h2>小鹏管家</h2>
 				</div>
 				<form class="mui-input-group vongi-login-form">
 					<div class="mui-input-row">
@@ -20,18 +21,21 @@
 						<a @click="findByNameAndPhone" v-html="sendMsgWz"></a>
 					</div>
 				</form>
-				<!-- <form class="mui-input-group vongi-xieyi">
+				<form class="mui-input-group vongi-xieyi">
 					<div class="mui-input-row mui-radio mui-left">
 						<label class="mui-h6">我已阅读并同意<span class="color4fc5f7">《用户使用协议》</span></label>
 						<input name="radio1" type="radio">
 					</div>
-				</form> -->
+				</form>
 
 			</div>
-			<div class="vongi-btn">
+			<div class="vongi-btn vongi-login-btn">
 				<button class="mui-btn mui-btn-primary" @click="nextStep">
 					登录
 				</button>
+				<button type="button" class="mui-btn mui-btn-primary mui-btn-outlined">
+					申请加入
+				</button>
 			</div>
 		</div>