代码更新

pages.json

@@ -25,8 +25,9 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
 				// "app-plus":{"titleNView":false}
+				"enablePullDownRefresh":true
 
 			}
 		},
@@ -125,7 +126,8 @@
 			"path": "pages/openDoor/openDoor",
 			"style": {
 				"navigationBarTitleText": "一键开门",
-				"navigationBarTextStyle": "black"
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh":true
 			}
 		},
 		// 解锁记录
@@ -133,7 +135,8 @@
 			"path": "pages/openDoor/openDoorList",
 			"style": {
 				"navigationBarTitleText": "解锁记录",
-				"navigationBarTextStyle": "black"
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh":true
 			}
 		},
 		// 开门码
@@ -181,8 +184,8 @@
 				"navigationStyle": "custom",
 				"app-plus": {
 					"titleNView": false
-				}
-
+				},
+				"enablePullDownRefresh":true
 			}
 		},
 		// 注册页面
@@ -276,7 +279,8 @@
 			"path": "pages/mine/myHouse",
 			"style": {
 				"navigationBarTitleText": "我的房屋",
-				"navigationBarTextStyle": "black"
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh":true
 			}
 		},
 		//我的房屋
@@ -353,7 +357,8 @@
 			"path": "pages/index/more",
 			"style": {
 				"navigationBarTitleText": "物业公告",
-				"navigationBarTextStyle": "black"
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh":true
 			}
 		},
 		// 物业公告详情

pages/authentication/selectHouse.vue

@@ -193,7 +193,6 @@
 				this.index=Number(e.target.value)
 				this.form.houseName=this.houseData[this.index].comtyName
 				this.name=this.houseData[this.index].comtyId
-				uni.setStorageSync('comtyId', this.name)
 				this.getLouData(this.name, 1, '', 'lou')
 			},
 			// 选择楼层事件
