调试页面

src/common/common.scss

@@ -44,309 +44,33 @@ body {
     -webkit-box-orient: vertical;
     letter-spacing: 1rpx;
 }
-
-// 右箭头
-.arrorRight {
-    display: inline-block;
-    width: 30rpx;
-    height: 30rpx;
-}
-
-// tab选项卡样式
-.tabBox {
-    height: 70rpx;
+// 空数据样式
+.empty-box{
+    display: flex;
+    flex-direction: column;
     align-items: center;
-    margin-bottom: 20rpx;
-    &_li {
-        padding: 0 50rpx;
-        font-size: 36rpx;
-        font-weight: 400;
-        color: #999999;
-    }
-    &_li_active {
-        font-size: 36rpx;
-        font-weight: 500;
-        color: #333333;
-        position: relative;
+    justify-content: center;
+    margin-top: 200rpx;
+    .img{
+        width: 570rpx;
+        height: 362rpx;
     }
-    &_li_active::after {
-        content: '';
-        display: block;
-        position: absolute;
-        width: 48rpx;
-        height: 18rpx;
-        left: 50%;
-        transform: translateX(-50%);
-        bottom: -40%;
-        background: url('https://static.quhouse.com/upload/pic/20210421102103429117.png') no-repeat;
-        background-size: 40rpx 14rpx;
-    }
-}
-
-// 提交按钮
-.btnBox {
-    position: fixed;
-    bottom: 10rpx;
-    left: 0;
-    width: 100%;
-    // background: #FFFFFF;
-    padding: 20rpx;
-    z-index: 9;
-    .pushTranBtn {
-        width: 690rpx;
-        height: 86rpx;
-        background: #DA2222;
-        margin: 0 auto;
-        border-radius: 44rpx;
-        text-align: center;
-        line-height: 86rpx;
-        font-size: 36rpx;
+    .no-data{
+        width: 112rpx;
+        height: 40rpx;
+        font-size: 28rpx;
+        font-family: PingFangSC-Regular, PingFang SC;
         font-weight: 400;
-        color: #FFFFFF;
-    }
-}
-
-// tab 列表内容公共样式
-.relist {
-    border-bottom: 10rpx solid #E7E7E7;
-    .reli {
-        padding: 20rpx 30rpx;
-        align-items: flex-start;
-        &_img {
-            display: inline-block;
-            width: 178rpx;
-            height: 178rpx;
-            margin-right: 20rpx;
-            border-radius: 10rpx;
-        }
-        &_main {
-            &_name {
-                margin-bottom: 20rpx;
-                height: 42rpx;
-                font-size: 30rpx;
-                font-weight: 500;
-                color: #333333;
-                line-height: 42rpx;
-            }
-            &_subname {
-                margin-bottom: 10rpx;
-                height: 30rpx;
-                font-size: 22rpx;
-                font-weight: 400;
-                color: #999999;
-                line-height: 30rpx;
-            }
-        }
-    }
-    .relicom {
-        padding: 20rpx 30rpx;
-        align-items: flex-start;
-        position: relative;
-        .rightArr {
-            display: block;
-            right: 20rpx;
-            top: 50%;
-            transform: translateY(-50%);
-            width: 30rpx;
-            height: 30rpx;
-            position: absolute;
-        }
-        &_img {
-            display: inline-block;
-            width: 128rpx;
-            height: 128rpx;
-            margin-right: 20rpx;
-            border-radius: 50%;
-        }
-        .reli_main {
-            &_name {
-                margin-bottom: 20rpx;
-                height: 42rpx;
-                font-size: 30rpx;
-                font-weight: 500;
-                color: #333333;
-                line-height: 42rpx;
-            }
-            &_subname {
-                margin-bottom: 10rpx;
-                height: 30rpx;
-                font-size: 22rpx;
-                font-weight: 400;
-                color: #999999;
-                line-height: 30rpx;
-            }
-        }
+        color: #666666;
+        line-height: 40rpx;
     }
 }
-
-.relist:last-of-type {
-    border-bottom: 0;
-}
-
-.acBoxhead {
-    padding-left: 10rpx;
-    position: relative;
-    height: 50rpx;
-    font-size: 32rpx;
-    font-weight: 500;
+// 列表数据加载中
+.loading{
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
     color: #333333;
-    line-height: 50rpx;
-}
-
-.acBoxhead::after {
-    content: '';
-    display: block;
-    position: absolute;
-    width: 6rpx;
-    height: 32rpx;
-    background: #FF8C13;
-    border-radius: 4rpx;
-    left: -3rpx;
-    top: 50%;
-    transform: translateY(-50%);
-}
-
-// 新增弹框
-.addBox {
-    position: fixed;
-    // width: 100%;
-    // height: 100%;
-    background: rgba(0,0,0,0.4);
-    left: 0;
-    top: 0;
-    bottom: 0;
-    right: 0;
-    z-index: 999;
-}
-
-.addmainBoxTi {
-    padding: 40rpx 0 0 0;
-}
-
-.addmain {
-    padding: 40rpx 0 0 0;
-    width: 688rpx;
-    border-radius: 20rpx;
-    position: fixed;
-    left: 50%;
-    top: 50%;
-    transform: translate(-50%, -50%);
-    background: #FFFFFF;
-    z-index: 9999;
-    .addmainMain {
-        padding: 0 40rpx 40rpx;
-        .addtitle {
-            width: 100%;
-            text-align: center;
-            margin-bottom: 30rpx;
-            font-size: 36rpx;
-            font-weight: 400;
-            color: #333333;
-        }
-        .stliComCont {
-            font-size: 30rpx;
-            font-weight: 400;
-            color: #333333;
-            line-height: 42rpx;
-        }
-    }
-    .stliCom {
-        height: 36rpx;
-        align-items: center;
-        margin-bottom: 30rpx;
-        font-size: 26rpx;
-        font-weight: 400;
-        color: #333333;
-        .stliComImg {
-            display: inline-block;
-            width: 30rpx;
-            height: 30rpx;
-            margin: 0 14rpx 0 30rpx;
-        }
-    }
-    .stmain {
-        align-items: center;
-        height: 42rpx;
-        font-size: 30rpx;
-        font-weight: 400;
-        color: #333333;
-        padding: 0 30rpx;
-        margin-bottom: 20rpx;
-    }
-    .stlili {
-        flex-wrap: wrap;
-        margin-bottom: 10rpx;
-        .stlimain {
-            padding: 0 16rpx;
-            height: 70rpx;
-            line-height: 70rpx;
-            font-size: 24rpx;
-            font-weight: 400;
-            color: #292929;
-            border-radius: 6rpx;
-            border: 1rpx solid #FF8C13;
-            margin: 0 10rpx 10rpx 0;
-        }
-        .stlimain_Active {
-            background: #FF8C13;
-            color: #FFFFFF;
-            border: 1px solid #FF8C13;
-        }
-    }
-    .addBtnBox {
-        height: 92rpx;
-        align-items: center;
-        border-top: 1rpx solid #E0E0E0;
-        .addBtnBoxLeft {
-            height: 92rpx;
-            line-height: 92rpx;
-            border-right: 1rpx solid #E0E0E0;
-            font-size: 30rpx;
-            font-weight: 400;
-            color: #333333;
-            text-align: center;
-            width: 50%;
-        }
-        .addBtnBoxright {
-            font-size: 30rpx;
-            font-weight: 400;
-            color: #FF8C13;
-            text-align: center;
-            width: 50%;
-        }
-    }
-    .addBtnBoxbrn {
-        height: 124rpx;
-        align-items: center;
-        border-top: 1rpx solid #E0E0E0;
-        font-size: 36rpx;
-        font-weight: 400;
-        color: #FF8C13;
-        justify-content: center;
-        width: 100%;
-    }
-}
-
-// 选择按钮
-.followList {
-    flex-wrap: wrap;
-    margin-bottom: 30rpx;
-    &_li {
-        padding: 0 10rpx;
-        height: 70rpx;
-        text-align: center;
-        line-height: 70rpx;
-        background: #FFFFFF;
-        border-radius: 6rpx;
-        margin: 0 20rpx 20rpx 0;
-        border: 1px solid #333333;
-        font-size: 24rpx;
-        font-weight: 400;
-        color: #333;
-    }
-    &_li_Active {
-        background: #FF8C13;
-        color: #FFFFFF;
-        border: 1px solid #FF8C13;
-    }
+    font-size: 28rpx;
 }

src/pages.json

@@ -232,6 +232,12 @@
                 "navigationBarTitleText": "出租专区详情",
                 "navigationBarTextStyle": "black"
             }
+        }, {
+            "path": "gonggaoDetail",
+            "style": {
+                "navigationBarTitleText": "公告详情",
+                "navigationBarTextStyle": "black"
+            }
         }, {
             "path": "ledList",
             "style": {

src/pages/customer/addCustomer.vue

@@ -70,24 +70,7 @@
 					needType: 0,//需求类型 
 					mark: ''//备注
 				},
-				sourceList: [
-					{
-						value: '1',
-						label: '来电'
-					},
-					{
-						value: '2',
-						label: '来访'
-					},
-					{
-						value: '3',
-						label: '到访'
-					},
-					{
-						value: '4',
-						label: '2来访'
-					},
-				],
+				sourceList: [],
 				customStyle:{
 					maxHeight:'200rpx',
 					padding: '20rpx',
@@ -97,13 +80,29 @@
 			};
 		},
 		onLoad(options) {
+			this.getChannel()
 		},
 		onShow() {
 		
 		},
 		methods: {
+			getChannel(){
+				this.$u.api.getChannel({body:{}}).then((res)=>{
+					if(res.ErrNo=='0000'){
+						if(res.result&&res.result.length){
+							this.sourceList = res.result.map(item=>{
+								return{
+									value: item.code,
+									label: item.text
+								}
+							})
+						}else{
+							this.sourceList  =[]
+						}
+					}
+				})
+			},
 			confirmSource(e){
-				console.log(e)
 				this.form.source = e[0].value
 				this.form.sourceName = e[0].label
 			},
@@ -118,10 +117,10 @@
 					"gender":this.form.sex
 				}
 				this.$u.api.customerAdd({body:body}).then((res)=>{
-
+					if(res.ErrNo=='0000'){
+						uni.navigateBack()
+					}
 				})
-				
-				
 			},
 			sexChange(){
 				console.log(this.form.sex)
@@ -202,7 +201,7 @@
 		height: 88rpx;
 		line-height: 88rpx;
 		text-align: center;
-		background: #FFB692;
+		background: #FF6D25;
 		border-radius: 12rpx;
 		margin-left: 30rpx;
 		font-size: 32rpx;

src/pages/customer/addLedlook.vue

@@ -4,7 +4,7 @@
 			<view class="item">
 				<view class="label">房源地址</view>
 				<view class="input">
-					<u-input height="102" disabled input-align="right" v-model="form.address"  @click="topage"  placeholder="请选择房源地址"></u-input>
+					<u-input height="102" style="width: 350rpx"  disabled input-align="right" v-model="form.address"  @click="topage"  placeholder="请选择房源地址"></u-input>
 					<image class="path" src="/static/path.png" mode="" />
 				</view>
 			</view>
@@ -54,7 +54,7 @@
 			let houseSource = wx.getStorageSync('houseSource')
 			if(houseSource&&houseSource.address){
 				this.form.address = houseSource.address
-				this.roomId = houseSource.roomId
+				this.roomId = houseSource.houseId
 				uni.removeStorageSync('houseSource')
 			}
 		},
@@ -95,15 +95,9 @@
 					// console.log(res)
 					this.flag = false;
 					if(res.ErrNo=='0000'){
-						uni.showToast({
-							title: res.ErrMsg,
-							icon: 'none'
-						})
-						setTimeout(function() {
 							wx.switchTab({
 								url: '/pages/tabs/customer'
 							})
-						}, 1000);
 					}
 				})
 			}

