xuanyan 4 jaren geleden
bovenliggende
commit
7a59394e81

+ 2 - 0
pages/myFamily/audit-detail/audit-detail.vue

@@ -169,6 +169,8 @@ export default {
 		  params['checkOpinion'] = that.checkOpinion;
 		  params['name'] = that.dataDetail.name;
 		  params['idCard'] = that.dataDetail.id_card;
+		  params['operatorId'] = that.vuex_member.id;
+		  params['operatorName'] = that.vuex_member.name;
 		  // let operation = 'applyUser/updateCheckState';
 		  that.$http.updateCheckState(params).then(res =>{
 			  //添加成功

+ 2 - 0
pages/myFamily/editApplyFamily/editApplyFamily.vue

@@ -590,6 +590,8 @@ export default {
       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 =>{
 		  //添加成功

+ 6 - 1
pages/myFamily/myFamily.vue

@@ -28,7 +28,7 @@
 			</swiper>
 		</view>
 		
-		<u-picker mode="selector" v-model="roomShow"   :range="roomList" range-key="fullRoomName" @confirm="roomChange"></u-picker>
+		<u-picker mode="selector" v-model="roomShow"   :range="realRoomList" range-key="fullRoomName" @confirm="roomChange"></u-picker>
 		<!-- <u-select z-index="9999999"  mode="single-column"  value-name="id" label-name="name" v-model="roomShow" :list="roomList" @confirm="roomChange"></u-select> -->
 	</view>
 </template>
@@ -41,6 +41,7 @@
 		data() {
 			return {
 				roomShow:false,
+				realRoomList:[],
 				roomList:[],
 				roomName:'',
 				roomId:'',
@@ -81,6 +82,7 @@
 				// let operation = 'estate/getRoomByMemberId';
 				that.$http.getRoomByMemberId(params).then(res =>{
 					if (res.data.result_code == 1) {
+						this.realRoomList=res.data.roomList
 						that.roomList=res.data.list
 						
 						let own_room_list=[]
@@ -91,6 +93,9 @@
 							item.fullRoomName=item.buildingName+"-"+item.unitName+"-"+item.name
 							
 						})
+						that.realRoomList.forEach(item=>{
+							item.fullRoomName=item.buildingName+"-"+item.unitName+"-"+item.name
+						})
 						//业主自己的房子
 						getApp().globalData.own_room_list = own_room_list;
 						that.$u.vuex('vuex_own_room_list',own_room_list)

+ 2 - 2
pages/myhome/myhome.vue

@@ -116,14 +116,14 @@ export default {
 					let data=[]
 					if (uni.getStorageSync('plotName')) {
 						//如果选择了当前小区,就只把当前小区的房屋列表展示出来
-						  res.data.list.map(item => {
+						  res.data.roomList.map(item => {
 							if (item.residentialName == uni.getStorageSync('plotName')) {
 							  data.push(item);
 							}
 						  })
 					} else {
 						// 如果没有选择到小区,就把所有的房屋列表展示出来
-					  data = res.data.list;
+					  data = res.data.roomList;
 					}
 					//不推荐
 					mescroll.endSuccess(data.length)