huangmp пре 4 година
родитељ
комит
28ea10b665

+ 3 - 1
assets/http/api.js

@@ -63,6 +63,7 @@ const memberRegister = p => http.post('/community-app-service/app/member/memberR
 const authentication = p => http.post('/community-app-service/app/member/authentication', p)
 //编辑家
 const editFamily = p => http.post('/community-app-service/app/houseuser/editUser', p)
+const modifyFace = p => http.post('/community-app-service/app/houseuser/modifyFace', p)
 //绑定家人
 const bindRoom = (p,q) => http.post('/community-app-service/app/houseuser/bindRoom?memberId='+p, q)
 
@@ -210,5 +211,6 @@ export const api = {
 	getHouseUserCondition,
 	feedback,
 	getResidentialListByMember,
-	getAuditListByMemberId
+	getAuditListByMemberId,
+	modifyFace
 }

+ 10 - 0
assets/http/service.js

@@ -41,6 +41,7 @@ let isRefreshing = false
 // 重试队列,每一项将是一个待执行的函数形式
 let requests = []
 http.interceptors.response.use(async (response) => {
+	console.log(response,"response");
 	/* 请求之后拦截器。可以使用async await 做异步操作  */
 	let data = response.data
 	if (data.code && data.code != 200) {
@@ -85,6 +86,15 @@ http.interceptors.response.use(async (response) => {
 			})
 		}
 	}
+	if (err.data.code == 500) {
+		uni.hideLoading()
+		uni.showModal({
+			title: '提示',
+			content:err.data.msg,
+			showCancel:false,
+			confirmColor: '#2979ff' ,
+		});
+	}
 	return Promise.reject(err)
 })
 export {

+ 34 - 22
comps/bindHome.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="">
-		<u-popup v-model="show" mode="center" width="80%" :border-radius="10" >
+		<u-popup v-model="show" mode="center" width="80%" :border-radius="10" @close="close">
 			<view style="padding:30rpx 0rpx;display: flex;flex-direction: column;justify-content: space-between;">
 				<view class="center text-center padding-bottom-30">
 					<text>绑定房间</text>
@@ -16,9 +16,17 @@
 						</u-cell-group>
 					</u-checkbox-group>
 				</view>
-				<view style="display: flex;justify-content: center;padding-top: 50rpx;">
+				
+				<view class="text-sm"
+					style="display: flex;padding: 5rpx 32rpx 38rpx">
+					<u-checkbox v-model="checked" size="26" name="checked" :label-disabled="true">
+						<text style="font-size: 28rpx;">不再提示</text>
+					</u-checkbox>
+				</view>
+			
+				<view style="display: flex;justify-content: center">
 					<u-button v-if="type==1" :customStyle="createStyle" @click="createRoom">创建新房间</u-button>
-					<u-button v-else :customStyle="cancelStyle" @click="cancel">暂不绑定</u-button>
+					<u-button v-else :customStyle="cancelStyle" @click="show=false" >暂不绑定</u-button>
 					<u-button :customStyle="confirmStyle" @click="confirm">确认绑定</u-button>
 				</view>
 			</view>
@@ -29,15 +37,16 @@
 <script>
 	export default {
 		name: '',
-		props:['type'],
+		props: ['type'],
 		data() {
 			return {
+				checked: false,
 				show: false,
 				roomList: [],
 				iconStyle: {
 					'color': '#2f7ff5'
 				},
-				createStyle:{
+				createStyle: {
 					backgroundColor: '#ff9900',
 					height: '70rpx',
 					lineHeight: '70rpx',
@@ -72,12 +81,17 @@
 			this.initData()
 		},
 		methods: {
+			close(){
+				if (this.checked) {
+					uni.setStorageSync('cancelBind', true)
+				}
+			},
 			check(item) {
 				item.checked = !item.checked
 				this.$forceUpdate()
 			},
 			async initData() {
-				let cancelBind=uni.getStorageSync('cancelBind') || false
+				let cancelBind = uni.getStorageSync('cancelBind') || false
 				if (cancelBind || this.$isEmpty(this.vuex_member)) {
 					return
 				}
@@ -87,11 +101,12 @@
 				}
 				let list = (await this.$http.getHouseUserCondition(params)).data.data
 				this.roomList = list.filter(item => this.isEmpty(item.memberId))
-				this.roomList.forEach(item=>{
-					item.checked=false
-					item.address=item.residentialName+"-"+item.buildingName+"-"+item.unitName+"-"+item.roomName
+				this.roomList.forEach(item => {
+					item.checked = false
+					item.address = item.residentialName + "-" + item.buildingName + "-" + item.unitName + "-" +
+						item.roomName
 				})
-					if (this.$isNotEmpty(this.roomList)) {
+				if (this.$isNotEmpty(this.roomList)) {
 					this.show = true
 				}
 			},
@@ -101,26 +116,23 @@
 				}
 				return false
 			},
-			cancel(){
-				uni.setStorageSync('cancelBind',true)
-				this.show=false
-			},
-			confirm(){
-				let checkList=this.roomList.filter(item=>item.checked)
-				let ids= checkList.map(item=>item.id)
+			confirm() {
+				let checkList = this.roomList.filter(item => item.checked)
+				let ids = checkList.map(item => item.id)
 				if (this.$isEmpty(ids)) {
 					this.$u.toast('至少选择一项')
 					return
 				}
-				let params={
-					memberId:this.vuex_member.id,
+				let params = {
+					memberId: this.vuex_member.id,
 					ids
 				}
-				this.$http.bindRoom(this.vuex_member.id,ids).then(res=>{
-					this.show=false
+				this.$http.bindRoom(this.vuex_member.id, ids).then(res => {
+					this.show = false
 					if (res.data.success) {
 						this.$u.toast('绑定成功')
-					}else{
+						this.$emit('reload')
+					} else {
 						this.$u.toast('操作失败')
 					}
 				})

+ 19 - 20
pages/bindRoom/bindRoom.vue

@@ -1,25 +1,22 @@
 <!-- 地址列表 -->
 <template>
 	<view class="address-wrap">
-		<view class="" v-if="$isNotEmpty(houseList)">
-			<u-checkbox-group :wrap="true" v-for="(item,index) in houseList" :key="index">
-				<view class="card_list" @click="checked(item)">
-					<view class="card_list_left">
-						<u-icon name="home"></u-icon>
-						<text class="padding-left-10">{{item.residentialName}} | {{item.buildingName}} |
-							{{item.unitName}} | {{item.roomName}}</text>
-					</view>
-					<view class="card_list_right">
-						<u-checkbox style="float: right;" v-model="item.checked" :name="item.id"></u-checkbox>
-					</view>
+		<u-checkbox-group :wrap="true" v-for="(item,index) in houseList" :key="index">
+			<view class="card_list" @click="checked(item)">
+				<view class="card_list_left">
+					<u-icon name="home"></u-icon>
+					<text class="padding-left-10">{{item.address}}</text>
 				</view>
-			</u-checkbox-group>
-		</view>
-		<u-empty v-else src="/static/common/empty.png" icon-size="180" marginTop="300"></u-empty>
+				<view class="card_list_right">
+					<u-checkbox style="float: right;" v-model="item.checked" :name="item.id"></u-checkbox>
+				</view>
+			</view>
+		</u-checkbox-group>
 
-		<view class="" style="position: fixed;bottom: 80rpx;left: 0;right: 0;margin: auto;width: 270rpx;">
-			<u-button size="medium" :customStyle="confirmStyle" type="primary" @click="confirm">确定绑定</u-button>
+		<view
+			style="position: fixed;bottom: 70rpx;display: flex;justify-content: center;align-items: center;width: 100%;">
 			<u-button size="medium" :customStyle="cancelStyle" @click="auth">创建新房间</u-button>
+			<u-button size="medium" :customStyle="confirmStyle" type="primary" @click="confirm">确定绑定</u-button>
 		</view>
 	</view>
 </template>
@@ -31,13 +28,15 @@
 			return {
 				houseList: [],
 				cancelStyle: {
-					marginTop: '20rpx', // 注意驼峰命名,并且值必须用引号包括,因为这是对象
+					width: '260rpx',
 					border: '1rpx solid #d0d0d0',
-					color:'#171717',
-					width:'270rpx'
+					borderRadius: 0,
+					marginRight: '20rpx'
 				},
 				confirmStyle: {
-					width:'270rpx'
+					width: '260rpx',
+					borderRadius: 0,
+					marginLeft: '20rpx'
 				}
 			};
 		},

+ 44 - 40
pages/empty/empty.vue

@@ -1,13 +1,14 @@
 <template>
 	<view style="background-color: #fff;min-height: 100vh;">
-		<view class="default" >
-		  <image src="/static/common/empty.png" mode="heightFix"></image>
-		  <view style="font-size: 26rpx;">
-		    <text style="color: #909090;">{{msg}}</text>
-		  </view>
-		  <navigator :url="url" class="cu-btn round bg-btn margin-top-50" style="padding: 35rpx 65rpx;margin-left: 8rpx;">
+		<view class="default">
+			<image src="/static/common/empty.png"></image>
+			<view style="font-size: 26rpx;">
+		 	<text style="color: #909090;">{{msg}}</text>
+			</view>
+			<navigator :url="url" class="cu-btn sm  margin-top-50"
+				style="padding: 35rpx 65rpx;margin-left: 8rpx;background-color: #FFFFFF;border: 1rpx solid #d0d0d0;color: #606266;font-size: 26rpx;">
 				{{btnName}}
-		  </navigator>
+			</navigator>
 		</view>
 	</view>
 </template>
@@ -16,63 +17,66 @@
 	export default {
 		data() {
 			return {
-				msg:"您还未完成注册认证",
-				btnName:"去注册认证",
-				url:"../register/register"
+				msg: "您还未完成注册认证",
+				btnName: "去注册认证",
+				url: "../register/register"
 			}
 		},
 		onLoad(options) {
-			if(options.type=='2'){
+			if (options.type == '2') {
 				this.getHouseUser()
 				this.initData()
 			}
 		},
 		methods: {
-			initData(){
+			initData() {
 				//导航栏标题
 				uni.setNavigationBarTitle({
-					title:"房屋认证"
+					title: "房屋认证"
 				})
 				//去认证
-				this.msg="您还未完成房屋认证"
-				this.btnName="去认证"
+				this.msg = "您还未完成房屋认证"
+				this.btnName = "去认证"
 			},
-			async getHouseUser(){
-				let member=getApp().globalData.member
+			async getHouseUser() {
+				let member = getApp().globalData.member
 				if (this.$isEmpty(member)) {
-					this.url="../auth/auth"
+					this.url = "../auth/auth"
 					return
 				}
-				let params={
-					name:member.name,
-					phone:member.tel
+				let params = {
+					name: member.name,
+					phone: member.tel
 				}
-				let res=await this.$http.getHouseUserCondition(params)
-				let list=res.data.data
+				let res = await this.$http.getHouseUserCondition(params)
+				let list = res.data.data
 				if (this.$isEmpty(list)) {
-					this.url="../auth/auth"
+					this.url = "../auth/auth"
 					return
 				}
-				uni.setStorageSync('houseList',list)
-				this.url="../bindRoom/bindRoom"
+				uni.setStorageSync('houseList', list)
+				this.url = "../bindRoom/bindRoom"
 			}
 		}
 	}
 </script>
 
 <style lang="scss">
-.default {
-  text-align: center;
-  position: fixed;
-  left: 50%;
-  top: 40%;
-  transform: translate(-50%, -50%);
-}
-.default text{
-	color: #AAAAAA;
-}
-.default image {
-  height: 160rpx;
-  display: inline-block;
-}
+	.default {
+		text-align: center;
+		position: fixed;
+		left: 50%;
+		top: 40%;
+		transform: translate(-50%, -70%);
+	}
+
+	.default text {
+		color: #AAAAAA;
+	}
+
+	.default image {
+		height: 180rpx;
+		width: 180rpx;
+		display: inline-block;
+	}
 </style>

+ 31 - 21
pages/index/index.vue

@@ -100,7 +100,7 @@
 			<u-divider bgColor="#f1f1f1;" height="80">到底了</u-divider>
 		</view>
 		<login ref="login" @signIn="signIn"></login>
-		<bindHome v-if="vuex_member"></bindHome>
+		<bindHome v-if="vuex_member" @reload="onshow"></bindHome>
 	</view>
 </template>
 
@@ -225,25 +225,7 @@
 			}
 		},
 		onShow() {
-			this.login()
-			// this.fetchNoticeList()
-			//获取访客授权待审核的数量
-			if (this.canReset) this.fetchAuthRecordNum()
-			this.canReset = true
-
-			//获取设备列表
-			this.getAuthDevice()
-
-			//处理进入小程序的不同场景
-			this.execParam();
-			// this.loadData()
-			//每次打开此页面都把商品数组打乱
-			// this.$u.randomArray(this.goodsList)
-			if (this.isFirst) {
-				this.isFirst = false
-			} else {
-				this.getResidentialListByMember()
-			}
+			this.onshow()
 		},
 		onLoad(options) {
 			that = this
@@ -258,6 +240,27 @@
 			// this.fetchGoodsList()
 		},
 		methods: {
+			onshow(){
+				this.login()
+				// this.fetchNoticeList()
+				//获取访客授权待审核的数量
+				if (this.canReset) this.fetchAuthRecordNum()
+				this.canReset = true
+				
+				//获取设备列表
+				this.getAuthDevice()
+				
+				//处理进入小程序的不同场景
+				this.execParam();
+				// this.loadData()
+				//每次打开此页面都把商品数组打乱
+				// this.$u.randomArray(this.goodsList)
+				if (this.isFirst) {
+					this.isFirst = false
+				} else {
+					this.getResidentialListByMember()
+				}
+			},
 			signIn() {
 				this.getOpenId();
 			},
@@ -570,6 +573,13 @@
 					_this.getAuthDevice()
 					_this.fetchAuthRecordNum()
 					_this.getOwnRoomList()
+				}else{
+					uni.removeStorageSync("personTel");
+					uni.removeStorageSync("plotName");
+					uni.removeStorageSync("residentialId");
+					uni.removeStorageSync("doorNeedAudit");
+					uni.removeStorageSync("myPhone");
+					uni.removeStorageSync("residentialList");
 				}
 			},
 			getOwnRoomList(){
@@ -615,7 +625,7 @@
 					let doorNeedAuditList = []
 					let residentialIdList = [];
 					let personTelList = []
-
+					
 					if (res.data.success) {
 						that.fetchNoticeList(res.data.data[0].residentialId);
 						app.globalData.userId = res.data.data[0].userId

+ 0 - 3
pages/myFamily/add/add.vue

@@ -440,10 +440,7 @@
 				params['memberId'] = app.globalData.member.id;
 				params['operatorName'] = app.globalData.member.name;
 				params['createType'] = '0'; //申请来源0-小程序添加 1-后台添加  2-后台导入 3-app添加
-
 				params['recordType'] = '1'; ///申请的记录类型 0--认证类型 1--新增类型 2--编辑类型
-				// let operation = 'member/authentication';
-				console.log(params,"params");
 				this.$dialog.showLoading('请等待...')
 				let res = await that.$http.authentication(params)
 				uni.hideLoading()

+ 118 - 112
pages/myFamily/comps/apply-card.vue

@@ -1,10 +1,11 @@
 <template>
 	<view class="">
-		<view class="data" v-for="(item, index) in list" :key="index" >
+		<view class="data" v-for="(item, index) in list" :key="index">
 			<view class="top">
 				<view class="left">
 					<u-icon name="home" :size="30" color="rgb(94,94,94)"></u-icon>
-					<view class="title">{{item.residentialName}}-{{item.buildingName}}-{{item.unitName}}-{{item.roomName}}</view>
+					<view class="title">
+						{{item.residentialName}}-{{item.buildingName}}-{{item.unitName}}-{{item.roomName}}</view>
 				</view>
 				<view class="right">
 					<text v-if="item.auditStatus==0" class="text-warning">待审核</text>
@@ -14,146 +15,151 @@
 			</view>
 			<view class="item">
 				<view class="left">
-					<view  data-aid="undefined">
-					  <image v-if="!$isEmpty(item.faceUrl)" mode="aspectFill" :src="item.faceUrl"></image>
-					  <image v-else="" mode="aspectFill" src="https://szsq.nxzhsq.cn/community/miniofile/image/head.png"></image>
+					<view data-aid="undefined">
+						<image v-if="!$isEmpty(item.faceUrl)" mode="aspectFill" :src="item.faceUrl"></image>
+						<image v-else="" mode="aspectFill"
+							src="https://szsq.nxzhsq.cn/community/miniofile/image/head.png"></image>
 					</view>
 					<view class="content" data-aid="undefined">
-						<view >
+						<view>
 							<text>姓名:{{item.name}}</text>
-							<text v-if="item.type==0"  class="cu-tag radius line-blue sm margin-left-20">业主</text>
+							<text v-if="item.type==0" class="cu-tag radius line-blue sm margin-left-20">业主</text>
 							<text v-if="item.type==1" class="cu-tag radius line-blue sm margin-left-20">家属</text>
 							<text v-if="item.type==2" class="cu-tag radius line-blue sm margin-left-20">租客</text>
 							<text v-if="item.type==3" class="cu-tag radius line-blue sm margin-left-20">访客</text>
 						</view>
-						<view >手机:{{item.phone}}</view>
-						<view >申请时间:{{item.createTime}}</view>
-						<view  v-if="item.auditStatus==2">
-						    <text>审核意见:</text>
-							<text >{{item.checkOpinion}}</text>
+						<view>手机:{{item.phone}}</view>
+						<view>申请时间:{{item.createTime}}</view>
+						<view v-if="item.auditStatus==2">
+							<text>审核意见:</text>
+							<text class="text-red">{{item.checkOpinion}}</text>
 						</view>
 					</view>
 				</view>
 			</view>
-			<view class="bottom" >
-				<view @click="edit(item)" v-if="item.auditStatus==2"  class="cu-btn line-btn round sm margin-right-sm" >
-					重新提交
-				</view>
-			</view>
 		</view>
 	</view>
 </template>
 
 <script>
-export default {
-	props:{
-		list:Array
-	},
-	data() {
-		return {
-			
-		};
-	},
-	computed:{
-	    editShow() {
-			return item => {
-				//旧版本的逻辑,有点看不懂
-				if (item.auditStatus!=2) {
-					return false
-				}
-				this.vuex_own_room_list.forEach(val=>{
-					if (val.id==item.roomId) {
-						return true
-					}else{
+	export default {
+		props: {
+			list: Array
+		},
+		data() {
+			return {
+
+			};
+		},
+		computed: {
+			editShow() {
+				return item => {
+					//旧版本的逻辑,有点看不懂
+					if (item.auditStatus != 2) {
 						return false
 					}
-				})
-			};
+					this.vuex_own_room_list.forEach(val => {
+						if (val.id == item.roomId) {
+							return true
+						} else {
+							return false
+						}
+					})
+				};
+			},
 		},
-	},
-	onLoad() {
-		
-	},
-	methods:{
-		edit(item){
-			let params={
-				apply_user_id:item.id,
-				name:item.name,
-				tel:item.tel,
-				room_name:item.roomName,
-				type:item.type,
-				user_id: item['userId'],
-				id_card:item.idCard || '',
-				sex:item.sex,
-				nationality:item.nationality,
-				faceUrl:item.faceUrl,
-				passport_img_uri:item.passportImgUri || '',
-				entry_img_uri:item.entryImgUri
-			}
-			if (this.vuex_relationshipType==0) {
-				//业主身份操作
-				params['operUserType']=0
-			}else{
-				//不是业主身份操作
-				params['operUserType']=item.type
+		onLoad() {
+
+		},
+		methods: {
+			edit(item) {
+				let params = {
+					apply_user_id: item.id,
+					name: item.name,
+					tel: item.phone,
+					room_name: item.roomName,
+					type: item.type,
+					user_id: item['userId'],
+					id_card: item.idCard || '',
+					sex: item.sex,
+					nationality: item.nationality,
+					faceUrl: item.faceUrl,
+					passport_img_uri: item.passportImgUri || '',
+					entry_img_uri: item.entryImgUri
+				}
+				if (this.vuex_relationshipType == 0) {
+					//业主身份操作
+					params['operUserType'] = 0
+				} else {
+					//不是业主身份操作
+					params['operUserType'] = item.type
+				}
+				uni.navigateTo({
+					url: "/pages/myFamily/editApplyFamily/editApplyFamily" + this.$u.queryParams(params)
+				})
 			}
-			uni.navigateTo({
-				url:"/pages/myFamily/editApplyFamily/editApplyFamily"+this.$u.queryParams(params)
-			})
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.data {
-	background-color: #FFFFFF;
-	width: 720rpx;
-	margin:10rpx auto;
-	border-radius: 6rpx;
-	box-sizing: border-box;
-	padding: 20rpx;
-	font-size: 28rpx;
-	border-bottom: 1rpx solid #d1d1d1;
-	.top {
-		display: flex;
-		justify-content: space-between;
-		border-bottom: 1rpx dashed #DEDEDE;
-		padding-bottom: 20rpx;
-		.left {
+	.data {
+		background-color: #FFFFFF;
+		width: 720rpx;
+		margin: 10rpx auto;
+		border-radius: 6rpx;
+		box-sizing: border-box;
+		padding: 20rpx;
+		font-size: 28rpx;
+		border-bottom: 1rpx solid #d1d1d1;
+
+		.top {
 			display: flex;
-			align-items: center;
-			.title {
-				margin: 0 10rpx;
-				font-size: 32rpx;
+			justify-content: space-between;
+			border-bottom: 1rpx dashed #DEDEDE;
+			padding-bottom: 20rpx;
+
+			.left {
+				display: flex;
+				align-items: center;
+
+				.title {
+					margin: 0 10rpx;
+					font-size: 32rpx;
+				}
 			}
 		}
-	}
-	.item {
-		display: flex;
-		flex-direction: row;
-		justify-content: space-between;
-		margin: 40rpx 0 20rpx 0;
-		.left {
+
+		.item {
 			display: flex;
-			image {
-				width: 130rpx;
-				height: 130rpx;
-				border-radius: 50%;
-			}
-			.content {
-				padding-left: 30rpx;
-				view{
-					padding-bottom: 16rpx;
+			flex-direction: row;
+			justify-content: space-between;
+			margin: 40rpx 0 20rpx 0;
+
+			.left {
+				display: flex;
+
+				image {
+					width: 130rpx;
+					height: 130rpx;
+					border-radius: 50%;
+				}
+
+				.content {
+					padding-left: 30rpx;
+
+					view {
+						padding-bottom: 16rpx;
+					}
 				}
 			}
 		}
+
+		.bottom {
+			display: flex;
+			margin-top: 20rpx;
+			justify-content: flex-end;
+			align-items: center;
+		}
 	}
-	.bottom {
-		display: flex;
-		margin-top: 20rpx;
-		justify-content: flex-end;
-		align-items: center;
-	}
-}
 </style>

+ 858 - 0
pages/myFamily/editApplyFamily/editApplyFamily - 副本.vue

@@ -0,0 +1,858 @@
+<template>
+<view class="container edit_wrap">
+	<u-toast ref="uToast" />
+  <form :style="'pointer-events:' + (waitAudit?'none':'auto')">
+    <view class="form_group">
+      <text class="red">*</text>
+      <text class="sex">姓名:</text>
+      <input disabled="true" placeholder-class="placeholder_style" type="text" :value="name" class="placeholder_style">
+      </input>
+    </view>
+    <view class="form_group">
+      <text class="red">*</text>
+      <text class="sex">手机号:</text>
+      <input name="data_name" @input="telFun" placeholder="请输入11位手机号码" placeholder-class="placeholder_style" type="text" :value="tel" class="placeholder_style">
+      </input>
+    </view>
+    <view class="form_group">
+      <text class="red">*</text>
+      <text class="sex">房间号:</text>
+      <input disabled="true" name="data_name" placeholder-class="placeholder_style" type="text" :value="room_name" class="placeholder_style">
+      </input>
+    </view>
+    <view class="form_group">
+      <text class="red">*</text>
+      <text class="sex">住户类型:</text>
+      <view class="ar_picker" style="background:#fff">
+        <view class="ar_picker_wrap">
+          <picker @change="typeChange" :value="type" :range="typeArray">
+            <view>
+              <text>{{typeArray[type]}}</text>
+            </view>
+          </picker>
+        </view>
+      </view>
+    </view>
+    <view class="form_group">
+      <text class="red">*</text>
+      <text class="sex">国籍:</text>
+      <view class="ar_picker" style="background:#fff">
+        <view class="ar_picker_wrap">
+          <picker @change="nationalityChange" :value="nationality" :range="nationalityArray">
+            <view>
+              <text>{{nationalityArray[nationality]}}</text>
+            </view>
+          </picker>
+        </view>
+      </view>
+    </view>
+    <view class="form_group">
+      <text class="sex">证件类型:</text>
+      <input :value="nationalityName" disabled="true" placeholder-class="placeholder_style" type="text" class="placeholder_style">
+      </input>
+    </view>
+     <view class="form_group">
+      <text class="sex">证件号码:</text>
+      <input @input="id_cardFun" name="data_name" placeholder="住户类型是业主时,必填" placeholder-class="placeholder_style" type="text" :value="id_card" class="placeholder_style">
+      </input>
+    </view>
+    <view class="form_group">
+      <text class="sex">性别:</text>
+<!--     <radio-group class="item-right radio-group" @change="sexChange">
+        <label v-for="(item, index) in sexArray" :key="index" class="radio">
+          <radio :class="item.checked?'red checked':''" color="#2e7eff" :value="item.sex" :checked="item.checked"></radio>{{item.name}}
+        </label>
+      </radio-group> -->
+	  <u-radio-group class="item-right radio-group" v-model="sex" >
+	  	<u-radio shape="circle"  name="1">男</u-radio>
+	  	<u-radio shape="circle"  name="2">女</u-radio>
+	  </u-radio-group>
+    </view>
+    <view v-if="waitAudit" class="form_group" :style="'pointer-events:' + (waitAudit?'auto':'none')">
+      <text class="sex">审核原因:</text>
+      <input @input="checkOpinionFun" placeholder="请填写审核原因" placeholder-class="placeholder_style" type="text" :value="checkOpinion" class="placeholder_style"></input>
+    </view>
+      <view v-if="nationality==3">
+      <view class="form_group mb0">
+        <view>
+          <text class="red">*</text>
+          <text class="sex">护照图片:</text>
+          <text class="tips">(基本身份信息页)</text>
+        </view>
+      </view>
+	  <view @click="operaType=1;chooseImage()" style="margin: 30rpx 0 10rpx 0;display: flex;align-items: center;flex-direction: column;">
+	    <upload-img
+	  	  :width="$isEmpty(show_passport_img_uri)?bgWidth:imgWidth"
+	  	  :height="$isEmpty(show_passport_img_uri)?bgHeight:imgHeight"
+	  	  :currentImage="show_passport_img_uri"
+	  	  :bgsrc="bgsrc"
+	  	  >
+	    </upload-img>
+	    <view class="" style="color: #59a5f0;">
+	  	 <text class="cuIcon-camera padding-right-sm" style="font-size: 30rpx;"></text>
+	  	 <text v-if="$isEmpty(show_passport_img_uri)">点击上传护照</text>
+	  	 <text style="margin-top: 40rpx;display: inline-block;" v-else>点击重新上传</text>
+	    </view>
+	  </view>
+    </view>
+
+    <view v-if="nationality==3">
+      <view class="form_group mb0">
+        <view>
+          <text class="red">*</text>
+          <text class="sex">入境证明:</text>
+          <text class="tips">(入镜盖章页)</text>
+        </view>
+      </view>
+	  
+	  <view @click="operaType=2;chooseImage()" style="margin: 30rpx 0 10rpx 0;display: flex;align-items: center;flex-direction: column;">
+	    <upload-img
+	  	  :width="$isEmpty(show_entry_img_uri)?bgWidth:imgWidth"
+	  	  :height="$isEmpty(show_entry_img_uri)?bgHeight:imgHeight"
+	  	  :currentImage="show_entry_img_uri"
+	  	  :bgsrc="bgsrc"
+	  	  >
+	    </upload-img>
+	    <view class="" style="color: #59a5f0;">
+	  	 <text class="cuIcon-camera padding-right-sm" style="font-size: 30rpx;"></text>
+	  	 <text v-if="$isEmpty(show_entry_img_uri)">点击上传入境证明</text>
+	  	 <text style="margin-top: 40rpx;display: inline-block;" v-else>点击重新上传</text>
+	    </view>
+	  </view>
+    </view>
+
+
+
+    <view v-if="appletType==1">
+		<view class="form_group mb0">
+		  <view>
+		    <text class="red">*</text>
+		    <text class="sex">人脸:</text>
+		    <text class="tips">(人脸用于开门,请上传正脸图片)</text>
+		  </view>
+		</view>
+	  <view @click="show=true;operaType=3" style="margin: 30rpx 0 10rpx 0;display: flex;align-items: center;flex-direction: column;">
+	    <upload-img
+	  	  :width="$isEmpty(show_image_uri)?bgWidth:imgWidth"
+	  	  :height="$isEmpty(show_image_uri)?bgHeight:imgHeight"
+	  	  :currentImage="show_image_uri"
+	  	  :bgsrc="bgsrc"
+	  	  >
+	    </upload-img>
+	    <view class="" style="color: #59a5f0;">
+	  	 <text class="cuIcon-camera padding-right-sm" style="font-size: 30rpx;"></text>
+	  	 <text v-if="$isEmpty(show_image_uri)">点击上传人脸</text>
+	  	 <text style="margin-top: 40rpx;display: inline-block;" v-else>点击重新上传</text>
+	    </view>
+	  </view>
+      <view class="category">
+        <view v-for="(item, index) in iconArray" :key="index" class="category_item">
+          <view class="category_item_wrap" :data-index="item.index">
+            <view class="icon_wrap">
+              <image :src="item.iconUrl" class="index_icon"></image>
+            </view>
+            <view class="category_item_text">
+              <text>{{item.iconText}}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </form>
+ <view  @click="editApplyUser"  class=" footer-fixed" >
+  	<view class="cu-btn  flex  text-lg bg-red-btn" style="padding: 46rpx 0;">
+  		提交修改
+  	</view>
+  </view>
+  
+  <view  v-if="waitAudit"  class=" footer-fixed" >
+	  <view class="flex">
+	  	<view @click="auditBtn" data-id="1" class="cu-btn  flex-sub  text-lg bg-blue" style="padding: 46rpx 0rpx;">
+	  		审核通过
+	  	</view>
+		<view @click="auditBtn" data-id="2" class="cu-btn  flex-sub light text-lg bg-orange " style="padding: 46rpx 0;">
+			审核不通过
+		</view>
+	  </view>
+  </view>
+  <u-action-sheet @click="photoChecked"  z-index="999999" :list="list" v-model="show"></u-action-sheet>
+</view>
+</template>
+
+<script>
+import uploadImg from '@/comps/uploadimg/uploadImg.vue'
+//获取app实例
+var app = getApp();
+
+export default {
+	components:{
+		uploadImg
+	},
+  data() {
+    return {
+		//操作类型,业主操作 0 其他
+		operUserType:'',
+		
+		// 小程序的审核状态
+		appletType:0,
+		
+		//默认点击弹出拍照模态框的是人脸上传操作,1:护照,2:入境,3:人脸
+		operaType:3,
+		//人脸上传模态框,上传照片或拍照
+		list: [{
+			text: '相册上传',
+		}, {
+			text: '拍照上传'
+		}],
+		show: false,
+		
+		//背景图
+		bgsrc:'http://139.9.103.171:1888/img/image/camera1.png',
+		bgWidth:350,
+		bgHeight:320,
+		//显示图
+		imgWidth:540,
+		imgHeight:400,
+		
+      user_id: null,
+      //修改的住户id
+      name: null,
+      //姓名
+      tel: null,
+      //电话号码
+      room_name: null,
+      //房间名字
+      typeArray: ['业主', '家属', '租户'],
+      type: 0,
+      nationalityArray: ['中国大陆', '中国香港/澳门', '中国台湾', '海外'],
+      nationality: 0,
+      nationalityName: '身份证',
+      id_card: null,
+      //身份证
+      sexArray: null,
+      sex: null	,
+      passport_img_uri: null,
+      //护照照片
+      show_passport_img_uri: null,
+      //护照照片回显
+      entry_img_uri: null,
+      //入境证明
+      show_entry_img_uri: null,
+      //入境证明回显
+      image_uri: null,
+      //人脸图片地址
+      show_image_uri: null,
+      //人脸回显
+      face_code: null,
+      iconArray: [{
+        "iconUrl": "http://139.9.103.171:1888/img/image/zd.png",
+        "iconText": '不要遮挡',
+        "index": 1
+      }, {
+        "iconUrl": "http://139.9.103.171:1888/img/image/mj.png",
+        "iconText": '不戴墨镜',
+        "index": 2
+      }, {
+        "iconUrl": "http://139.9.103.171:1888/img/image/zl.png",
+        "iconText": '不能仰头俯拍',
+        "index": 3
+      }, {
+        "iconUrl": "http://139.9.103.171:1888/img/image/cz.png",
+        "iconText": '光线充足',
+        "index": 4
+      }, {
+        "iconUrl": "http://139.9.103.171:1888/img/image/bg.png",
+        "iconText": '浅色背景',
+        "index": 5
+      }, {
+        "iconUrl": "http://139.9.103.171:1888/img/image/sh.png",
+        "iconText": '物业审核生效',
+        "index": 6
+      }],
+      waitAudit: false,
+      //判断是否从审核跳过来
+      checkOpinion: '' //审核原因
+      ,
+      apply_user_id: "",
+      own_room_list_index: ""
+    };
+  },
+
+  components: {},
+  props: {},
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+	  
+	  this.operUserType=options.operUserType
+	  
+    let apply_user_id = options.apply_user_id;
+    let name = options.name;
+    let tel = options.tel;
+    let room_name = options.room_name;
+    let type = options.type;
+	this.user_id = options.user_id;
+    let nationality = options.nationality;
+    let nationalityName = '';
+
+    if (nationality == 0) {
+      nationalityName = '身份证';
+    } else if (nationality == 1) {
+      nationalityName = '港澳居民往来内地通行证';
+    } else if (nationality == 2) {
+      nationalityName = '台湾居民往来大陆通行证';
+    } else if (nationality == 3) {
+      nationalityName = '护照';
+    }
+
+    this.setData({
+      nationality: nationality,
+      nationalityName: nationalityName
+    });
+    let id_card = options.id_card;
+    let sex = options.sex;
+    let passport_img_uri = options.passport_img_uri;
+    let entry_img_uri = options.entry_img_uri;
+    let image_uri = options.image_uri; //选中性别
+
+    let sexArray = [{
+      name: '男',
+      checked: false,
+      sex: "1"
+    }, {
+      name: '女',
+      checked: false,
+      sex: "2"
+    }];
+
+    for (let i in sexArray) {
+      if (sexArray[i].sex == sex) {
+        sexArray[i].checked = true;
+      }
+    }
+
+    if (options.waitAudit || options.waitAudit != undefined || options.waitAudit != null) {
+      uni.setNavigationBarTitle({
+        title: '住户审核'
+      });
+      this.setData({
+        waitAudit: options.waitAudit
+      });
+    }
+
+    this.setData({
+      apply_user_id: apply_user_id,
+      name: name,
+      tel: tel,
+      room_name: room_name,
+      type: type,
+      nationality: nationality,
+      id_card: id_card,
+      sex: sex,
+      show_image_uri: image_uri,
+      show_passport_img_uri: passport_img_uri,
+      show_entry_img_uri: entry_img_uri,
+      sexArray: sexArray
+    });
+  },
+  onShow() {
+	 this.appletType=uni.getStorageSync("appletType") 
+	 
+  	//获取当前页面的对象
+  	let currPage=this.$util.getPageCtx()
+  	if(!this.$isEmpty(currPage.data.image)){
+  		this.uploadImage(currPage.data.image)
+  	} 
+  },
+  methods: {
+	//点击模态框选项触发
+	photoChecked(index){
+		if (index==0) {
+			//图片上传
+			this.chooseImage()
+		} else if(index==1){
+			//拍照上传
+			uni.navigateTo({
+				url:"../../my-camera/my-camera"
+			})
+		}
+	},
+	/**
+	 * 点击上传图片事件
+	 */
+	chooseImage: function () {
+	  var that = this;
+	  uni.chooseImage({
+	    count: 1,
+	    //最多可以选择的图片张数,默认9
+	    sourceType: ['album', 'camera'],
+	    sizeType: ['compressed'],
+	    //可选择原图或压缩后的图片
+	    success: res => {
+	      let tempFilePaths = res.tempFilePaths;
+		  that.uploadImage(tempFilePaths[0])
+	    }
+	  });
+	},
+	/**上传图片
+	 * @param {Object} imgUrl 图片url
+	 */
+	uploadImage(imgUrl){
+		console.log("operatype: ",this.operaType);
+		console.log("imgUrl",imgUrl)
+		var that = this;
+		//是否需要md5加密上传人脸照
+		let is_need_md5 = false;
+		if (this.operaType == 3) {
+		  is_need_md5 = true;
+		}
+		that.$http.uploadFile(imgUrl).then(res =>{
+			if (that.operaType == 1) {
+			  that.setData({
+			    passport_img_uri: res.data.name,
+			    show_passport_img_uri: imgUrl
+			  });
+			} else if (that.operaType == 2) {
+			  that.setData({
+			    entry_img_uri: res.data.name,
+			    show_entry_img_uri: imgUrl
+			  });
+			} else if (that.operaType == 3) {
+			  that.setData({
+			    image_uri: res.data.name,
+			    show_image_uri: imgUrl,
+			    face_code: res.data.imgMd5
+			  });
+			}
+		})
+		
+	},
+	  
+	  
+    //获取input的标签值
+    nameFun: function (e) {
+      this.setData({
+        name: e.detail.value
+      });
+    },
+    telFun: function (e) {
+      this.setData({
+        tel: e.detail.value
+      });
+    },
+    id_cardFun: function (e) {
+      this.setData({
+        id_card: e.detail.value
+      });
+    },
+    checkOpinionFun: function (e) {
+      this.setData({
+        checkOpinion: e.detail.value
+      });
+    },
+    // 住户类型
+    typeChange: function (e) {
+      this.setData({
+        type: e.detail.value
+      });
+    },
+    // 类别选择
+    roomIdChange: function (e) {
+      this.setData({
+        own_room_list_index: e.detail.value
+      });
+    },
+    //性别
+    sexChange: function (enent) {
+      this.setData({
+        sex: enent.detail.value
+      });
+    },
+    // 国籍
+    nationalityChange: function (e) {
+      let nationality = e.detail.value;
+      let nationalityName = '';
+
+      if (nationality == 0) {
+        nationalityName = '身份证';
+      } else if (nationality == 1) {
+        nationalityName = '港澳居民往来内地通行证';
+      } else if (nationality == 2) {
+        nationalityName = '台湾居民往来大陆通行证';
+      } else if (nationality == 3) {
+        nationalityName = '护照';
+      }
+
+      this.setData({
+        nationality: nationality,
+        nationalityName: nationalityName
+      });
+    },
+    //编辑
+    editApplyUser: function () {
+      let that = this;
+      let params = {};
+      let apply_user_id = that.apply_user_id;
+      params['apply_user_id'] = apply_user_id;
+      let tel = that.tel;
+
+      if (!tel) {
+        app.globalData.autoFailHint("请填写手机");
+        return;
+      } //手机号码正则校验
+      if (!this.$u.test.mobile(tel)) {
+        app.globalData.autoFailHint("请填写正确手机号");
+        return;
+      }
+
+      params['tel'] = tel;
+      let type = that.type;
+      params['type'] = type;
+      let id_card = that.id_card;
+      params['id_card'] = id_card; //业主身份时,身份证必填
+
+      if (type == 0 && !id_card) {
+        app.globalData.autoFailHint("住户类型是业主时,身份证必填");
+        return;
+      } //0 中国大陆 1 中国香港/澳门 2 中国台湾 3 海外
+	  if (!this.$isEmpty(id_card)) {
+	    //如果身份证号不为空,就校验身份证号
+		if (!this.$u.test.idCard(id_card)) {
+			app.globalData.autoFailHint("请输入正确的身份证号");
+			return;
+		}
+	  }
+
+      let nationality = that.nationality;
+      params['nationality'] = nationality;
+      let passport_img_uri = that.passport_img_uri;
+      let entry_img_uri = that.entry_img_uri;
+
+      if (nationality == 3) {
+        params['passportImgUri'] = that.passport_img_uri;
+        params['entryImgUri'] = that.entry_img_uri;
+
+        if (type == 0) {
+          if (!passport_img_uri && !that.show_passport_img_uri) {
+            app.globalData.autoFailHint("请上传护照图片");
+            return;
+          }
+
+          if (!entry_img_uri && !that.show_entry_img_uri) {
+            app.globalData.autoFailHint("请上传入境证明");
+            return;
+          }
+        }
+      }
+
+      let image_uri = that.image_uri;
+      let face_code = that.face_code;
+
+      if (image_uri && face_code) {
+        params['image_uri'] = that.image_uri;
+        params['face_code'] = that.face_code;
+      } //性别
+
+
+      params['sex'] = that.sex; //添加了人脸
+
+      params['member_id'] = app.globalData.member.id; //申请来源0-小程序添加 1-后台添加  2-后台导入 3-app添加
+
+      params['create_type'] = '0';
+	  params['user_id'] = that.user_id;
+	  params['oper_user_type'] = that.operUserType;
+	  params['operatorName'] = app.globalData.member.name;
+	  params['name'] = that.name;
+      let operation = 'applyUser/editApplyUser';
+	  this.$http.editFamily(params)
+	  .then(res => {
+		  //添加成功
+		  if (res.data.result_code == 1) {
+		    app.globalData.oneFailHint(res.data.result_msg, function () {
+		      uni.navigateBack({
+		        delta: 1 // 返回上一级页面。
+		  
+		      });
+		    });
+		  } else {
+		    app.globalData.oneFailHint(res.data.result_msg);
+		  }
+	  });
+    },
+
+    auditBtn(e) {
+      let that = this;
+      let params = {};
+
+      if (e.currentTarget.dataset.id == 2 && that.checkOpinion == '') {
+        app.globalData.autoFailHint("请先填写审核意见");
+        return;
+      }
+
+      params['id'] = that.apply_user_id;
+      params['auditStatus'] = e.currentTarget.dataset.id;
+      params['checkOpinion'] = that.checkOpinion;
+	  params['name'] = that.name;
+	  params['idCard'] = that.id_card;
+	  params['operatorId'] = that.vuex_member.id;
+	  params['operatorName'] = that.vuex_member.name;
+      // let operation = 'applyUser/updateCheckState';
+      that.$http.updateCheckState(params).then (res =>{
+		  if (res.data.result_code==1) {
+		  	that.$refs.uToast.show({
+		  		title: '审核成功',
+		  		type: 'success',
+		  		url: '/pages/myFamily/myFamily',
+		  		position:'top'
+		  	})
+		  } else {
+		    app.globalData.autoFailHint(res.data.msg);
+		  }
+        
+      });
+    }
+
+  }
+};
+</script>
+<style lang="scss">
+page{
+  overflow-y: scroll;
+  background: #fff;
+}
+.edit_wrap {
+	background-color: #FFFFFF;
+  font-size: 30rpx;
+  padding: 0rpx 20rpx 120rpx;
+  color: #333;
+}
+
+.form_group {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  margin: 20rpx 20rpx;
+  line-height: 80rpx;
+  position: relative;
+    font-size: 26rpx;
+}
+
+.form_group .red {
+  color: red;
+  position: absolute;
+  left: 0;
+}
+
+.form_group text.sex {
+  margin-left: 15px;
+  text-align: left;
+}
+
+.form_group .radio-group {
+  text-align: left;
+  width: 500rpx;
+  margin-top: 16rpx;
+}
+
+.form_group .radio-group .radio {
+  margin-right: 60rpx;
+}
+
+.form_group input, .form_group picker {
+  border: 1px solid #ddd;
+  border-radius: 8rpx;
+  height: 80rpx;
+  line-height: 80rpx;
+  padding: 0rpx 20rpx;
+  color: #333;
+  width: 460rpx;
+}
+
+.form_group button {
+  font-size: 30rpx;
+  height: 80rpx;
+  line-height: 80rpx;
+  border: 1px dotted #fff;
+  background: white;
+  padding: 0rpx;
+  margin: 0rpx;
+  outline: none;
+  color: #000;
+}
+
+.placeholder_style {
+  font-family: '微软雅黑';
+  color: #adadad;
+}
+
+.save_btn {
+  width: 600rpx;
+  background: #d24a58;
+  font-size: 32rpx;
+  color: #fff;
+  border-radius: 0rpx;
+  margin: 40rpx 0rpx 10rpx;
+}
+
+
+radio {
+  width: 38rpx;
+}
+
+radio .wx-radio-input {
+  border-radius: 50%;
+  width: 28rpx;
+  height: 28rpx;
+}
+
+
+radio .wx-radio-input.wx-radio-input-checked::before {
+  border-radius: 50%;
+  width: 44rpx;
+  height: 44rpx;
+  line-height: 44rpx;
+  text-align: center;
+  font-size: 26rpx; /* 对勾大小 26rpx */
+  color: #fff; /* 对勾颜色 */
+  background: $base-btn-color;
+  border-color: $base-btn-color;
+}
+
+.form_group .upload {
+  padding: 0 28rpx;
+  font-size: 26rpx;
+  background: $base-btn-color;
+  color: #fff;
+  border: none;
+}
+
+.upload_tips {
+  font-size: 24rpx;
+}
+
+.upload_bg {
+  position: relative;
+  text-align: center;
+}
+
+.mb0 {
+  margin-bottom: 0;
+}
+
+.form_group .tips {
+  margin-left: 50rpx;
+}
+
+.upload_bg .upload_bgImg {
+  width: 540rpx;
+  height: 400rpx;
+}
+
+.upload_bg .upload_btn {
+  width: 120rpx;
+  height: 120rpx;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  margin-left: -65rpx;
+  margin-top: -60rpx;
+}
+
+.upload_bg .upload_btn image {
+  width: 100%;
+  height: 100%;
+}
+
+.upload_text {
+  position: absolute;
+  top: 70%;
+  left: 50%;
+  transform: translate(-50%, 0);
+  color: $base-btn-color;
+}
+upload_bg{
+  position: relative;
+text-align: center;
+}
+
+.upload_bg .upload_btn{
+  width: 120rpx;
+  height: 120rpx;
+  position: absolute;
+  left: 50%;
+  top: 40%;
+  margin-left: -65rpx;
+  margin-top: -60rpx;
+
+}
+.upload_bg .upload_btn image{
+  width: 100%;
+  height: 100%;
+}
+.upload_text{
+   position: absolute;
+   top: 55%;
+   width:100%;
+   color:$base-btn-color;
+     
+ 
+}
+
+.img_content .upload_bgImg{
+  
+  display: inline-block;
+}
+.reUpload{
+  height: 60rpx;
+  line-height: 60rpx;
+  text-align:right;
+  color: #333;
+  padding-right: 100rpx;
+}
+.img_content .img_icon{
+  width: 40rpx;
+  height: 40rpx;
+  vertical-align: text-top;
+  margin-right: 6rpx;
+  border-radius: 20rpx;
+}
+.category {
+  padding:20px 20rpx 0;
+  overflow: auto;
+  background-color: #FFF;
+text-align:center;
+
+}
+.category_item {
+  width: 33.3%;
+  float: left;
+  margin-bottom: 40rpx;
+}
+.icon_wrap {
+  width: 120rpx;
+  margin: 0 auto;
+  margin-bottom: 5px;
+}
+.index_icon {
+  width: 60rpx;
+  height: 60rpx;
+}
+.category_item_text {
+  text-align: center;
+  font-size: 24rpx;
+  color: #999;
+}
+.bottom_btn{
+  width:100%;
+  background: $base-btn-color;
+  font-size: 32rpx;
+  color: #fff;
+  border-radius: 10rpx;
+  margin: 20rpx 10rpx;
+  height: 100rpx;
+  text-align: center;
+  line-height: 100rpx;
+}
+</style>

+ 861 - 850
pages/myFamily/editApplyFamily/editApplyFamily.vue

@@ -1,864 +1,875 @@
 <template>
-<view class="container edit_wrap">
-	<u-toast ref="uToast" />
-  <form :style="'pointer-events:' + (waitAudit?'none':'auto')">
-    <view class="form_group">
-      <text class="red">*</text>
-      <text class="sex">姓名:</text>
-      <input disabled="true" placeholder-class="placeholder_style" type="text" :value="name" class="placeholder_style">
-      </input>
-    </view>
-    <view class="form_group">
-      <text class="red">*</text>
-      <text class="sex">手机号:</text>
-      <input name="data_name" @input="telFun" placeholder="请输入11位手机号码" placeholder-class="placeholder_style" type="text" :value="tel" class="placeholder_style">
-      </input>
-    </view>
-    <view class="form_group">
-      <text class="red">*</text>
-      <text class="sex">房间号:</text>
-      <input disabled="true" name="data_name" placeholder-class="placeholder_style" type="text" :value="room_name" class="placeholder_style">
-      </input>
-    </view>
-    <view class="form_group">
-      <text class="red">*</text>
-      <text class="sex">住户类型:</text>
-      <view class="ar_picker" style="background:#fff">
-        <view class="ar_picker_wrap">
-          <picker @change="typeChange" :value="type" :range="typeArray">
-            <view>
-              <text>{{typeArray[type]}}</text>
-            </view>
-          </picker>
-        </view>
-      </view>
-    </view>
-    <view class="form_group">
-      <text class="red">*</text>
-      <text class="sex">国籍:</text>
-      <view class="ar_picker" style="background:#fff">
-        <view class="ar_picker_wrap">
-          <picker @change="nationalityChange" :value="nationality" :range="nationalityArray">
-            <view>
-              <text>{{nationalityArray[nationality]}}</text>
-            </view>
-          </picker>
-        </view>
-      </view>
-    </view>
-    <view class="form_group">
-      <text class="sex">证件类型:</text>
-      <input :value="nationalityName" disabled="true" placeholder-class="placeholder_style" type="text" class="placeholder_style">
-      </input>
-    </view>
-     <view class="form_group">
-      <text class="sex">证件号码:</text>
-      <input @input="id_cardFun" name="data_name" placeholder="住户类型是业主时,必填" placeholder-class="placeholder_style" type="text" :value="id_card" class="placeholder_style">
-      </input>
-    </view>
-    <view class="form_group">
-      <text class="sex">性别:</text>
-<!--     <radio-group class="item-right radio-group" @change="sexChange">
+	<view class="container edit_wrap">
+		<u-toast ref="uToast" />
+		<form :style="'pointer-events:' + (waitAudit?'none':'auto')">
+			<view class="form_group">
+				<text class="red">*</text>
+				<text class="sex">姓名:</text>
+				<input disabled="true" placeholder-class="placeholder_style" type="text" :value="name"
+					class="placeholder_style">
+				</input>
+			</view>
+			<view class="form_group">
+				<text class="red">*</text>
+				<text class="sex">手机号:</text>
+				<input name="data_name" @input="telFun" placeholder="请输入11位手机号码" placeholder-class="placeholder_style"
+					type="text" :value="tel" class="placeholder_style">
+				</input>
+			</view>
+			<view class="form_group">
+				<text class="red">*</text>
+				<text class="sex">房间号:</text>
+				<input disabled="true" name="data_name" placeholder-class="placeholder_style" type="text"
+					:value="room_name" class="placeholder_style">
+				</input>
+			</view>
+			<view class="form_group">
+				<text class="red">*</text>
+				<text class="sex">住户类型:</text>
+				<view class="ar_picker" style="background:#fff">
+					<view class="ar_picker_wrap">
+						<picker @change="typeChange" :value="type" :range="typeArray">
+							<view>
+								<text>{{typeArray[type]}}</text>
+							</view>
+						</picker>
+					</view>
+				</view>
+			</view>
+			<view class="form_group">
+				<text class="red">*</text>
+				<text class="sex">国籍:</text>
+				<view class="ar_picker" style="background:#fff">
+					<view class="ar_picker_wrap">
+						<picker @change="nationalityChange" :value="nationality" :range="nationalityArray">
+							<view>
+								<text>{{nationalityArray[nationality]}}</text>
+							</view>
+						</picker>
+					</view>
+				</view>
+			</view>
+			<view class="form_group">
+				<text class="sex">证件类型:</text>
+				<input :value="nationalityName" disabled="true" placeholder-class="placeholder_style" type="text"
+					class="placeholder_style">
+				</input>
+			</view>
+			<view class="form_group">
+				<text class="sex">证件号码:</text>
+				<input @input="id_cardFun" name="data_name" placeholder="住户类型是业主时,必填"
+					placeholder-class="placeholder_style" type="text" :value="id_card" class="placeholder_style">
+				</input>
+			</view>
+			<view class="form_group">
+				<text class="sex">性别:</text>
+				<!--     <radio-group class="item-right radio-group" @change="sexChange">
         <label v-for="(item, index) in sexArray" :key="index" class="radio">
           <radio :class="item.checked?'red checked':''" color="#2e7eff" :value="item.sex" :checked="item.checked"></radio>{{item.name}}
         </label>
       </radio-group> -->
-	  <u-radio-group class="item-right radio-group" v-model="sex" >
-	  	<u-radio shape="circle"  name="1">男</u-radio>
-	  	<u-radio shape="circle"  name="2">女</u-radio>
-	  </u-radio-group>
-    </view>
-    <view v-if="waitAudit" class="form_group" :style="'pointer-events:' + (waitAudit?'auto':'none')">
-      <text class="sex">审核原因:</text>
-      <input @input="checkOpinionFun" placeholder="请填写审核原因" placeholder-class="placeholder_style" type="text" :value="checkOpinion" class="placeholder_style"></input>
-    </view>
-      <view v-if="nationality==3">
-      <view class="form_group mb0">
-        <view>
-          <text class="red">*</text>
-          <text class="sex">护照图片:</text>
-          <text class="tips">(基本身份信息页)</text>
-        </view>
-      </view>
-	  <view @click="operaType=1;chooseImage()" style="margin: 30rpx 0 10rpx 0;display: flex;align-items: center;flex-direction: column;">
-	    <upload-img
-	  	  :width="$isEmpty(show_passport_img_uri)?bgWidth:imgWidth"
-	  	  :height="$isEmpty(show_passport_img_uri)?bgHeight:imgHeight"
-	  	  :currentImage="show_passport_img_uri"
-	  	  :bgsrc="bgsrc"
-	  	  >
-	    </upload-img>
-	    <view class="" style="color: #59a5f0;">
-	  	 <text class="cuIcon-camera padding-right-sm" style="font-size: 30rpx;"></text>
-	  	 <text v-if="$isEmpty(show_passport_img_uri)">点击上传护照</text>
-	  	 <text style="margin-top: 40rpx;display: inline-block;" v-else>点击重新上传</text>
-	    </view>
-	  </view>
-    </view>
-
-    <view v-if="nationality==3">
-      <view class="form_group mb0">
-        <view>
-          <text class="red">*</text>
-          <text class="sex">入境证明:</text>
-          <text class="tips">(入镜盖章页)</text>
-        </view>
-      </view>
-	  
-	  <view @click="operaType=2;chooseImage()" style="margin: 30rpx 0 10rpx 0;display: flex;align-items: center;flex-direction: column;">
-	    <upload-img
-	  	  :width="$isEmpty(show_entry_img_uri)?bgWidth:imgWidth"
-	  	  :height="$isEmpty(show_entry_img_uri)?bgHeight:imgHeight"
-	  	  :currentImage="show_entry_img_uri"
-	  	  :bgsrc="bgsrc"
-	  	  >
-	    </upload-img>
-	    <view class="" style="color: #59a5f0;">
-	  	 <text class="cuIcon-camera padding-right-sm" style="font-size: 30rpx;"></text>
-	  	 <text v-if="$isEmpty(show_entry_img_uri)">点击上传入境证明</text>
-	  	 <text style="margin-top: 40rpx;display: inline-block;" v-else>点击重新上传</text>
-	    </view>
-	  </view>
-    </view>
-
-
-
-    <view v-if="appletType==1">
-		<view class="form_group mb0">
-		  <view>
-		    <text class="red">*</text>
-		    <text class="sex">人脸:</text>
-		    <text class="tips">(人脸用于开门,请上传正脸图片)</text>
-		  </view>
+				<u-radio-group class="item-right radio-group" v-model="sex">
+					<u-radio shape="circle" name="1">男</u-radio>
+					<u-radio shape="circle" name="2">女</u-radio>
+				</u-radio-group>
+			</view>
+			<view v-if="waitAudit" class="form_group" :style="'pointer-events:' + (waitAudit?'auto':'none')">
+				<text class="sex">审核原因:</text>
+				<input @input="checkOpinionFun" placeholder="请填写审核原因" placeholder-class="placeholder_style" type="text"
+					:value="checkOpinion" class="placeholder_style"></input>
+			</view>
+			<view v-if="nationality==3">
+				<view class="form_group mb0">
+					<view>
+						<text class="red">*</text>
+						<text class="sex">护照图片:</text>
+						<text class="tips">(基本身份信息页)</text>
+					</view>
+				</view>
+				<view @click="operaType=1;chooseImage()"
+					style="margin: 30rpx 0 10rpx 0;display: flex;align-items: center;flex-direction: column;">
+					<upload-img :width="$isEmpty(show_passport_img_uri)?bgWidth:imgWidth"
+						:height="$isEmpty(show_passport_img_uri)?bgHeight:imgHeight"
+						:currentImage="show_passport_img_uri" :bgsrc="bgsrc">
+					</upload-img>
+					<view class="" style="color: #59a5f0;">
+						<text class="cuIcon-camera padding-right-sm" style="font-size: 30rpx;"></text>
+						<text v-if="$isEmpty(show_passport_img_uri)">点击上传护照</text>
+						<text style="margin-top: 40rpx;display: inline-block;" v-else>点击重新上传</text>
+					</view>
+				</view>
+			</view>
+
+			<view v-if="nationality==3">
+				<view class="form_group mb0">
+					<view>
+						<text class="red">*</text>
+						<text class="sex">入境证明:</text>
+						<text class="tips">(入镜盖章页)</text>
+					</view>
+				</view>
+
+				<view @click="operaType=2;chooseImage()"
+					style="margin: 30rpx 0 10rpx 0;display: flex;align-items: center;flex-direction: column;">
+					<upload-img :width="$isEmpty(show_entry_img_uri)?bgWidth:imgWidth"
+						:height="$isEmpty(show_entry_img_uri)?bgHeight:imgHeight" :currentImage="show_entry_img_uri"
+						:bgsrc="bgsrc">
+					</upload-img>
+					<view class="" style="color: #59a5f0;">
+						<text class="cuIcon-camera padding-right-sm" style="font-size: 30rpx;"></text>
+						<text v-if="$isEmpty(show_entry_img_uri)">点击上传入境证明</text>
+						<text style="margin-top: 40rpx;display: inline-block;" v-else>点击重新上传</text>
+					</view>
+				</view>
+			</view>
+
+
+
+			<view v-if="appletType==1">
+				<view class="form_group mb0">
+					<view>
+						<text class="red">*</text>
+						<text class="sex">人脸:</text>
+						<text class="tips">(人脸用于开门,请上传正脸图片)</text>
+					</view>
+				</view>
+				<view @click="show=true;operaType=3"
+					style="margin: 30rpx 0 10rpx 0;display: flex;align-items: center;flex-direction: column;">
+					<upload-img :width="$isEmpty(show_image_uri)?bgWidth:imgWidth"
+						:height="$isEmpty(show_image_uri)?bgHeight:imgHeight" :currentImage="show_image_uri"
+						:bgsrc="bgsrc">
+					</upload-img>
+					<view class="" style="color: #59a5f0;">
+						<text class="cuIcon-camera padding-right-sm" style="font-size: 30rpx;"></text>
+						<text v-if="$isEmpty(show_image_uri)">点击上传人脸</text>
+						<text style="margin-top: 40rpx;display: inline-block;" v-else>点击重新上传</text>
+					</view>
+				</view>
+				<view class="category">
+					<view v-for="(item, index) in iconArray" :key="index" class="category_item">
+						<view class="category_item_wrap" :data-index="item.index">
+							<view class="icon_wrap">
+								<image :src="item.iconUrl" class="index_icon"></image>
+							</view>
+							<view class="category_item_text">
+								<text>{{item.iconText}}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</form>
+		<view @click="editApplyUser" class=" footer-fixed">
+			<view class="cu-btn  flex  text-lg bg-red-btn" style="padding: 46rpx 0;">
+				提交修改
+			</view>
 		</view>
-	  <view @click="show=true;operaType=3" style="margin: 30rpx 0 10rpx 0;display: flex;align-items: center;flex-direction: column;">
-	    <upload-img
-	  	  :width="$isEmpty(show_image_uri)?bgWidth:imgWidth"
-	  	  :height="$isEmpty(show_image_uri)?bgHeight:imgHeight"
-	  	  :currentImage="show_image_uri"
-	  	  :bgsrc="bgsrc"
-	  	  >
-	    </upload-img>
-	    <view class="" style="color: #59a5f0;">
-	  	 <text class="cuIcon-camera padding-right-sm" style="font-size: 30rpx;"></text>
-	  	 <text v-if="$isEmpty(show_image_uri)">点击上传人脸</text>
-	  	 <text style="margin-top: 40rpx;display: inline-block;" v-else>点击重新上传</text>
-	    </view>
-	  </view>
-      <view class="category">
-        <view v-for="(item, index) in iconArray" :key="index" class="category_item">
-          <view class="category_item_wrap" :data-index="item.index">
-            <view class="icon_wrap">
-              <image :src="item.iconUrl" class="index_icon"></image>
-            </view>
-            <view class="category_item_text">
-              <text>{{item.iconText}}</text>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-  </form>
- <view  @click="editApplyUser"  class=" footer-fixed" >
-  	<view class="cu-btn  flex  text-lg bg-red-btn" style="padding: 46rpx 0;">
-  		提交修改
-  	</view>
-  </view>
-  
-  <view  v-if="waitAudit"  class=" footer-fixed" >
-	  <view class="flex">
-	  	<view @click="auditBtn" data-id="1" class="cu-btn  flex-sub  text-lg bg-blue" style="padding: 46rpx 0rpx;">
-	  		审核通过
-	  	</view>
-		<view @click="auditBtn" data-id="2" class="cu-btn  flex-sub light text-lg bg-orange " style="padding: 46rpx 0;">
-			审核不通过
+
+		<view v-if="waitAudit" class=" footer-fixed">
+			<view class="flex">
+				<view @click="auditBtn" data-id="1" class="cu-btn  flex-sub  text-lg bg-blue"
+					style="padding: 46rpx 0rpx;">
+					审核通过
+				</view>
+				<view @click="auditBtn" data-id="2" class="cu-btn  flex-sub light text-lg bg-orange "
+					style="padding: 46rpx 0;">
+					审核不通过
+				</view>
+			</view>
 		</view>
-	  </view>
-  </view>
-  <u-action-sheet @click="photoChecked"  z-index="999999" :list="list" v-model="show"></u-action-sheet>
-</view>
+		<u-action-sheet @click="photoChecked" z-index="999999" :list="list" v-model="show"></u-action-sheet>
+	</view>
 </template>
 
 <script>
-import uploadImg from '@/comps/uploadimg/uploadImg.vue'
-//获取app实例
-var app = getApp();
-
-export default {
-	components:{
-		uploadImg
-	},
-  data() {
-    return {
-		//操作类型,业主操作 0 其他
-		operUserType:'',
-		
-		// 小程序的审核状态
-		appletType:0,
-		
-		//默认点击弹出拍照模态框的是人脸上传操作,1:护照,2:入境,3:人脸
-		operaType:3,
-		//人脸上传模态框,上传照片或拍照
-		list: [{
-			text: '相册上传',
-		}, {
-			text: '拍照上传'
-		}],
-		show: false,
-		
-		//背景图
-		bgsrc:'http://139.9.103.171:1888/img/image/camera1.png',
-		bgWidth:350,
-		bgHeight:320,
-		//显示图
-		imgWidth:540,
-		imgHeight:400,
-		
-      user_id: null,
-      //修改的住户id
-      name: null,
-      //姓名
-      tel: null,
-      //电话号码
-      room_name: null,
-      //房间名字
-      typeArray: ['业主', '家属', '租户'],
-      type: 0,
-      nationalityArray: ['中国大陆', '中国香港/澳门', '中国台湾', '海外'],
-      nationality: 0,
-      nationalityName: '身份证',
-      id_card: null,
-      //身份证
-      sexArray: null,
-      sex: null	,
-      passport_img_uri: null,
-      //护照照片
-      show_passport_img_uri: null,
-      //护照照片回显
-      entry_img_uri: null,
-      //入境证明
-      show_entry_img_uri: null,
-      //入境证明回显
-      image_uri: null,
-      //人脸图片地址
-      show_image_uri: null,
-      //人脸回显
-      face_code: null,
-      iconArray: [{
-        "iconUrl": "http://139.9.103.171:1888/img/image/zd.png",
-        "iconText": '不要遮挡',
-        "index": 1
-      }, {
-        "iconUrl": "http://139.9.103.171:1888/img/image/mj.png",
-        "iconText": '不戴墨镜',
-        "index": 2
-      }, {
-        "iconUrl": "http://139.9.103.171:1888/img/image/zl.png",
-        "iconText": '不能仰头俯拍',
-        "index": 3
-      }, {
-        "iconUrl": "http://139.9.103.171:1888/img/image/cz.png",
-        "iconText": '光线充足',
-        "index": 4
-      }, {
-        "iconUrl": "http://139.9.103.171:1888/img/image/bg.png",
-        "iconText": '浅色背景',
-        "index": 5
-      }, {
-        "iconUrl": "http://139.9.103.171:1888/img/image/sh.png",
-        "iconText": '物业审核生效',
-        "index": 6
-      }],
-      waitAudit: false,
-      //判断是否从审核跳过来
-      checkOpinion: '' //审核原因
-      ,
-      apply_user_id: "",
-      own_room_list_index: ""
-    };
-  },
-
-  components: {},
-  props: {},
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-	  
-	  this.operUserType=options.operUserType
-	  
-    let apply_user_id = options.apply_user_id;
-    let name = options.name;
-    let tel = options.tel;
-    let room_name = options.room_name;
-    let type = options.type;
-	this.user_id = options.user_id;
-    let nationality = options.nationality;
-    let nationalityName = '';
-
-    if (nationality == 0) {
-      nationalityName = '身份证';
-    } else if (nationality == 1) {
-      nationalityName = '港澳居民往来内地通行证';
-    } else if (nationality == 2) {
-      nationalityName = '台湾居民往来大陆通行证';
-    } else if (nationality == 3) {
-      nationalityName = '护照';
-    }
-
-    this.setData({
-      nationality: nationality,
-      nationalityName: nationalityName
-    });
-    let id_card = options.id_card;
-    let sex = options.sex;
-    let passport_img_uri = options.passport_img_uri;
-    let entry_img_uri = options.entry_img_uri;
-    let image_uri = options.image_uri; //选中性别
-
-    let sexArray = [{
-      name: '男',
-      checked: false,
-      sex: "1"
-    }, {
-      name: '女',
-      checked: false,
-      sex: "2"
-    }];
-
-    for (let i in sexArray) {
-      if (sexArray[i].sex == sex) {
-        sexArray[i].checked = true;
-      }
-    }
-
-    if (options.waitAudit || options.waitAudit != undefined || options.waitAudit != null) {
-      uni.setNavigationBarTitle({
-        title: '住户审核'
-      });
-      this.setData({
-        waitAudit: options.waitAudit
-      });
-    }
-
-    this.setData({
-      apply_user_id: apply_user_id,
-      name: name,
-      tel: tel,
-      room_name: room_name,
-      type: type,
-      nationality: nationality,
-      id_card: id_card,
-      sex: sex,
-      show_image_uri: image_uri,
-      show_passport_img_uri: passport_img_uri,
-      show_entry_img_uri: entry_img_uri,
-      sexArray: sexArray
-    });
-  },
-  onShow() {
-	 this.appletType=uni.getStorageSync("appletType") 
-	 
-  	//获取当前页面的对象
-  	let currPage=this.$util.getPageCtx()
-  	if(!this.$isEmpty(currPage.data.image)){
-  		this.uploadImage(currPage.data.image)
-  	} 
-  },
-  methods: {
-	//点击模态框选项触发
-	photoChecked(index){
-		if (index==0) {
-			//图片上传
-			this.chooseImage()
-		} else if(index==1){
-			//拍照上传
-			uni.navigateTo({
-				url:"../../my-camera/my-camera"
-			})
-		}
-	},
-	/**
-	 * 点击上传图片事件
-	 */
-	chooseImage: function () {
-	  var that = this;
-	  uni.chooseImage({
-	    count: 1,
-	    //最多可以选择的图片张数,默认9
-	    sourceType: ['album', 'camera'],
-	    sizeType: ['compressed'],
-	    //可选择原图或压缩后的图片
-	    success: res => {
-	      let tempFilePaths = res.tempFilePaths;
-		  that.uploadImage(tempFilePaths[0])
-	    }
-	  });
-	},
-	/**上传图片
-	 * @param {Object} imgUrl 图片url
-	 */
-	uploadImage(imgUrl){
-		console.log("operatype: ",this.operaType);
-		console.log("imgUrl",imgUrl)
-		var that = this;
-		//是否需要md5加密上传人脸照
-		let is_need_md5 = false;
-		if (this.operaType == 3) {
-		  is_need_md5 = true;
-		}
-		that.$http.uploadFile(imgUrl).then(res =>{
-			if (that.operaType == 1) {
-			  that.setData({
-			    passport_img_uri: res.data.name,
-			    show_passport_img_uri: imgUrl
-			  });
-			} else if (that.operaType == 2) {
-			  that.setData({
-			    entry_img_uri: res.data.name,
-			    show_entry_img_uri: imgUrl
-			  });
-			} else if (that.operaType == 3) {
-			  that.setData({
-			    image_uri: res.data.name,
-			    show_image_uri: imgUrl,
-			    face_code: res.data.imgMd5
-			  });
+	import uploadImg from '@/comps/uploadimg/uploadImg.vue'
+	//获取app实例
+	var app = getApp();
+
+	export default {
+		components: {
+			uploadImg
+		},
+		data() {
+			return {
+				//操作类型,业主操作 0 其他
+				operUserType: '',
+
+				// 小程序的审核状态
+				appletType: 0,
+
+				//默认点击弹出拍照模态框的是人脸上传操作,1:护照,2:入境,3:人脸
+				operaType: 3,
+				//人脸上传模态框,上传照片或拍照
+				list: [{
+					text: '相册上传',
+				}, {
+					text: '拍照上传'
+				}],
+				show: false,
+
+				//背景图
+				bgsrc: 'http://139.9.103.171:1888/img/image/camera1.png',
+				bgWidth: 350,
+				bgHeight: 320,
+				//显示图
+				imgWidth: 540,
+				imgHeight: 400,
+
+				user_id: null,
+				//修改的住户id
+				name: null,
+				//姓名
+				tel: null,
+				//电话号码
+				room_name: null,
+				//房间名字
+				typeArray: ['业主', '家属', '租户'],
+				type: 0,
+				nationalityArray: ['中国大陆', '中国香港/澳门', '中国台湾', '海外'],
+				nationality: 0,
+				nationalityName: '身份证',
+				id_card: null,
+				//身份证
+				sexArray: null,
+				sex: null,
+				passport_img_uri: null,
+				//护照照片
+				show_passport_img_uri: null,
+				//护照照片回显
+				entry_img_uri: null,
+				//入境证明
+				show_entry_img_uri: null,
+				//入境证明回显
+				image_uri: null,
+				//人脸图片地址
+				show_image_uri: null,
+				//人脸回显
+				face_code: null,
+				iconArray: [{
+					"iconUrl": "http://139.9.103.171:1888/img/image/zd.png",
+					"iconText": '不要遮挡',
+					"index": 1
+				}, {
+					"iconUrl": "http://139.9.103.171:1888/img/image/mj.png",
+					"iconText": '不戴墨镜',
+					"index": 2
+				}, {
+					"iconUrl": "http://139.9.103.171:1888/img/image/zl.png",
+					"iconText": '不能仰头俯拍',
+					"index": 3
+				}, {
+					"iconUrl": "http://139.9.103.171:1888/img/image/cz.png",
+					"iconText": '光线充足',
+					"index": 4
+				}, {
+					"iconUrl": "http://139.9.103.171:1888/img/image/bg.png",
+					"iconText": '浅色背景',
+					"index": 5
+				}, {
+					"iconUrl": "http://139.9.103.171:1888/img/image/sh.png",
+					"iconText": '物业审核生效',
+					"index": 6
+				}],
+				waitAudit: false,
+				//判断是否从审核跳过来
+				checkOpinion: '' //审核原因
+					,
+				apply_user_id: "",
+				own_room_list_index: ""
+			};
+		},
+
+		components: {},
+		props: {},
+
+		/**
+		 * 生命周期函数--监听页面加载
+		 */
+		onLoad: function(options) {
+
+			this.operUserType = options.operUserType
+
+			let apply_user_id = options.apply_user_id;
+			let name = options.name;
+			let tel = options.tel;
+			let room_name = options.room_name;
+			let type = options.type;
+			this.user_id = options.user_id;
+			let nationality = options.nationality;
+			let nationalityName = '';
+
+			if (nationality == 0) {
+				nationalityName = '身份证';
+			} else if (nationality == 1) {
+				nationalityName = '港澳居民往来内地通行证';
+			} else if (nationality == 2) {
+				nationalityName = '台湾居民往来大陆通行证';
+			} else if (nationality == 3) {
+				nationalityName = '护照';
 			}
-		})
-		
-	},
-	  
-	  
-    //获取input的标签值
-    nameFun: function (e) {
-      this.setData({
-        name: e.detail.value
-      });
-    },
-    telFun: function (e) {
-      this.setData({
-        tel: e.detail.value
-      });
-    },
-    id_cardFun: function (e) {
-      this.setData({
-        id_card: e.detail.value
-      });
-    },
-    checkOpinionFun: function (e) {
-      this.setData({
-        checkOpinion: e.detail.value
-      });
-    },
-    // 住户类型
-    typeChange: function (e) {
-      this.setData({
-        type: e.detail.value
-      });
-    },
-    // 类别选择
-    roomIdChange: function (e) {
-      this.setData({
-        own_room_list_index: e.detail.value
-      });
-    },
-    //性别
-    sexChange: function (enent) {
-      this.setData({
-        sex: enent.detail.value
-      });
-    },
-    // 国籍
-    nationalityChange: function (e) {
-      let nationality = e.detail.value;
-      let nationalityName = '';
-
-      if (nationality == 0) {
-        nationalityName = '身份证';
-      } else if (nationality == 1) {
-        nationalityName = '港澳居民往来内地通行证';
-      } else if (nationality == 2) {
-        nationalityName = '台湾居民往来大陆通行证';
-      } else if (nationality == 3) {
-        nationalityName = '护照';
-      }
-
-      this.setData({
-        nationality: nationality,
-        nationalityName: nationalityName
-      });
-    },
-    //编辑
-    editApplyUser: function () {
-      let that = this;
-      let params = {};
-      let apply_user_id = that.apply_user_id;
-      params['apply_user_id'] = apply_user_id;
-      let tel = that.tel;
-
-      if (!tel) {
-        app.globalData.autoFailHint("请填写手机");
-        return;
-      } //手机号码正则校验
-      if (!this.$u.test.mobile(tel)) {
-        app.globalData.autoFailHint("请填写正确手机号");
-        return;
-      }
-
-      params['tel'] = tel;
-      let type = that.type;
-      params['type'] = type;
-      let id_card = that.id_card;
-      params['id_card'] = id_card; //业主身份时,身份证必填
-
-      if (type == 0 && !id_card) {
-        app.globalData.autoFailHint("住户类型是业主时,身份证必填");
-        return;
-      } //0 中国大陆 1 中国香港/澳门 2 中国台湾 3 海外
-	  if (!this.$isEmpty(id_card)) {
-	    //如果身份证号不为空,就校验身份证号
-		if (!this.$u.test.idCard(id_card)) {
-			app.globalData.autoFailHint("请输入正确的身份证号");
-			return;
+
+			this.setData({
+				nationality: nationality,
+				nationalityName: nationalityName
+			});
+			let id_card = options.id_card;
+			let sex = options.sex;
+			let passport_img_uri = options.passport_img_uri;
+			let entry_img_uri = options.entry_img_uri;
+			let image_uri = options.image_uri; //选中性别
+
+			let sexArray = [{
+				name: '男',
+				checked: false,
+				sex: "1"
+			}, {
+				name: '女',
+				checked: false,
+				sex: "2"
+			}];
+
+			for (let i in sexArray) {
+				if (sexArray[i].sex == sex) {
+					sexArray[i].checked = true;
+				}
+			}
+
+			if (options.waitAudit || options.waitAudit != undefined || options.waitAudit != null) {
+				uni.setNavigationBarTitle({
+					title: '住户审核'
+				});
+				this.setData({
+					waitAudit: options.waitAudit
+				});
+			}
+
+			this.setData({
+				apply_user_id: apply_user_id,
+				name: name,
+				tel: tel,
+				room_name: room_name,
+				type: type,
+				nationality: nationality,
+				id_card: id_card,
+				sex: sex,
+				show_image_uri: image_uri,
+				show_passport_img_uri: passport_img_uri,
+				show_entry_img_uri: entry_img_uri,
+				sexArray: sexArray
+			});
+		},
+		onShow() {
+			this.appletType = uni.getStorageSync("appletType")
+
+			//获取当前页面的对象
+			let currPage = this.$util.getPageCtx()
+			if (!this.$isEmpty(currPage.data.image)) {
+				this.uploadImage(currPage.data.image)
+			}
+		},
+		methods: {
+			//点击模态框选项触发
+			photoChecked(index) {
+				if (index == 0) {
+					//图片上传
+					this.chooseImage()
+				} else if (index == 1) {
+					//拍照上传
+					uni.navigateTo({
+						url: "../../my-camera/my-camera"
+					})
+				}
+			},
+			/**
+			 * 点击上传图片事件
+			 */
+			chooseImage: function() {
+				var that = this;
+				uni.chooseImage({
+					count: 1,
+					//最多可以选择的图片张数,默认9
+					sourceType: ['album', 'camera'],
+					sizeType: ['compressed'],
+					//可选择原图或压缩后的图片
+					success: res => {
+						let tempFilePaths = res.tempFilePaths;
+						that.uploadImage(tempFilePaths[0])
+					}
+				});
+			},
+			/**上传图片
+			 * @param {Object} imgUrl 图片url
+			 */
+			uploadImage(imgUrl) {
+				console.log("operatype: ", this.operaType);
+				console.log("imgUrl", imgUrl)
+				var that = this;
+				//是否需要md5加密上传人脸照
+				let is_need_md5 = false;
+				if (this.operaType == 3) {
+					is_need_md5 = true;
+				}
+				that.$http.uploadFile(imgUrl).then(res => {
+					if (that.operaType == 1) {
+						that.setData({
+							passport_img_uri: res.data.name,
+			 			show_passport_img_uri: imgUrl
+						});
+					} else if (that.operaType == 2) {
+						that.setData({
+							entry_img_uri: res.data.name,
+							show_entry_img_uri: imgUrl
+						});
+					} else if (that.operaType == 3) {
+			 		that.setData({
+							image_uri: res.data.name,
+							show_image_uri: imgUrl,
+							face_code: res.data.imgMd5
+						});
+					}
+				})
+
+			},
+
+
+			//获取input的标签值
+			nameFun: function(e) {
+				this.setData({
+					name: e.detail.value
+				});
+			},
+			telFun: function(e) {
+				this.setData({
+					tel: e.detail.value
+				});
+			},
+			id_cardFun: function(e) {
+				this.setData({
+					id_card: e.detail.value
+				});
+			},
+			checkOpinionFun: function(e) {
+				this.setData({
+					checkOpinion: e.detail.value
+				});
+			},
+			// 住户类型
+			typeChange: function(e) {
+				this.setData({
+					type: e.detail.value
+				});
+			},
+			// 类别选择
+			roomIdChange: function(e) {
+				this.setData({
+					own_room_list_index: e.detail.value
+				});
+			},
+			//性别
+			sexChange: function(enent) {
+				this.setData({
+					sex: enent.detail.value
+				});
+			},
+			// 国籍
+			nationalityChange: function(e) {
+				let nationality = e.detail.value;
+				let nationalityName = '';
+
+				if (nationality == 0) {
+					nationalityName = '身份证';
+				} else if (nationality == 1) {
+					nationalityName = '港澳居民往来内地通行证';
+				} else if (nationality == 2) {
+					nationalityName = '台湾居民往来大陆通行证';
+				} else if (nationality == 3) {
+					nationalityName = '护照';
+				}
+
+				this.setData({
+					nationality: nationality,
+					nationalityName: nationalityName
+				});
+			},
+			//编辑
+			editApplyUser: function() {
+				let that = this;
+				let params = {};
+				let apply_user_id = that.apply_user_id;
+				params['apply_user_id'] = apply_user_id;
+				let tel = that.tel;
+
+				if (!tel) {
+					app.globalData.autoFailHint("请填写手机");
+					return;
+				} //手机号码正则校验
+				if (!this.$u.test.mobile(tel)) {
+					app.globalData.autoFailHint("请填写正确手机号");
+					return;
+				}
+
+				params['tel'] = tel;
+				let type = that.type;
+				params['type'] = type;
+				let id_card = that.id_card;
+				params['id_card'] = id_card; //业主身份时,身份证必填
+
+				if (type == 0 && !id_card) {
+					app.globalData.autoFailHint("住户类型是业主时,身份证必填");
+					return;
+				} //0 中国大陆 1 中国香港/澳门 2 中国台湾 3 海外
+				if (!this.$isEmpty(id_card)) {
+					//如果身份证号不为空,就校验身份证号
+					if (!this.$u.test.idCard(id_card)) {
+						app.globalData.autoFailHint("请输入正确的身份证号");
+						return;
+					}
+				}
+
+				let nationality = that.nationality;
+				params['nationality'] = nationality;
+				let passport_img_uri = that.passport_img_uri;
+				let entry_img_uri = that.entry_img_uri;
+
+				if (nationality == 3) {
+					params['passportImgUri'] = that.passport_img_uri;
+					params['entryImgUri'] = that.entry_img_uri;
+
+					if (type == 0) {
+						if (!passport_img_uri && !that.show_passport_img_uri) {
+							app.globalData.autoFailHint("请上传护照图片");
+							return;
+						}
+
+						if (!entry_img_uri && !that.show_entry_img_uri) {
+							app.globalData.autoFailHint("请上传入境证明");
+							return;
+						}
+					}
+				}
+
+				let image_uri = that.image_uri;
+				let face_code = that.face_code;
+
+				if (image_uri && face_code) {
+					params['image_uri'] = that.image_uri;
+					params['face_code'] = that.face_code;
+				} //性别
+
+
+				params['sex'] = that.sex; //添加了人脸
+
+				params['member_id'] = app.globalData.member.id; //申请来源0-小程序添加 1-后台添加  2-后台导入 3-app添加
+
+				params['create_type'] = '0';
+				params['user_id'] = that.user_id;
+				params['oper_user_type'] = that.operUserType;
+				params['operatorName'] = app.globalData.member.name;
+				params['name'] = that.name;
+				let operation = 'applyUser/editApplyUser';
+				this.$http.editFamily(params)
+					.then(res => {
+						//添加成功
+						if (res.data.result_code == 1) {
+							app.globalData.oneFailHint(res.data.result_msg, function() {
+								uni.navigateBack({
+									delta: 1 // 返回上一级页面。
+
+								});
+							});
+						} else {
+							app.globalData.oneFailHint(res.data.result_msg);
+						}
+					});
+			},
+
+			auditBtn(e) {
+				let that = this;
+				let params = {};
+
+				if (e.currentTarget.dataset.id == 2 && that.checkOpinion == '') {
+					app.globalData.autoFailHint("请先填写审核意见");
+					return;
+				}
+
+				params['id'] = that.apply_user_id;
+				params['auditStatus'] = e.currentTarget.dataset.id;
+				params['checkOpinion'] = that.checkOpinion;
+				params['name'] = that.name;
+				params['idCard'] = that.id_card;
+				params['operatorId'] = that.vuex_member.id;
+				params['operatorName'] = that.vuex_member.name;
+				// let operation = 'applyUser/updateCheckState';
+				that.$http.updateCheckState(params).then(res => {
+					if (res.data.result_code == 1) {
+						that.$refs.uToast.show({
+							title: '审核成功',
+							type: 'success',
+							url: '/pages/myFamily/myFamily',
+							position: 'top'
+						})
+					} else {
+						app.globalData.autoFailHint(res.data.msg);
+					}
+
+				});
+			}
+
 		}
-	  }
-
-      let nationality = that.nationality;
-      params['nationality'] = nationality;
-      let passport_img_uri = that.passport_img_uri;
-      let entry_img_uri = that.entry_img_uri;
-
-      if (nationality == 3) {
-        params['passportImgUri'] = that.passport_img_uri;
-        params['entryImgUri'] = that.entry_img_uri;
-
-        if (type == 0) {
-          if (!passport_img_uri && !that.show_passport_img_uri) {
-            app.globalData.autoFailHint("请上传护照图片");
-            return;
-          }
-
-          if (!entry_img_uri && !that.show_entry_img_uri) {
-            app.globalData.autoFailHint("请上传入境证明");
-            return;
-          }
-        }
-      }
-
-      let image_uri = that.image_uri;
-      let face_code = that.face_code;
-
-      if (image_uri && face_code) {
-        params['image_uri'] = that.image_uri;
-        params['face_code'] = that.face_code;
-      } //性别
-
-
-      params['sex'] = that.sex; //添加了人脸
-
-      params['member_id'] = app.globalData.member.id; //申请来源0-小程序添加 1-后台添加  2-后台导入 3-app添加
-
-      params['create_type'] = '0';
-	  params['user_id'] = that.user_id;
-	  params['oper_user_type'] = that.operUserType;
-	  params['operatorName'] = app.globalData.member.name;
-	  params['name'] = that.name;
-      let operation = 'applyUser/editApplyUser';
-	  this.$http.editFamily(params)
-	  .then(res => {
-		  //添加成功
-		  if (res.data.result_code == 1) {
-		    app.globalData.oneFailHint(res.data.result_msg, function () {
-		      uni.navigateBack({
-		        delta: 1 // 返回上一级页面。
-		  
-		      });
-		    });
-		  } else {
-		    app.globalData.oneFailHint(res.data.result_msg);
-		  }
-	  });
-      // app.globalData.postRequest(params, operation, function (res) {
-        
-      // });
-    },
-
-    auditBtn(e) {
-      let that = this;
-      let params = {};
-
-      if (e.currentTarget.dataset.id == 2 && that.checkOpinion == '') {
-        app.globalData.autoFailHint("请先填写审核意见");
-        return;
-      }
-
-      params['id'] = that.apply_user_id;
-      params['auditStatus'] = e.currentTarget.dataset.id;
-      params['checkOpinion'] = that.checkOpinion;
-	  params['name'] = that.name;
-	  params['idCard'] = that.id_card;
-	  params['operatorId'] = that.vuex_member.id;
-	  params['operatorName'] = that.vuex_member.name;
-      // let operation = 'applyUser/updateCheckState';
-      that.$http.updateCheckState(params).then (res =>{
-		  //添加成功
-		  if (res.data.result_code==1) {
-		  	that.$refs.uToast.show({
-		  		title: '审核成功',
-		  		type: 'success',
-		  		url: '/pages/myFamily/myFamily',
-		  		position:'top'
-		  	})
-		  } else {
-		    app.globalData.autoFailHint(res.data.msg);
-		  }
-        
-      });
-    }
-
-  }
-};
+	};
 </script>
 <style lang="scss">
-page{
-  overflow-y: scroll;
-  background: #fff;
-}
-.edit_wrap {
-	background-color: #FFFFFF;
-  font-size: 30rpx;
-  padding: 0rpx 20rpx 120rpx;
-  color: #333;
-}
-
-.form_group {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  margin: 20rpx 20rpx;
-  line-height: 80rpx;
-  position: relative;
-    font-size: 26rpx;
-}
-
-.form_group .red {
-  color: red;
-  position: absolute;
-  left: 0;
-}
-
-.form_group text.sex {
-  margin-left: 15px;
-  text-align: left;
-}
-
-.form_group .radio-group {
-  text-align: left;
-  width: 500rpx;
-  margin-top: 16rpx;
-}
-
-.form_group .radio-group .radio {
-  margin-right: 60rpx;
-}
-
-.form_group input, .form_group picker {
-  border: 1px solid #ddd;
-  border-radius: 8rpx;
-  height: 80rpx;
-  line-height: 80rpx;
-  padding: 0rpx 20rpx;
-  color: #333;
-  width: 460rpx;
-}
-
-.form_group button {
-  font-size: 30rpx;
-  height: 80rpx;
-  line-height: 80rpx;
-  border: 1px dotted #fff;
-  background: white;
-  padding: 0rpx;
-  margin: 0rpx;
-  outline: none;
-  color: #000;
-}
-
-.placeholder_style {
-  font-family: '微软雅黑';
-  color: #adadad;
-}
-
-.save_btn {
-  width: 600rpx;
-  background: #d24a58;
-  font-size: 32rpx;
-  color: #fff;
-  border-radius: 0rpx;
-  margin: 40rpx 0rpx 10rpx;
-}
-
-/* 自定义 radio 样式 */
-
-radio {
-  width: 38rpx;
-}
-
-radio .wx-radio-input {
-  border-radius: 50%;
-  width: 28rpx;
-  height: 28rpx;
-}
-
-/* 选中后的样式 (可根据设计稿需求自己修改) */
-
-radio .wx-radio-input.wx-radio-input-checked::before {
-  border-radius: 50%;
-  width: 44rpx;
-  height: 44rpx;
-  line-height: 44rpx;
-  text-align: center;
-  font-size: 26rpx; /* 对勾大小 26rpx */
-  color: #fff; /* 对勾颜色 */
-  background: $base-btn-color;
-  border-color: $base-btn-color;
-}
-
-.form_group .upload {
-  padding: 0 28rpx;
-  font-size: 26rpx;
-  background: $base-btn-color;
-  color: #fff;
-  border: none;
-}
-
-.upload_tips {
-  font-size: 24rpx;
-}
-
-.upload_bg {
-  position: relative;
-  text-align: center;
-}
-
-.mb0 {
-  margin-bottom: 0;
-}
-
-.form_group .tips {
-  margin-left: 50rpx;
-}
-
-.upload_bg .upload_bgImg {
-  width: 540rpx;
-  height: 400rpx;
-}
-
-.upload_bg .upload_btn {
-  width: 120rpx;
-  height: 120rpx;
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  margin-left: -65rpx;
-  margin-top: -60rpx;
-}
-
-.upload_bg .upload_btn image {
-  width: 100%;
-  height: 100%;
-}
-
-.upload_text {
-  position: absolute;
-  top: 70%;
-  left: 50%;
-  transform: translate(-50%, 0);
-  color: $base-btn-color;
-}
-upload_bg{
-  position: relative;
-text-align: center;
-}
-
-.upload_bg .upload_btn{
-  width: 120rpx;
-  height: 120rpx;
-  position: absolute;
-  left: 50%;
-  top: 40%;
-  margin-left: -65rpx;
-  margin-top: -60rpx;
-
-}
-.upload_bg .upload_btn image{
-  width: 100%;
-  height: 100%;
-}
-.upload_text{
-   position: absolute;
-   top: 55%;
-   width:100%;
-   color:$base-btn-color;
-     
- 
-}
-
-.img_content .upload_bgImg{
-  
-  display: inline-block;
-}
-.reUpload{
-  height: 60rpx;
-  line-height: 60rpx;
-  text-align:right;
-  color: #333;
-  padding-right: 100rpx;
-}
-.img_content .img_icon{
-  width: 40rpx;
-  height: 40rpx;
-  vertical-align: text-top;
-  margin-right: 6rpx;
-  border-radius: 20rpx;
-}
-.category {
-  padding:20px 20rpx 0;
-  overflow: auto;
-  background-color: #FFF;
-text-align:center;
-
-}
-.category_item {
-  width: 33.3%;
-  float: left;
-  margin-bottom: 40rpx;
-}
-.icon_wrap {
-  width: 120rpx;
-  margin: 0 auto;
-  margin-bottom: 5px;
-}
-.index_icon {
-  width: 60rpx;
-  height: 60rpx;
-}
-.category_item_text {
-  text-align: center;
-  font-size: 24rpx;
-  color: #999;
-}
-.bottom_btn{
-  width:100%;
-  background: $base-btn-color;
-  font-size: 32rpx;
-  color: #fff;
-  border-radius: 10rpx;
-  margin: 20rpx 10rpx;
-  height: 100rpx;
-  text-align: center;
-  line-height: 100rpx;
-}
-</style>
+	page {
+		overflow-y: scroll;
+		background: #fff;
+	}
+
+	.edit_wrap {
+		background-color: #FFFFFF;
+		font-size: 30rpx;
+		padding: 0rpx 20rpx 120rpx;
+		color: #333;
+	}
+
+	.form_group {
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		margin: 20rpx 20rpx;
+		line-height: 80rpx;
+		position: relative;
+		font-size: 26rpx;
+	}
+
+	.form_group .red {
+		color: red;
+		position: absolute;
+		left: 0;
+	}
+
+	.form_group text.sex {
+		margin-left: 15px;
+		text-align: left;
+	}
+
+	.form_group .radio-group {
+		text-align: left;
+		width: 500rpx;
+		margin-top: 16rpx;
+	}
+
+	.form_group .radio-group .radio {
+		margin-right: 60rpx;
+	}
+
+	.form_group input,
+	.form_group picker {
+		border: 1px solid #ddd;
+		border-radius: 8rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		padding: 0rpx 20rpx;
+		color: #333;
+		width: 460rpx;
+	}
+
+	.form_group button {
+		font-size: 30rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		border: 1px dotted #fff;
+		background: white;
+		padding: 0rpx;
+		margin: 0rpx;
+		outline: none;
+		color: #000;
+	}
+
+	.placeholder_style {
+		font-family: '微软雅黑';
+		color: #adadad;
+	}
+
+	.save_btn {
+		width: 600rpx;
+		background: #d24a58;
+		font-size: 32rpx;
+		color: #fff;
+		border-radius: 0rpx;
+		margin: 40rpx 0rpx 10rpx;
+	}
+
+
+	radio {
+		width: 38rpx;
+	}
+
+	radio .wx-radio-input {
+		border-radius: 50%;
+		width: 28rpx;
+		height: 28rpx;
+	}
+
+
+	radio .wx-radio-input.wx-radio-input-checked::before {
+		border-radius: 50%;
+		width: 44rpx;
+		height: 44rpx;
+		line-height: 44rpx;
+		text-align: center;
+		font-size: 26rpx;
+		/* 对勾大小 26rpx */
+		color: #fff;
+		/* 对勾颜色 */
+		background: $base-btn-color;
+		border-color: $base-btn-color;
+	}
+
+	.form_group .upload {
+		padding: 0 28rpx;
+		font-size: 26rpx;
+		background: $base-btn-color;
+		color: #fff;
+		border: none;
+	}
+
+	.upload_tips {
+		font-size: 24rpx;
+	}
+
+	.upload_bg {
+		position: relative;
+		text-align: center;
+	}
+
+	.mb0 {
+		margin-bottom: 0;
+	}
+
+	.form_group .tips {
+		margin-left: 50rpx;
+	}
+
+	.upload_bg .upload_bgImg {
+		width: 540rpx;
+		height: 400rpx;
+	}
+
+	.upload_bg .upload_btn {
+		width: 120rpx;
+		height: 120rpx;
+		position: absolute;
+		left: 50%;
+		top: 50%;
+		margin-left: -65rpx;
+		margin-top: -60rpx;
+	}
+
+	.upload_bg .upload_btn image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.upload_text {
+		position: absolute;
+		top: 70%;
+		left: 50%;
+		transform: translate(-50%, 0);
+		color: $base-btn-color;
+	}
+
+	upload_bg {
+		position: relative;
+		text-align: center;
+	}
+
+	.upload_bg .upload_btn {
+		width: 120rpx;
+		height: 120rpx;
+		position: absolute;
+		left: 50%;
+		top: 40%;
+		margin-left: -65rpx;
+		margin-top: -60rpx;
+
+	}
+
+	.upload_bg .upload_btn image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.upload_text {
+		position: absolute;
+		top: 55%;
+		width: 100%;
+		color: $base-btn-color;
+
+
+	}
+
+	.img_content .upload_bgImg {
+
+		display: inline-block;
+	}
+
+	.reUpload {
+		height: 60rpx;
+		line-height: 60rpx;
+		text-align: right;
+		color: #333;
+		padding-right: 100rpx;
+	}
+
+	.img_content .img_icon {
+		width: 40rpx;
+		height: 40rpx;
+		vertical-align: text-top;
+		margin-right: 6rpx;
+		border-radius: 20rpx;
+	}
+
+	.category {
+		padding: 20px 20rpx 0;
+		overflow: auto;
+		background-color: #FFF;
+		text-align: center;
+
+	}
+
+	.category_item {
+		width: 33.3%;
+		float: left;
+		margin-bottom: 40rpx;
+	}
+
+	.icon_wrap {
+		width: 120rpx;
+		margin: 0 auto;
+		margin-bottom: 5px;
+	}
+
+	.index_icon {
+		width: 60rpx;
+		height: 60rpx;
+	}
+
+	.category_item_text {
+		text-align: center;
+		font-size: 24rpx;
+		color: #999;
+	}
+
+	.bottom_btn {
+		width: 100%;
+		background: $base-btn-color;
+		font-size: 32rpx;
+		color: #fff;
+		border-radius: 10rpx;
+		margin: 20rpx 10rpx;
+		height: 100rpx;
+		text-align: center;
+		line-height: 100rpx;
+	}
+</style>

+ 13 - 16
pages/myFamily/editFamily/editFamily.vue

@@ -421,7 +421,7 @@
 				let that = this;
 				let params = {};
 				let user_id = that.user_id;
-				params['user_id'] = user_id;
+				params['id'] = user_id;
 				let tel = that.tel;
 
 				if (!tel) {
@@ -433,12 +433,12 @@
 					return;
 				}
 
-				params['tel'] = tel;
+				params['phone'] = tel;
 
 				let type = that.type;
 				params['type'] = type;
 				let id_card = that.id_card;
-				params['id_card'] = id_card; //业主身份时,身份证必填
+				params['idCard'] = id_card; //业主身份时,身份证必填
 
 				if (type == 0 && !id_card) {
 					app.globalData.autoFailHint("住户类型是业主时,身份证必填");
@@ -478,30 +478,27 @@
 				let face_code = that.face_code;
 
 				if (image_uri && face_code) {
-					params['image_uri'] = that.image_uri;
-					params['face_code'] = that.face_code;
+					params['faceUrl'] = that.image_uri;
+					params['faceCode'] = that.face_code;
 				} //性别
 
-				params['oper_user_type'] = that.operUserType
+				params['operUserType'] = that.operUserType
 				params['sex'] = that.sex; //添加了人脸
 
-				params['member_id'] = app.globalData.member.id; //申请来源0-小程序添加 1-后台添加  2-后台导入 3-app添加
+				params['memberId'] = app.globalData.member.id; //申请来源0-小程序添加 1-后台添加  2-后台导入 3-app添加
 				params['operatorName'] = app.globalData.member.name;
-				params['create_type'] = '0';
+				params['createType'] = '0';
 				params['name'] = that.name;
-				console.log(params)
-				// let operation = 'user/editUser';
 				that.$http.editFamily(params).then(res => {
-					//添加成功
-					if (res.data.result_code == 1) {
-						app.globalData.oneFailHint(res.data.result_msg, function() {
+					if (res.data.success) {
+						this.$dialog.showModal('修改成功',false).then(()=>{
 							uni.navigateBack({
 								delta: 1 // 返回上一级页面。
-
+							
 							});
-						});
+						})
 					} else {
-						app.globalData.oneFailHint(res.data.result_msg);
+						this.$dialog.showModal(res.data.msg,false)
 					}
 
 				});

+ 18 - 15
pages/register/register.vue

@@ -28,13 +28,15 @@
 				<text class="red">*</text>
 				<text class="sex">验证码:</text>
 				<input type="text" class="sendmsg_input" @input="verifyCodeInput"></input>
-				<button class="right code_btn" @tap="sendMsgButton" :disabled="disabled"
-					:style="'background-color:' + color">{{text}}</button>
+				<view style="position: relative;bottom: -10rpx;">
+					<button class="right code_btn " @tap="sendMsgButton" :disabled="disabled"
+						:style="'background-color:' + color">{{text}}</button>
+				</view>
 			</view>
 			<view style="display:flex;margin:20rpx 20rpx">
-				<u-checkbox v-model="isCheck" active-color="blue">
+				<u-checkbox v-model="isCheck" active-color="#2f7ff5">
 				</u-checkbox>
-				<view style="display: flex;">
+				<view style="display: flex;" class="text-sm">
 					<text>请阅读并同意</text>
 					<navigator class="text-red" :url="webviewUrl1">《隐私协议》</navigator>
 					<text>和</text>
@@ -45,12 +47,12 @@
 				<text style="padding-left: 40rpx;">认证后用户可享受更多权益,随时获取到您所在小区的动态</text>
 			</view>
 
-			<button style="border-radius: 0;" open-type="getUserInfo" @getuserinfo="showDialogBtn"
-				class=" footer-fixed">
-				<view class="cu-btn  flex  text-lg bg-red-btn" style="padding: 46rpx 0;">
-					确认
-				</view>
-			</button>
+				<button style="border-radius: 0;" :style="{bottom:safeAreaBottom+'rpx'}" open-type="getUserInfo" @getuserinfo="showDialogBtn"
+					class=" footer-fixed">
+					<view class="cu-btn  flex  text-lg bg-red-btn" style="padding: 46rpx 0;">
+						确认
+					</view>
+				</button>
 		</form>
 	</view>
 </template>
@@ -195,7 +197,7 @@
 				//构建参数
 				let params = {};
 				params['name'] = name;
-				params['phone'] = tel;
+				params['tel'] = tel;
 				params['verify_code'] = verify_code;
 
 				params['create_type'] = 0;
@@ -220,6 +222,7 @@
 					}
 					let member = resp.data.member;
 					app.globalData.member = member;
+					this.$u.vuex('vuex_member',member)
 					if (member.state == 1 || member.state == 2) {
 						uni.reLaunch({
 							url: '/pages/index/index',
@@ -282,7 +285,7 @@
 		line-height: 100rpx;
 		position: relative;
 		font-size: 26rpx;
-		border-bottom: 2rpx solid #ddd;
+		border-bottom: 1rpx solid #eee;
 
 	}
 
@@ -357,10 +360,10 @@
 	.code_btn {
 		width: 150rpx;
 		background: $base-btn-color;
-		height: 60rpx;
-		line-height: 60rpx;
+		height: 50rpx;
+		line-height: 50rpx;
 		text-align: center;
-		border-radius: 10rpx;
+		border-radius: 8rpx;
 		color: #fff;
 		font-size: 33rpx;
 		padding: 0 10rpx;

+ 4 - 4
pages/uploadFace/uploadFace.vue

@@ -8,7 +8,7 @@
 							<text>我的房屋</text>
 						</view>
 						<view class="action">
-							<text>{{selectLabel?selectLabel:list[0].roomName}}</text>
+							<text>{{selectLabel?selectLabel:list[0].address}}</text>
 							<text class="cuIcon-right padding-left-10"></text>
 						</view>
 					</view>
@@ -50,7 +50,7 @@
 					提交人脸信息
 				</view>
 			</view>
-			<u-select z-index="9999999" mode="single-column" value-name="id" label-name="roomName"
+			<u-select z-index="9999999" mode="single-column" value-name="id" label-name="address"
 				v-model="locationShow" :list="list" @confirm="roomChange"></u-select>
 			<u-action-sheet @click="photoChecked" z-index="999999" :list="actionList" v-model="show"></u-action-sheet>
 		</view>
@@ -197,7 +197,7 @@
 					memberId: app.globalData.member.id,
 					residentialId: uni.getStorageSync("residentialId")
 				};
-				this.$http.getHouseUser(params).then(res => {
+				this.$http.getHouseUserCondition(params).then(res => {
 					if (this.$isNotEmpty(res.data.data)) {
 						this.list = res.data.data;
 						this.face_url = this.list[0].faceUrl
@@ -233,7 +233,7 @@
 					this.$u.toast('请上传人脸')
 					return
 				}
-				this.$http.editFamily(data).then(res => {
+				this.$http.modifyFace(data).then(res => {
 					if (res.data.success) {
 						this.$u.toast('修改成功')
 					} else {

+ 1 - 1
pages/wode/myInfo/myInfo.vue

@@ -13,7 +13,7 @@
     <view class="section_cont">
       <view class="section_cont_tel">
         <text class="left">手机:</text>
-        <text>{{member.tel}}</text>
+        <text>{{member.phone}}</text>
 
       </view>
     </view>

BIN
static/common/empty.png