年后第一发

App.vue

@@ -79,9 +79,9 @@
 			token: "j2qctr89u1xfmbjkp69hegfmqhwquycw",
 			//对接后台的api地址
 			//远程的
-			apiurl: "https://community.58fo.com/api/app/",
-			// apiurl: "http://192.168.1.117:9082/app/",
-			// apiurl: "http://192.168.0.104:9082/app/",
+			// apiurl: "https://community.58fo.com/api/app/",
+			// apiurl: "http://192.168.1.19:9082/app/",
+			apiurl: "http://192.168.1.117:9082/app/",
 			member: null,
 			//用户信息--后台
 			userInfo: null,

comps/mp-time/index.vue

@@ -50,9 +50,12 @@
 					</view>
 				</view>
 			</view>
-			<view @click="confirm" class="cu-btn bg-red-btn round flex footer-fixed" style="margin:10rpx 0;padding: 40rpx;">
-				确认
+			<view style="box-sizing: border-box;">
+				<view @click="confirm" class="cu-btn bg-blue   footer-fixed" style="padding: 42rpx;">
+					确认
+				</view>
 			</view>
+			
 	</view>
 </template>
 

pages/authorize_record/authorize_record.vue

@@ -17,7 +17,8 @@
 	</view>
 	<navigator url="../record/record" class="cu-btn line-btn sm round">
 		<text class="cuIcon-footprint padding-right-sm"></text>
-		访客记录
+		<text>访客记录</text>
+		<u-badge :is-center="true" type="error" :count="vuex_auth_audit_count"></u-badge>
 	</navigator>
 </view>
 <view style="height:88rpx;"></view>
@@ -27,28 +28,28 @@
 	   <view class="data" v-for="(item, index) in list" :key="index"  style="border-bottom: 1rpx solid #b6b6b6;">
 	   	<view class="top">
 	   		<view class="left">
-	   			<u-icon name="map-fill" :size="30" color="rgb(94,94,94)"></u-icon>
+	   			<u-icon name="map-fill" :size="30" color="#2f7ff5"></u-icon>
 				<view class="padding-left-sm" >
-					授权位置: {{item.residentialName}} {{item.unitName}} {{item.roomName}}
+					授权位置: {{item.residentialName}} {{item.buildingName}} {{item.unitName}} {{item.roomName}}
 				</view>
 	   		</view>
+			<view class="right text-orange">
+				<text  v-if="item.guestType==0">朋友</text>
+				<text  v-if="item.guestType==1">外卖</text>
+				<text  v-if="item.guestType==2">快递</text>
+				<text  v-if="item.guestType==3">其他</text>
+			</view>
 	   	</view>
 	   	<view class="item">
 	   		<view class="left">
 	   			<view class="content" >
+					
 					<view class="">
-						<u-icon name="account" :size="30" color="rgb(94,94,94)"></u-icon>
-						<text class="padding-left-sm" v-if="item.guestType==0">访客授权: 朋友</text>
-						<text class="padding-left-sm" v-if="item.guestType==1">访客授权: 外卖</text>
-						<text class="padding-left-sm" v-if="item.guestType==2">访客授权: 快递</text>
-						<text class="padding-left-sm" v-if="item.guestType==3">访客授权: 其他</text>
-					</view>
-					<view class="">
-						<u-icon name="hourglass" :size="30" color="rgb(94,94,94)"></u-icon>
+						<u-icon name="hourglass" :size="30" color="#2f7ff5"></u-icon>
 						<text class="padding-left-sm">授权时间:{{item.beginDate}}</text>
 					</view>
 					<view class="">
-						<u-icon name="clock" :size="30" color="rgb(94,94,94)"></u-icon>
+						<u-icon name="clock" :size="30" color="#2f7ff5"></u-icon>
 						<text class="padding-left-sm">失效时间:{{item.endDate}}</text>
 					</view>
 	   			</view>
