修改身份获取方法

src/apis/common.js

@@ -9,3 +9,10 @@ export function uploadBase64(formData) {
 		method: 'post',
 	})
 }
+export function getSchoolServeList(params) {
+	return request({
+		url: '/mobile/companyInfoApi/schoolServeList',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}

src/components/ShareServer.vue

@@ -0,0 +1,128 @@
+<template>
+</template>
+
+<script>
+    import * as API_Common from '$project/utils/common'
+
+    import wx from 'weixin-js-sdk'
+    import * as WxJsApi from '$project/utils/wxJsApi'
+
+	export default {
+		name: 'Share',
+		props: {
+			id: {
+				require: true,
+				default: '0',
+			},
+			serverList: {
+				require: true,
+				type: Array,
+				default: () => {
+					return [];
+				}
+			}
+		},
+		data() {
+			return {
+				isLoading: false,
+				nowItem: {
+					shareTitle: '',
+					shareImg: '',
+					shareDescription: ''
+				}
+			}
+		},
+		created() {},
+		methods: {
+			//父组件调用子组件的方法在获取相应的数据后调用
+			init() {
+				for (var i = 0; i < this.serverList.length; i++) {
+					if (this.serverList[i]['dictionaryId'] == this.id) {
+						this.nowItem = this.serverList[i];
+						break;
+					}
+				}
+				//定义微信分享
+				this.wxShare();
+			},
+
+			//第二种方法，直接通过调用该方法来处理
+			setShare() {
+				this.isLoading = true;
+				API_Common.getSchoolServeList().then(response => {
+					this.isLoading = false;
+
+					var serverList = ['0']; //这里要默认一个0
+					for (var i = 0; i < response.length; i++) {
+						if (response[i]['dictionaryId'] == this.id) {
+							this.nowItem = response[i];
+							break;
+						}
+					}
+
+					//定义微信分享
+					this.wxShare();
+
+				}).catch(error => {
+					this.isLoading = false;
+					this.mui.toast(error);
+				})
+			},
+
+			//获取微信jssdk配置信息
+			get_wx_config() {
+				this.isLoading = true;
+				API_WeiXin.getConfig(window.location.href.split("#")[0]).then(response => {
+					this.isLoading = false;
+
+					var wxconfig = response.wxConfig;
+					console.log(wxconfig.nonceStr)
+					this.wxConfig = wxconfig;
+					wx.config({
+						debug: false, // 开启调试模式,
+						appId: wxconfig.appId, // 必填，企业号的唯一标识，此处填写企业号corpid
+						timestamp: wxconfig.timestamp, // 必填，生成签名的时间戳
+						nonceStr: wxconfig.nonceStr, // 必填，生成签名的随机串
+						signature: wxconfig.signature, // 必填，签名，见附录1
+						jsApiList: ['onMenuShareTimeline', 'onMenuShareAppMessage', 'onMenuShareQQ', 'onMenuShareQZone'] // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
+					});
+				}).catch(error => {
+					this.isLoading = false;
+					this.mui.toast(error);
+				})
+			},
+			//微信分享自定义
+			wxShare() {
+				console.log(this.nowItem);
+				let joinUrl = window.location.href
+				var _this = this;
+				wx.ready(function() {
+					wx.onMenuShareAppMessage({
+						title: _this.nowItem.shareTitle,
+						desc: _this.nowItem.shareDescription,
+						link: joinUrl,
+						imgUrl: _this.nowItem.shareImg,
+						success: function() {
+							// 设置成功
+						}
+					})
+					wx.onMenuShareTimeline({
+						title: _this.nowItem.shareTitle,
+						desc: _this.nowItem.shareDescription,
+						link: joinUrl,
+						imgUrl: _this.nowItem.shareImg,
+						success: function() {
+							// 设置成功
+						}
+					})
+				});
+			}
+		},
+		mounted() {
+            WxJsApi.getWxConfig();
+		},
+	}
+</script>
+
+<style>
+</style>

src/projects/business/apis/Guest/current.js

@@ -0,0 +1,22 @@
+import request from '@/utils/request'
+import Qs from 'qs';
+
+//免登陆
+//获取访客记录（部分）
+export function info(id) {
+    return request({
+        url: '/mobile/guestInfoRecordApi/detail/'+id,
+        //data: Qs.stringify({id:id}),
+        method: 'get',
+    })
+}
+
+//免登陆
+//访客确认
+export function add(params) {
+    return request.post('/mobile/guestInfoRecordApi/update', params,{
+        headers: {
+            "Content-Type": "application/json"
+        }
+    });
+}

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

@@ -13,8 +13,8 @@
 						{{person_popedom.personRoleName}}
 					</div>
 					<div class="mui-col-xs-9 mui-media-body">
-						{{person_data.position1}}
-						<h5 v-text="person_data.position2"></h5>
+						{{person_popedom.companyName}}
+						<h5 v-text="person_popedom.deptName"></h5>
 					</div>
 				</div>
 				<div class="vongi-yuan vongi-yuan1"></div>

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

@@ -1,14 +1,66 @@
 <template>
 <div>
-    <header class="mui-bar mui-bar-nav">
-				<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
-				<h1 class="mui-title">扫码通行</h1>
-			</header>
-			<div class="mui-content">
+	<common @asynCallBack="asynCallBack"></common>
+	<header class="mui-bar mui-bar-nav" v-if="step==2">
+		<h1 class="mui-title">扫码通行</h1>
+		<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" @click="back"></a>
+	</header>
+
+	<header class="mui-bar mui-bar-nav" v-if="step==1">
+		<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" v-if="step==2">
+		<div class="mui-content-padded vongi-editme vongi-qingjiadt">
+			<form class="mui-input-group">
+				<div class="mui-input-row">
+					<label>访客姓名<i class="colorfe616c">*</i></label>
+					<span>孙鹏</span>
+				</div>
+				<div class="mui-input-row">
+					<label style='width:40%'>访客手机号码<i class="colorfe616c">*</i></label>
+					<span style="width:60%">15599998888</span>
+				</div>
+				<div class="mui-input-row">
+					<label>身份证号<i class="colorfe616c">*</i></label>
+					<span>420400200001011010</span>
+				</div>
+				<div class="mui-input-row">
+					<label>访客单位<i class="colorfe616c">*</i></label>
+					<span>湖北荆盛商贸有限公司湖北荆盛商贸有限公司湖北荆盛商贸有限公司湖北荆盛商贸有限公司湖北荆盛商贸有限公司</span>
+				</div>
+				<div class="mui-input-row">
+					<label>车牌号</label>
+					<input type="text" class="mui-input-clear" placeholder="请填写车牌号">
+				</div>
+			</form>
+		</div>
+		<div class="mui-content-padded vongi-editme vongi-qingjiadt">
+			<form class="mui-input-group">
+				<div class="mui-input-row">
+					<label>受访人<i class="colorfe616c">*</i></label>
+					<span>孙鹏</span>
+				</div>
+				<div class="mui-input-row">
+					<label style='width:45%'>受访人手机号码<i class="colorfe616c">*</i></label>
+					<span style="width:55%">15599998888</span>
+				</div>
+				<div class="mui-input-row">
+					<label>访问事由</label>
+					<input type="text" class="mui-input-clear" placeholder="请填写访问事由">
+				</div>
+			</form>
+		</div>
+	</div>
+	<div class="fyy-footer" v-if="step==1">
+		<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-primary ">下一步</button></div>
+	</div>
+
+			<div class="mui-content"  v-if="step==2">
 				<div class="fyy-scon">
 					<div class="fyy-scon-top">
 						<div class="fyy-scon-head mui-col-xs-5">
-							<img src="~$project/assets/img/zhaop2.png" alt="">
+							<img src="~$project/assets/img/default_photo.png" alt="">
 						</div>
 						<div class="fyy-scon-det mui-col-xs-7">
 							<div class="fyy-scon-det-top">
@@ -66,7 +118,7 @@
 					<!--<div class="examine-btn examine-btn3">灰色按钮</div>-->
 				</div>
 			</div>
-			<div class="vongi-popup">
+			<div class="vongi-popup"  v-if="step==2">
 				<div class="vongi-popup-bg"></div>
 				<div class="vongi-popup-ceter">
 					<div class="vongi-popup-inner">
@@ -77,12 +129,84 @@
 					</div>
 				</div>
 			</div>
+	<loading :visible="isLoading"></loading>
+
 </div>
 </template>
 
 <script>
+
+	import * as API_Current from '@/apis/Guest/current'
+	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: 'GuestFromInfo',
+		components: {
+			Common,
+			Loading,
+			TopHeader
+		},
+		data() {
+			return {
+				pageTitle: '扫码通行',
+				detail: {
+
+				},
+				step:'1',
+				isLoading: false,
+
+			}
+		},
+		created() {
+
+ 		},
+		methods:  {
+			back(){
+				this.step='1';
+			},
+			//获取详情
+			getDetail() {
+				this.isLoading = true;
+
+				API_Current.info(this.id ).then(response => {
+					this.isLoading = false;
+
+					this.detail = response.info;
+					this.list=response.list;
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},asynCallBack(){},
+		},
+		mounted() {
+			//this.getDetail(this.openId);
+		},
+		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>

src/projects/business/views/Master/Guest/Scan.vue

@@ -5,7 +5,7 @@
 
 		<div class="mui-content vongi-fklist">
 			<div class="vongi-clasadmin">
-				<h4>{{person_data.position1}}</h4>
+				<h4>{{person_popedom.companyName}}</h4>
 				<div class="vongi-clasadmin-list">
 					<div class="vongi-clasadmin-ma mui-col-xs-6">
 						<p class="mui-ellipsis">{{nowTime()}}</p>

src/projects/business/views/Master/Health/WorkerInfo.vue

@@ -18,15 +18,15 @@
 				</div>
 				<div class="mui-input-row">
 					<label>公司名称</label>
-					<span v-html="detail.personHealthLedger.personInfo.position1"></span>
+					<span v-html="detail.position1"></span>
 				</div>
 				<div class="mui-input-row">
 					<label>所属部门</label>
-					<span v-html="detail.personHealthLedger.personInfo.position2"></span>
+					<span v-html="detail.position2"></span>
 				</div>
 				<div class="mui-input-row">
 					<label>岗位</label>
-					<span v-html="detail.personHealthLedger.personInfo.position3"></span>
+					<span v-html="detail.position3"></span>
 				</div>
 
 			</form>
@@ -56,7 +56,7 @@
 					<span class="vongi-yddk-dat-photo" style="width:50%">
 						<div class="flew">
 							<div class="mui-col-xs-3" v-for="(code,index) in detail.personHealthLedger.familyGreenCode.split(',')">
-								<img :src="code+ '?x-oss-process=image/resize,m_fill,w_128,h_128'" width="100%" />
+								<img v-if="code" :src="code+ '?x-oss-process=image/resize,m_fill,w_128,h_128'" width="100%" />
 							</div>
 						</div>
 					</span>

src/projects/business/views/Master/Health/WorkerReport.vue

@@ -22,15 +22,15 @@
 				</div>
 				<div class="mui-input-row">
 					<label>所属单位</label>
-					<span>{{person_data.position1}}</span>
+					<span>{{person_popedom.companyName}}</span>
 				</div>
 				<div class="mui-input-row">
 					<label>所属部门</label>
-					<span>{{person_data.position2}}</span>
+					<span>{{person_popedom.deptName}}</span>
 				</div>
 				<div class="mui-input-row">
 					<label>岗位</label>
-					<span>{{person_data.position3}}</span>
+					<span>{{person_popedom.job}}</span>
 				</div>
 			</form>
 			<div class="mui-content-padded">
@@ -83,7 +83,7 @@
 					<div class="mui-media-body">上传家庭成员健康码</div>
 					<div class="fyy-upphoto">
 						<div class="mui-col-xs-3 fyy-upphoto-close" v-for="(picture,index) in report.pictures" :key="index"  >
-							<img :src="picture + '?x-oss-process=image/resize,m_fill,w_128,h_128'" />
+							<img  v-if="picture" :src="picture + '?x-oss-process=image/resize,m_fill,w_128,h_128'" />
 							<a class="mui-icon mui-icon-closeempty" v-if="!curDateIsUpload" @click="delImg(index)" ></a>
 						</div>
 						<div class="mui-col-xs-3"  v-if="!curDateIsUpload"   @click="changeImg" >
@@ -387,7 +387,7 @@
 					familyGreenCode: this.report.pictures.join(",")
 				}).then(data => {
 					mui.toast("已提交");
-					this.send=false;
+					this.send=true;
 					this.isLoading = false;
 
 				}).catch(error => {

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

@@ -22,8 +22,8 @@
 					</button>
 				</div>
 				<div class="vongi-me-card">
-					<h2 v-text="person_data.position1"></h2>
-					<h4 v-text="person_data.position2"></h4>
+					<h2 v-text="person_popedom.companyName"></h2>
+					<h4 v-text="person_popedom.deptName"></h4>
 				</div>
 			</div>
 			<div class="vongi-me-list">