@@ -233,9 +232,13 @@
 						 zzjgid:this.home
 					 }).then((res)=>{
 						 if(res.code==0){
-							 uni.setStorageSync('homeId',this.home)
-							 let str=this.form.houseName+this.form.lou+this.form.hoodNum+this.form.home
-							 uni.setStorageSync('homeAdress',str)
+							 // 判断当前是否已经有认证绑定过房屋了
+							 if(!uni.getStorageSync('homeId')){
+								 uni.setStorageSync('comtyId', this.name)
+								 uni.setStorageSync('homeId',this.home)
+								 let str=this.form.houseName+this.form.lou+this.form.hoodNum+this.form.home
+								 uni.setStorageSync('homeAdress',str)
+							 }
 							 // 判断认证房屋时  是否已经微信授权登录过了
 							 if (!uni.getStorageSync('createBy')) {
 							 	uni.navigateTo({

pages/circle/circles.vue

@@ -94,13 +94,14 @@
 	</view>
 </template>
 <script>
+	var a
 	var _self, page = 1 //定义初始页数;
 	import uLiLoadMore from "../../components/uLi-load-more/uLi-load-more.vue"
 	export default {
 		data() {
 			return {
 				houseStatus: '',
-				userName: uni.getStorageSync('userName'),
+				userName: uni.getStorageSync('createBy'),
 				headImg: uni.getStorageSync('headImg'),
 				userPhone: uni.getStorageSync('userPhone'),
 				circleId: '', //朋友圈Id
@@ -127,13 +128,26 @@
 			}
 		},
 		onTabItemTap() {
+			uni.pageScrollTo({
+			    scrollTop: 0,
+			    duration: 300
+			});
 			_self = this;
 			page = 1
 			this.getData()
-			
 		},
 		onShow() {
 			this.houseStatus = uni.getStorageSync('houseStatus')
+			this.userName =uni.getStorageSync('createBy')
+			this.headImg=uni.getStorageSync('headImg')
+			if(a){
+				a=false
+				return
+			}else{
+				_self = this;
+				page = 1
+				this.getData()
+			}
 		},
 		onPullDownRefresh() {
 			uni.showLoading({
@@ -163,6 +177,8 @@
 			page = 1
 			this.getData()
 			this.houseStatus = uni.getStorageSync('houseStatus')
+			this.userName =uni.getStorageSync('createBy')
+			this.headImg=uni.getStorageSync('headImg')
 		},
 		methods: {
 			//重新认证房屋
@@ -188,6 +204,10 @@
 			},
 			//获取列表数据
 			getData() {
+				uni.showLoading({
+					mask:true,
+					title:'加载中'
+				})
 				this.http.httpRequest('/wxapplet/prop/comtycircle/list', 'get', {
 					pageNum: page,
 					comtyId: uni.getStorageSync('comtyId'),
@@ -247,6 +267,7 @@
 			},
 			// 预览图片
 			previewImage(item,index) {
+				a=true
 				uni.previewImage({
 					current:item[index],
 					urls: item,

pages/circle/publish.vue

@@ -7,8 +7,13 @@
 			</view>
 			<view class="imgBox">
 				<view class="upImg" >
-					<image :src="item" v-for="(item,index) in imgData" :key="index" @longpress="deleteImg(index)" @tap="prew(imgData,index)"  style="width:208rpx;height: 208rpx;margin-right: 10rpx;margin-bottom: 10rpx;"
-					 v-show="imgData.length>0" ></image>
+					<div v-for="(item,index) in imgData" :key="index" style="width:208rpx;height: 208rpx;margin-right: 20rpx;margin-bottom: 20rpx;position: relative;"> 
+					<image src="../../static/icon_colse@2x.png" class="deleteImg" @tap="deleteImg(index)"></image>
+						<image :src="item"   @tap="prew(imgData,index)"  style="width:208rpx;height: 208rpx;"
+						 v-show="imgData.length>0" >
+						 </image>
+					</div>
+					
 					<image src="../../static/circle_image@2x.png" style="width:208rpx;height: 208rpx;margin-bottom: 10rpx;" @tap="chooseImg" v-if="imgData.length<9"></image>
 					<!-- <view style="font-size: 18rpx;line-height:114rpx;color: #999999;margin-left: 10rpx;" v-if="imgData.length>0">长按图片可以进行删除</view> -->
 				</view>
@@ -49,18 +54,19 @@
 			},
 			// 长按图片删除
 			deleteImg(index){
-				 wx.showModal({
-				   title: '提示',
-				   content: '确定要删除此图片吗？',
-				   success:  (res) =>{
-				    if (res.confirm) {
 				     this.imgData.splice(index, 1);
-					 this.formatNum()
-				    } else if (res.cancel) {
-				      return false;    
-				     }
-				   }
-				  })
+				 // wx.showModal({
+				 //   title: '提示',
+				 //   content: '确定要删除此图片吗？',
+				 //   success:  (res) =>{
+				 //    if (res.confirm) {
+				 //     this.imgData.splice(index, 1);
+					//  this.formatNum()
+				 //    } else if (res.cancel) {
+				 //      return false;    
+				 //     }
+				 //   }
+				 //  })
 			},
 			// 发表
 			push() {
@@ -191,18 +197,24 @@
 </script>
 
 <style>
+	.deleteImg{
+		width: 40rpx;
+		height: 40rpx;
+		position: absolute;
+		top: -15rpx;
+		right: -15rpx;
+	}
 	.upImg {
 		display: flex;
 		flex-wrap: wrap;
-	}
 
+	}
 	.imgBox {
 		width: 100%;
 		margin-top: 30rpx;
 		/* display: flex;
 		flex-wrap: wrap; */
 	}
-
 	.content {
 		width: 702rpx;
 		margin: 0 auto;

pages/complain/compalinSuccess.vue

@@ -18,9 +18,9 @@
 			}
 		},
 		onUnload() {
-			uni.reLaunch({
-			      url: '/pages/complain/index',
-			 })
+			uni.navigateTo({
+				url:'./index'
+			})
 		}
 	}
 </script>

pages/complain/evaluateCompalin.vue

@@ -17,7 +17,7 @@
 				<image src="../../static/appraise_icon_appraise@2x.png" class="mainImg"></image>
 				<view class="fa">发表评价</view>
 				<view class="star">
-					
+
 					<uni-rate :value="starNum" style="margin-top: 10rpx;margin-left: 80rpx;" @change="changeRate()"></uni-rate>
 				</view>
 				<image src="../../static/guarantee_icon_content@2x.png" class="contentImg"></image>
@@ -25,7 +25,8 @@
 					评价内容
 				</view>
 				<view class="textContent">
-					<textarea placeholder="请填写评价" style="width: 95%;height: 96%;margin-left: 10rpx;margin-top: 10rpx;" v-model="textRea" cursor-spacing="120" maxlength="300"></textarea>
+					<textarea placeholder="请填写评价" style="width: 95%;height: 96%;margin-left: 10rpx;margin-top: 10rpx;" v-model="textRea"
+					 cursor-spacing="120" maxlength="300"></textarea>
 				</view>
 				<!-- 图片盒字 -->
 				<!-- <view style="width:646rpx;height: 114rpx;position: absolute;left: 24rpx;bottom: 40rpx;display: flex;">
@@ -36,7 +37,7 @@
 				</view> -->
 			</view>
 		</view>
-		<button class="submit" :class="{active:starNum && textRea}" @tap="submit" >提交</button>
+		<button class="submit" :class="{active:starNum && textRea}" @tap="submit">提交</button>
 	</view>
 </template>
 
@@ -45,16 +46,18 @@
 	export default {
 		data() {
 			return {
-				isLoading:false,
-				textRea:'',//评价内容
-				starNum:0,//星星数量
+				isLoading: false,
+				textRea: '', //评价内容
+				starNum: 0, //星星数量
 				phoneHeight: 0, //手机状态栏的高度
 				isShow: false,
 				imgData: [],
-				id:''
+				id: ''
 			}
 		},
-		 components: {uniRate},
+		components: {
+			uniRate
+		},
 		created() {
 			// 获取状态栏的高度
 			this.phoneHeight = uni.getSystemInfoSync().statusBarHeight
@@ -64,52 +67,52 @@
 		},
 		methods: {
 			// 选择评分
-		changeRate(e){
-			this.starNum=e.value.toFixed(1)
-		},
+			changeRate(e) {
+				this.starNum = e.value.toFixed(1)
+			},
 			// 提交
-			submit(){
-			   if(!this.textRea || !this.starNum){
-				   return
-			   }else{
-				   uni.showLoading({
-				   	mask:true,
-					title:'加载中'
-				   })
-				   this.http.httpRequest('/wxapplet/owneradvice/edit', 'post', {
-				   	adviceId: Number(this.id),
-				   	score: this.starNum,
-				   	ownerEvalu: this.textRea
-				   }).then((res) => {
-				   	// 判断请求是否成功 0 成功 
-				   	if (res.code == 0) {
-				   		uni.setStorageSync('rateType',0)
-						this.textRea=''
-						this.starNum=0
-				   		uni.navigateTo({
-				   			url:"../onlineRpair/evalueSuccess"
-				   		})
+			submit() {
+				if (!this.textRea || !this.starNum) {
+					return
+				} else {
+					uni.showLoading({
+						mask: true,
+						title: '加载中'
+					})
+					this.http.httpRequest('/wxapplet/owneradvice/edit', 'post', {
+						adviceId: Number(this.id),
+						score: this.starNum,
+						ownerEvalu: this.textRea
+					}).then((res) => {
+						// 判断请求是否成功 0 成功 
+						if (res.code == 0) {
+							uni.setStorageSync('rateType', 0)
+							this.textRea = ''
+							this.starNum = 0
+							uni.redirectTo({
+								url: "../onlineRpair/evalueSuccess"
+							})
+							uni.hideLoading()
+						} else {
+							uni.hideLoading()
+							uni.showToast({
+								title: res.msg,
+								"icon": 'none'
+							})
+						}
+					}).catch(() => {
 						uni.hideLoading()
-				   	} else {
-					uni.hideLoading()
-				   		uni.showToast({
-				   			title: res.msg,
-				   			"icon": 'none'
-				   		})
-				   	}
-				   }).catch(()=>{
-					   uni.hideLoading()
-				   })
-			   }
+					})
+				}
 			},
 			// 返回上一层
-			back(){
+			back() {
 				uni.navigateBack({
-					delta:1
+					delta: 1
 				})
 			}
 		},
-		
+
 	}
 </script>
 
@@ -125,7 +128,7 @@
 		font-weight: bold;
 		color: rgba(204, 204, 204, 1);
 		position: absolute;
-		bottom:56rpx;
+		bottom: 56rpx;
 		left: 26rpx;
 		text-align: center;
 		line-height: 90rpx;
@@ -237,9 +240,10 @@
 		position: absolute;
 		top: 0;
 	}
-	.active{
-		color:rgba(255,255,255,1);
-		background:rgba(41,138,253,1);
-		opacity:1;
+
+	.active {
+		color: rgba(255, 255, 255, 1);
+		background: rgba(41, 138, 253, 1);
+		opacity: 1;
 	}
 </style>

pages/complain/index.vue

@@ -9,7 +9,7 @@
 					<view style="width:100%;height:44rpx;display: flex;justify-content: space-between;">
 						<view class="name">{{item.createBy}}</view>
 						<view class="topBtn" v-if="item.state==2">已处理</view>
-						<view v-else class="topBtn" style="border:2rpx solid rgba(41,138,253,1);color:#298AFD;">未处理</view>
+						<view v-else-if="item.state==1" class="topBtn" style="border:2rpx solid rgba(41,138,253,1);color:#298AFD;">未处理</view>
 					</view>
 					<view class="text">
 						{{item.content}}
@@ -18,6 +18,24 @@
 						<image :src="img" style="width: 180rpx;height: 180rpx;padding-right: 10rpx;margin-bottom: 10rpx;"@tap="prew(item.photosUrlList,index1)" v-for="(img,index1) in item.photosUrlList"
 						 :key="index1"></image>
 					</view>
+					<!-- 回复信息 -->
+					<view class="replay" v-if="item.reprList.length>0">
+						<view style="width: 100%;margin: 20rpx 0rpx 20rpx 20rpx;"  v-for="(rep,index3) in item.reprList" :key="index3">
+							<view class="replayItem" v-if="rep.disposeState==2">
+								<view class="replayName" style="padding-right: 15rpx;" >
+									<text style="font-size: 28rpx;color: #333333;font-family:PingFang SC;font-weight:bold;margin-right:5rpx;">{{rep.maintainBy}}
+									</text><text style="color: rgba(41, 138, 253, 1);"> 回复</text><text style="font-size: 28rpx;color: #333333;font-family:PingFang SC;font-weight:bold;margin-left: 5rpx;">{{item.createBy}}:</text>
+									<text style="font-size: 25rpx;padding-left: 5rpx;">{{rep.disposeResult}}</text></view>
+								<!-- <view class="replayContent">{{rep.disposeResult}}</view> -->
+							</view>
+							<view class="replayItem"  v-else-if="rep.disposeState==3">
+								<view class="replayName" style="padding-right: 15rpx;padding-top: 5rpx;">
+								<uni-rate :value="rep.score" :disabled="true" ></uni-rate>
+								</view>
+								<view style="padding-top: 10rpx;">{{rep.disposeResult}}</view>
+							</view>
+						</view>
+					</view>
 					<!-- 我要评论 -->
 					<view class="bottomBtn" @tap="myTalk(item.adviceId)" v-show="item.userId==userId &&item.state==2 ">我的评价</view>
 					<view class="date">{{(item.createTime).substr(0,16)}}</view>
@@ -32,6 +50,7 @@
 </template>
 
 <script>
+	import uniRate from '@/components/uni-rate/uni-rate.vue'
 	export default {
 		data() {
 			return {
@@ -50,6 +69,9 @@
 				url:'../index/index'
 			})
 		},
+		components: {
+			uniRate
+		},
 		methods: {
 			// 预览图片
 			prew(item,index){
@@ -73,10 +95,36 @@
 					this.loadData(pullScroll);
 				}, 200);
 			},
+			// 
+			downData(pullScroll){
+				this.pageNum = pullScroll.page
+				setTimeout(() => {
+					this.http.httpRequest('/wxapplet/owneradvice/list', 'get', {
+						pageNum: pullScroll.page,
+						pageSize: this.pageSize,
+						userId: uni.getStorageSync("userId")
+					}).then((res) => {
+						if (res.code == 0) {
+							this.data = res.data.rows
+							pullScroll.finish();
+						} else {
+							pullScroll.finish();
+							uni.showToast({
+								title: res.msg,
+								"icon": 'none'
+							})
+						}
+					}).catch(()=>{
+						pullScroll.finish();
+					})
+				}, 500);
+			},
 			//获取加载数据
 			loadData(pullScroll) {
-				console.log(pullScroll)
 				this.pageNum = pullScroll.page
+				if(pullScroll.page==1){
+					this.data=[]
+				}
 				setTimeout(() => {
 					this.http.httpRequest('/wxapplet/owneradvice/list', 'get', {
 						pageNum: pullScroll.page,
@@ -90,6 +138,8 @@
 							} else {
 								pullScroll.success();
 								let data = res.data.rows
+								console.log(this.data);
+								console.log(data);
 								this.data = this.data.concat(data);
 							}
 						} else {

pages/complain/wantCompalin.vue

@@ -187,7 +187,7 @@
 					}, true).then((res)=>{
 						console.log(res)
 						if(res.code==0){
-							uni.navigateTo({
+							uni.redirectTo({
 								url:'./compalinSuccess'
 							})
 							this.textRea=''

pages/family/family.vue

@@ -1,13 +1,12 @@
 <template>
 	<view>
-		
 		<view class="topImg">
 			<image src="../../static/care_family.png" style="width: 100%;height: 100%;"></image>
 			<view class="topTile">家人关怀</view>
 			<view class="topNum">今天有<text style="font-weight:400;">0</text>条出行异常</view>
 		</view>
 		<!-- <view style="margin-top: 30rpx;"> -->
-		<view >
+		<view style="width: 100%;">
 			<!-- <view class="img">
 				<image src="../../static/null_image_checking@2x.png" style="width: 100%;height: 100%;"></image>
 			</view> -->
@@ -48,10 +47,26 @@
 				visible:true,
 				moreIndex: '',
 				IsFirst: true, //判断是否显示更多数据
-				data: []
+				data: [
+					
+				]
 			}
 		},
 		onShow() {
+			// this.getList()
+		},
+		onTabItemTap(e) {
+			uni.pageScrollTo({
+			    scrollTop: 0,
+			    duration: 300
+			});
+		this.getList()
+		},
+		onPullDownRefresh() {
+			uni.showLoading({
+				title: '加载中',
+				mask: true
+			})
 			this.getList()
 		},
 		onLoad() {
@@ -83,7 +98,10 @@
 							this.visible=false
 							this.data = res.data.rows
 						}
-						uni.hideLoading()
+						setTimeout(() => {
+							uni.hideLoading()
+							uni.stopPullDownRefresh()
+						}, 1000)
 					} else {
 						uni.hideLoading()  
 						uni.showToast({
@@ -167,7 +185,7 @@
 		/* box-shadow: 0rpx 6rpx 10rpx rgba(0, 0, 0, 0.1); */
 		opacity: 1;
 		overflow: hidden;
-		border:2rpx solid rgba(215,215,217,1);
+		border-bottom:2rpx solid rgba(215,215,217,1);
 	}
 
 	.topImg {

pages/index/index.vue

@@ -10,7 +10,8 @@
 						{{adress}}
 					</view>
 					<view v-else>
-						<text>xx小区</text> <text>111楼</text> <text>2单元 801</text>
+						<!-- <text>xx小区</text> <text>111楼</text> <text>2单元 801</text> -->
+						<text>还没认证房屋</text>
 					</view>
 					<view class="topIcon">
 						<image src="../../static/home_combo_more@2x.png" style="width: 100%;height: 100%;margin-bottom: 5rpx;"></image>
@@ -124,8 +125,20 @@
 			// 获取状态栏的高度
 			this.phoneHeight = uni.getSystemInfoSync().statusBarHeight
 			this.getBannerData()
-			this.getUserInfo()
-		
+			// this.getUserInfo()
+
+		},
+		onTabItemTap(e) {
+			uni.pageScrollTo({
+			    scrollTop: 0,
+			    duration: 300
+			});
+		this.getNoticeList()
+		this.getStatus()
+		},
+		onPullDownRefresh() {
+			this.getNoticeList()
+			this.getStatus()
 		},
 		onLoad() {
 			this.getStatus()
@@ -133,7 +146,7 @@
 		},
 		onShow() {
 			this.getStatus()
-				this.status = uni.getStorageSync('houseStatus')
+			this.status = uni.getStorageSync('houseStatus')
 			this.adress = uni.getStorageSync('homeAdress')
 			this.getNoticeList()
 		},
@@ -160,8 +173,28 @@
 					houseId: uni.getStorageSync('homeId'),
 				}, true).then((res) => {
 					if (res.code == 0) {
-						this.status = res.data.houseStatus
-						uni.setStorageSync('houseStatus', res.data.houseStatus)
+						// 判断当前用户是否存在
+						if (res.data.userList[0].userId) {
+							this.status = res.data.houseStatus
+							uni.setStorageSync('createBy', res.data.userList[0].createBy),
+								uni.setStorageSync('houseStatus', res.data.houseStatus)
+							uni.setStorageSync('userName', res.data.userList[0].loginName)
+							uni.setStorageSync('userPhone', res.data.userList[0].phoneNumBer)
+							if (res.data.userList[0].avatar.indexOf('https://') == -1) {
+								uni.setStorageSync('headImg', this.getBase64ImageUrl(res.data.userList[0].avatar))
+							} else {
+								uni.setStorageSync('headImg', res.data.userList[0].avatar)
+							}
+						}else{
+							uni.showToast({
+								title:'当前用户已不存在,请重新注册',
+								'icon':'none'
+							})
+							uni.navigateTo({
+								url:'../register/register'
+							})
+						}
+
 					}
 				})
 			},
@@ -176,29 +209,7 @@
 				// 刷新数据
 				return base64ImgUrl
 			},
-			// 获取用户信息
-			getUserInfo() {
-				this.http.httpRequest('/wxapplet/ownersid/getUser', 'get', {
-					userId: uni.getStorageSync('userId')
-				}, true).then((res) => {
-					if (res.code == 0) {
-						uni.setStorageSync('userName', res.data.loginName)
-						uni.setStorageSync('userPhone', res.data.phoneNum)
-						// 判断当前返回值是否是网络路径图片
-						if (res.data.avatar.indexOf('https://') == -1) {
-							uni.setStorageSync('headImg', this.getBase64ImageUrl(res.data.avatar))
-						} else {
-							uni.setStorageSync('headImg', res.data.avatar)
-						}
-					} else {
-						// uni.showToast({
-						// 	title: res.msg,
-						// 	'icon': 'none'
-						// })
-					}
 
-				}).catch(() => {})
-			},
 			// 获取轮播图数据
 			getBannerData() {
 				this.http.httpRequest('/wxapplet/owner/AdvertPhoto/list', 'get', {}, true).then((res) => {
@@ -233,7 +244,11 @@
 						} else {
 							this.list = res.data.rows
 						}
-						uni.hideLoading()
+						setTimeout(() => {
+							uni.hideLoading()
+							uni.stopPullDownRefresh()
+						}, 1000)
+
 					} else {
 						uni.hideLoading()
 						uni.showToast({
@@ -339,11 +354,13 @@
 		top: 20rpx;
 
 	}
+
 	.topBg {
 		width: 100%;
 		height: 110rpx;
 		background: rgba(41, 138, 253, 1);
 	}
+
 	.popupBtn {
 		width: 342rpx;
 		height: 80rpx;

pages/index/more.vue

@@ -25,19 +25,26 @@
 		</view>
 	</view>
 </template>
-
 <script>
 	export default {
 		data() {
 			return {
 				listData: [],
-				visible: true
+				visible: true,
+				upLoadingText: '加载中 ...',
+				upFinishText: '暂无更多了',
 			}
 		},
-
 		mounted() {
 			this.getNoticeList()
 		},
+		onPullDownRefresh() {
+			uni.showLoading({
+				title: '加载中',
+				mask: true
+			})
+			this.getNoticeList()
+		},
 		methods: {
 			// 获取公告数据
 			getNoticeList() {
@@ -57,7 +64,10 @@
 							this.visible = false
 						}
 						this.listData = res.data.rows
-						uni.hideLoading();
+						setTimeout(() => {
+							uni.hideLoading()
+							uni.stopPullDownRefresh()
+						}, 1000)
 					} else {
 						uni.showToast({
 							title: res.msg,

pages/index/visitorPass.vue

@@ -180,10 +180,10 @@
 							cardNo: this.form.idNumber,
 							phoneNum: this.form.phone,
 							personName: this.form.name
-
+							
 						},true).then((res) => {
 							if (res.code == 0) {
-								uni.navigateTo({
+								uni.redirectTo({
 									url: "../visitor/doorCode?code="+res.data.Qrcode+'&img='+res.data.codePhotoUrl
 								})
 								uni.hideLoading()

pages/login/login.vue

@@ -14,7 +14,7 @@
 					<view class="left-icon">
 						<image src="../../static/login_icon_phone@2x.png" style="width: 100%;height: 100%;"></image>
 					</view>
-					<input class="uni-input item-input" v-model="form.phone"  type="number" placeholder="请输入手机号" @input="changePhone" />
+					<input class="uni-input item-input" v-model="form.phone" type="number" placeholder="请输入手机号" @input="changePhone" />
 				</view>
 				<view class="item">
 					<view class="left-icon">
@@ -41,7 +41,7 @@
 	export default {
 		data() {
 			return {
-				isLoading:false,
+				isLoading: false,
 				phoneLength: 0, //手机号的长度
 				isShow: false, //判断是否显示重新获取
 				isGet: true, //判断是否显示获取验证码
@@ -60,23 +60,32 @@
 		},
 		created() {
 			let id = uni.getStorageSync('userId')
-			let name =uni.getStorageSync('createBy')
+			let name = uni.getStorageSync('createBy')
 			// 判断当前用户是否已经登录过是 直接跳到首页 否 需要登录
-			if(id && name){
+			if (id && name) {
 				uni.switchTab({
-					url:'../index/index'
+					url: '../index/index'
 				})
-			}else{
-				if(id){
-					uni.navigateTo({
-						url:'./authorization'
-					})
-				}else{
-					
-				}
 			}
+			// else{
+			// 	if(id){
+			// 		uni.navigateTo({
+			// 			url:'./authorization'
+			// 		})
+			// 	}else{
+
+			// 	}
+			// }
 		},
 		methods: {
+			// 校验是否注册
+			check() {
+				this.http.httpRequest('/wxapplet/ownersid/checkphone', 'get', {
+					phoneNumBer: this.fom.phone
+				}, true).then((res) => {
+					console.log(res)
+				})
+			},
 			// 监听输入手机号码的长度
 			changePhone() {
 				this.phoneLength = this.form.phone.length
@@ -94,28 +103,41 @@
 				} else {
 					let phoneReg = /^1[3|4|5|7|8][0-9]{9}$/; //手机号正则校验
 					if (phoneReg.test(this.form.phone)) {
-						this.isShow = true
-						this.isGet = false
-						const TIME_COUNT = 60;
-						// 判断当前timer是否有值
-						if (!this.timer) {
-							this.num = TIME_COUNT;
-							this.show = false;
-							this.timer = setInterval(() => {
-								// 判断当前num值大于0并且小于等于60执行
-								if (this.num > 0 && this.num <= TIME_COUNT) {
-									this.num--;
-								} else {
-									//否则就清除定时
-									clearInterval(this.timer);
-									this.timer = null;
-									this.num = 0
-								}
-							}, 1000)
-						}
-						this.http.httpRequest('/wxapplet/ownersid/shortmessaging', 'get', {
+						this.http.httpRequest('/wxapplet/ownersid/checkphone', 'get', {
 							phoneNumBer: this.form.phone
-						}, true).then((res) => {})
+						}, true).then((res) => {
+							console.log(res)
+							// 判断当前手机号是否注册
+							if (res.code == 1) {
+								this.isShow = true
+								this.isGet = false
+								const TIME_COUNT = 60;
+								// 判断当前timer是否有值
+								if (!this.timer) {
+									this.num = TIME_COUNT;
+									this.show = false;
+									this.timer = setInterval(() => {
+										// 判断当前num值大于0并且小于等于60执行
+										if (this.num > 0 && this.num <= TIME_COUNT) {
+											this.num--;
+										} else {
+											//否则就清除定时
+											clearInterval(this.timer);
+											this.timer = null;
+											this.num = 0
+										}
+									}, 1000)
+								}
+								this.http.httpRequest('/wxapplet/ownersid/shortmessaging', 'get', {
+									phoneNumBer: this.form.phone
+								}, true).then((res) => {})
+							} else {
+								uni.showToast({
+									title: res.data,
+									'icon': 'none'
+								})
+							}
+						})
 					} else {
 						uni.showToast({
 							"icon": "none",
@@ -140,8 +162,8 @@
 					return
 				} else {
 					uni.showLoading({
-						mask:true,
-						title:'登录中'
+						mask: true,
+						title: '登录中'
 					})
 					this.http.httpRequest('/wxapplet/ownersid/login', 'post', {
 						phoneNumBer: this.form.phone,
@@ -151,18 +173,18 @@
 						// 判断是否登陆成功
 						if (res.code == 0) {
 							console.log(res)
-							uni.setStorageSync('userId',res.data[0].userId)
-							uni.setStorageSync('idNumber',res.data[0].idcardNum)
-							uni.setStorageSync('phoneNumber',res.data[0].phoneNumBer)
+							uni.setStorageSync('userId', res.data[0].userId)
+							uni.setStorageSync('idNumber', res.data[0].idcardNum)
+							uni.setStorageSync('phoneNumber', res.data[0].phoneNumBer)
 							// 判断当前是否已经认证过房屋了
-							if(res.data[0].comtyInfos.length>0){
-								uni.setStorageSync('comtyId',res.data[0].comtyInfos[0].cbId)
-								uni.setStorageSync('homeId',res.data[0].comtyInfos[0].ownerBases[0].bid)
-								uni.setStorageSync('homeAdress',res.data[0].comtyInfos[0].comtyName)
+							if (res.data[0].comtyInfos.length > 0) {
+								uni.setStorageSync('comtyId', res.data[0].comtyInfos[0].cbId)
+								uni.setStorageSync('homeId', res.data[0].comtyInfos[0].ownerBases[0].bid)
+								uni.setStorageSync('homeAdress', res.data[0].comtyInfos[0].comtyName)
 								uni.switchTab({
-									url:'../index/index'
+									url: '../index/index'
 								})
-							}else{
+							} else {
 								console.log('走这里')
 								uni.navigateTo({
 									url: '../authentication/city'
@@ -176,7 +198,7 @@
 								'icon': 'none'
 							})
 						}
-					}).catch(()=>{
+					}).catch(() => {
 						uni.hideLoading()
 					})
 
@@ -190,15 +212,19 @@
 	.getCode {
 		color: rgba(163, 197, 237, 1);
 	}
+
 	.codeActive {
 		color: rgba(41, 138, 253, 1);
 	}
+
 	.cx {
 		color: rgba(163, 197, 237, 1);
 	}
+
 	.cxActive {
 		color: rgba(41, 138, 253, 1);
 	}
+
 	.regiter {
 		width: 56rpx;
 		height: 40rpx;

pages/mine/addCar.vue

@@ -75,7 +75,7 @@
 						comtyId: uni.getStorageSync('comtyId')
 					}, true).then((res) => {
 						if (res.code == 0) {
-						uni.navigateTo({
+						uni.redirectTo({
 							url:'./myCar'
 						})
 						  uni.hideLoading()

pages/mine/addFamily.vue

@@ -39,7 +39,7 @@
 				phone: '', //手机号
 				idNumber: '', //身份证号
 				photo: '', //人脸照片
-				img:'',
+				img: '',
 				isShow: true, //判断添加照片是否显示
 				isImg: false
 			}
@@ -47,26 +47,39 @@
 		methods: {
 			// 选择照片
 			chooseImg() {
+
 				uni.chooseImage({
 					count: 1, //默认9
 					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
 					// sourceType: ['album'], //从相册选择
 					success: (res) => {
-						this.img=res.tempFiles[0].path
+						uni.showLoading({
+							mask: true,
+							title: '上传中'
+						})
+						this.img = res.tempFiles[0].path
 						wx.getFileSystemManager().readFile({
-						  filePath:res.tempFiles[0].path,//微信小程序图片默认路径
-						  encoding: 'base64', //编码格式
-						  success:(res)=>{
-							  this.isShow = false
-							  this.isImg = true
-						   this.photo=res.data
-						  },fail(){
-						   
-						  }
+							filePath: res.tempFiles[0].path, //微信小程序图片默认路径
+							encoding: 'base64', //编码格式
+							success: (res) => {
+								this.isShow = false
+								this.isImg = true
+								this.photo = res.data
+								uni.hideLoading()
+								setTimeout(() => {
+									uni.showToast({
+										title: '上传成功',
+										'icon': 'success'
+									}, 500)
+								})
+							},
+							fail() {
+
+							}
 						})
-						
-						
-					
+
+
+
 					}
 				})
 			},
@@ -84,7 +97,7 @@
 							title: '请输入正确的姓名格式',
 							duration: 2000
 						});
-					} 
+					}
 					// 表单校验
 					else if (!phoneReg.test(this.phone)) {
 						uni.showToast({
@@ -98,8 +111,8 @@
 						})
 					} else {
 						uni.showLoading({
-							mask:true,
-							title:'加载中'
+							mask: true,
+							title: '加载中'
 						})
 						this.http.httpRequest('/wxapplet/owner/peopleInfor/faceadd', 'post', {
 							comtyId: uni.getStorageSync('comtyId'),
@@ -107,7 +120,7 @@
 							personName: this.name,
 							phoneNum: this.phone,
 							facePic: this.photo,
-							doorNum:uni.getStorageSync('homeId')
+							doorNum: uni.getStorageSync('homeId')
 						}, true).then((res) => {
 							if (res.code == 0) {
 								uni.hideLoading()
@@ -115,14 +128,14 @@
 									'icon': 'success',
 									title: "保存成功"
 								})
-								this.name=''
-								this.phone=''
-								this.idNumber=''
-								setTimeout(()=>{
-									uni.navigateTo({
+								this.name = ''
+								this.phone = ''
+								this.idNumber = ''
+								setTimeout(() => {
+									uni.redirectTo({
 										url: './family'
 									})
-								},500)
+								}, 500)
 							} else {
 								uni.hideLoading()
 								uni.showToast({
@@ -130,10 +143,10 @@
 									'icon': 'none'
 								})
 							}
-						}).catch(()=>{
+						}).catch(() => {
 							uni.hideLoading()
 						})
-						
+
 					}
 				}
 

pages/mine/face.vue

@@ -102,6 +102,10 @@
 					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
 					// sourceType: ['album'], //从相册选择
 					success: (res) => {
+						uni.showLoading({
+							mask: true,
+							title: '上传中'
+						})
 						this.facePhoto=res.tempFiles[0].path
 						wx.getFileSystemManager().readFile({
 						  filePath:res.tempFiles[0].path,//微信小程序图片默认路径

pages/mine/family.vue

@@ -5,8 +5,8 @@
 		<view style="width:144rpx;height:50rpx;font-size:36rpx;margin: 0 auto;margin-top: 46rpx;">暂无数据</view>
 	</view>
 		<!-- <view style="width: 100%;text-align: center;margin-top: 20rpx;" v-if="data.length==0">暂无数据</view> -->
-		<uni-swipe-action v-show="!visible">
-			<uni-swipe-action-item :options="options" @click="onClick(item)" @change="change" v-for="(item,index) in data" :key="index">
+		<uni-swipe-action v-if="!visible">
+			<uni-swipe-action-item :options="options" @click="onClick(item)"  v-for="(item,index) in data" :key="index">
 				<view class="item">
 					<view class="left">
 						<image src="../../static/youer.png" style="width:140rpx;height:140rpx;border-radius: 20rpx;" v-if="IdCard(item.cardNo)<=6"></image>
@@ -17,7 +17,17 @@
 						<image src="../../static/old.png" style="width:140rpx;height:140rpx;border-radius: 20rpx;" v-else-if="IdCard(item.cardNo)>69"></image>
 					</view>
 					<view class="right">
-						<view class="name">{{item.personName}}</view>
+						<view class="name">
+							<view>
+								{{item.personName}}
+							</view>
+							<view style="color:#57E087;font-size: 25rpx;line-height:44rpx;" v-if="item.state==2">
+								审核已通过
+							</view>
+							<view style="color:#F8C348;font-size: 25rpx;line-height:44rpx;" v-else-if="item.state==1">
+								审核中
+							</view>
+						</view>
 						<view class="phone">
 							<text>手机号 :</text><text style="margin-left:15rpx">{{item.phoneNum}}</text>
 						</view>
@@ -134,9 +144,9 @@
 						if (res.data.rows.length == 0) {
 							this.visible=true
 						}else{
-							this.data = res.data.rows
 							this.visible=false
 						}
+						this.data = res.data.rows
 						uni.hideLoading()
 					} else {
 						uni.hideLoading()
@@ -204,8 +214,10 @@
 		font-size: 32rpx;
 		font-family: PingFang SC;
 		font-weight: bold;
-		line-height: 44px;
+		/* line-height: 44px; */
 		color: rgba(51, 51, 51, 1);
+		display: flex;
+		justify-content: space-between;
 	}
 
 	.phone {

pages/mine/message.vue

@@ -1,33 +1,35 @@
 <!-- 我的消息 -->
 <template>
 	<view class="">
+		<!-- 分页加载组件 -->
 		<scroll ref="pullScroll" :pullDown="pullDown" :pullUp="loadData">
-			<view class="item" v-for="(item,index) in data" :key="index">
+			<view class="item" v-for="(item,index) in data" :key="index" @tap="seeMore(item)">
 				<view class="top">
-					<view class="left" v-if="item.status==1">
+					<view class="left" v-if="item.msgType==1 || item.msgType==2">
 						<view class="icon">审核</view>
 						<view class="title">审核信息</view>
 					</view>
-					<view class="left" v-else-if="item.status==2">
+				<!-- 	<view class="left" v-else-if="item.status==2">
 						<view class="icon" style="background:rgba(248,195,72,1);">报修</view>
 						<view class="title">报修信息</view>
-					</view>
-					<view class="left" v-else-if="item.status==3">
-						<view class="icon" style="background:rgba(96,139,233,1);">投诉</view>
-						<view class="title">投诉信息</view>
-					</view>
+					</view> -->
 					<view class="left" v-else>
+						<view class="icon" style="background:rgba(96,139,233,1);">其他</view>
+						<view class="title">其他信息</view>
+					</view>
+					<!-- <view class="left" v-else>
 						<view class="icon" style="background:rgba(87,224,135,1);">访问</view>
 						<view class="title">访问信息</view>
-					</view>
-					<view class="right">{{item.date}}</view>
+					</view> -->
+					<view class="right">{{item.createDate}}</view>
 				</view>
-				<view class="content" @tap="seeMore(index)">
-					<view class="info" :class="{active:item.show}">{{item.info}}</view>
-					<image src="../../static/icon_combo_nor@2x.png" style="width:29rpx;height: 15rpx;margin-left: 28rpx;margin-top: 15rpx;"
+				<!--  @tap="seeMore(index)" -->
+				<view class="content">
+					<view class="info" :class="{active:item.show}">{{item.msgContent}}</view>
+					<!-- <image src="../../static/icon_combo_nor@2x.png" style="width:29rpx;height: 15rpx;margin-left: 28rpx;margin-top: 15rpx;"
 					 v-show="!item.show"></image>
 					<image src="../../static/icon_combo_set@2x.png" style="width:29rpx;height: 15rpx;margin-left: 28rpx;margin-top: 15rpx;"
-					 v-show="item.show"></image>
+					 v-show="item.show"></image> -->
 				</view>
 			</view>
 		</scroll>
@@ -38,11 +40,9 @@
 	export default {
 		data() {
 			return {
-				isShow: true, //
+				isShow: true, //判断
 				status: 4,
-				data: [
-					
-				]
+				data: []
 			}
 		},
 		onLoad() {
@@ -65,88 +65,50 @@
 			//获取加载数据
 			loadData(pullScroll) {
 				console.log(pullScroll)
+				uni.showLoading({
+					mask: true,
+					title: '加载中'
+				})
 				setTimeout(() => {
-					// if (pullScroll.page == 1) {
-					// 	this.doorData = [];
-					// }
-					let data = [
-						{
-							status: 1,
-							date: '07-21 10:24',
-							info: '恭喜您！您在花园小区1单元101室的审核已经通过！安全现已接收到您提交的报修信息',
-							show: false
-						}, {
-							status: 2,
-							date: '07-21 10:24',
-							show: false,
-							info: '恭喜您！您在花园小区1单元101室的审核已经通过！安全现已接收到您提交的报修信息'
-						}, {
-							status: 3,
-							date: '07-21 10:24',
-							show: false,
-							info: '恭喜您！您在花园小区1单元101室的审核已经通过！安全现已接收到您提交的报修信息'
-						},
-						{
-							status: 1,
-							date: '07-21 10:24',
-							info: '恭喜您！您在花园小区1单元101室的审核已经通过！安全现已接收到您提交的报修信息',
-							show: false
-						}, {
-							status: 2,
-							date: '07-21 10:24',
-							show: false,
-							info: '恭喜您！您在花园小区1单元101室的审核已经通过！安全现已接收到您提交的报修信息'
-						}, {
-							status: 3,
-							date: '07-21 10:24',
-							show: false,
-							info: '恭喜您！您在花园小区1单元101室的审核已经通过！安全现已接收到您提交的报修信息'
-						},
-						{
-							status: 1,
-							date: '07-21 10:24',
-							info: '恭喜您！您在花园小区1单元101室的审核已经通过！安全现已接收到您提交的报修信息',
-							show: false
-						}, {
-							status: 2,
-							date: '07-21 10:24',
-							show: false,
-							info: '恭喜您！您在花园小区1单元101室的审核已经通过！安全现已接收到您提交的报修信息'
-						}, {
-							status: 3,
-							date: '07-21 10:24',
-							show: false,
-							info: '恭喜您！您在花园小区1单元101室的审核已经通过！安全现已接收到您提交的报修信息'
-						},
-						{
-							status: 1,
-							date: '07-21 10:24',
-							info: '恭喜您！您在花园小区1单元101室的审核已经通过！安全现已接收到您提交的报修信息',
-							show: false
-						}, {
-							status: 2,
-							date: '07-21 10:24',
-							show: false,
-							info: '恭喜您！您在花园小区1单元101室的审核已经通过！安全现已接收到您提交的报修信息'
-						}, {
-							status: 3,
-							date: '07-21 10:24',
-							show: false,
-							info: '恭喜您！您在花园小区1单元101室的审核已经通过！安全现已接收到您提交的报修信息'
-						},
-					]
-					this.data = this.data.concat(data);
-					// 判断数据是否加载完毕
-					if (this.data.length >= 20) {
-						pullScroll.finish();
-					} else {
-						pullScroll.success();
+					if (pullScroll.page == 1) {
+						this.data = [];
 					}
+					this.http.httpRequest('/wxapplet/ownerMessger/list', 'get', {
+						userId: uni.getStorageSync('userId'),
+						pageNum: pullScroll.page,
+						pageSize: 10
+					}, true).then((res) => {
+						console.log(res)
+						if (res.code == 0) {
+							if (this.data.length == res.data.total) {
+								pullScroll.finish();
+							} else {
+								pullScroll.success();
+								this.data=this.data.concat(res.data.rows)
+								if(this.data.length == res.data.total){
+									pullScroll.finish();
+								}
+							}
+							uni.hideLoading()
+						} else {
+							uni.hideLoading()
+							pullScroll.finish();
+							uni.showToast({
+								title: res.msg,
+								'icon': 'none'
+							})
+						}
+					})
 				}, 500);
 			},
 			// 查看更多
-			seeMore(index) {
-				this.data[index].show = !this.data[index].show
+			seeMore(item) {
+				// this.data[index].show = !this.data[index].show
+				this.http.httpRequest('/wxapplet/ownerMessger/getMes','get',{
+						msgId:item.msgId
+				},true).then((res)=>{
+					console.log(res)
+				})
 			}
 		}
 	}
@@ -216,7 +178,7 @@
 	}
 
 	.right {
-		width: 166rpx;
+		width: 300rpx;
 		margin-top: 3rpx;
 		height: 36rpx;
 		font-size: 26rpx;

pages/mine/myCar.vue

@@ -2,13 +2,18 @@
 <template>
 	<view class="">
 		<!-- 循环体 -->
-		<scroll ref="pullScroll" :pullDown="pullDown" :pullUp="loadData">
+		<scroll ref="pullScroll" :pullDown="pullDown" :pullUp="loadData" >
+			<!-- <uni-swipe-action style="height: 180rpx;"> -->
+			<!-- <uni-swipe-action-item :options="options" @click="onClick(item)" > -->
 			<view class="item" v-for="(item,index) in data" :key="index" @tap="seeDetail(item)">
-					<view class="num">{{item.carNo}}</view>
-						<view style="width: 400rpx;height: 180rpx;margin-left: 70rpx;">
-							<image src="../../static/carBg.png" style="width:100%;height:100%;" ></image>
-					</view>
+				<view class="delete" @tap.stop="deleteInfo(item)">删除</view>
+				<view class="num">{{item.carNo}}</view>
+				<view style="width: 400rpx;height: 180rpx;margin-left: 70rpx;">
+					<image src="../../static/carBg.png" style="width:100%;height:100%;"></image>
+				</view>
 			</view>
+			<!-- </uni-swipe-action-item> -->
+			<!-- </uni-swipe-action> -->
 		</scroll>
 		<!-- 绑定新的车辆 -->
 		<view class="btn" @tap="addCar">
@@ -18,25 +23,77 @@
 </template>
 
 <script>
-	
+	import uniSwipeAction from '../../components/uni-swipe-action/uni-swipe-action.vue'
+	import uniSwipeActionItem from '../../components/uni-swipe-action-item/uni-swipe-action-item.vue'
 	export default {
 		data() {
 			return {
 				isShow: false,
-				data: []
+				data: [],
+				options: [{ //左滑动数据
+					text: '删除',
+					style: {
+						backgroundColor: '#dd524d'
+					}
+				}]
 			}
 		},
 		onLoad() {
 			this.refresh();
 		},
 		mounted() {
-			
+
+		},
+		onUnload() {
+			uni.switchTab({
+				url: './mine'
+			})
+		},
+		components: {
+			uniSwipeAction,
+			uniSwipeActionItem
 		},
 		methods: {
+			// onClick(){
+				
+			// },
+			// 删除事件
+			deleteInfo(item){
+				uni.showModal({
+					title: '提示',
+					content: '您确定删除当前车辆信息',
+					success: (res) => {
+						if (res.confirm) {
+							this.http.httpRequest('/wxapplet/ownercar/del', 'post', {
+								carNo:item.carNo
+							}, true).then((res) => {
+								if (res.code == 0) {
+									// 判断当前删除的房屋是否是绑定的当前的
+									uni.showToast({
+										title: '删除成功',
+										'icon': 'success'
+									})
+									setTimeout(() => {
+										this.$refs.pullScroll.refresh();
+									}, 500)
+								} else {
+									uni.showToast({
+										title: res.msg,
+										'icon': 'none'
+									})
+				
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
 			// 查看汽车通行记录
-			seeDetail(item){
+			seeDetail(item) {
 				uni.navigateTo({
-					url:'./carList?id='+item.carNo
+					url: './carList?id=' + item.carNo
 				})
 			},
 			// 刷新页面
@@ -54,6 +111,9 @@
 			//获取加载数据
 			loadData(pullScroll) {
 				this.pageNum = pullScroll.page
+				if (pullScroll.page == 1) {
+					this.data = []
+				}
 				setTimeout(() => {
 					this.http.httpRequest('/wxapplet/ownercar/list', 'get', {
 						// cardNo: uni.getStorageSync('idNumber'),
@@ -83,7 +143,7 @@
 					})
 				}, 500);
 			},
-		
+
 			// 查看或隐藏记录
 			seeMore(index) {
 				this.data[index].show = !this.data[index].show
@@ -158,7 +218,7 @@
 	}
 
 	.left {
-		width:100%;
+		width: 100%;
 		display: flex;
 		justify-content: space-between;
 	}
@@ -170,18 +230,31 @@
 		font-family: PingFang SC;
 		font-weight: bold;
 		line-height: 40rpx;
-		color:rgba(51,51,51,1);
+		color: rgba(51, 51, 51, 1);
 		margin-top: 70rpx;
 		margin-left: 60rpx;
 	}
+
 	.item {
 		width: 702rpx;
 		margin: 0 auto;
 		display: flex;
 		height: 180rpx;
 		margin-top: 35rpx;
-		background:rgba(241,245,249,1);
-		border-radius:20rpx;
+		background: rgba(241, 245, 249, 1);
+		border-radius: 20rpx;
+		position: relative;
+	}
+	.delete{
+		width: 60rpx;
+		height: 32rpx;
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: 600;
+		color: rgba(41, 138, 253, 1);
+		position: absolute;
+		top: 15rpx;
+		right: 20rpx;
 	}
 	.content {
 		width: 620rpx;

pages/mine/myHouse.vue

@@ -1,14 +1,14 @@
 <!-- 我的房屋 -->
 <template>
 	<view class="">
-		 <view v-show="visible">
-			 <view class="img">
-			 		<image src="../../static/null_image_checking@2x.png" style="width: 100%;height: 100%;"></image>
-			 </view>
-			 <view class="title">
-			 	暂无数据~
-			 </view>
-		 </view>
+		<view v-show="visible">
+			<view class="img">
+				<image src="../../static/null_image_checking@2x.png" style="width: 100%;height: 100%;"></image>
+			</view>
+			<view class="title">
+				暂无数据~
+			</view>
+		</view>
 		<view class="item" v-for="(item,index) in data" :key="index" v-show="!visible">
 			<view class="content">
 				<view class="city">
@@ -22,8 +22,12 @@
 				</view>
 				<view class="address">
 					<image src="../../static/house_icon_house@2x.png" style="width: 40rpx;height:40rpx;margin-right: 18rpx;"></image>
-					<view class="text">{{item.houseName}}</view>
-					
+					<view class="text">
+						<text>{{item.houseName}}</text>
+						 <!-- <text class="houseStatus">审核已通过</text> -->
+					</view>
+
+
 				</view>
 			</view>
 		</view>
@@ -37,7 +41,8 @@
 		data() {
 			return {
 				data: [],
-				visible:true
+				visible: true,
+				isFirst: false
 			}
 		},
 		mounted() {
@@ -46,7 +51,14 @@
 		onUnload() {
 			uni.navigateTo({
 				url: './mine',
-			})    
+			})
+		},
+		onPullDownRefresh() {
+			uni.showLoading({
+				title: '加载中',
+				mask: true
+			})
+			this.getHouseData()
 		},
 		methods: {
 			// 删除房屋
@@ -63,16 +75,19 @@
 								houseId: item
 							}, true).then((res) => {
 								if (res.code == 0) {
-									// if(item==uni.getStorageSync('comtyId') && id==uni.getStorageSync('homeId')){
-										
-									// }
+									// 判断当前删除的房屋是否是绑定的当前的
+									if (item == uni.getStorageSync('homeId') && id == uni.getStorageSync('comtyId')) {
+										this.isFirst = true
+									} else {
+										this.isFirst = false
+									}
 									uni.showToast({
 										title: '删除成功',
 										'icon': 'success'
 									})
-									setTimeout(()=>{
+									setTimeout(() => {
 										this.getHouseData()
-									},500)
+									}, 500)
 								} else {
 									uni.showToast({
 										title: res.msg,
@@ -104,21 +119,27 @@
 				}, true).then((res) => {
 					console.log(res)
 					if (res.code == 0) {
-						if(res.data.length==0){
-							 this.visible=true
-							 uni.removeStorageSync('comtyId')
-							 uni.removeStorageSync('homeId')
-							 uni.removeStorageSync('homeAdress')
-							 uni.setStorageSync('houseStatus','4')
-						}else{
-							this.visible=false
+						// 判断当前是否有数据
+						if (res.data.length == 0) {
+							this.visible = true
+							uni.removeStorageSync('comtyId')
+							uni.removeStorageSync('homeId')
+							uni.removeStorageSync('homeAdress')
+							uni.setStorageSync('houseStatus', '4')
+						} else {
+							this.visible = false
 							this.data = res.data
-							// uni.removeStorageSync('houseStatus')
-							uni.setStorageSync('comtyId',this.data[0].comtyId)
-							uni.setStorageSync('homeId',this.data[0].houseId)
-							uni.setStorageSync('homeAdress',this.data[0].houseName)
+							// 判断当前绑定的房屋是否被删除
+							if (this.isFirst) {
+								uni.setStorageSync('comtyId', this.data[0].comtyId)
+								uni.setStorageSync('homeId', this.data[0].houseId)
+								uni.setStorageSync('homeAdress', this.data[0].houseName)
+							}
 						}
-						uni.hideLoading()
+						setTimeout(() => {
+							uni.hideLoading()
+							uni.stopPullDownRefresh()
+						}, 1000)
 					} else {
 						uni.hideLoading()
 						uni.showToast({
@@ -136,25 +157,26 @@
 </script>
 
 <style>
-	.img{
+	.img {
 		width: 520rpx;
 		height: 520rpx;
-		margin: 0  auto;
+		margin: 0 auto;
 		margin-top: 262rpx;
 	}
-	.title{
+
+	.title {
 		width: 510rpx;
 		height: 50rpx;
-		font-size:36rpx;
-		font-family:PingFang SC;
-		font-weight:400;
-		line-height:50rpx;
-		color:rgba(36,36,36,1);
-		margin:0 auto;
+		font-size: 36rpx;
+		font-family: PingFang SC;
+		font-weight: 400;
+		line-height: 50rpx;
+		color: rgba(36, 36, 36, 1);
+		margin: 0 auto;
 		margin-top: 46rpx;
 		text-align: center;
-		}
-		
+	}
+
 	.btn {
 		width: 702rpx;
 		height: 90rpx;
@@ -221,8 +243,12 @@
 		font-weight: bold;
 		line-height: 40rpx;
 		color: rgba(41, 138, 253, 1);
+		position: relative;
+	}
+	.houseStatus{
+		position: absolute;
+		right: 0;
 	}
-
 	.address .text {
 		width: 550rpx;
 		height: 36rpx;

pages/mine/myInfo.vue

@@ -81,7 +81,7 @@
 				},true).then((res)=>{
 					console.log(res)
 					if(res.code==0){
-						uni.hideLoading()
+						
 						// 判断当前返回值是否是网络路径图片
 						if(res.data.avatar.indexOf('https://')==-1){
 							this.headPhoto=this.getBase64ImageUrl(res.data.avatar)
@@ -99,6 +99,7 @@
 						this.status=res.data.status
 						this.photo=res.data.facePhoto
 						this.facePhoto=this.getBase64ImageUrl(res.data.facePhoto)
+						uni.hideLoading()
 					}else{
 						uni.hideLoading()
 						uni.showToast({
@@ -200,12 +201,17 @@
 					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
 					// sourceType: ['album'], //从相册选择
 					success: (res) => {
+						uni.showLoading({
+							mask:true,
+							title:'上传中'
+						})
 						this.facePhoto=res.tempFiles[0].path
 						wx.getFileSystemManager().readFile({
 							filePath: res.tempFiles[0].path, //微信小程序图片默认路径
 							encoding: 'base64', //编码格式
 							success: (res) => {
 								this.photo = res.data
+								uni.hideLoading()
 								this.updateInfo()
 							},
 							fail() {

pages/onlineRpair/evalueSuccess.vue

@@ -18,13 +18,14 @@
 		},
 		onUnload() {
 			if(uni.getStorageSync('rateType')==1){
-				uni.reLaunch({
-				      url: '/pages/onlineRpair/index',
-				    })
+				uni.navigateTo({
+					url: '/pages/onlineRpair/index',
+				})
+				          
 			}else{
-				uni.reLaunch({
+				uni.navigateTo({
 				      url: '/pages/complain/index',
-				    })
+				 })
 			}
 		}
 	}

pages/onlineRpair/index.vue

@@ -9,7 +9,7 @@
 					<view style="width:100%;height:44rpx;display: flex;justify-content: space-between;">
 						<view class="name">{{item.createBy}}</view>
 						<view class="topBtn" v-if="item.state==2">已处理</view>
-						<view v-else class="topBtn" style="border:2rpx solid rgba(41,138,253,1);color:#298AFD;">未处理</view>
+						<view v-else-if="item.state==1" class="topBtn" style="border:2rpx solid rgba(41,138,253,1);color:#298AFD;">未处理</view>
 					</view>
 					<view class="text">
 						{{item.content}}
@@ -19,20 +19,24 @@
 						 v-for="(img,index1) in item.photosUrlList" :key="index1"></image>
 					</view>
 					<!-- 回复信息 -->
-					<!-- 		<view class="replay">
-					<view style="width: 100%;margin: 20rpx 0rpx 20rpx 20rpx;">
-						<view class="replayItem">
-							<view class="replayName"><text style="font-size: 28rpx;color: #333333;font-family:PingFang SC;font-weight:bold;">物业
-								</text><text style="color:rgba(51,51,51,1);">回复</text><text style="font-size: 28rpx;color: #333333;font-family:PingFang SC;font-weight:bold;margin-left: 5rpx;">肖战:</text></view>
-							<view class="replayContent">换了一个新的，已经修好啦~</view>
-						</view>
-						<view class="replayItem">
-							<view class="replayName"><text style="font-size: 28rpx;color: #333333;font-family:PingFang SC;font-weight:bold;">小赞
-								</text><text style="color:rgba(51,51,51,1);">回复</text><text style="font-size: 28rpx;color: #333333;font-family:PingFang SC;font-weight:bold;margin-left: 5rpx;">肖战:</text></view>
-							<view class="replayContent">换了一个新的，已经修好啦~</view>
+					<view class="replay" v-if="item.reprList.length>0">
+						<view style="width: 100%;margin: 20rpx 0rpx 20rpx 20rpx;" v-for="(rep,index3) in item.reprList" :key="index3">
+							<view class="replayItem"  v-if="rep.disposeState==2">
+								<view class="replayName" style="padding-right: 15rpx;">
+									<text style="font-size: 28rpx;color: #333333;font-family:PingFang SC;font-weight:bold;margin-right:5rpx;">{{rep.maintainBy}}
+									</text><text style="color: rgba(41, 138, 253, 1);"> 回复</text><text style="font-size: 28rpx;color: #333333;font-family:PingFang SC;font-weight:bold;margin-left: 5rpx;">{{item.createBy}}:</text>
+									<text style="font-size: 25rpx;padding-left: 5rpx;">{{rep.disposeResult}}</text></view>
+								<!-- <view class="replayContent">{{rep.disposeResult}}</view> -->
+
+							</view>
+							<view class="replayItem"  v-else-if="rep.disposeState==3">
+								<view class="replayName" style="padding-right: 15rpx;padding-top: 5rpx;">
+								<uni-rate :value="rep.score" :disabled="true" ></uni-rate>
+								</view>
+								<view style="padding-top: 10rpx;">{{rep.disposeResult}}</view>
+							</view>
 						</view>
 					</view>
-				</view> -->
 					<!-- 我要评论 -->
 					<view class="bottomBtn" @tap="myTalk(item.id)" v-show="item.userId==userId &&item.state==2">我的评价</view>
 					<view class="date">{{(item.createTime).substr(0,16)}}</view>
@@ -48,6 +52,7 @@
 </template>
 
 <script>
+	import uniRate from '@/components/uni-rate/uni-rate.vue'
 	export default {
 		data() {
 			return {
@@ -58,12 +63,18 @@
 				pageSize: 3, //每页显示多少条数
 			}
 		},
+		components: {
+			uniRate
+		},
 		onLoad() {
 			this.refresh();
 		},
+		onShow() {
+			this.refresh();
+		},
 		onUnload() {
 			uni.switchTab({
-				url:'../index/index'
+				url: '../index/index'
 			})
 		},
 		methods: {
@@ -93,6 +104,9 @@
 			//获取加载数据
 			loadData(pullScroll) {
 				console.log(pullScroll)
+				if (pullScroll.page == 1) {
+					this.data = []
+				}
 				this.pageNum = pullScroll.page
 				setTimeout(() => {
 					this.http.httpRequest('/wxapplet/ownerreprair/list', 'post', {

pages/onlineRpair/repairSuccess.vue

@@ -18,7 +18,7 @@
 			}
 		},
 		onUnload() {
-			wx.navigateTo({
+			uni.navigateTo({
 				url: '/pages/onlineRpair/index',
 			})
 		}

pages/onlineRpair/repairsEvaluate.vue

@@ -90,7 +90,7 @@
 							this.textRea=''
 							this.starNum=0
 							setTimeout(()=>{
-								uni.navigateTo({
+								uni.redirectTo({
 									url: './evalueSuccess'
 								})
 							},1000)

pages/onlineRpair/wantRepair.vue

@@ -241,7 +241,7 @@
 							this.textRea=''
 							this.digest=''
 							setTimeout(()=>{
-								uni.navigateTo({
+								uni.redirectTo({
 									url: './index'
 								})
 								uni.hideLoading()

pages/openDoor/openDoor.vue

@@ -47,6 +47,13 @@
 			// this.refresh();
 			this.getList()
 		},
+		onPullDownRefresh() {
+			uni.showLoading({
+				title: '加载中',
+				mask: true
+			})
+			this.getList()
+		},
 		methods: {
 			// 获取列表数据
 			getList() {
@@ -67,7 +74,10 @@
 							this.visible=false
 						}
 						this.doorData = res.data
+					setTimeout(() => {
 						uni.hideLoading()
+						uni.stopPullDownRefresh()
+					}, 1000)
 					} else {
 						uni.hideLoading()
 						uni.showToast({
@@ -81,6 +91,10 @@
 			},
 			// 开门
 			openDoor(id) {
+				uni.showLoading({
+					mask:true,
+					title:'开门中'
+				})
 				this.http.httpRequest('/wxapplet/owneradvice/mqopendoor/json', 'post', {
 					cardNo: uni.getStorageSync('idNumber'),
 					comtyId: uni.getStorageSync('comtyId'),
@@ -89,13 +103,19 @@
 				}, true).then((res) => {
 					console.log(res)
 					if (res.code == 0) {
-
+						setTimeout(()=>{
+							uni.hideLoading()
+							uni.showToast({
+								title: '开门成功',
+								'icon': 'success'
+							}) 
+						},5000)
 					} else {
-						uni.showToast({
-							title: res.msg,
-							'icon': 'none'
-						})
-
+							uni.hideLoading()
+							uni.showToast({
+								title: res.msg,
+								'icon': 'none'
+							})
 					}
 				})
 			},

pages/openDoor/openDoorList.vue

@@ -43,6 +43,13 @@
 		mounted() {
 			this.getList()
 		},
+		onPullDownRefresh() {
+			uni.showLoading({
+				title: '加载中',
+				mask: true
+			})
+			this.getList()
+		},
 		methods: {
 			// 获取列表数据
 			getList() {
@@ -62,7 +69,10 @@
 							this.visible=false
 						}
 						this.data=res.data.rows
-						uni.hideLoading()
+						setTimeout(() => {
+							uni.hideLoading()
+							uni.stopPullDownRefresh()
+						}, 1000)
 					} else {
 						uni.hideLoading()
 						uni.showToast({
@@ -123,7 +133,7 @@
 	}
 
 	.dec {
-		width: 356rpx;
+		width: 400rpx;
 		height: 40rpx;
 		font-size: 24rpx;
 		font-family: PingFang SC;

pages/visitor/historyList.vue

@@ -9,7 +9,7 @@
 							{{item.personName}}
 						</view>
 						<view style="width:196rpx ;height: 40rpx;ont-size:28px;font-family:PingFang SC;font-weight:bold;line-height:40rpx;color:rgba(41,138,253,1);">
-							{{item.visitorPhone}}
+							{{item. phoneNum}}
 						</view>
 					</view>
 					<view class="itemList">
@@ -114,9 +114,9 @@
 			loadData(pullScroll) {
 				console.log(pullScroll)
 				setTimeout(() => {
-					// if (pullScroll.page == 1) {
-					// 	this.doorData = [];
-					// }
+					if (pullScroll.page == 1) {
+						this.data = [];
+					}
 					this.http.httpRequest('/wxapplet/owner/peolepass/visitList', 'get', {
 						phoneNum: uni.getStorageSync('phoneNumber'),
 						pageNum: pullScroll.page,