@@ -103,6 +104,8 @@ var app = getApp();
 export default {
   data() {
     return {
+	  count:0,
+		
 	  codeModelShow:false,
 	  codeImg:'',
 	  
@@ -146,13 +149,13 @@ export default {
   },
   //转发
   onShareAppMessage: function (ops) {
-	  let title ="访问房间："+this.shareData.roomName+ "; 有效期: " + this.shareData.beginDate + " 到 " + this.shareData.endDate
+	  let title ="访问房间："+this.shareData.roomName+ "; 有效期:   " + this.shareData.beginDate + " 到 " + this.shareData.endDate
 	  let path="/pages/guest/guest_form?id="+this.shareData.id+"&doorNeedAudit="+this.doorNeedAudit+"&memberId="+app.globalData.member.id
 	  this.shareShow=false
 	  return {
 		title: title,
 		path:path,
-		imageUrl: "http://139.9.103.171:1888/img/image/ps_bg.png"
+		imageUrl: "/static/clock.png"
 	  };
   },
   methods: {
@@ -211,7 +214,9 @@ export default {
     //获取密码授权记录
     getRecord: function () {
       let that = this;
-      let params = {};
+      let params = {
+		  pageSize:50
+	  };
       params['member_id'] = app.globalData.member.id;
       ;
       let operation = 'guestAuthorize/getListByMemberId';

pages/authorize_record/openPass/openPass.vue

@@ -129,15 +129,14 @@ export default {
 
   onShareAppMessage: function (ops) {
 	  
-	 this.showModal=false
+	this.showModal=false
 		
 	let roomName=this.selectRoomName?this.selectRoomName:this.room_list[0].name
-    let title ="访问房间："+roomName+ "; 有效期" + this.begin_date + " 到 " + this.end_date;
-	// console.log("id:"+this.id+";doorNeedAudit="+this.doorNeedAudit+";memberId="+app.globalData.member.id);
+	let title ="访问房间："+roomName+ "; 有效期:   " + this.begin_date + " 到 " + this.end_date
     return {
       title: title,
       path: "/pages/guest/guest_form?id="+this.id+"&doorNeedAudit="+this.doorNeedAudit+"&memberId="+app.globalData.member.id,
-      imageUrl: "http://139.9.103.171:1888/img/image/ps_bg.png"
+      imageUrl: "/static/clock.png"
     };
   },
   methods: {

pages/choosePlot/chooseBuilding/chooseBuilding.vue

@@ -18,12 +18,9 @@
 	<u-cell-group v-if="!$isEmpty(buiding_list)">
 		<u-cell-item  @click="jump(item)"  v-for="(item, index) in buiding_list" :key="index"  :title="item.name" :arrow="false"></u-cell-item>
 	</u-cell-group>
-	<view class="default" v-if="$isEmpty(buiding_list)&&!loading">
-	  <image src="/static/common/empty.png" mode="heightFix"></image>
-	  <view>
-		<text >没有获取到楼栋信息</text>
-	  </view>
-	</view>
+	
+	<u-empty marginTop="200" icon-size="260"  v-if="$isEmpty(buiding_list)&&!loading" text="暂无楼栋信息" src="http://139.9.103.171:1888/miniofile/xlyq/empty/empty.png"></u-empty>
+
 	<u-back-top :scroll-top="scrollTop"></u-back-top>
 </view>
 </template>
@@ -152,9 +149,6 @@ page{
   text-overflow: ellipsis;
   display: inline-block;
 }
-.default {  text-align: center;  position: fixed;  left: 50%;  top: 40%;  transform: translate(-50%, -50%);}
-.default text{
-	color: #AAAAAA;
-}
-.default image {  height: 250rpx;  display: inline-block;}.empty-wrap{	background-color: #FFFFFF;	min-height: 100vh;}
+
+.empty-wrap{	background-color: #FFFFFF;	min-height: 100vh;}
 </style>

pages/choosePlot/choosePlot.vue

@@ -12,7 +12,7 @@
 	</view>
 	<view class="cf city" 	 >
 		<view class="text-blue fl">
-			<text class="cuIcon-location padding-right-10"></text>
+			<text class="cuIcon-locationfill padding-right-10"></text>
 			<text class="">{{city}}{{county}}</text>
 		</view>
 		<view class="cu-btn line-blue sm round fr" @tap="switchCity">
@@ -27,12 +27,7 @@
 		<u-cell-item  @click="jump(item)"  v-for="(item, index) in residential_list" :key="index"  :title="item.name" :arrow="false"></u-cell-item>
 	</u-cell-group>
 	<u-divider bg-color="#ffffff" v-if="residential_list.length>=10" height="80">没有更多了</u-divider>
-	<view class="default" v-if="$isEmpty(residential_list)&&!loading">
-	  <image src="http://139.9.103.171:1888/miniofile/xlyq/empty/empty.png"></image>
-	  <view>
-		<text>没有获取到小区信息</text>
-	  </view>
-	</view>
+	<u-empty marginTop="200" icon-size="260"  v-if="$isEmpty(residential_list)&&!loading" text="暂无小区信息" src="http://139.9.103.171:1888/miniofile/xlyq/empty/empty.png"></u-empty>
 	<u-back-top :scroll-top="scrollTop"></u-back-top>
 </view>
 </template>
@@ -277,17 +272,4 @@ input {
     transform: translate(0,-50%);
     font-size: 40rpx;
 }
-.default {
-  text-align: center;
-  position: fixed;
-  left: 50%;
-  top: 50%;
-  transform: translate(-50%, -50%);
-}
-
-.default image {
-  width: 180rpx;
-  height: 140rpx;
-  display: inline-block;
-}
 </style>

pages/choosePlot/chooseRoom/chooseRoom.vue

@@ -18,13 +18,10 @@
 	<u-cell-group v-if="!$isEmpty(room_list)">
 		<u-cell-item  @click="jump(item)"  v-for="(item, index) in room_list" :key="index"  :title="item.name" :arrow="false"></u-cell-item>
 	</u-cell-group>
-<view class="default" v-if="$isEmpty(room_list)&&!loading">
-  <image src="/static/common/empty.png" mode="heightFix"></image>
-  <view>
-    <text>没有获取到房间信息</text>
-  </view>
-</view>
-<u-back-top :scroll-top="scrollTop"></u-back-top>
+	
+	<u-empty marginTop="200" icon-size="260"  v-if="$isEmpty(room_list)" text="暂无房间信息" src="http://139.9.103.171:1888/miniofile/xlyq/empty/empty.png"></u-empty>
+	
+	<u-back-top :scroll-top="scrollTop"></u-back-top>
 </view>
 </template>
 
@@ -158,8 +155,5 @@ page{
   text-overflow: ellipsis;
   display: inline-block;
 }
-.default {  text-align: center;  position: fixed;  left: 50%;  top: 40%;  transform: translate(-50%, -50%);}
-.default text{
-	color: #AAAAAA;
-}.default image {  height: 250rpx;  display: inline-block;}.empty-wrap{	background-color: #FFFFFF;	min-height: 100vh;}
+.empty-wrap{	background-color: #FFFFFF;	min-height: 100vh;}
 </style>

pages/choosePlot/chooseUnit/chooseUnit.vue

@@ -18,12 +18,8 @@
 	<u-cell-group v-if="unit_list.length>0">
 		<u-cell-item  @click="jump(item)"  v-for="(item, index) in unit_list" :key="index"  :title="item.name" :arrow="false"></u-cell-item>
 	</u-cell-group>
-<view class="default" v-if="$isEmpty(unit_list)">
-  <image src="/static/common/empty.png" mode="heightFix"></image>
-  <view>
-    <text >没有获取到单元信息</text>
-  </view>
-</view>
+	<u-empty marginTop="200" icon-size="260"  v-if="$isEmpty(unit_list)" text="暂无单元信息" src="http://139.9.103.171:1888/miniofile/xlyq/empty/empty.png"></u-empty>
+
 </view>
 </template>
 
@@ -141,9 +137,5 @@ page{
   text-overflow: ellipsis;
   display: inline-block;
 }
-.default {  text-align: center;  position: fixed;  left: 50%;  top: 40%;  transform: translate(-50%, -50%);}
-.default text{
-	color: #AAAAAA;
-}
-.default image {  height: 250rpx;  display: inline-block;}.empty-wrap{	background-color: #FFFFFF;	min-height: 100vh;}
+.empty-wrap{	background-color: #FFFFFF;	min-height: 100vh;}
 </style>

pages/choosePlot/householdCert/householdCert.vue

@@ -12,7 +12,7 @@
 				</view>
 				<view class="">
 					<view style="padding: 50rpx 0 20rpx 48rpx;">
-						<text class="cuIcon-location padding-right-sm"></text>
+						<text class="cuIcon-locationfill text-blue padding-right-sm"></text>
 						<text class="local_city_info">{{residential_name}},{{building_name}},{{unit_name}},{{room_name}}</text>
 					</view>
 				</view>
@@ -87,7 +87,7 @@
 				  </view>
 				</view>
 				<!-- 人脸 begin ，微信小程序审核时，隐藏该模块 -->
-				<view style="background-color: #FFFFFF;" v-if="appletType==1">
+				<view style="background-color: #FFFFFF;" v-if="vuex_appletType==1">
 							<view class="form_group mb0" style="padding-left: 60rpx;">
 								 <view>
 									<text class="sex">人脸：</text>
@@ -272,7 +272,6 @@ export default {
 		};
 	},
 	onLoad: function (options) {
-		  this.appletType=uni.getStorageSync('appletType')
 		  //显示用户选择的小区+楼栋+房间名字
 		  this.residential_name = options.residential_name;
 		  this.building_name=options.building_name
@@ -282,6 +281,7 @@ export default {
 		  this.name=app.globalData.member.name
 	},
 	onShow() {
+		this.getAppletType()
 		//总步骤数
 		//注册的流程总步骤数是3，其他流程总步骤数是2
 		if(this.$isEmpty(app.globalData.totalStep)){
@@ -302,6 +302,24 @@ export default {
 		
 	},
 	methods: {
+		getAppletType: function () {
+		  var that = this;
+		    uni.login({
+		      success: res => {
+		        let params = {};
+		        params['js_code'] = res.code;
+				params['name'] = 'community';
+		        let operation = 'miniprogram/getOpenid'; //发起请求
+		        app.globalData.postRequest(params, operation, function (res) {
+		          //获取成功
+		          if (res.data.result_code == 1) {
+					uni.setStorageSync("appletType", res.data.appletType);
+					that.$u.vuex('vuex_appletType',res.data.appletType)
+		          } 
+		        });
+		      }
+		    });
+		},
 		//点击模态框选项触发
 		photoChecked(index){
 			if (index==0) {
@@ -447,6 +465,11 @@ export default {
 		  }
 		  console.log(that.image_uri);
 		  let image_uri = that.image_uri;
+		  if (this.$isEmpty(image_uri)&&this.vuex_appletType==1) {
+		  	//微信小程序通过审核时，开放人脸模块
+			this.$u.toast('请上传人脸')
+			return
+		  }
 		  params['image_uri'] = that.image_uri;
 		  let face_code = that.face_code;
 		  params['face_code'] = that.face_code; //性别

pages/community/detail/elderlyDetail.vue

@@ -25,7 +25,7 @@
 							<text>{{dataDetail.temperature}} ℃</text>
 						</view>
 					</view>
-					<view class="padding-top-20" v-if="appletType==1">
+					<view class="padding-top-20" v-if="vuex_appletType==1">
 						<image @click="previewImg(dataDetail.image)"  style="width: 250rpx;height: 280rpx;border-radius: 12rpx;" mode="scaleToFill" :src="dataDetail.image"></image>
 					</view>
 				</view>

pages/guest/guest_form.vue

@@ -26,7 +26,7 @@
 					<view>接待人</view>
 				</view>
 				<view class="bg-gray padding-20 "  >
-					<input :disabled="auditStatus!=null?true:false" type="text" placeholder="请填写接待人"  v-model="data.userName" />
+					<input :disabled="isDisabled" type="text" placeholder="请填写接待人"  v-model="data.userName" />
 				</view>
 			</view>
 			<view class="form">
@@ -35,7 +35,7 @@
 					<view>您的姓名:</view>
 				</view>
 				<view class="bg-gray padding-20 "  >
-					<input :disabled="auditStatus!=null?true:false" type="text" placeholder="请填写您的姓名" v-model="data.guestName" />
+					<input :disabled="isDisabled" type="text" placeholder="请填写您的姓名" v-model="data.guestName" />
 				</view>
 			</view>
 			<view class="form ">
@@ -45,7 +45,7 @@
 				</view>
 				<view class="bg-gray padding-20  flex justify-between " style="box-sizing: border-box;" >
 					<input disabled maxlength="11" type="number" placeholder="请获取您的联系方式" v-model="data.guestTel" />
-					<button open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" class="light sm cu-btn bg-blue radius">
+					<button :disabled="isDisabled" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" class="light sm cu-btn bg-blue radius">
 						获取手机号
 					</button>
 				</view>
@@ -56,7 +56,7 @@
 					<view>您的身份证号</view>
 				</view>
 				<view class="bg-gray padding-20 " >
-					<input :disabled="auditStatus!=null?true:false" placeholder="请输入您的身份证号" v-model="data.guestIdcard" />
+					<input :disabled="isDisabled" placeholder="请输入您的身份证号" v-model="data.guestIdcard" />
 				</view>
 			</view>
 		</view>
@@ -67,7 +67,7 @@
 					<view>来访目的</view>
 				</view>
 				<view  class="bg-gray padding-10">
-					<textarea :disabled="auditStatus!=null?true:false"   v-model="data.guestReason" maxlength="100" style="width: 100%;height: 270rpx;line-height: 50rpx;"  placeholder="请填写来访原因"></textarea>
+					<textarea :disabled="isDisabled"   v-model="data.guestReason" maxlength="100" style="width: 100%;height: 270rpx;line-height: 50rpx;"  placeholder="请填写来访原因"></textarea>
 					<view  class="text-right text-df text-gray padding-top-10">
 						{{data.guestReason.length}} / 100
 					</view>
@@ -110,7 +110,7 @@
 		  <view class="modal-title">提示</view>
 		    <view class="modal-content">
 		      <view class="modal-input">
-		        <text class="password">授权成功，请转发给好友填写表单</text>
+		        <text class="password">填写成功，请转发给好友审核</text>
 		      </view>
 		    </view>
 		    <view class="modal-footer">
@@ -119,6 +119,9 @@
 		    </view>
 		</view>
 		
+		<view v-if="auditStatus==0" @click="getAuthRecords" class="cuIcon cu-btn" style="width: 88rpx;height: 88rpx;background-color: rgba(0,0,0,.2);color: #FFFFFF;position: fixed;bottom: 40%;right: 20rpx;">
+			<text class="cuIcon-refresh" style="font-size: 50rpx;"></text>
+		</view>
 		
 		<u-picker @confirm="timeConfirm" :params="params" v-model="timeShow" mode="time"></u-picker>
 	</view>
@@ -186,6 +189,21 @@
 				shareId:'',
 			}
 		},
+		computed:{
+			isDisabled:{
+				get(){
+					if (this.auditStatus==null) {
+						if (this.islock) {
+							return true
+						}else{
+							return false
+						}
+					}else{
+						return true
+					}
+				}
+			}
+		},
 		onShareAppMessage: function (ops) {
 		  this.showModal=false
 		  this.getAuthRecords()
@@ -216,7 +234,7 @@
 				})
 				return
 			}
-			this.id=options.id 
+			this.id=options.id
 			this.doorNeedAudit=options.doorNeedAudit
 			this.memberId=options.memberId
 			this.data.guestAuthId=this.id
@@ -249,9 +267,13 @@
 			 * 跳转到设备列表
 			 */
 			jumpOpenDoor(){
-				console.log(this.memberId,this.residentialId);
+				let params={
+					memberId:this.memberId,
+					residentialId:this.residentialId,
+					guestTel:this.data.guestTel
+				}
 				uni.redirectTo({
-					url:"/pages/guest/open_door?memberId="+this.memberId+"&residentialId="+this.residentialId
+					url:"/pages/guest/open_door"+this.$u.queryParams(params)
 				})
 			},
 			timeConfirm(e){
@@ -266,16 +288,20 @@
 			 * 查不到记录就填表
 			 */
 			async getAuthRecords(){
+				let that=this
 				let operation="guestAuthorize/getById/"+this.id
 				let params={}
 				let res=await app.globalData.postRequestAsync(params, operation);
 				if (res.data.result_code!=1) {
-					this.$refs.uToast.show({
-						title: '没有该授权记录',
-						position:"top",
-						type: 'error',
+					uni.showModal({
+						showCancel:false,
+						content:"没有该授权记录，或者授权记录已被撤销",
+						success: (res) => {
+							if (res.confirm) {
+								that.islock=true
+							}
+						}
 					})
-					this.islock=true
 					return
 				}
 				//授权详情
@@ -359,12 +385,16 @@
 			submit(){
 				let that=this
 				if (this.$isEmpty(this.data.guestPosition)) {
-					this.$refs.uToast.show({
-						title: '系统错误！',
-						position:"top",
-						type: 'error',
+					uni.showModal({
+						title:"提示",
+						content:"系统错误",
+						showCancel:false,
+						success: (res) => {
+							if (res.confirm) {
+								that.islock=true
+							}
+						}
 					})
-					this.islock=true
 					return
 				}
 				if (this.$isEmpty(this.data.guestTime)) {

pages/guest/open_door.vue

@@ -30,6 +30,8 @@ export default {
 	},
 	data() {
 		return {
+			guestTel:'',
+			
 			memberId:'',
 			residentialId:'',
 			
@@ -41,6 +43,7 @@ export default {
 	},
 	onLoad(options) {
 		that=this
+		this.guestTel=options.guestTel
 		this.memberId=options.memberId
 		this.residentialId=options.residentialId
 		console.log(this.memberId);
@@ -65,6 +68,8 @@ export default {
 			 let params = {};
 			 params['member_id'] = this.memberId;
 			 params['device_id'] = device_id;
+			 params['phone']=this.guestTel
+			 params['is_guest']='1'
 			 let operation = 'member/openDoor';
 			 app.globalData.postRequest(params, operation, function (res) {
 				 that.isloading=false

pages/index/index.vue

@@ -5,12 +5,12 @@
 			<u-navbar :is-back="false" title=" ">
 				<view class="slot-wrap">
 					<view v-if="$isEmpty(plot)" class="padding-left-20" @click="$u.toast('暂无小区信息')">
-						<u-icon name="map" size="34"></u-icon>
+						<u-icon name="map-fill" color="#2f7ff5"  size="34"></u-icon>
 						<text class="padding-left-sm " style="font-size: 34rpx;">暂无小区信息</text>
 					</view>
 					<picker v-else @change="typeChange" :value="plotIndex" :range="plotArray">
 					  <view class="padding-left-20 ">
-					  	<u-icon name="map" size="34"></u-icon>
+					  	<u-icon name="map-fill" color="#2f7ff5"  size="34"></u-icon>
 					  	<text class="padding-left-sm " style="font-size: 34rpx;">{{plot}}</text>
 					  </view>
 					</picker>
@@ -33,11 +33,14 @@
 				<view  style="padding: 30rpx 30rpx 0 30rpx;">
 					<text class="text-bold text-lg">智慧社区</text>
 				</view>
+				
+			
+				
 				<view style="padding: 40rpx 10rpx 0rpx;" class="cu-list grid col-5 no-border" >
 					<view class="cu-item" :class="item.index==5?'img1-lg':''" @click="top(item.index)" v-for="(item,index) in gridList" :key="index">
 						<block v-if="item.index==5">
 							<view class="grid-icon" >
-								<image  style="width: 88rpx;height: 88rpx;" :src="modalShow?'../../static/home/open1.png':'../../static/home/open4.png'"/>
+								<image  style="width: 88rpx;height: 88rpx;" :src="modalShow?'../../static/home/open4.png':'../../static/home/open4.png'"/>
 							</view>
 							<text  style="color: #333333;font-size: 30rpx;font-weight: 800;" >{{item.title}}</text>
 						</block>
@@ -47,18 +50,20 @@
 							</view>
 							<text  style="color: #333333;font-size: 26rpx;" >{{item.title}}</text>
 						</block>
-						<view class="cu-tag bg-orange badge" v-if="item.badge>0">{{item.badge}}</view>
+						<view class="cu-tag bg-red badge" v-if="item.badge>0">{{item.badge}}</view>
 					</view>
 				</view>
+				
 				<!-- 设备列表 -->
-				<view v-if="modalShow==true" class="flex justify-around margin-top-30" >
+				<view v-if="modalShow" class="flex justify-around margin-top-10" >
 					<view @click="open(item.id)" v-for="(item,index) in device_list" :key="index" style="flex-direction: column;" class="flex justify-center align-center">
-						<image style="width: 60rpx;height: 60rpx;" src="../../static/home/kaimen.png"/>
-						<view class="text-center padding-top-20" style="font-size: 24rpx;">
+						<image style="width: 60rpx;height: 60rpx;" src="/static/kaimen.png"/>
+						<view class="text-center padding-top-20 text-cut-1" style="font-size: 24rpx;">
 							{{item.name}}
 						</view>
 					</view>
 				</view>
+				
 			</view>
 			<view class="nav-list bg-white padding-top-20" >
 				<view hover-class="none"
@@ -110,15 +115,15 @@
 		data() {
 			return {
 				isloading:false,
-				modalShow:false,
 				//开门设备列表
 				device_list: [],
-				
 				background: {
 					backgroundColor: '#e54d42',
 				},
 				noticeList:[],
 				
+				modalShow:false,
+				
 				userInfo:{},
 				jsCode:'',
 				openid:'',
@@ -206,7 +211,7 @@
 					{
 						icon:'../../static/home/fangke1.png',
 						title:"访客授权",
-						badge:0,
+						badge:this.vuex_auth_audit_count,
 						index:4
 					},
 					
@@ -214,8 +219,13 @@
 			}
 		},
 		onShow() {
-			//从功能列表一键开门跳转过来的，打开开门设备列表
-			this.modalShow=getApp().globalData.openDoor
+			this.fetchNoticeList()
+			//获取访客授权待审核的数量
+			if (this.canReset) this.fetchAuthRecordNum() 
+			this.canReset=true
+			
+			//获取设备列表
+			this.getAuthDevice()
 			
 			//处理进入小程序的不同场景
 			this.execParam();
@@ -242,13 +252,39 @@
 			this.fetchGoodsList()
 		},
 		methods: {
+			fetchAuthRecordNum(){
+				try{
+					let memberId=app.globalData.member.id
+					if (!this.$isEmpty(memberId)) {
+						let params={
+							member_id:memberId,
+							size:99,
+							auditStatus:0
+						}
+						let operation='guestRecord/getListByMemberId'
+						getApp().globalData.postRequest(params,operation,function(res){
+							let length=res.data.list.length
+							that.$u.vuex('vuex_auth_audit_count',length)
+							that.gridList.forEach(item=>{
+								if (item.index==4) {
+									item.badge=length
+								}
+							})
+						})
+					}
+				}catch(e){
+					
+				}
+			},
 			open(id){
-				//进度条加载
-				this.isloading=true
-				let that=this
-				setTimeout(()=>{
-					that.openDoor(id)
-				},2300)
+				//直接开门
+				that.openDoor(id)
+				//进度条加载模式开门
+				// this.isloading=true
+				// let that=this
+				// setTimeout(()=>{
+				// 	that.openDoor(id)
+				// },500)
 			},
 			//立即开门
 			openDoor: function (id) {
@@ -261,7 +297,6 @@
 				 app.globalData.postRequest(params, operation, function (res) {
 					 that.isloading=false
 				   app.globalData.oneFailHint(res.data.result_msg,function(){
-					   that.modalShow=false
 				   });
 				 });
 			},
@@ -298,8 +333,6 @@
 				await this.$nextTick(function(){
 					 this.touristLogin()
 				})
-				//加载通知公告
-				this.fetchNoticeList()
 			},
 			getParam(e){
 				// 用来保存所有的属性名称和值
@@ -481,6 +514,7 @@
 			            //openid存入缓存
 			            uni.setStorageSync("openid", res.data.openid);
 						uni.setStorageSync("appletType", res.data.appletType);
+						that.$u.vuex('vuex_appletType',res.data.appletType)
 						that.openid=res.data.openid
 						that.sessionKey=res.data.sessionKey
 			            that.getMemberByOpenid(res.data.openid);
@@ -492,24 +526,20 @@
 			    });
 			},
 			//根据openid获取用户信息
-			getMemberByOpenid: function (openid) {
-			  let _this = this;
-			  let params = {};
-			  params['openid'] = openid;
-			  let operation = 'miniprogram/getMemberByOpenid';
-			  app.globalData.postRequest(params, operation, function (res) {
-			    console.info("getMemberByOpenid==" + res.data.result_msg); //获取成功
-			    if (res.data.result_code == 1) {
-			      app.globalData.member = res.data.member;
-				  that.$u.vuex('vuex_member',res.data.member)
-				  
-			      app.globalData.anyHousePass = res.data.anyHousePass; //获取房屋列表
-			      _this.getRoomByMemberId();
-				  _this.getAuthDevice()
-			    } else {
-					
-			    }
-			  });
+			async getMemberByOpenid(openid) {
+				  let _this = this;
+				  let params = {};
+				  params['openid'] = openid;
+				  let operation = 'miniprogram/getMemberByOpenid';
+				  let res=await app.globalData.postRequestAsync(params, operation)
+				  if (res.data.result_code == 1) {
+				    app.globalData.member = res.data.member;
+				    that.$u.vuex('vuex_member',res.data.member)
+				    app.globalData.anyHousePass = res.data.anyHousePass; //获取房屋列表
+				    _this.getRoomByMemberId();
+				    _this.getAuthDevice()
+					_this.fetchAuthRecordNum() 
+				  } 
 			},
 			/**
 			 * 游客登陆
@@ -567,17 +597,18 @@
 			          });
 			        } else {
 						uni.setStorageSync("personTel", personTelList[0]);
-					  uni.setStorageSync("doorNeedAudit", doorNeedAuditList[0]);
-			          uni.setStorageSync("plotName", list[0]);
-			          uni.setStorageSync("residentialId", residentialIdList[0]);
-			          that.setData({
-			            plot: list[0]
-			          });
+					    uni.setStorageSync("doorNeedAudit", doorNeedAuditList[0]);
+			            uni.setStorageSync("plotName", list[0]);
+			            uni.setStorageSync("residentialId", residentialIdList[0]);
+						  that.setData({
+							plot: list[0]
+						  });
 			        }
 			      }
 				  let residentialList=[]
 				  list.forEach((item,index)=>{
 					  let tmp={}
+					  tmp.residentialName=item
 					  tmp.personTel=personTelList[index]
 					  tmp.residentialId=residentialIdList[index]
 					  tmp.doorNeedAudit=doorNeedAuditList[index]
@@ -607,17 +638,6 @@
 			 * @param {Object} index 当前项的index属性,而不是当前项的下标
 			 */
 			top: function (index) {
-			 if (index==5) {
-				 if (this.$isEmpty(this.device_list)) {
-				 	uni.showToast({
-				 		title:"暂无设备",
-						icon:"none"
-				 	})
-					return
-				 }
-				 this.modalShow=!this.modalShow
-			 	 return
-			 }
 			  if (index==99) {
 				  //查看更多
 				  uni.navigateTo({
@@ -625,6 +645,13 @@
 				  })
 				  return
 			  }
+			  if (index==9) {
+				uni.navigateToMiniProgram({
+					appId:'wx2eec5fb00157a603',
+				})
+				return
+			  }
+			  
 			   var that = this;
 			    var member = app.globalData.member;
 			    var anyHousePass = app.globalData.anyHousePass; //会员认证状态：{ 0：未认证，1：待审审核，2：已认证 }
@@ -668,10 +695,18 @@
 			          url = '/pages/authorize_record/authorize_record';
 			          break;
 			        case 5:
-					  //一键开门
-					  uni.switchTab({
-					  	url:"../device/device"
-					  })
+						if (this.$isEmpty(this.device_list)) {
+							uni.showToast({
+								title:"暂无设备",
+								icon:"none"
+							})
+							return
+						 }
+						 if (this.device_list.length==1) {
+						 	this.open(this.device_list[0].id)
+						 }else{
+							 this.modalShow=!this.modalShow
+						 }
 			          break;
 					case 6:
 					  //防疫登记
@@ -689,7 +724,8 @@
 					  url = '/pages/services/property/property';
 					  break;
 					case 9:
-					  url = '/pages/healthCode/healthCode';
+					
+					  // url = '/pages/healthCode/healthCode';
 					  break;
 			        default:
 			          url = "";

pages/myFamily/activateFace/activateFace.vue

@@ -1,6 +1,6 @@
 <template>
 <view style="background-color: #FFFFFF;height: 100vh;">
-	<view class="" v-if="appletType==1">
+	<view class="" v-if="vuex_appletType==1">
 		<view v-if="faceList!=null && faceList.length!=0">
 			<view class="head">请选择人脸套餐：</view>
 			<view class="content">

pages/myFamily/add/add.vue

@@ -77,7 +77,7 @@
 		  </view>
 		</view>
 		
-		<view style="background-color: #FFFFFF;" v-if="appletType==1">
+		<view style="background-color: #FFFFFF;" v-if="vuex_appletType==1">
 					<view class="form_group mb0" style="padding-left: 60rpx;">
 						 <view>
 							<text class="sex">人脸：</text>
@@ -100,7 +100,7 @@
 					</view>
 					<view class="category" style="padding-bottom: 140rpx;">
 						<view v-for="(item, index) in iconArray" :key="index" class="category_item">
-						  <view class="category_item_wrap" @tap="top" :data-index="item.index">
+						  <view class="category_item_wrap" >
 							<view class="icon_wrap">
 							  <image :src="item.iconUrl" class="index_icon"></image>
 							</view>
@@ -432,6 +432,11 @@ export default {
 		  }
 		
 		  let image_uri = that.image_uri;
+		  if (this.$isEmpty(image_uri)&&this.vuex_appletType==1) {
+		  	//微信小程序通过审核时，开放人脸模块
+			this.$u.toast('请上传人脸')
+			return
+		  }
 		  params['image_uri'] = that.image_uri;
 		  let face_code = that.face_code;
 		  params['face_code'] = that.face_code; //性别

pages/myFamily/addFamily/addFamily.vue

@@ -126,7 +126,7 @@
         </view>
       </view>
     </view>
-	<view class="" v-if="appletType==1">
+	<view class="" v-if="vuex_appletType==1">
 		<view class="form_group mb0">
 		  <view>
 		    <text class="red">*</text>

pages/myFamily/editFamily/editFamily.vue

@@ -76,7 +76,7 @@
 		  </view>
 		</view>
 		
-		<view style="background-color: #FFFFFF;" v-if="appletType==1">
+		<view style="background-color: #FFFFFF;" v-if="vuex_appletType==1">
 					<view class="form_group mb0" style="padding-left: 60rpx;">
 						 <view>
 							<text class="sex">人脸：</text>

pages/myFamily/item.vue

@@ -40,7 +40,7 @@
 				mescroll: null, // mescroll 对象
 				// 上拉配置参数
 				up: {
-					noMoreSize: 2, 
+					noMoreSize: 3, 
 					auto: false,
 					page: {
 						page: 0,
@@ -192,6 +192,11 @@
 			   this.vuex_own_room_list.forEach(item=>{
 				   room_ids.push(item.id)
 			   })
+			   if (this.$isEmpty(this.room_ids)) {
+				   //就算没有自己的房屋，也要传room_ids,不然后台报错
+			   	 room_ids=['-1']
+			   }
+			   
 			  let that = this;
 			  let params = {
 				  "pageNum":mescroll.num.toString(),

pages/myFamily/user-card.vue

@@ -31,9 +31,9 @@
 				</view>
 				<!-- 小程序审核时，不要出现人脸功能 -->
 				<!-- 业主可以激活所有人的人脸，其他只可以操作自己 -->
-				<navigator v-if="showActiveFace(item)" class="cu-btn line-btn round sm margin-right-sm"  @click.stop="activeFace(item)">
+				<!-- <navigator v-if="showActiveFace(item)" class="cu-btn line-btn round sm margin-right-sm"  @click.stop="activeFace(item)">
 					人脸激活
-				</navigator>
+				</navigator> -->
 				<!-- 自己不能删除自己，业主可以删除成员，但是也不能删除自己 -->
 				<view v-if="vuex_relationshipType==0&&item.type!=0" class="cu-btn bg-btn sm round" @click.stop="deleteUserById(item.id)">
 					删除
@@ -84,7 +84,7 @@ export default {
 		showActiveFace(){
 			//小程序的审核状态为1才显示人脸模块，
 			return item => {
-				if (this.appletType==1) {
+				if (this.vuex_appletType==1) {
 					if (this.vuex_relationshipType==0) {
 						return true
 					}

pages/myhome/familyList.vue

@@ -7,23 +7,21 @@
 			<view class="content">
 				<view class="flex">
 					<text class="name">{{item.name}}</text>
-					<view style="margin:8rpx 0 0 15rpx;" class="cu-tag sm bg-blue radius">
+					<view style="margin:8rpx 0 0 15rpx;" class="cu-tag sm line-blue radius">
 						<text v-if="item.type==0">业主</text>
 						<text v-if="item.type==1">家属</text>
 						<text v-if="item.type==2">租客</text>
 					</view>
 				</view>
 				<view class="padding-top-20 ">
-					<text class="cuIcon-mobile  padding-right-10"></text>
+					<text class="cuIcon-mobile text-blue  padding-right-10"></text>
 					<text>{{item.tel}}</text>
 				</view>
 				<view class="padding-top-10 ">
-					<text class="cuIcon-vipcard  padding-right-10"></text>
+					<text class="cuIcon-vipcard text-blue  padding-right-10"></text>
 					<text>{{item.idCard || '暂无'}}</text>
 				</view>
 			</view>
-			
-			
 		</view>
 	</mescroll-body>
 </template>
@@ -43,7 +41,7 @@ export default {
 			upOption:{
 				auto:true,
 				use:true,
-				noMoreSize:3
+				noMoreSize:5
 			}
 		};
 	},
@@ -94,7 +92,8 @@ export default {
 <style lang="scss" scoped>
 	.card{
 		background-color: #FFFFFF;
-		margin: 20rpx;
+		// margin: 20rpx;
+		margin-bottom: 2rpx;
 		padding:30rpx 20rpx;
 		// border-radius: 10rpx;
 		display: flex;
@@ -110,7 +109,7 @@ export default {
 			padding-left: 20rpx;
 			.name{
 				font-size: 32rpx;
-				font-weight: 800;
+				font-weight: 600;
 			}
 		}
 	}

pages/myhome/myhome.vue

@@ -7,6 +7,13 @@
 						<u-icon name="home" :size="30" color="rgb(94,94,94)"></u-icon>
 						<view class="title">{{item.residentialName}}</view>
 					</view>
+					
+					<view class="right text-orange">
+						<text  v-if="item.relationshipType==0">业主</text>
+						<text  v-if="item.relationshipType==1">家属</text>
+						<text  v-if="item.relationshipType==2">租户</text>
+						<text  v-if="item.relationshipType==3">访客</text>
+					</view>
 				</view>
 				<view class="item">
 					<view class="left">
@@ -15,13 +22,6 @@
 								<text>房屋信息：</text>
 								<text >{{item.buildingName}},{{item.unitName}},{{item.name}}</text>
 							</view>
-							<view class="content">
-								<text>身份：</text>
-								<text  v-if="item.relationshipType==0">业主</text>
-								<text  v-if="item.relationshipType==1">家属</text>
-								<text  v-if="item.relationshipType==2">租户</text>
-								<text  v-if="item.relationshipType==3">访客</text>
-							</view>
 						</view>
 					</view>
 				</view>
@@ -159,6 +159,8 @@ button
 	.top {
 		display: flex;
 		justify-content: space-between;
+		border-bottom: 1rpx dashed #DDDDDD;
+		padding-bottom: 20rpx;
 		.left {
 			display: flex;
 			align-items: center;
@@ -172,15 +174,14 @@ button
 	.item {
 		margin: 40rpx 0 20rpx 0;
 		.content {
-			border-bottom: 1rpx dashed #DDDDDD;
 			display: flex;
 			justify-content: space-between;
-			padding: 30rpx 0;
+			padding: 10rpx 0;
 		}
 	}
 	.bottom {
 		display: flex;
-		margin-top: 30rpx;
+		margin-top: 20rpx;
 		justify-content: flex-end;
 		align-items: center;
 	}

pages/record/card.vue

@@ -42,7 +42,7 @@
 						</view>
 						<view class="content">
 							<text class="padding-right-10">来访目的：</text>
-							<text style="line-height: 50rpx;">{{item.remarks}}</text>
+							<text style="line-height: 50rpx;">{{item.guestReason}}</text>
 						</view>
 					</view>
 				</view>

pages/record/item.vue

@@ -32,7 +32,7 @@
 				// 上拉配置参数
 				up: {
 					noMoreSize: 3, 
-					auto: true,
+					auto: false,
 					page: {
 						page: 0,
 						size: 10
@@ -48,9 +48,44 @@
 		created() {
 			this.memberId=getApp().globalData.member.id
 		},
+		watch:{
+			type(val) {
+				if(!this.isInit && val === this.i) {
+					this.mescroll.resetUpScroll()
+				}
+			}
+		},
+		mounted() {
+			if(!this.isInit && this.i === 0) {
+				this.mescroll.resetUpScroll()
+			}
+		},
 		methods: {
+			/**
+			 * 获取待审核的数量
+			 */
+			fetchAuthRecordNum(){
+				let that=this
+				let memberId=app.globalData.member.id
+				if (!this.$isEmpty(memberId)) {
+					let params={
+						member_id:memberId,
+						size:99,
+						auditStatus:0
+					}
+					let operation='guestRecord/getListByMemberId'
+					getApp().globalData.postRequest(params,operation,function(res){
+						let length=res.data.list.length
+						that.$u.vuex('vuex_auth_audit_count',length)
+					})
+				}
+			},
+			/**
+			 * 显示详情
+			 * @param {Object} item
+			 */
 			showDetail(item){
-				this.$emit('test',item)
+				this.$emit('showDetail',item)
 			},
 			/**
 			 * 通过审核
@@ -67,7 +102,7 @@
 					success: (res) => {
 						if (res.confirm) {
 							getApp().globalData.postRequest(params,operation,function(res){
-								console.log(res);
+								that.fetchAuthRecordNum()
 								that.mescroll.resetUpScroll()
 							})
 						}
@@ -76,9 +111,9 @@
 			},
 			/**
 			 * 审核不通过
-			 * @param {Object}
+			 * @param {Object} item
 			 */
-			submitFailAudit(){
+			fail(item){
 				let that=this
 				let {rootOrgId,orgPosition,orgId,...params}=item
 				params.auditStatus=2
@@ -90,21 +125,13 @@
 					success: (res) => {
 						if (res.confirm) {
 							getApp().globalData.postRequest(params,operation,function(res){
-								console.log(res);
+								that.fetchAuthRecordNum()
 								that.mescroll.resetUpScroll()
 							})
 						}
 					}
 				})
 			},
-			/**
-			 * 显示审核不通过的意见框
-			 * @param {Object} item
-			 */
-			fail(item){
-				this.dataDetail=item
-				this.modelShow=true
-			},
 			/**
 			 * @param {Object} mescroll 初始化组件
 			 */

pages/record/record.vue

@@ -13,6 +13,7 @@
 				</u-cell-group>
 			</view>
 		</u-popup>
+		
 		<u-modal cancel-text="重置" cancel-color="#000000" @cancel="filterReset" :show-cancel-button="true"  @confirm="filterConfirm" title="筛选" :mask-close-able="true" v-model="filterShow" >
 			<view class="slot-content" style="margin: 20rpx;">
 				<u-form label-width="150"  ref="uForm">
@@ -27,7 +28,7 @@
 				<scroll-view scroll-x class="bg-white nav" >
 					<view class="flex text-center">
 						<view class="cu-item flex-sub" :class="index==current?'text-blue text-xl text-bold ':'text-lg'" v-for="(item,index) in tabs" :key="index" @tap="tabChange(index)" >
-							{{item.name}}
+							<text>{{item.name}}</text>
 						</view>
 					</view>
 				</scroll-view>
@@ -42,7 +43,7 @@
 				@animationfinish="animationfinish">
 				<swiper-item  v-for="(item, index) in tabs" :key="index">
 					<scroll-view scroll-y style="height: 100%;">
-						<item @test="showDetail" ref="mescrollItem" :params="params" :i="index" :item="item" :type="current"></item>
+						<item @showDetail="showDetail" ref="mescrollItem" :params="params" :i="index" :item="item" :type="current"></item>
 					</scroll-view>
 				</swiper-item>
 			</swiper>
@@ -77,7 +78,7 @@
 					},
 					{
 						name: '待审核',
-						value:0
+						value:0,
 					},
 					{
 						name: '已通过',
@@ -105,6 +106,13 @@
 				this.detailShow=true
 				this.detailData=item
 			},
+			/**
+			 * 审核不通过时显示弹出框
+			 * @param {Object} item
+			 */
+			fail(item){
+				console.log(item);
+			},
 			/**
 			 * 显示筛选弹窗
 			 */
@@ -186,9 +194,6 @@
 </script>
 
 <style lang="scss" scoped>
-	.text-blue{
-		color: #59a5f0;
-	}
 	.text-xl{
 		font-size: 34rpx;
 	}
@@ -198,7 +203,7 @@
 	  padding: 78rpx 0rpx 0rpx;
 	 .tabs {
 	    position: fixed;
-	    top: -10rpx;
+	    top: -2rpx;
 		left: 0;
 		width: 100%;
 		background-color: #FFFFFF;

pages/services/property/detail.vue

@@ -67,16 +67,16 @@
 		
 		<view  class="footer-fixed  padding-sm bg-white flex justify-end margin-right-30" style="box-sizing: border-box;z-index: 999;padding: 20rpx;">
 			<!-- 待处理，取消工单 -->
-			<view class="cu-btn line-blue round " v-if="dataDetail.handleStatus==0" @click="cancelItem()">
+			<view class="cu-btn sm lineBlue round " v-if="dataDetail.handleStatus==0" @click="cancelItem()">
 				取消工单
 			</view>
 			<!-- 已撤销工单，删除工单 -->
-			<view class="cu-btn line-blue round margin-right-20" v-if="dataDetail.handleStatus==-1||dataDetail.handleStatus==1" @click="deleteItem()" >
+			<view class="cu-btn sm lineBlue round margin-right-20" v-if="dataDetail.handleStatus==-1||dataDetail.handleStatus==1" @click="deleteItem()" >
 				删除工单
 			</view>
 			<!-- v-if="dataDetail.handleStatus==1&&dataDetail.estimateStatus==0" -->
 			<!-- 已处理，待评价 -->
-			<navigator url="./comment" v-if="dataDetail.handleStatus==1&&dataDetail.estimateStatus==0" class="cu-btn bg-blue  round "  >
+			<navigator url="./comment" v-if="dataDetail.handleStatus==1&&dataDetail.estimateStatus==0" class="cu-btn sm bg-blue  round "  >
 				写评价
 			</navigator>
 		</view>
@@ -164,6 +164,14 @@
 	}
 </script>
 
-<style>
-
+<style lang="scss">
+	.bg-blue{
+		background-color: #59a5f0;
+		color: #FFFFFF;
+	}
+	
+	.lineBlue{
+		color: #59a5f0;
+		border: 1rpx solid #59a5f0;
+	}
 </style>

pages/services/property/list/card.vue

@@ -35,7 +35,7 @@
 			</view>
 			<view class="bottom" >
 				<button @click.stop="" open-type="contact" class="cu-btn  sm round line-black margin-right-20" >
-					联系客服
+					联系物业
 				</button>
 				<!-- 待处理，显示取消工单 -->
 				<view v-if="item.handleStatus==0" class="cu-btn  sm round bg-blue" @click.stop="cancel(item)">
@@ -102,6 +102,11 @@ export default {
 </script>
 
 <style lang="scss">
+.bg-blue{
+	background-color: #59a5f0;
+	color: #FFFFFF;
+}
+	
 .data {
 	width: 710rpx;
 	background-color: #ffffff;

pages/services/property/property.vue

@@ -42,7 +42,8 @@
 		<view class="card ">
 			<view class="form" style="height: 320rpx;">
 				<view  class="bg-gray padding-10">
-					<textarea @click="showMask"   v-model="data.reportDetail" maxlength="100" style="width: 100%;height: 270rpx;line-height: 50rpx;"  placeholder="请填写故障描述"></textarea>
+					<u-input v-model="data.reportDetail" type="textarea"  maxlength="100" height="240" placeholder="请填写故障描述" style="width: 100%;line-height: 50rpx;"/>
+					<!-- <textarea @click="showMask"   v-model="data.reportDetail" maxlength="100" style="width: 100%;height: 270rpx;line-height: 50rpx;"  placeholder="请填写故障描述"></textarea> -->
 					<view  class="text-right text-df text-gray padding-top-10">
 						{{data.reportDetail.length}} / 100
 					</view>
@@ -69,7 +70,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="bg-white" style="height: 160rpx;"></view>
+		<view  style="height: 110rpx;"></view>
 		<view style="z-index: 999;" class=" footer-fixed" @click="submit">
 			<view class="cu-btn  flex  text-lg bg-red-btn" style="padding: 46rpx 0;">
 				确定提交
@@ -210,7 +211,6 @@
 				this.data.pic=JSON.stringify(this.base64_image)
 				let operation='estateRepair/addEstateRepair'
 				console.log(this.data);
-				return
 				app.globalData.postRequest(this.data, operation, function (res) {
 					if (res.data.add_result) {
 						app.globalData.oneFailHint("提交成功");
@@ -244,12 +244,6 @@
 				this.data.beginTime=e.beginTime
 				this.data.endTime=e.endTime
 				this.dateTimeStr=this.data.beginTime+"   至   "+this.data.endTime
-				console.log(this.dateTimeStr);
-				// if (this.timeType=='start') {
-				// 	this.data.beginTime=e.year+'-'+e.month+'-'+e.day+" "+e.hour+':'+e.minute
-				// }else if (this.timeType=='end') {
-				// 	this.data.endTime=e.year+'-'+e.month+'-'+e.day+" "+e.hour+':'+e.minute
-				// }
 			},
 			/**
 			 * 上传问题截图
@@ -312,17 +306,13 @@
 		background-color: #f7f7f7;
 	}
 	.card{
-		// width: 700rpx;
-		// margin:20rpx auto 0rpx auto;
-		// border-radius: 12rpx;
+		margin: 18rpx;
+		border-radius: 20rpx;
 		box-sizing: border-box;
 		background-color: #FFFFFF;
 	}
- 	.card:first-child{
-		// margin-top: 30rpx;
-	}
 	.card .form{
-		padding: 20rpx 40rpx;
+		padding: 23rpx;
 	}
 	.need{
 		font-size: 38rpx;

pages/tool-list/epidemic-pass/list.vue

@@ -4,7 +4,7 @@
 		 <view @click="goDetail(item)" class="card" v-for="(item,index) in list" :key="index">
 		 	<view class="item top" style="padding: 15rpx 0;">
 		 		<view class="">
-		 			<u-icon name="map"></u-icon>
+		 			<u-icon name="map-fill"  color="#2f7ff5"></u-icon>
 		 			<text class="padding-left-10">{{item.residentialName}}</text>
 		 		</view>
 		 	</view>

pages/uploadFace/uploadFace.vue

@@ -1,6 +1,6 @@
 <template>
 <view>
-	<view class="" v-if="appletType==1">
+	<view class="" v-if="vuex_appletType==1">
 		<view>
 		  <view class="cu-list menu" @click="locationShow=true">
 		  	<view class="cu-item" >
@@ -123,7 +123,7 @@ export default {
     };
   },
   onShow() {
-	 if (this.appletType==0) {
+	 if (this.vuex_appletType==0) {
 	 	uni.setNavigationBarTitle({
 	 		title:"功能待开发"
 	 	})
@@ -145,12 +145,33 @@ export default {
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-	this.appletType=uni.getStorageSync('appletType')
-	
+
     this.getFaceImg();
   },
-
+  onShow() {
+  	this.getAppletType()
+  },
   methods: {
+	  //获取小程序是否已经审核通过,通过就开放人脸
+	  getAppletType: function () {
+	    var that = this;
+	      uni.login({
+	        success: res => {
+	          let params = {};
+	          params['js_code'] = res.code;
+	  		params['name'] = 'community';
+	          let operation = 'miniprogram/getOpenid'; //发起请求
+	          app.globalData.postRequest(params, operation, function (res) {
+	            //获取成功
+	            if (res.data.result_code == 1) {
+	  			uni.setStorageSync("appletType", res.data.appletType);
+				that.appletType=res.data.appletType
+	  			that.$u.vuex('vuex_appletType',res.data.appletType)
+	            } 
+	          });
+	        }
+	      });
+	  },
 	  //点击模态框选项触发
 	  photoChecked(index){
 		if (index==0) {

pages/wode/wode.vue

@@ -120,7 +120,7 @@ export default {
 				},
 				{
 					icon:'../../static/wode/wuye.png',
-					title:"报修业务",
+					title:"我的报修",
 					badge:0,
 					index:3
 				},
@@ -299,7 +299,7 @@ export default {
 					this.tapToCar()
 					break;
 				case 3: 
-					// 报修业务
+					// 我的报修
 					if (this.buttonMethod()) {
 						uni.navigateTo({
 						  url: '../services/property/list/list'

pagesM/pages/browse_records.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="dt-page">
-    <view class="" v-if="appletType==1">
+    <view class="" v-if="vuex_appletType==1">
     	<block v-if="emptyType == 0">
     		<view style="height: 20upx;"></view>
     	  <view class="data_wrap" v-for="(item,index) in dataList" :key="index">

store/index.js

@@ -12,7 +12,7 @@ try{
 }
 
 // 需要永久存储，且下次APP启动需要取出的，在state中的变量名
-let saveStateKeys = [];
+let saveStateKeys = [''];
 
 // 保存变量到本地存储中
 const saveLifeData = function(key, value){
@@ -39,6 +39,11 @@ const store = new Vuex.Store({
 		vuex_member: lifeData.vuex_member ? lifeData.vuex_member : null,
 		//自己的房屋列表
 		vuex_own_room_list: lifeData.vuex_own_room_list ? lifeData.vuex_own_room_list : null,
+		//待审核数量
+		vuex_auth_audit_count: lifeData.vuex_auth_audit_count ? lifeData.vuex_auth_audit_count : 0,
+		//小程序审核状态
+		vuex_appletType: lifeData.vuex_appletType ? lifeData.vuex_appletType : 0,
+		
 	},
 	mutations: {
 		$uStore(state, payload) {