src/pages/customer/ledList.vue

@@ -9,6 +9,14 @@
 			</view>
 			<view class="bot">{{item.address}}</view>
 		</view>
+		<view class="empty-box" v-if="listData.length==0&&!loading">
+			<image class="img" src="http://images.2weisou.com/20221031114904TSF6jF4S.png" mode=""/>
+			<view class="no-data">暂无数据</view>
+		</view>
+		<view class="loading" v-if="loading">
+			<u-loading size="40" :show="loading"/>
+			正在加载中
+		</view>
 	</view>
 </template>
 <script>
@@ -19,6 +27,7 @@
 				pageNo: 1,
 				pageSize: 10,
 				loadDone: false,
+				loading: false,
 				customerId:''
 			};
 		},
@@ -29,6 +38,7 @@
 		methods: {
 			getList(){
 				if (this.loadDone) return;
+				this.loading = true;
 				let body = {
 					pageNo:this.pageNo,
 					pageSize:this.pageSize,
@@ -36,6 +46,7 @@
 				}
 				this.$u.api.customerViewHistory({body:body}).then((res)=>{
 					// console.log(res)
+					this.loading = false;
 					if(res.result&&res.result.length){
 						if(this.pageNo==1){
 							this.listData = res.result

src/pages/customer/selectHousesource.vue

@@ -15,6 +15,14 @@
 					<image class="path" src="/static/path.png" mode="" />
 				</view>
 			</view>
+			<view class="empty-box" v-if="listData.length==0&&!loading">
+				<image class="img" src="http://images.2weisou.com/20221031114904TSF6jF4S.png" mode=""/>
+				<view class="no-data">暂无数据</view>
+			</view>
+			<view class="loading" v-if="loading">
+				<u-loading size="40" :show="loading"/>
+				正在加载中
+			</view>
 		</view>
 	</view>
 </template>
@@ -27,6 +35,7 @@
 				pageNo: 1,
 				pageSize: 10,
 				loadDone: false,
+				loading: false,
 			};
 		},
 		onLoad(options) {
@@ -47,13 +56,15 @@
 			},
 			getList(){
 				if (this.loadDone) return;
+				this.loading = true;
 				let params = {
 					pageNo:this.pageNo,
 					pageSize:this.pageSize,
 					message:this.keyword
 				}
 				this.$u.api.findProxyHouse({body:params}).then((res)=>{
-					console.log(res)
+					// console.log(res)
+					this.loading = false;
 					if(res.result&&res.result.length){
 						if(this.pageNo==1){
 							this.listData = res.result

src/pages/my/applyHistory.vue

@@ -16,13 +16,29 @@
 			</view>
 			<view class="bot">{{item.address}}</view>
 			<view class="status-box">
-				<view class="left">由 {{item.applyName}} 提交申请</view>
+				<view class="left"><image class="icon" src="/static/myapply/passed.png" mode="" />已申请</view>
 				<!-- 审批状态0未审核 1通过 2 拒绝 -->
-				<view class="btn success-btn" v-if="item.reviewName[0].secondApplyStatus==1">审核通过</view>
-				<view class="btn fail-btn" v-else-if="item.reviewName[0].secondApplyStatus==0">未审核</view>
-				<view class="btn fail-btn" v-else-if="item.reviewName[0].secondApplyStatus==2">未通过</view>
-				<view class="btn dealing-btn" v-else>处理中</view>
+				<view class="right">
+					<view class="right-cont" v-for="(subitem,i) in item.reviewName" :key="i">
+						<view class="subitem" v-if="i==0">
+							<image class="icon" v-if="subitem.firstApplyStatus==1" src="/static/myapply/passed.png" mode="" />
+							<image class="icon" v-else src="/static/myapply/not_pass.png" mode="" />
+							{{subitem.firstReview}}{{subitem.firstApplyStatus==1?'已通过':subitem.firstApplyStatus==2?'未通过':'未审核'}}</view>
+						<view class="subitem" v-if="i==1" style="margin-left:30rpx">
+							<image class="icon" v-if="subitem.firstApplyStatus==1" src="/static/myapply/passed.png" mode="" />
+							<image class="icon" v-else src="/static/myapply/not_pass.png" mode="" />
+							{{subitem.secondReview}}{{subitem.secondApplyStatus==1?'已通过':subitem.secondApplyStatus==2?'未通过':'未审核'}}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="loading" v-if="loading">
+				<u-loading size="40" :show="loading"/>
+				正在加载中
 			</view>
+		<view class="empty-box" v-if="listData.length==0&&!loading">
+			<image class="img" src="http://images.2weisou.com/20221031114904TSF6jF4S.png" mode=""/>
+			<view class="no-data">暂无数据</view>
 		</view>
 	</view>
 </template>
@@ -34,6 +50,7 @@
 				pageNo: 1,
 				pageSize: 10,
 				loadDone: false,
+				loading: false,
 			};
 		},
 		onLoad(options) {
@@ -48,6 +65,7 @@
 		methods: {
 			getList(){
 				if (this.loadDone) return;
+				this.loading = true;
 				let body = {
 					pageNo:this.pageNo,
 					pageSize:this.pageSize,
@@ -57,6 +75,7 @@
 				}
 				this.$u.api.cleanRepairHistory({body:body}).then((res)=>{
 					// console.log(res)
+					this.loading = false;
 					if(res.result&&res.result.length){
 						if(this.pageNo==1){
 							this.listData = res.result
@@ -132,40 +151,39 @@
 			align-items: center;
 			justify-content: space-between;
 			.left{
+				width: 160rpx;
 				height: 42rpx;
-				font-size: 30rpx;
+				font-size: 28rpx;
 				font-family: PingFangSC-Regular, PingFang SC;
 				font-weight: 400;
 				color: #333333;
-				line-height: 42rpx;
-			}
-			.btn{
-				width: 144rpx;
-				height: 56rpx;
-				border-radius: 8rpx;
-				text-align: center;
-				line-height: 56rpx;
-				font-size: 26rpx;
-				font-family: PingFangSC-Regular, PingFang SC;
-				font-weight: 400;
-			}
-			.success-btn{
-				
-				background: rgba(7,183,157,0.04);
-				
-				border: 1px solid #07B79D;
-				
-				color: #07B79D;	
-			}
-			.fail-btn{
-				background: rgba(231,72,60,0.04);
-				border: 1px solid #E7483C;
-				color: #E7483C;
+				display: flex;
+				align-items: center;
+				.icon{
+					width: 36rpx;
+					height: 36rpx;
+					margin-right: 8rpx;
+				}
 			}
-			.dealing-btn{
-				background: rgba(254,160,23,0.04);
-				border: 1px solid #FEA017;
-				color: #FEA017;
+			.right{
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				.right-cont{
+					.subitem{
+						display: flex;
+						align-items: center;
+						font-size: 28rpx;
+						font-family: PingFangSC-Regular, PingFang SC;
+						font-weight: 400;
+						color: #333333;
+						.icon{
+							width: 36rpx;
+							height: 36rpx;
+							margin-right: 8rpx;
+						}
+					}
+				}
 			}
 		}
 	}

src/pages/my/apply_baojie.vue

@@ -124,13 +124,18 @@
 					"remark":this.form.mark
 				}
 				this.$u.api.cleanRepairApply({body:params}).then((res)=>{
-					console.log(res)
+					// console.log(res)
 					if(res.ErrNo=='0000'){
 						uni.showToast({
 							title: res.ErrMsg,
 							icon: 'none'
 						})
 					}
+					setTimeout(()=>function (){
+						uni.navigateTo({
+							url: '/pages/my/apply'
+						})
+					},2000)
 				})
 				
 			},

src/pages/my/changePrice_apply.vue

@@ -59,7 +59,7 @@
 				let body={
 					"price": +this.form.price,
 					"roomId": +this.roomId,
-					"Remark": this.form.mark
+					"remark": this.form.mark
 				}
 				this.$u.api.appChangePriceapply({body:body}).then((res)=>{
 					// console.log(res)

src/pages/my/changePrice_check.vue

@@ -1,6 +1,5 @@
 <template>
 	<view class="container">
-	
 		<view class="list-box">
 			<view class="list-item" v-for="(item,index) in listData" :key="index">
 				<view class="item-info">
@@ -21,6 +20,10 @@
 					<view class="btn refuse" @click="clickFun(2,item)">拒绝</view>
 				</view>
 			</view>
+			<view class="empty-box" v-if="listData.length==0">
+			<image class="img" src="http://images.2weisou.com/20221031114904TSF6jF4S.png" mode=""/>
+			<view class="no-data">暂无数据</view>
+		</view>
 		</view>
 	</view>
 </template>
@@ -29,22 +32,13 @@
 		data() {
 			return {
 				roomId: '',
-				listData: [],
-				pageNo: 1,
-				pageSize: 10,
-				loadDone: false,
+				listData: []
 			};
 		},
 		onLoad(options) {
 			this.roomId = options.id;
-			console.log(this.roomId)
 			this.getList()
 		},
-		onReachBottom() {
-			this.getList();
-		},
-		created(){
-		},
 		methods: {
 				// 申请状态【0 未审核 1 已审核 2 拒绝】
 			clickFun(type,item){
@@ -64,31 +58,17 @@
 				})
 			},
 			getList(){
-				if (this.loadDone) return;
-				this.$u.api.appChangePricelist({body:{}}).then((res)=>{
-					console.log(res)
+				this.$u.api.appChangePricelist({body:{
+					roomId: this.roomId
+				}}).then((res)=>{
+					// console.log(res)
 					if(res.result&&res.result.length){
-						if(this.pageNo==1){
 							this.listData = res.result
-						}else{
-							this.listData = [...this.listData, ...res.result];
-						}
-						if(res.result.length<this.pageSize){
-							this.loadDone = true;
-							return ;
-						}
-						this.pageNo += 1;
-						this.loadDone = false
 					}else{
-						this.loadDone = true;
-						if(this.pageNo==1){
 							this.listData = []
-							
-						}
 					}
 				})
 			}
-		
 		},
 	};
 </script>

src/pages/my/contactList.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<view class="search">
-			<u-search placeholder="搜索同事" height="78" :show-action="false" v-model="keyword"></u-search>
+			<u-search placeholder="搜索同事" @change="search" height="78" :show-action="false" v-model="keyword"></u-search>
 		</view>
 		<view class="list-box">
 			<view class="item" v-for="(item,index) in listData" :key="index">
@@ -18,6 +18,14 @@
 					</view>
 				</view>
 			</view>
+			<view class="empty-box" v-if="listData.length==0&&!loading">
+				<image class="img" src="http://images.2weisou.com/20221031114904TSF6jF4S.png" mode=""/>
+				<view class="no-data">暂无数据</view>
+			</view>
+			<view class="loading" v-if="loading">
+				<u-loading size="40" :show="loading"/>
+				正在加载中
+			</view>
 		</view>
 	</view>
 </template>
@@ -29,43 +37,8 @@
 				pageNo: 1,
 				pageSize: 10,
 				loadDone: false,
-				listData: [
-					{
-						first: 'a',
-						cell:[{
-							 "deptName": "a政部",
-								"tellPhone": "18811152687",
-								"namespell": "a",
-								"personName": "安丽红",
-								"personImage": "/static/avatar.png" 
-						},{
-							"deptName": "ab政部",
-								"tellPhone": "18811152687",
-								"namespell": "a",
-								"personName": "安丽红",
-								"personImage": "/static/avatar.png" 
-						}
-						]
-					},{
-						first: 'b',
-						cell:[{
-							 "deptName": "b政部",
-								"tellPhone": "18811152687",
-								"namespell": "b",
-								"personName": "丽红",
-								"personImage": "" 
-						}]
-					},{
-						first: 'c',
-						cell:[{
-							 "deptName": "c政部",
-								"tellPhone": "18811152687",
-								"namespell": "c",
-								"personName": "王丽红",
-								"personImage": "" 
-						}]
-					}
-				]
+				loading: false,
+				listData: []
 			};
 		},
 		onLoad(options) {
@@ -80,10 +53,17 @@
 			this.getList();
 		},
 		methods: {
+			search(){
+				this.pageNo=1
+				this.listData = []
+				this.loadDone = false
+				this.getList();
+			},
 			getList(){
 				if (this.loadDone) return;
-				this.$u.api.addressBook({body:{pageNo:this.pageNo,pageSize:this.pageSize}}).then((res)=>{
-					console.log(res)
+				this.loading = true;
+				this.$u.api.addressBook({body:{pageNo:this.pageNo,pageSize:this.pageSize,message: this.keyword}}).then((res)=>{
+					this.loading = false
 					if(res.result&&res.result.length){
 						if(this.pageNo==1){
 							this.listData = res.result

src/pages/my/contact_check.vue

@@ -41,7 +41,10 @@
 				<!-- <rich-text :nodes="content"></rich-text> -->
 			</view>
 		</u-modal>
-		<u-toast ref="uToast" />
+		<view class="loading" v-if="loading">
+			<u-loading size="40" :show="loading"/>
+			正在加载中
+		</view>
 	</view>
 </template>
 <script>
@@ -49,6 +52,7 @@
 		data() {
 			return {
 				showmodal: false,
+				loading: false,
 				titleStyle: {
 					fontSize: '32rpx',
 					fontFamily: 'PingFangSC-Semibold, PingFang SC',
@@ -99,12 +103,14 @@
 			},
 			getList(){
 				if (this.loadDone) return;
+				this.loading = true;
 				let params = {
 					pageNo:this.pageNo,
 					pageSize:this.pageSize,
 				}
 				this.$u.api.getContractList({body:params}).then((res)=>{
 					// console.log(res)
+					this.loading = false;
 					if(res.result&&res.result.length){
 						if(this.pageNo==1){
 							this.listData = res.result
@@ -121,7 +127,6 @@
 						this.loadDone = true;
 						if(this.pageNo==1){
 							this.listData = []
-							
 						}
 					}
 				})
@@ -131,11 +136,13 @@
 				this.$u.api.examine({body:{contractId:this.contractId,status:this.pass==1?1:2}}).then((res)=>{
 					// console.log(res)
 					if(res.ErrNo=='0000'){
-						this.$refs.uToast.show({
+						uni.showToast({
 							title: '操作成功',
-							icon: 'none',
-							type:'success'
+							icon: 'none'
 						})
+						this.listData = []
+						this.pageNo = 1
+						this.loadDone = false
 						this.getList();
 					}
 				})

src/pages/my/dingjin_check.vue

@@ -51,13 +51,17 @@
 				<view class="my-tip">您确认通过该审核吗？</view>
 			</view>
 		</u-modal>
-		<u-toast ref="uToast" />
+		<view class="loading" v-if="loading">
+			<u-loading size="40" :show="loading"/>
+			正在加载中
+		</view>
 	</view>
 </template>
 <script>
 	export default {
 		data() {
 			return {
+				loading: false,
 				showmodal: false,
 				titleStyle: {
 					fontSize: '32rpx',
@@ -86,12 +90,14 @@
 		methods: {
 			getList(){
 				if (this.loadDone) return;
+				this.loading = true;
 				let params = {
 					pageNo:this.pageNo,
 					pageSize:this.pageSize,
 				}
 				this.$u.api.getDepositList({body:params}).then((res)=>{
 					// console.log(res)
+					this.loading = false
 					if(res.result&&res.result.length){
 						if(this.pageNo==1){
 							this.listData = res.result
@@ -108,7 +114,6 @@
 						this.loadDone = true;
 						if(this.pageNo==1){
 							this.listData = []
-							
 						}
 					}
 				})
@@ -122,12 +127,14 @@
 				this.$u.api.depositExamine({body:{contractId:this.contractId,status: this.status}}).then((res)=>{
 					if(res.ErrNo=='0000'){
 						this.showmodal = false;
-						this.$refs.uToast.show({
+						uni.showToast({
 							title: '审核成功',
-							icon: false,
-							type:'success'
+							icon:'none'
 						})
 					}
+					this.listData = []
+						this.pageNo = 1
+						this.loadDone = false
 					this.getList()
 				})
 			}

src/pages/my/electContract.vue

@@ -33,7 +33,7 @@
 					<view class="item">
 						<view class="label">星座</view>
 						<view class="input">
-							<u-input height="102" disabled input-align="right" v-model="form.starName"  @click="starShow = true"  placeholder="请选择星座"></u-input>
+							<u-input height="102" disabled input-align="right" v-model="form.star"  @click="starShow = true"  placeholder="请选择星座"></u-input>
 							<image class="path" src="/static/path.png" mode="" />
 							<u-select confirm-color="#FF6D25" v-model="starShow" :list="starList" @confirm="confirmXingzuo"></u-select>
 						</view>
@@ -59,13 +59,13 @@
 					<view class="item">
 						<view class="label">租金</view>
 						<view class="input">
-							<u-input :clearable="false" input-align="right"  type="number" v-model="form.rentPrice" placeholder="请输入租金"></u-input>
+							<u-input :clearable="false" disabled input-align="right"  type="number" v-model="form.rentPrice" placeholder="请输入租金"></u-input>
 						</view>
 					</view>
 					<view class="item">
 						<view class="label">押金</view>
 						<view class="input">
-							<u-input :clearable="false" maxlength="11" type="number" input-align="right" v-model="form.deposit" placeholder="请输入押金"></u-input>
+							<u-input :clearable="false" disabled  maxlength="11" type="number" input-align="right" v-model="form.deposit" placeholder="请输入押金"></u-input>
 						</view>
 					</view>
 					<view class="item">
@@ -105,9 +105,17 @@
 					<view class="item">
 						<view class="label">租约期限</view>
 						<view class="input">
-							<u-input height="102" style="width:380rpx" disabled input-align="right" v-model="form.rentDate" @click="calendarShow = true"  placeholder="请选择租约期限"></u-input>
-							<image class="calendar" src="/static/kehu/calendar.png" mode="" @click="calendarShow = true" />
-							<u-calendar v-model="calendarShow" mode="range" @change="changeDate"></u-calendar>
+							<u-input height="102" style="width:380rpx" disabled input-align="right" v-model="form.rent_date_start" @click="calendarShow1 = true"  placeholder="请选择租约期限"></u-input>
+							<image class="calendar" src="/static/kehu/calendar.png" mode="" @click="calendarShow1 = true" />
+							<u-calendar v-model="calendarShow1" mode="date" @change="changeDate1"></u-calendar>
+						</view>
+					</view>
+					<view class="item">
+						<view class="label">至</view>
+						<view class="input">
+							<u-input height="102" style="width:380rpx" disabled input-align="right" v-model="form.rent_date_end" @click="calendarShow2 = true"  placeholder="请选择租约期限"></u-input>
+							<image class="calendar" src="/static/kehu/calendar.png" mode="" @click="calendarShow2 = true" />
+							<!-- <u-calendar v-model="calendarShow2" mode="date" @change="changeDate2"></u-calendar> -->
 						</view>
 					</view>
 					<view class="item">
@@ -146,7 +154,8 @@
 				canEdit: true,
 				errText: '',
 				step:1,
-				calendarShow: false,
+				calendarShow1: false,
+				calendarShow2: false,
 				starShow: false,
 				hobbyShow: false,
 				jobShow: false,
@@ -157,7 +166,7 @@
 				form: {
 					idno: '',//身份证号
 					name: '',//客户姓名
-					sex: '男',//性别
+					sex: '',//性别
 					tel: '',//手机号
 					starName: '',//
 					star: '',//星座
@@ -176,9 +185,8 @@
 					deptId: '',//成交部门
 					dealPeople: '',//成交人
 					dealPeopleName: '',//成交人
-					rentDate: '',//租约期限
-					rent_date_start: '',//
-					rent_date_end: ''
+					rent_date_start: '',//租约开始期限
+					rent_date_end: ''//租约结束期限
 				},
 				starList: [
 					{
@@ -345,8 +353,8 @@
 			}else{
 				this.electContractInfo = uni.getStorageSync('electContractInfo');
 				uni.removeStorageSync('electContractInfo');
+				console.log(this.electContractInfo)
 				this.roomId = this.electContractInfo.roomId;
-				this.form.rentDate = this.electContractInfo.rent_date_start + '~' +this.electContractInfo.rent_date_end
 				this.form.rent_date_start = this.electContractInfo.rent_date_start
 				this.form.rent_date_end = this.electContractInfo.rent_date_end
 			}
@@ -390,6 +398,7 @@
 				this.$u.api.oneVerificationContractInfo({body:{"roomId": this.roomId}}).then((res)=>{
 					if(res.ErrNo=='0000'){
 						let data = res.result
+						if(!data) return;
 						this.contractId  = data.contractId 
 						this.form.idno = data.idno
 						this.form.name = data.customerName
@@ -408,10 +417,6 @@
 			},
 		// 第一步保存
 			nextStep(){
-				// this.$refs.uToast.show({
-				// 	duration: 3000,
-				// 	title: '拆单金额(3010.0)与第一笔合计不等(6001.0),押金、服务费(6009.0)默认第一笔不在计算在内！',
-				// })
 				let body = {
 					roomId: this.roomId,
 					"customerName": this.form.name,
@@ -425,24 +430,60 @@
 				this.$u.api.oneCustomerInfo({body:body}).then((res)=>{
 					if(res.ErrNo=='0000'){
 						this.form.rentPrice = res.result.rentPrice
+						this.form.deposit = res.result.rentPrice
 						this.contractId= res.result.contractId
-						// this.form.rent_date_end = res.result.contractEndDate
-						// this.form.rent_date_end = '2024-03-04'
-						// let datetimer = new Date().getTime()
-						// this.form.rent_date_start = this.$u.timeFormat(datetimer, 'yyyy-mm-dd')
-						// this.form.rentDate = this.form.rent_date_start+ ' ~ ' + this.form.rent_date_end 
+						this.form.rent_date_end = res.result.contractEndDate
+						let datetimer = new Date().getTime()
+						this.form.rent_date_start = this.$u.timeFormat(datetimer, 'yyyy-mm-dd')
 						this.step = 2
 					}else{
-						this.$refs.uToast.show({
-							title: res.ErrMsg,
-							icon: false,
-							type:'error'
-						})
 					}
 				})
 			},
 			// 第二部保存
 			submit() {
+				if(this.form.fee==''){
+					this.$refs.uToast.show({
+						title: '请输入服务费'
+					})
+					return ;
+				}
+				if(this.form.ws_fee==''){
+					this.$refs.uToast.show({
+						title: '请输入卫生费'
+					})
+					return ;
+				}
+				if(this.form.payment_way==''){
+					this.$refs.uToast.show({
+						title: '请选择收款方式'
+					})
+					return ;
+				}
+				if(this.form.paytype==''){
+					this.$refs.uToast.show({
+						title: '请选择支付类型'
+					})
+					return ;
+				}
+				if(this.form.peoples==''){
+					this.$refs.uToast.show({
+						title: '请输入居住人数'
+					})
+					return ;
+				}
+				if(this.form.rent_date_end==''){
+					this.$refs.uToast.show({
+						title: '请输入租约的结束时间'
+					})
+					return ;
+				}
+				if(this.form.rent_date_end==''){
+					this.$refs.uToast.show({
+						title: '请输入租约的结束时间'
+					})
+					return ;
+				}
 				let body = {
 					"contractId": this.contractId,
 					"oldContractId": this.electContractInfo.proxy_contract_id,//续期合同id
@@ -472,11 +513,6 @@
 							url: '/pages/my/contact_check_page?src='+res.result
 						})
 					}else{
-						this.$refs.uToast.show({
-							title: res.ErrMsg,
-							icon: 'none',
-							type:'error'
-						})
 					}
 				})
 				
@@ -510,10 +546,12 @@
 			},
 			
 			// 租约期限
-			changeDate(e){
-				this.form.rent_date_start = e.startDate
-				this.form.rent_date_end = e.endDate
-				this.form.rentDate = e.startDate+ ' ~ ' + e.endDate
+			changeDate1(e){
+				this.form.rent_date_start = e.result
+			},
+			// 租约期限
+			changeDate2(e){
+				this.form.rent_date_end = e.result
 			},
 			sexChange(){
 				console.log(this.form.sex)
@@ -608,10 +646,12 @@
 		font-weight: 400;
 		color: #FFFFFF;
 		position: fixed;
+		z-index: 9999;
 		bottom: 50rpx;
 	}
 	.step2{
 		position: fixed;
+		z-index: 9999;
 		bottom: 50rpx;
 		width: 690rpx;
 		margin-left: 30rpx;
@@ -637,7 +677,6 @@
 			background: #FF6D25;
 			color: #FFFFFF;
 		}
-
 	}
 
 }

src/pages/my/goonContract.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<view class="search">
-			<u-search @search="search" placeholder="房间号搜索" height="78" :show-action="false" v-model="keyword"></u-search>
+			<u-search @change="search" placeholder="房间号搜索" height="78" :show-action="false" v-model="keyword"></u-search>
 		</view>
 		<view class="calendar">
 			<view class="date" @click="openCalendar(0)">
@@ -24,7 +24,15 @@
 				<view>租客：{{item.customer_name}}</view>
 				<view>租金{{item.rent_price}}</view>
 				<view class="tel"><image class="tel-icon" src="/static/my/tel.png" mode="" />{{item.customer_tel}}</view>
-				</view>
+			</view>
+		</view>
+		<view class="empty-box" v-if="listData.length==0&&!loading">
+				<image class="img" src="http://images.2weisou.com/20221031114904TSF6jF4S.png" mode=""/>
+				<view class="no-data">暂无数据</view>
+			</view>
+		<view class="loading" v-if="loading">
+			<u-loading size="40" :show="loading"/>
+			正在加载中
 		</view>
 	</view>
 </template>
@@ -36,6 +44,7 @@
 				starDate: '',
 				endDate: '',
 				mindate: '',
+				loading: false,
 				maxdate: '2099-12-31',
 				type: 0,// 默认是开始时间
 				calendarShow: false,
@@ -70,7 +79,10 @@
 				this.calendarShow = true;
 			},
 			search(){
-				
+				this.pageNo=1
+				this.listData = []
+				this.loadDone = false
+				this.getList();
 			},
 			topage(item){
 				uni.setStorageSync('electContractInfo',item)
@@ -80,6 +92,7 @@
 			},
 			getList(){
 				if (this.loadDone) return;
+				this.loading = true;
 				let params = {
 					account: this.keyword,
 					pageNo:this.pageNo,
@@ -89,6 +102,7 @@
 				}
 				this.$u.api.contractList({body:params}).then((res)=>{
 					console.log(res)
+					this.loading = false;
 					if(res.result&&res.result.length){
 						if(this.pageNo==1){
 							this.listData = res.result
@@ -118,6 +132,7 @@
 				}else{
 					this.endDate = e.result
 				}
+				this.search()
 			}
 		},
 	};

src/pages/my/myapply.vue

@@ -19,7 +19,7 @@
 			</view>
 			<view class="tab" @click="topage('repairlist')">
 				<image class="img" src="/static/myapply/record.png" mode="" />
-				装修清单
+				维修清单
 			</view>
 		</view>
 	</view>

src/pages/my/mywarReport.vue

@@ -65,7 +65,6 @@
 					type:this.type,
 					deptId:this.deptId,
 				}
-				
 				this.$u.api.personReport({body:params}).then((res)=>{
 					// console.log(res)
 					if(res.result&&res.result.length){

src/pages/my/networkquery.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<view class="search">
-			<u-search placeholder="房间号搜索" height="78" :show-action="false" v-model="keyword"></u-search>
+			<u-search placeholder="房间号搜索" @change="search" height="78" :show-action="false" v-model="keyword"></u-search>
 		</view>
 		<view class="list-box">
 			<view class="list-item" @click="selectItem(item)" v-for="(item,index) in listData" :key="index">
@@ -15,6 +15,14 @@
 					<image class="path" src="/static/path.png" mode="" />
 				</view>
 			</view>
+			<view class="empty-box" v-if="listData.length==0&&!loading">
+				<image class="img" src="http://images.2weisou.com/20221031114904TSF6jF4S.png" mode=""/>
+				<view class="no-data">暂无数据</view>
+			</view>
+			<view class="loading" v-if="loading">
+				<u-loading size="40" :show="loading"/>
+				正在加载中
+			</view>
 		</view>
 	</view>
 </template>
@@ -26,6 +34,7 @@
 				pageNo: 1,
 				pageSize: 10,
 				loadDone: false,
+				loading: false,
 				listData: []
 			};
 		},
@@ -38,6 +47,12 @@
 			this.getList();
 		},
 		methods: {
+			search(){
+				this.pageNo=1
+				this.listData = []
+				this.loadDone = false
+				this.getList();
+			},
 			selectItem(item){
 				wx.navigateTo({
 					url:'/pages/my/networkquery_detail?id='+item.houseId
@@ -45,6 +60,7 @@
 			},
 			getList(){
 				if (this.loadDone) return;
+				this.loading = true;
 				let body = {
 					pageNo:this.pageNo,
 					pageSize:this.pageSize,
@@ -52,6 +68,7 @@
 				}
 				this.$u.api.findProxyHouse({body:body}).then((res)=>{
 					// console.log(res)
+					this.loading = false;
 					if(res.result&&res.result.length){
 						if(this.pageNo==1){
 							this.listData = res.result

src/pages/my/rentReceive.vue

@@ -26,6 +26,14 @@
 				<view class="tel"><image class="tel-icon" src="/static/my/tel.png" mode="" />{{item.customerMobile}}</view>
 				</view>
 		</view>
+		<view class="empty-box" v-if="listData.length==0&&!loading">
+			<image class="img" src="http://images.2weisou.com/20221031114904TSF6jF4S.png" mode=""/>
+			<view class="no-data">暂无数据</view>
+		</view>
+		<view class="loading" v-if="loading">
+				<u-loading size="40" :show="loading"/>
+				正在加载中
+		</view>
 	</view>
 </template>
 <script>
@@ -41,6 +49,7 @@
 				pageNo: 1,
 				pageSize: 10,
 				loadDone: false,
+				loading: false,
 				listData: []
 			};
 		},
@@ -58,6 +67,7 @@
 		methods: {
 			getList(){
 				if (this.loadDone) return;
+				this.loading = true;
 				let body = {
 					pageNo:this.pageNo,
 					pageSize:this.pageSize,
@@ -65,6 +75,7 @@
 				}
 				this.$u.api.customerReceivable({body:body}).then((res)=>{
 					// console.log(res)
+					this.loading = false;
 					if(res.result&&res.result.length){
 						if(this.pageNo==1){
 							this.listData = res.result

src/pages/my/repairlist.vue

@@ -10,6 +10,7 @@
 				<view v-else class="desc">结束日期</view>
 			</view>
 			<u-calendar v-model="calendarShow" :min-date="mindate" :max-date="maxdate" mode="date" @change="changeDate"></u-calendar>
+			<!-- <view class="export-btn">导出</view> -->
 		</view>
 		<view class="report-tab">
 			<u-tabs :list="tabList" bar-width="60" bar-height="6" active-color="#FF6D25" inactive-color="#666666" font-size="30" :is-scroll="false" :current="current" @change="change"></u-tabs>
@@ -27,12 +28,22 @@
 				<view class="btn todo-btn" v-else>待审核</view>
 			</view>
 		</view>
+		<view class="empty-box" v-if="listData.length==0&&!loading">
+			<image class="img" src="http://images.2weisou.com/20221031114904TSF6jF4S.png" mode=""/>
+			<view class="no-data">暂无数据</view>
+		</view>
+		<view class="loading" v-if="loading">
+				<u-loading size="40" :show="loading"/>
+				正在加载中
+		</view>
+
 	</view>
 </template>
 <script>
 	export default {
 		data() {
 			return {
+				loading: false,
 				type: 0,// 默认是开始时间
 				starDate: '',
 				endDate: '',
@@ -50,7 +61,8 @@
 				listData: [],
 				pageNo: 1,
 				pageSize: 10,
-				loadDone: false
+				loadDone: false,
+				loading: false
 			};
 		},
 		onLoad(options) {
@@ -65,13 +77,17 @@
 		methods: {
 			getList(){
 				if (this.loadDone) return;
+				this.loading = true;
 				let params = {
-					pageNo:this.pageNo,
-					pageSize:this.pageSize,
-					message:this.keyword
+					"pageNo":this.pageNo,
+					"pageSize":this.pageSize,
+					"applyStatus": this.applyStatus,//审批状态0未审核 1通过 2 拒绝
+					"serviceType":41,//服务类别 40保洁 41维修 42 带房
+					"createTimeBegin":this.starDate,
+					"createTimeEnd":this.endDate
 				}
-				this.$u.api.findProxyHouse({body:params}).then((res)=>{
-					console.log(res)
+				this.$u.api.findCleanRepair({body:params}).then((res)=>{
+					this.loading = false
 					if(res.result&&res.result.length){
 						if(this.pageNo==1){
 							this.listData = res.result
@@ -95,6 +111,17 @@
 			},
 			change(index){
 				this.current = index
+				this.pageNo = 1
+				this.loadDone= false
+				this.listData =[]
+				if(index==0){
+					this.applyStatus=''
+				}else if(index==1){
+					this.applyStatus=1
+				}else{
+					this.applyStatus=0
+				}
+				this.getList()
 			},
 			openCalendar(type){
 				if(type==0){
@@ -115,6 +142,10 @@
 				}else{
 					this.endDate = e.result
 				}
+				this.pageNo = 1
+				this.loadDone= false
+				this.listData =[]
+				this.getList()
 			}
 		},
 
@@ -157,6 +188,18 @@
 				color: #999999;
 			}
 		}
+		.export-btn{
+			width: 112rpx;
+			height: 56rpx;
+			line-height: 56rpx;
+			text-align: center;
+			background: #FF6D25;
+			border-radius: 8rpx;
+			font-size: 26rpx;
+			font-family: PingFangSC-Regular, PingFang SC;
+			font-weight: 400;
+			color: #FFFFFF;
+		}
 	}
 	.report-tab{
 		border-bottom: 1px solid rgba(224,224,224,0.5);
@@ -224,5 +267,6 @@
 			}
 		}
 	}
+	
 }
 </style>

src/pages/otherPage/companywarReport.vue

@@ -45,6 +45,14 @@
 					</view>
 				</view>
 			</view>
+			<view class="empty-box" v-if="listData.length==0&&!loading">
+				<image class="img" src="http://images.2weisou.com/20221031114904TSF6jF4S.png" mode=""/>
+				<view class="no-data">暂无数据</view>
+			</view>
+			<view class="loading" v-if="loading">
+				<u-loading size="40" :show="loading"/>
+				正在加载中
+			</view>
 		</view>
 	</view>
 </template>
@@ -64,6 +72,7 @@
 				pageNo: 1,
 				pageSize: 10,
 				loadDone: false,
+				loading: false,
 			};
 		},
 		created(){
@@ -75,9 +84,11 @@
 		methods: {
 			getList(){
 				if (this.loadDone) return;
+				this.loading = true;
 				// type： 今日：0，本周：1，本月：2
 				this.$u.api.departmentReport({body:{pageNo:this.pageNo,pageSize:this.pageSize,type: this.current}}).then((res)=>{
-					console.log(res)
+					// console.log(res)
+					this.loading = false;
 					if(res.result&&res.result.length){
 						if(this.pageNo==1){
 							this.listData = res.result

src/pages/otherPage/gonggaoDetail.vue

@@ -0,0 +1,70 @@
+<template>
+	<view class="container">
+		<view class="title">{{detailData.title||''}}</view>
+		<view class="sub-title">{{detailData.time||''}} &nbsp;&nbsp;&nbsp;&nbsp;{{detailData.deptName||''}}</view>
+		<view class="cont">
+			<u-parse :html="detailData.content" :tag-style="style"></u-parse>
+		</view>
+	</view>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+				id:'',
+				detailData: {},
+				style: {
+					// 字符串的形式
+					p: 'font-size: 30rpx;font-family: PingFangSC-Regular, PingFang SC;color: #303030;',
+				}
+			};
+		},
+		
+		methods: {
+			getdetail(){
+				this.$u.api.appdetail({body:{id:this.id}}).then((res)=>{
+					if(res.ErrNo =='0000'){
+						this.detailData = res.result||{}
+					}
+				})
+			}
+		},
+
+		onLoad: function(options) {
+			this.id=options.id
+			this.getdetail()
+		},
+		onHide: function() {},
+	};
+</script>
+
+<style lang="scss" scoped>
+.container{
+	width: 750rpx;
+	min-height: 100vh;
+	padding: 30rpx;
+	.title{
+		font-size: 32rpx;
+		font-family: PingFangSC-Semibold, PingFang SC;
+		font-weight: 600;
+		color: #303030;
+		line-height: 45rpx;
+		margin-bottom: 20rpx;
+	}
+	.sub-title{
+		height: 40rpx;
+		font-size: 28rpx;
+		font-family: PingFangSC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #666666;
+		line-height: 40rpx;
+		margin-bottom: 30rpx;
+	}
+	.cont{
+		padding: 30rpx;
+		width: 690rpx;
+		background: #FAFAFA;
+	}
+	
+}
+</style>

src/pages/otherPage/historyList.vue

@@ -10,6 +10,14 @@
 					<view class="house">{{item.createTime}}</view>
 				</view>
 			</view>
+			<view class="empty-box" v-if="listData.length==0&&!loading">
+				<image class="img" src="http://images.2weisou.com/20221031114904TSF6jF4S.png" mode=""/>
+				<view class="no-data">暂无数据</view>
+			</view>
+			<view class="loading" v-if="loading">
+				<u-loading size="40" :show="loading"/>
+				正在加载中
+			</view>
 		</view>
 	</view>
 </template>
@@ -21,6 +29,7 @@
 				pageNo: 1,
 				pageSize: 10,
 				loadDone: false,
+				loading: false,
 			};
 		},
 		onLoad(options) {
@@ -33,6 +42,7 @@
 		methods: {
 			getList(){
 				if (this.loadDone) return;
+				this.loading = true;
 				let params = {
 					pageNo:this.pageNo,
 					pageSize:this.pageSize,
@@ -40,6 +50,7 @@
 				}
 				this.$u.api.findDetailHistory({body:params}).then((res)=>{
 					// console.log(res)
+					this.loading = false
 					if(res.result&&res.result.length){
 						if(this.pageNo==1){
 							this.listData = res.result

src/pages/otherPage/jjrent.vue

@@ -23,6 +23,14 @@
 				</view>
 			</view>
 		</view>
+		<view class="empty-box" v-if="listData.length==0&&!loading">
+			<image class="img" src="http://images.2weisou.com/20221031114904TSF6jF4S.png" mode=""/>
+			<view class="no-data">暂无数据</view>
+		</view>
+		<view class="loading" v-if="loading">
+				<u-loading size="40" :show="loading"/>
+				正在加载中
+			</view>
     <u-modal v-model="showModal" :show-cancel-button="true" confirm-color="#FF6D25" @confirm="confirmFun" title="确认操作" :content="'您确认'+(isTop==0?'置顶吗?':'取消置顶吗?')"></u-modal>
 	</view>
 </template>
@@ -30,6 +38,7 @@
 	export default {
 		data() {
 			return {
+        loading: false,
         showModal: false,
 				keyword: '',
 				searchForm: {
@@ -119,6 +128,7 @@
 			},
 			getList(){
 				if (this.loadDone) return;
+				this.loading = true;
 				let params = {
 					pageNo:this.pageNo,
 					pageSize:this.pageSize,
@@ -126,6 +136,7 @@
 				}
 				this.$u.api.intermediary({body:params}).then((res)=>{
 					// console.log(res)
+					this.loading = false
 					if(res.result&&res.result.length){
 						res.result.forEach(item=>{
 							if(item.pictrues&&item.pictrues.length){

src/pages/otherPage/jjrentDetail.vue

@@ -33,8 +33,8 @@
 		</view>
 	
 		<view class="bottom-box">
-			<view class="item" @click="careFun">
-				<!-- 0未关注  1关注  -->
+			<view class="item" @click="openmodal">
+				<!--isStore 0未关注  1关注  -->
 				<image class="item-icon" v-if="roomInfo.isStore==1" src="/static/kehu/love.png" mode="" />
 				<image class="item-icon" v-else src="/static/czDetail/care_icon.png" mode="" />
 				<view class="item-text">关注</view>
@@ -55,14 +55,17 @@
 				<view class="item-text">历史记录</view>
 			</view>
 		</view>
+		<u-modal v-model="modalShow" :content="tip" :show-cancel-button="true" confirm-color="#FF6D25" title="确认操作" @confirm="careFun" ref="uModal" :async-close="false"></u-modal>
 	</view>
 </template>
 <script>
 	export default {
 		data() {
 			return {
+				modalShow: false,
 				picList: [],
 				roomId:'',
+				tip:'',
 				roomInfo:{}
 			};
 		},
@@ -76,9 +79,6 @@
 					item.pictureUrl
 				)
 			}
-		},
-		onShow() {
-		
 		},
 		methods: {
 			//拜访
@@ -92,6 +92,14 @@
 					url: '/pages/otherPage/historyList?mediacyId='+ this.roomInfo.mediacyId
 				})
       },
+			openmodal(){
+				if(this.roomInfo.isStore==1){
+					this.tip = '您确认要取消关注吗'
+				}else{
+					this.tip = '您确认要关注吗'
+				}
+				this.modalShow = true
+			},
 			// 关注，取消关注
 			careFun(){
 				if(this.roomInfo.isStore==1){

src/pages/otherPage/jjrentVisit.vue

@@ -18,13 +18,15 @@
 			</view>
 			<u-upload upload-text="添加图片" ref="uUpload" :show-progress="false" max-count="6" @on-uploaded="upload" :action="action" :auto-upload="true" :file-list="fileList" ></u-upload>
 		</view>
-		<view class="submit-btn" @click="submit">提交</view>
+		<view class="submit-btn" @click="openModal">提交</view>
+		<u-modal v-model="modalShow" content="您确认提交吗？" :show-cancel-button="true" confirm-color="#FF6D25" title="确认操作" @confirm="submit" ref="uModal" :async-close="false"></u-modal>
 	</view>
 </template>
 <script>
 	export default {
 		data() {
 			return {
+				modalShow: false,
 				action: 'https://erpx.2weisou.com/sjjy/file/upload.do',
 				fileList: [],
 				form: {
@@ -42,23 +44,15 @@
 		onLoad(options) {
 			this.mediacyId = options.mediacyId;
 			this.masterHouseId = options.masterHouseId;
-			this.form.person = options.personName;
+			let user = uni.getStorageSync('user')
+			this.form.person = user.name||user.userName||''
 			this.form.address = options.address;
 		},
 		methods: {
 			upload(lists, name){
 				console.log(lists)
 			},
-			submit() {
-				let	files = this.$refs.uUpload.lists;
-				this.fileList = files.length&&files.map(item=>{
-					return {
-						url: item.response.result.FilePath,
-						webUrl: item.response.result.FilePath,
-					}
-				})
-				console.log(files)
-				console.log(this.fileList )
+			openModal(){
 				if(this.form.address==''){
 					uni.showToast({
 						title: '请输入地址',
@@ -73,20 +67,34 @@
 					})
 					return;
 				}
+				let	files = this.$refs.uUpload.lists
+				// console.log(files)
+				this.fileList = files.length&&files.map(item=>{
+					return {
+						url: item.response.result.FilePath,
+						webUrl: item.response.result.FilePath,
+					}
+				})
+				if(this.fileList&&this.fileList.length){
+					this.modalShow = true
+				}else{
+					uni.showToast({
+						title: '请上传图片',
+						icon: 'none'
+					})
+					return;
+				}
+			},
+			submit() {
 				let params = {
           "masterHouseId": this.masterHouseId,
           "mediacyId": this.mediacyId,
-					imageDetails: this.fileList
+					"imageDetails": this.fileList
         }
         this.$u.api.visit({body:params}).then((res)=>{
-					// console.log(res)
 					if(res.ErrNo=='0000'){
-							uni.showToast({
-								title: res.ErrMsg,
-								icon: 'none'
-							})
-							wx.navigateBack()
-						}
+						wx.navigateBack()
+					}
         })
 			},
 		},

src/pages/otherPage/ledList.vue

@@ -9,6 +9,14 @@
 			</view>
 			<view class="bot">{{item.address}}</view>
 		</view>
+		<view class="loading" v-if="loading">
+				<u-loading size="40" :show="loading"/>
+				正在加载中
+			</view>
+		<view class="empty-box" v-if="listData.length==0&&!loading">
+			<image class="img" src="http://images.2weisou.com/20221031114904TSF6jF4S.png" mode=""/>
+			<view class="no-data">暂无数据</view>
+		</view>
 	</view>
 </template>
 <script>
@@ -19,6 +27,7 @@
 				pageNo: 1,
 				pageSize: 10,
 				loadDone: false,
+				loading: false,
 				roomId:''
 			};
 		},
@@ -29,6 +38,7 @@
 		methods: {
 			getList(){
 				if (this.loadDone) return;
+				this.loading = true;
 				let body = {
 					pageNo:this.pageNo,
 					pageSize:this.pageSize,
@@ -36,6 +46,7 @@
 				}
 				this.$u.api.housecustomerViewHistory({body:body}).then((res)=>{
 					// console.log(res)
+					this.loading = false;
 					if(res.result&&res.result.length){
 						if(this.pageNo==1){
 							this.listData = res.result

src/pages/otherPage/rent.vue

@@ -13,10 +13,17 @@
 		</view>
 		<view class="list-box">
 			<view class="list-item" @click="topage(item)" v-for="(item,index) in listData" :key="index">
+				<!-- roomFlag 1转租、2违约 -->
+				<view class="mark" v-if="item.roomFlag==1">转租</view>
+				<view class="mark" v-if="item.roomFlag==2">违约</view>
 				<image class="house-img" :src="item.pictrues[0].pictureUrl||'/static/kehu/pic1.png'" mode="" />
 				<view class="item-info">
 					<view class="house-name u-line-1">{{item.address}}</view>
-					<view class="type">{{item.houseType}} / {{item.area}}㎡</view>
+					<view class="type">{{item.houseType}} / {{item.area}}㎡
+						<!-- 1 收定  2退定 -->
+						<view class="type-status" v-if="item.rentPeriod==1">收定</view>
+						<view class="type-status" v-if="item.rentPeriod==2">退定</view>
+					</view>
 					<view class="rent-time">剩余租期：{{item.remainderPeriod}}个月</view>
 					<view class="bot-wrap">
 						<view class="left u-line-1"><image class="person-icon" src="/static/person.png" mode="" />{{item.personName}}</view>
@@ -24,6 +31,14 @@
 					</view>
 				</view>
 			</view>
+			<view class="loading" v-if="loading">
+				<u-loading size="40" :show="loading"/>
+				正在加载中
+			</view>
+			<view class="empty-box" v-if="listData.length==0&&!loading">
+			<image class="img" src="http://images.2weisou.com/20221031114904TSF6jF4S.png" mode=""/>
+			<view class="no-data">暂无数据</view>
+		</view>
 		</view>
 		<!-- 位置 -->
 		<u-popup v-model="addressShow" mode="top">
@@ -70,6 +85,7 @@
 	export default {
 		data() {
 			return {
+				loading: false,
 				addressShow: false,
 				priceShow: false,
 				houseTypeShow: false,
@@ -229,6 +245,7 @@
 			},
 			getList(){
 				if (this.loadDone) return;
+				this.loading = true;
 				let params = {
 					pageNo:this.pageNo,
 					pageSize:this.pageSize,
@@ -243,7 +260,8 @@
 				}
 				
 				this.$u.api.roomList({body:params}).then((res)=>{
-					console.log(res)
+					// console.log(res)
+					this.loading = false;
 					if(res.result&&res.result.length){
 						if(this.pageNo==1){
 							this.listData = res.result
@@ -260,7 +278,6 @@
 						this.loadDone = true;
 						if(this.pageNo==1){
 							this.listData = []
-							
 						}
 					}
 				})
@@ -320,6 +337,22 @@
 			height: 202rpx;
 			margin-bottom: 30rpx;
 			display: flex;
+			position: relative;
+			.mark{
+				position: absolute;
+				left: 0;
+				top: 0;
+				width: 80rpx;
+				height: 44rpx;
+				line-height: 44rpx;
+				text-align: center;
+				font-size: 24rpx;
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #FFFFFF;
+				background: #FF6D25;
+				border-radius: 12rpx 0px 12rpx 0px;
+			}
 			.house-img{
 				width: 248rpx;
 				height: 202rpx;
@@ -336,16 +369,38 @@
 					font-weight: 500;
 					color: #333333;
 					line-height: 44rpx;
-					margin-bottom: 2rpx;
+					margin-bottom: 15rpx;
 					max-width: 410rpx;
 				}
-				.type,.rent-time{
+				.type{
+					height: 44rpx;
+					font-size: 26rpx;
+					font-family: PingFangSC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #333333;
+					margin-bottom: 12rpx;
+					display: flex;
+					align-items: center;
+					.type-status{
+						margin-left: 24rpx;
+						width: 108rpx;
+						height: 44rpx;
+						line-height: 44rpx;
+						text-align: center;
+						background: #FFFFFF;
+						border-radius: 8rpx;
+						font-size: 26rpx;
+						font-family: PingFangSC-Regular, PingFang SC;
+						color: #2671E2;
+						border: 1rpx solid #2671E2;
+					}
+				}
+				.rent-time{
 					height: 36rpx;
 					font-size: 26rpx;
 					font-family: PingFangSC-Regular, PingFang SC;
 					font-weight: 400;
 					color: #333333;
-					line-height: 36rpx;
 					margin-bottom: 12rpx;
 				}
 				.bot-wrap{

src/pages/otherPage/rentDetail.vue

@@ -7,7 +7,7 @@
 			<view class="top-cont">
 				<view class="title" @click="tomap(roomInfo.address)"><view class="u-line-1">{{roomInfo.address}}</view>
 					 <image class="map" src="/static/czDetail/map.png" mode="" /></view>
-				<view class="call-info" @click="call(item.tellPhone)">
+				<view class="call-info" @click="call(roomInfo.tellPhone)">
 					<image class="call" src="/static/czDetail/call.png" mode="" />{{roomInfo.personName}}
 				</view>
 			</view>

src/pages/otherPage/shouding.vue

@@ -94,16 +94,16 @@
 				calendarShow2: false,
 				payTypeShow: false,
 				form: {
-					customerName: '赵彩云',
-					mobile: '18339694416',
-					money: '1000',
-					fee: '100',
-					rent_price: '2000',
-					idno: '412702199011176926',//身份证号
+					customerName: '',
+					mobile: '',
+					money: '',
+					fee: '',
+					rent_price: '',
+					idno: '',//身份证号
 					endDate:'',
 					starDate:'',
-					ws_fee: '100',
-					tv_price: '100',
+					ws_fee: '',
+					tv_price: '',
 					rent_date: '',
 					payment_way:'1',
 					payTypeName:''
@@ -190,11 +190,12 @@
 				this.$u.api.appSave({body:body}).then((res)=>{
 					console.log(res)
 					if(res.ErrNo=='0000'){
-						this.$refs.uToast.show({
-							title: res.ErrMsg,
-							icon: 'none',
-							type:'success'
-						})
+						// this.$refs.uToast.show({
+						// 	title: res.ErrMsg,
+						// 	icon: 'none',
+						// 	type:'success'
+						// })
+						uni.navigateBack()
 					}
 				})
 			},
@@ -261,7 +262,7 @@
 		height: 88rpx;
 		line-height: 88rpx;
 		text-align: center;
-		background: #FFB692;
+		background: #FF6D25;
 		border-radius: 12rpx;
 		margin-left: 30rpx;
 		font-size: 32rpx;
@@ -270,6 +271,7 @@
 		color: #FFFFFF;
 		position: fixed;
 		bottom: 30rpx;
+		z-index: 99;
 	}
 }
 </style>

src/pages/tabs/customer.vue

@@ -18,14 +18,14 @@
 			<view class="list-item" v-for="(item,index) in listData" :key="index">
 				<view class="item-top">
 					<view class="item-left">
-						<view class="person">{{item.customerName}}<image v-if="item.customerLevel==1" class="love" src="/static/kehu/love.png" mode="" />
+						<view class="person">{{item.customerName}}<image v-if="item.customerLevel==1" @click="love(item)" class="love" src="/static/kehu/love.png" mode="" />
 						<image v-else @click="love(item)" class="love" src="/static/kehu/notlove.png" mode="" />
 						</view> 
 						<view class="time">{{item.belongPerson}}于{{item.createTime}}录入</view>
 						<view class="diffDay">未跟进时间：{{item.missingDays}}天</view>
 					</view>
 					<view class="item-right">
-						<image style="margin-right: 40rpx;" src="/static/kehu/news.png" mode="" />
+						<!-- <image @click="sendCode(item.customerMobile)" style="margin-right: 40rpx;" src="/static/kehu/news.png" mode="" /> -->
 						<image @click="tocall(item.customerMobile)" src="/static/kehu/call.png" mode="" />
 					</view>
 				</view>
@@ -35,6 +35,14 @@
 					<view class="btn" @click="topage('ledList',item.customerId)"><image class="icon" src="/static/kehu/edit.png" mode="" />带看记录</view>
 				</view>
 			</view>
+			<view class="loading" v-if="loading">
+				<u-loading size="40" :show="loading"/>
+				正在加载中
+			</view>
+			<view class="empty-box" v-if="listData.length==0&&!loading">
+				<image class="img" src="http://images.2weisou.com/20221031114904TSF6jF4S.png" mode=""/>
+				<view class="no-data">暂无数据</view>
+			</view>
 		</view>
 		<!-- 户型弹窗 -->
 		<u-popup v-model="huxingshow" mode="top">
@@ -59,6 +67,7 @@
 	export default {
 		data() {
 			return {
+				loading: false,
 				modalShow: false,
 				keyword: '',
 				listData: [],
@@ -98,6 +107,7 @@
 			this.zujinshow = false
 			this.huxingshow = false
 			this.pageNo = 1
+			this.listData = []
 			this.searchForm = {
 				huxingval: '',
 				zujinval: '',
@@ -115,7 +125,7 @@
 			love(item){
 				this.$u.api.updateLevel({body:{
 					customerMobile: item.customerMobile,
-					customerLevel: 1
+					customerLevel: item.customerLevel==1?0:1
 				}}).then((res)=>{
 					// console.log(res)
 					if(res.ErrNo=='0000'){
@@ -123,7 +133,7 @@
 							title: res.ErrMsg,
 							icon: 'none'
 						})
-						item.customerLevel = 1
+						item.customerLevel = item.customerLevel==1?0:1
 					}
 				})
 			},
@@ -156,24 +166,31 @@
 			search(){
 				this.pageNo = 1
 				this.loadDone = false
+				this.listData = []
 				this.getcustomerList()
 			},
 			tocall(phone){
 				uni.makePhoneCall({
 					phoneNumber: phone
 				})
+			},
+			sendCode(){
+
 			},
 			getcustomerList(){
 				if (this.loadDone) return;
+				this.loading = true;
 				let body = {
-					pageNo:this.pageNo,
-					pageSize:this.pageSize,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+					phone: this.keyword,
 					houseType: this.searchForm.huxingval,//房型： 1,开间  2,一居 3,二居 4,三居 5,四居 6,其他
 					rentPriceMin: this.searchForm.zujinval?this.searchForm.zujinlabel.split('~')[0]:'',//最小租金
 					rentPriceMax: this.searchForm.zujinval?this.searchForm.zujinlabel.split('~')[1]:''
 				}
 				this.$u.api.customerFind({body:body}).then((res)=>{
 					// console.log(res)
+					this.loading = false;
 					if(res.result&&res.result.length){
 						if(this.pageNo==1){
 							this.listData = res.result
@@ -200,6 +217,7 @@
 					this.searchForm.zujinlabel  = ''
 					this.zujinshow = false
 					this.pageNo = 1
+					this.listData = []
 					this.loadDone = false
 					this.getcustomerList()
 					return ;
@@ -208,6 +226,7 @@
 				this.searchForm.zujinlabel = item.text
 				this.zujinshow = false
 				this.pageNo = 1
+				this.listData = []
 				this.loadDone = false
 				this.getcustomerList()
 			},
@@ -218,6 +237,7 @@
 					this.huxingshow = false
 					this.pageNo = 1
 					this.loadDone = false
+					this.listData = []
 					this.getcustomerList()
 					return ;
 				}
@@ -225,6 +245,7 @@
 				this.searchForm.huxinglabel = item.text
 				this.huxingshow = false
 				this.pageNo = 1
+				this.listData = []
 				this.loadDone = false
 				this.getcustomerList()
 			},

src/pages/tabs/gonggao.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
-		<view class="list" v-for="(item,index) in gonggaoList" :key="index">
-			<view class="item-top">
+		<view class="list" v-for="(item,index) in listData" :key="index">
+			<view class="item-top" @click="toDetail(item.id)">
 				<view class="title" :class="{'boldtitle':item.content==1}">
 					<view class="dot" v-if="item.content"></view>
 					<view class="u-line-1" style="max-width: 580rpx;">{{item.title}}</view>
@@ -17,16 +17,25 @@
 				<view class="btn"><image class="img" src="/static/list.png" mode="" />查看记录</view>
 			</view>
 		</view>
+		<view class="loading" v-if="loading">
+				<u-loading size="40" :show="loading"/>
+				正在加载中
+			</view>
+		<view class="empty-box" v-if="listData.length==0&&!loading">
+			<image class="img" src="http://images.2weisou.com/20221031114904TSF6jF4S.png" mode=""/>
+			<view class="no-data">暂无数据</view>
+		</view>
 	</view>
 </template>
 <script>
 	export default {
 		data() {
 			return {
-				gonggaoList: [],
+				listData: [],
 				pageNo: 1,
 				pageSize: 10,
 				loadDone: false,
+				loadDone: false,
 			};
 		},
 		created(){
@@ -36,15 +45,22 @@
 			this.getGonggao();
 		},
 		methods: {
+			toDetail(id){
+				uni.navigateTo({
+					url: '/pages/otherPage/gonggaoDetail?id='+id
+				})
+			},
 			getGonggao(){
 				if (this.loadDone) return;
+				this.loading = true;
 				this.$u.api.applist({body:{pageNo:this.pageNo,pageSize:this.pageSize}}).then((res)=>{
 					// console.log(res)
+					this.loading = false;
 					if(res.result&&res.result.length){
 						if(this.pageNo==1){
-							this.gonggaoList = res.result
+							this.listData = res.result
 						}else{
-							this.gonggaoList = [...this.gonggaoList, ...res.result];
+							this.listData = [...this.listData, ...res.result];
 						}
 						if(res.result.length<this.pageSize){
 							this.loadDone = true;
@@ -55,7 +71,7 @@
 					}else{
 						this.loadDone = true;
 						if(this.pageNo==1){
-							this.gonggaoList = []
+							this.listData = []
 						}
 					}
 				})

src/pages/tabs/index.vue

@@ -24,7 +24,7 @@
 				<view class="dot"></view>
 			</view>
 			<view class="right">
-				<u-notice-bar type="none" :speed="200"  padding="18rpx 0" font-size="28" color="#303030" mode="vertical" :volume-icon="false" :more-icon="false" :list="gonggaoList"></u-notice-bar>
+				<u-notice-bar @click="toDetail" type="none" :speed="200"  padding="18rpx 0" font-size="28" color="#303030" mode="vertical" :volume-icon="false" :more-icon="false" :list="gonggaoList"></u-notice-bar>
 			</view>
 			<image class="more-icon" src="/static/index/right-arrow.png" mode="" />
 		</view>
@@ -64,6 +64,7 @@
 		data() {
 			return {
 				gonggaoList: [],
+				gonggaoList1: [],
 				tabList: [{
 					name: '今日战报'
 				}, {
@@ -108,6 +109,13 @@
 		created(){
 		},
 		onShow() {
+			let token = uni.getStorageSync('token');
+			if(token){
+				this.$u.vuex("vuex_token",token);
+				uni.switchTab({
+					url: '/pages/tabs/index'
+				})
+			}
 			this.current = 0
 			this.current1 = 0
 			this.getGonggao()
@@ -115,6 +123,12 @@
 			this.getcompanyReport(0)
 		},
 		methods: {
+			// 公告详情
+			toDetail(index){
+				uni.navigateTo({
+					url: '/pages/otherPage/gonggaoDetail?id='+ this.gonggaoList1[index].id
+				})
+			},
 			// 经纪人排名与组排名
 			getRanking(api){
 				this.$u.api[api]({body:{}}).then((res)=>{
@@ -124,7 +138,10 @@
 			// 获取公告
 			getGonggao(){
 				this.$u.api.applist({body:{pageNo:1,pageSize:20}}).then((res)=>{
-					this.gonggaoList = res.result&&res.result.map(item=>item.title)
+					if(res.ErrNo=='0000'){
+						this.gonggaoList1 = res.result ||[]
+						this.gonggaoList = res.result&&res.result.map(item=>item.title)
+					}
 				})
 			},
 			// 获取战报