Merge remote-tracking branch 'origin/master'

src/assets/css/xpwyfyy.css

@@ -1440,7 +1440,7 @@ h3 {
 	margin: 7px 15px;
 	align-items: right;
 	float: right;
-	border-radius: 4px;
+	border-radius: 50%;
 }
 
 .vongi-qingjiadt-photo img {
@@ -1905,3 +1905,6 @@ h3 {
 .vongi-xzyljg .mui-table-view-cell:after{
 	left:0
 }
+.vongi-padright{
+	padding-right:15px
+}

src/projects/business/router/guest.js

@@ -31,7 +31,7 @@ const routesGuest = [
 							title: '邀请访客',
 						}
 					},
-					//邀请访客
+					//邀请函详情
 					{
 						path: 'info',
 						name: 'GuestFromInfo',
@@ -42,6 +42,17 @@ const routesGuest = [
 							title: '访客详情',
 						}
 					},
+					//邀请函详情
+					{
+						path: 'infoPartner',
+						name: 'GuestFromInfoPartner',
+						component: () => import('../views/Guest/From/InfoPartner.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '访客详情',
+						}
+					},
 					//邀请访客勾选下发设备
 					{
 						path: 'device',

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

@@ -1,134 +1,91 @@
 <template>
-<div>
-	<common @asynCallBack="asynCallBack"></common>
-	<top-header :pageTitle="pageTitle"  ></top-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>
-
-	<loading :visible="isLoading"></loading>
-
-</div>
+  <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-qingjiadt">
+        <form class="mui-input-group">
+          <div class="mui-input-row">
+            <label>受邀人</label>
+            <span>刘韬</span>
+          </div>
+          <div class="mui-input-row">
+            <label>手机号码</label>
+            <span>15500001111</span>
+          </div>
+          <div class="mui-input-row">
+            <label>身份证号</label>
+            <span>420400199301011010</span>
+          </div>
+          <div class="mui-input-row">
+            <label style="width: 50%">人脸识别照片</label>
+            <span class="vongi-qingjiadt-photo"
+              ><img src="~$project/assets/img/audit1.png" />
+            </span>
+          </div>
+          <div class="mui-input-row">
+            <label>受邀单位</label>
+            <span>湖北荆盛商贸有限公司</span>
+          </div>
+          <div class="mui-input-row">
+            <label>访问事由</label>
+            <span>商务洽谈</span>
+          </div>
+          <div class="mui-input-row">
+            <label>邀访时间</label>
+            <span>2020-9-18 15:00:00</span>
+          </div>
+          <div class="mui-input-row">
+            <label>结束时间</label>
+            <span>2020-9-18 17:30:00</span>
+          </div>
+          <div class="mui-input-row">
+            <label style="width: 50%">人脸识别照片</label>
+            <span class="vongi-fkdat-name" style="width: 50%">
+              <a class="flew mui-navigate-right vongi-padright" href="">
+                <h5>冯</h5>
+                <h5>冯</h5>
+                <h5>冯</h5>
+              </a>
+            </span>
+          </div>
+          <div class="mui-input-row">
+            <label>车牌号</label>
+            <span>鄂D88888</span>
+          </div>
+        </form>
+      </div>
+      <div class="mui-content-padded vongi-qingjiadt vongi-editme">
+        <form class="mui-input-group vongi-login-form">
+          <div class="mui-input-row">
+            <label>邀请单状态</label>
+            <span class="color55f868">已确认</span>
+            <!--<span class="colorf8b155">待确认</span>
+						<span class="color999">已过期</span>-->
+          </div>
+          <div class="mui-input-row">
+            <label>发送时间</label>
+            <span>2020-09-16 10:00:00 </span>
+          </div>
+          <div class="mui-input-row">
+            <label>确认时间</label>
+            <span>2020-09-17 12:57:30 </span>
+          </div>
+        </form>
+      </div>
+      <div class="vongi-btn vongi-login-btn">
+        <button class="mui-btn mui-btn-primary">确认访客已离开</button>
+      </div>
+    </div>
+  </div>
 </template>
 
-
 <script>
-	import * as API_From from '@/apis/Guest/from'
-	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'
-	import {
-		currentTimeStamp,
-		parseUnixTime
-	} from '$project/utils'
-	export default {
-		name: 'GuestFromDeviceInfo',
-		components: {
-			Common,
-			Loading,
-			TopHeader
-		},
-		data() {
-			return {
-				pageTitle: '访客详情',
-				id: '',
-				detail: {
-				},
-				isLoading: false,
-			}
-		},
-		created() {
-			this.id = this.$route.query.id;
-		},
-		methods:  {
-			//获取详情
-			getDetail() {
-				this.isLoading = true;
-
-				API_From.getDetail(this.id ).then(response => {
-					this.isLoading = false;
-
-					this.detail = response;
-				}).catch(error => {
-					this.isLoading = false;
-					mui.toast(error);
-				})
-			},asynCallBack(){},
-		},
-		mounted() {
-			this.getDetail();
-
-		},
-
-
-		destroyed() {
-
-		},
-		computed: {
-			...mapGetters({
-				openId: 'wx_openid',
-				token: 'token',
-				person_data: 'person_data',
-				person_popedom: 'person_popedom',
-			})
-		}
-	}
 </script>
 
 <style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
-</style>
+</style>

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

@@ -0,0 +1,40 @@
+<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-qingjiadt">
+        <form class="mui-input-group">
+          <div class="mui-input-row">
+            <label>拜访人</label>
+            <span>刘韬</span>
+          </div>
+          <div class="mui-input-row">
+            <label>手机号码</label>
+            <span>15500001111</span>
+          </div>
+          <div class="mui-input-row">
+            <label>身份证号</label>
+            <span>420400199301011010</span>
+          </div>
+          <div class="mui-input-row">
+            <label style="width: 50%">人脸识别照片</label>
+            <span class="vongi-qingjiadt-photo"
+              ><img src="~$project/assets/img/audit1.png" />
+            </span>
+          </div>
+        </form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+</script>
+
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
+<style>
+</style>