1

property_ui/api/login.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 // 登录方法
-export function login(username, password, code, uuid,tenantId,clientId,grantType,phonenumber,smsCode) {
+export function login(username, password, code, uuid,tenantId,clientId,grantType,clientKey,phonenumber,smsCode) {
   const data = {
     username,
     password,
@@ -10,6 +10,7 @@ export function login(username, password, code, uuid,tenantId,clientId,grantType
 	tenantId,
 	clientId,
 	grantType,
+	clientKey,
 	phonenumber,smsCode
   }
   return request({//

property_ui/manage/pages/community/newssqdetail.vue

@@ -73,7 +73,7 @@
 				datainfo:{
 					
 				},
-				communityContent:'<span>hello uni-app x!</span><br/><span>uni-app x，终极跨平台方案</span>',
+				communityContent:'',
 				text:'',
 				id:"",
 				commentlist:[],//评论列表

property_ui/mine/components/box/list.vue

@@ -36,7 +36,7 @@
 							<view class="flex1 overh">
 								<view class="flexc mb6">
 									<view class="name flex1 over">{{ite.nickName}}</view>
-									<view class="time flex0 ml10">02-26</view>
+									<!-- <view class="time flex0 ml10">02-26</view> -->
 								</view>
 								<view class="txt mb8">{{ite.commentContent}}</view>
 								<view class="flexc overh mb2">

property_ui/mine/pages/news/sh.vue

@@ -21,6 +21,7 @@
 				pageNum: 1,
 				reachflag: true,
 				wtdt:'',
+				tenantId:this.$store.state.user.tenantId
 			}
 		},
 		onLoad: function() {
@@ -80,6 +81,7 @@
 				var params={
 					pageSize:this.pageSize,
 					pageNum: this.pageNum,
+					tenantId:this.tenantId,
 					"status":'1'
 				}
 				commentSh(params).then(res=>{

property_ui/pages/tlogin.vue

@@ -139,6 +139,8 @@
 				code: "",
 				password:'',
 				clientId:config.Clientid,
+				clientKey:config.userType,
+				
 			},
 			//sms
 			voList:[],

property_ui/people/pages/people/fwindex.vue

@@ -142,6 +142,7 @@
 				var params={
 					pageSize:this.pageSize,
 					pageNum: this.pageNum,
+					examine:2,
 				}
 				if(this.ftype=='house'){
 					params.houseId=this.houseId

property_ui/service/components/popup/popup.vue

@@ -290,15 +290,17 @@
 			onuploadEnd(item,fileVal,bigType) {
 				var newobj={}
 				var responseText=JSON.parse(item.responseText)
+				console.log(responseText,22)
 				if(responseText.code==200){
 					// if(fileVal=='qtfj'){
 					// 	newobj.name=responseText.originalFilename;
 					// }else{
 					// 	newobj.name=responseText.newFileName;
 					// }
-					newobj.name=responseText.newFileName;
-					newobj.oldName=responseText.originalFilename;
-					newobj.url=responseText.fileName;
+					var response=responseText.data
+					newobj.name=response.newFileName;
+					newobj.oldName=response.originalFilename;
+					newobj.url=response.fileName;
 					newobj.type=fileVal;
 					newobj.bigType=bigType;
 					newobj.suggestionId=this.suggestionId;

property_ui/service/pages/service/complaintdetail.vue

@@ -22,7 +22,7 @@
 				<view class="txt">{{datainfo.createTime}}</view>
 			</view> -->
 			<view class="cdmain">
-				<view class="tit">{{datainfo.replyContent}}</view>
+				<view class="tita">{{datainfo.replyContent}}</view>
 				<block v-if="datainfo.suggestionFjList">
 				<view class="fjlists"  v-for="(fite,fidx) in datainfo.suggestionFjList" :key='fidx'>
 					<view class="flext" @click="getDownloader(fite.url,fite.name)">
@@ -258,7 +258,7 @@
 			.txt{font-weight: 500;font-size: 24rpx;color: #AAAAAA;}
 		}
 		.cdmain{padding: 24rpx 0 24rpx;
-			.tit{font-weight: 500;font-size: 26rpx;color: #666666;line-height: 36rpx;margin-bottom: 30rpx;}
+			.tita{font-weight: 500;font-size: 26rpx;color: #666666;line-height: 36rpx;margin-bottom: 30rpx;}
 			.imgs{display: flex;align-items: center;flex-wrap: wrap;
 				image{width: 142rpx;height: 142rpx;border-radius: 20rpx;margin: 0 18rpx 18rpx 0;}
 			}

property_ui/store/modules/user.js

@@ -133,10 +133,11 @@ const user = {
 	  const tenantId = ''
 	  const clientId = Clientid
 	  const grantType = userInfo.grantType
+	  const clientKey = userInfo.clientKey
 	  const phonenumber=userInfo.username.trim()
 	  const smsCode=userInfo.code
       return new Promise((resolve, reject) => {
-        login(username, password, code, uuid,tenantId,clientId,grantType,phonenumber,smsCode).then(res => {
+        login(username, password, code, uuid,tenantId,clientId,grantType,clientKey,phonenumber,smsCode).then(res => {
           setToken(res.data.access_token)
           commit('SET_TOKEN', res.data.access_token)
 		  // setToken(res.token)

property_ui/work/components/car/list.vue

@@ -11,8 +11,9 @@
 					<image :src="houseb" class="imgs" v-if="ite.houseStatus==2"></image>
 					<image :src="housec" class="imgs" v-if="ite.houseStatus==3"></image>
 					<view class="tit">{{ite.communityName}}{{ite.detailedAddress}}</view>
+					<image :src="pdel" class="chdel" @click.stop="getDelFn(ite)" v-if="checkPermi(['wuYe:residentInfo:deleteResident'])"></image>
 					<view class="flex1"></view>
-					<view @click.stop="getDelFn(ite)" v-if="checkPermi(['wuYe:residentInfo:deleteResident'])">删除</view>
+					<!-- <view @click.stop="getDelFn(ite)" v-if="checkPermi(['wuYe:residentInfo:deleteResident'])">删除</view> -->
 					<block v-if="tabval=='-1'&&ite.examine==1&&checkPermi(['wuYe:residentInfo:examineStaff'])">
 						<view class="shbtn btna" @click.stop="getSh('3',ite)">拒绝</view>
 						<view class="shbtn btnb" @click.stop="getSh('2',ite)">通过</view>
@@ -24,9 +25,17 @@
 						<view class="txt co6" v-if="ite.houseStatus==3">代售</view>
 					</block>
 				</view>
-				<view class="clists" v-if="tabval=='-1'">
+				<view class="clists pr" v-if="tabval=='-1'||tabval=='wtg'">
+					<!-- 房本信息 -->
+					<view class="chtit">
+						<image :src="chtitbg" class="chtitbg"></image>
+						<view class="chtxt">房本信息</view>
+					</view>
 					<view class="clist"><view class="tit">姓名</view>{{ite.residentName}}</view>
 					<view class="clist"><view class="tit">手机号</view>{{ite.residentPhone}}</view>
+					<view class="clist"><view class="tit">人员类型</view>
+						
+					{{kaType(ite.residentType,rylxList)}}</view>
 					<!-- <view class="clist"><view class="tit">房屋坐落</view>{{ite.location}}</view>
 					<view class="w50 flexc">
 						<view class="clist"><view class="tit">房屋状态</view>
@@ -242,6 +251,12 @@
 				default () {
 					return []
 				}
+			},
+			rylxList:{
+				type:Array,
+				default () {
+					return []
+				}
 			}
 		},
 		data(){
@@ -268,6 +283,7 @@
 				star:require('@/manage/static/community/star.png'),
 				stara:require('@/manage/static/community/stara.png'),
 				eye:require('@/manage/static/community/eye.png'),
+				chtitbg:require('@/work/static/manage/hbg.png'),
 				baseUrl:config.baseUrl,
 				delBtnWidth:66,//左滑默认宽度
 			}
@@ -493,6 +509,11 @@ font-size: 26rpx;color: #272727;display: flex;line-height: 34rpx;
 			&.cc{color: #28C529;}
 		}
 	}
+	.chdel{width: 44rpx;height: 44rpx;margin-left: 12rpx;flex: 0 0 auto;}
+	.chtit{font-size: 26rpx;color: #66b4d1;position: absolute;right: -10rpx;top: 16rpx;
+		.chtitbg{width: 55rpx;height: 149rpx;}
+		.chtxt{position: absolute;width: 44rpx;height: 149rpx;left: 0;top: 0;padding: 10rpx;box-sizing: border-box;padding-left: 14rpx;}
+	}
 	.shbtn{border-radius: 20rpx;font-weight: 500;min-width: 92rpx;height: 40rpx;font-size: 26rpx;box-sizing: border-box;padding: 0 20rpx;line-height: 38rpx;margin-left: 24rpx;
 		&.btna{border: 2rpx solid #FF6969;background: #FFF8F8;color: #FF6969;}
 		&.btnb{border: 2rpx solid #28C529;background: #EEFCEE;color: #28C529;}

property_ui/work/pages/manage/house.vue

@@ -20,14 +20,14 @@
 				<view class="tabtop flexc">
 					<view class="tabt" :class="tabval==ite.val?'act':''" v-for="(ite,idx) in tablist" :key="idx" @click="getTabFn(ite.val)">{{ite.tit}}</view>
 					
-				<view class="tabbtn">未通过审核</view>
+				<view class="tabbtn" :class="tabval=='wtg'?'act':''" @click="getTabFn('wtg')">未通过审核</view>
 			</view>
 			
 			</view>
 		</view>
 		<!-- 列表 -->
 		<view class="carlists">
-			<car-list :datainfo="list" :wtdt="wtdt" :tabval="tabval" type='comehouse' @getDetail="getDetail" @getPut="getPut" @getJuzhu="getJuzhu" @getDelFn="getDelFn" @getCar="getCar" @getShFn="getShFn"></car-list>
+			<car-list :datainfo="list" :wtdt="wtdt" :tabval="tabval" :rylxList="rylxList" type='comehouse' @getDetail="getDetail" @getPut="getPut" @getJuzhu="getJuzhu" @getDelFn="getDelFn" @getCar="getCar" @getShFn="getShFn"></car-list>
 		</view>
 		<view class="cdbtns">
 			<!-- <view class="btna" @click="getAddFn">单个添加</view>
@@ -64,6 +64,7 @@
 				tabval:'-1',
 				tablist:[{tit:"待审核",val:'-1'}],
 				fwztList:[],
+				rylxList:[],
 			}
 		},
 		onUnload() {
@@ -120,6 +121,17 @@
 						})
 					}
 				})
+				//人员类型
+				getDictionaryFn('resident_Type').then(res=>{
+					if(res.code==200){
+						this.rylxList = res.data.map(v => {
+							return {
+								dictLabel: v.dictLabel,
+								dictValue: v.dictValue
+							}
+						})
+					}
+				})
 			},
 			getAddFn(){
 				this.$tab.navigateTo("/work/pages/manage/houseadd")
@@ -127,7 +139,7 @@
 			getDetail(data){
 				var info=JSON.parse(JSON.stringify(data))
 				var tabval=this.tabval;
-				if(tabval=='-1'){
+				if(tabval=='-1'||tabval=='wtg'){
 					var id=info.residentId
 					this.$tab.navigateTo(`/work/pages/manage/housedetail?id=${id}`)
 				}else{
@@ -190,14 +202,18 @@
 					pageSize:this.pageSize,
 					pageNum: this.pageNum,
 				}
-				if(this.tabval!=-1){
+				if(this.tabval!=-1&&this.tabval!='wtg'){
 					params.houseStatus=this.tabval
 				}
 				if(this.text){
 					params.detailedAddress=this.text
 				}
-				if(this.tabval==-1){
-					params.examine=1
+				if(this.tabval==-1||this.tabval=='wtg'){
+					if(this.tabval=='wtg'){
+						params.examine=3
+					}else{
+						params.examine=1
+					}
 					residentInfoList(params).then(res=>{
 						if(res.code==200){
 							if (res.rows.length < this.pageSize) {
@@ -280,7 +296,11 @@ color: #FFFFFF;}
 				}
 			}
 		}
-		.tabbtn{border-radius: 58rpx 0 0 58rpx;background: #E6E6E6;padding: 0 18rpx 0 26rpx;font-weight: 500;font-size: 26rpx;color: #3565ED;line-height: 58rpx;position: absolute;right: 0;top: 0;}
+		.tabbtn{border-radius: 58rpx 0 0 58rpx;background: #E6E6E6;padding: 0 18rpx 0 26rpx;font-weight: 500;font-size: 26rpx;color: #3565ED;line-height: 58rpx;position: absolute;right: 0;top: 0;
+			&.act{
+				&::after{content: '';width: 40rpx;height: 10rpx;background: #0156FE;border-radius: 6rpx;position: absolute;left: 50%;margin-left: -20rpx;bottom: -10rpx;}
+			}
+		}
 	}
 	
 }

property_ui/work/pages/manage/housedetail.vue

@@ -283,6 +283,9 @@
 					<view class="btn btn1" @click.stop="getShFn('3')">拒绝</view>
 					<view class="btn btn2" @click.stop="getShFn('2')">通过</view>
 				</view>
+				<!-- <view class="hfbtns flexcj" v-if="datainfo.examine==3&&checkPermi(['wuYe:residentInfo:editAuthentication'])">
+					<view class="btn btn2" @click.stop="getSubmit">修改提交</view>
+				</view> -->
 			</view>
 		</uni-forms>
 		
@@ -297,7 +300,7 @@
 	import {uploadIdentify,uploadmore} from '@/utils/common.js'
 	import {listNoPageTenant,houseInfoDet,examineResident} from "@/api/work/work.js"
 	import {gettenantList} from "@/api/login.js"
-	import {residentInfoDet} from "@/api/work/people.js"
+	import {residentInfoDet,authenticationPut} from "@/api/work/people.js"
 	import {getDictionaryFn} from "@/api/system/user.js"
 	import {selectValueKey} from "@/utils/common.js"
 	import {getOcrIdCard,getrealEstateCertificatee} from "@/api/system/card.js"
@@ -815,6 +818,8 @@
 									},1500)
 								}
 							})
+						}else{
+							
 						}
 					}else{
 						if(this.rzflag){
@@ -834,6 +839,18 @@
 									},1500)
 								}
 							})
+						}else{
+							authenticationPut(params).then(res=>{
+								if(res.code==200){
+									this.$toast("修改成功")
+									setTimeout(function(){
+										uni.$emit("residentInfoList")
+										uni.navigateBack({
+											delta:1
+										})
+									},1500)
+								}
+							})
 						}
 						
 					}