修改

pages/bindRoom/bindRoom.vue

@@ -19,17 +19,8 @@
 
 		<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>
-			<u-button size="medium" :customStyle="cancelStyle" @click="confirm">创建新房间</u-button>
+			<u-button size="medium" :customStyle="cancelStyle" @click="auth">创建新房间</u-button>
 		</view>
-
-		<!-- 		<view class="foot_box-wrap safe-area-inset-bottom">
-			<view class="foot_box u-flex u-row-between safe-area-inset-bottom" style="box-sizing: border-box;">
-				<button @click="auth" class="sync-wxaddress u-m-20 u-flex u-row-center u-col-center">
-					绑定新房间
-				</button>
-				<button class="u-m-20 add-btn" @click="confirm">确定绑定</button>
-			</view>
-		</view> -->
 	</view>
 </template>
 

pages/myFamily/audit-detail/audit-detail.vue

@@ -2,10 +2,10 @@
 	<view class="">
 		<u-toast ref="uToast"/>
 		<u-modal   :show-cancel-button="true"  @confirm="auditBtn(2)" title="审核意见" :mask-close-able="true" v-model="modelShow" >
-			<view class="slot-content" style="margin: 20rpx;">
+			<view class="slot-content" style="margin: 30rpx;">
 				<u-form label-width="150"  ref="uForm">
 					<u-form-item :border-bottom="false">
-						<u-input height="150" placeholder="请输入审核意见(选填)" v-model="checkOpinion" />
+						<u-input height="150" placeholder="请输入审核意见" v-model="checkOpinion" />
 					</u-form-item>
 				</u-form>
 			</view>
@@ -162,6 +162,7 @@ export default {
 		
 		  if (e == 2 && that.checkOpinion == '') {
 		    app.globalData.autoFailHint("请先填写审核意见");
+			this.modelShow=true
 		    return;
 		  }
 		  params['id'] = that.apply_user_id;

pages/myFamily/comps/item.vue

@@ -78,28 +78,26 @@
 
 		},
 		methods: {
-			reload(){
+			reload() {
 				this.mescroll.resetUpScroll()
 			},
 			/**
 			 * 删除用户
 			 */
 			deleteUserById(id) {
-				app.globalData.twoFailHint("确认删除该住户吗？", ()=>{
+				this.$dialog.showModal('确认删除该住户吗？').then(() => {
 					let params = {
 						user_id: id
 					};
-					// let operation = 'user/deleteUserById';
-					this.$http.deleteUserById(params).then(res =>{
+					this.$http.deleteUserById(params).then(res => {
 						if (res.data.result_code == 1) {
 							this.$u.toast(res.data.result_msg)
 							this.mescroll.resetUpScroll()
 						} else {
 							app.globalData.oneFailHint(res.data.result_msg);
 						}
-						
-					});
-				});
+					})
+				})
 			},
 			/**
 			 * @param {Object} mescroll 初始化组件
@@ -137,11 +135,11 @@
 			 */
 			getUserListByMemberId(mescroll) {
 				let params = {
-					query:{
-						current:mescroll.num,
-						size:mescroll.size,
+					query: {
+						current: mescroll.num,
+						size: mescroll.size,
 					},
-					"residentialId":uni.getStorageSync('residentialId'),
+					"residentialId": uni.getStorageSync('residentialId'),
 				};
 				if (!this.$isEmpty(this.roomId)) {
 					params.roomId = this.roomId
@@ -151,7 +149,7 @@
 					this.$http.getAllUserByMemberId(params).then(res => {
 						if (res.data.success) {
 							let data = res.data.data.records
-							let total=res.data.data.total
+							let total = res.data.data.total
 							mescroll.endBySize(data.length, total);
 							if (mescroll.num == 1) this.userList = [];
 							this.userList = this.userList.concat(data); //追加新数据
@@ -173,14 +171,13 @@
 					"current": mescroll.num,
 					"size": mescroll.size,
 					"memberId": getApp().globalData.member.id,
-					'residentialId':uni.getStorageSync('residentialId')
 				}
 				try {
 					this.$http.getAllApplyUserByMemberId(params).then(res => {
 						console.log(res);
 						if (res.data.success) {
 							let data = res.data.data.records
-							let total=res.data.data.total
+							let total = res.data.data.total
 							mescroll.endBySize(data.length, total);
 							if (mescroll.num == 1) this.applyList = [];
 							this.applyList = this.applyList.concat(data); //追加新数据
@@ -203,13 +200,13 @@
 				let params = {
 					"current": mescroll.num,
 					"size": mescroll.size,
-					"memberId": getApp().globalData.member.id 
+					"memberId": getApp().globalData.member.id
 				}
 				try {
-					this.$http.getAuditListByMemberId(params).then(res =>{
+					this.$http.getAuditListByMemberId(params).then(res => {
 						if (res.data.success) {
 							let data = res.data.data.records
-							let total=res.data.data.total
+							let total = res.data.data.total
 							mescroll.endBySize(data.length, total);
 							if (mescroll.num == 1) this.auditList = [];
 							this.auditList = this.auditList.concat(data); //追加新数据

pages/register/register.vue

@@ -195,7 +195,7 @@
 				//构建参数
 				let params = {};
 				params['name'] = name;
-				params['tel'] = tel;
+				params['phone'] = tel;
 				params['verify_code'] = verify_code;
 
 				params['create_type'] = 0;
@@ -214,7 +214,6 @@
 						openid: uni.getStorageSync("openid")
 					};
 					let resp = await that.$http.getMemberByOpenid(params)
-					 console.log(resp,"resp");
 					if (resp.data.result_code == 0) {
 						app.globalData.oneFailHint(resp.data.result_msg);
 						return