调试页面

src/common/http.api.js

@@ -267,5 +267,5 @@ const install = (Vue, vm) => {
 }
 
 export default {
-    install
+  install
 }

src/pages/my/contact_check.vue

@@ -37,8 +37,7 @@
 		</view>
 		<u-modal title="确认操作" @confirm="confirm" show-cancel-button confirm-color="#FF6D25" :confirm-text="pass==1?'通过':'拒绝'" :mask-close-able="true" v-model="showmodal" :title-style="titleStyle">
 			<view class="slot-content">
-				<view class="my-tip">您确认{{pass==1?'通过':'拒绝'}}该审核吗？</view>
-				<!-- <rich-text :nodes="content"></rich-text> -->
+				<view class="my-tip">您确认要{{pass==1?'通过':'拒绝'}}该审核吗？</view>
 			</view>
 		</u-modal>
 		<view class="loading" v-if="loading">
@@ -93,7 +92,7 @@
 			djContract(id){
 				// 审批状态0未审核 1通过 2 拒绝
 				this.$u.api.djContract({body:{contractId:id}}).then((res)=>{
-					console.log(res)
+					// console.log(res)
 					if(res.ErrNo=='0000'){
 						wx.navigateTo({
 							url: '/pages/my/contact_check_page?src='+res.result
@@ -134,7 +133,6 @@
 			confirm(){
 				// 审核状态 0 未审核 1 已审核 2 拒绝
 				this.$u.api.examine({body:{contractId:this.contractId,status:this.pass==1?1:2}}).then((res)=>{
-					// console.log(res)
 					if(res.ErrNo=='0000'){
 						uni.showToast({
 							title: '操作成功',

src/pages/my/electContract.vue

@@ -107,7 +107,7 @@
 						<view class="input">
 							<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>
+							<u-calendar v-model="calendarShow1" max-date="2099-12-31" mode="date" @change="changeDate1"></u-calendar>
 						</view>
 					</view>
 					<view class="item">
@@ -115,7 +115,7 @@
 						<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> -->
+							<u-calendar v-model="calendarShow2" max-date="2099-12-31" mode="date" @change="changeDate2"></u-calendar>
 						</view>
 					</view>
 					<view class="item">
@@ -151,6 +151,8 @@
 	export default {
 		data() {
 			return {
+				mindate: '',
+				maxdate: '2099-12-31',
 				canEdit: true,
 				errText: '',
 				step:1,
@@ -310,7 +312,8 @@
 						label: '其他'
 					},
 				],
-				paymentMethodList: [
+				// 支付类型
+				paytypeList: [
 					{
 						value: '1',
 						label: '现金'
@@ -320,8 +323,8 @@
 						label: '第三方'
 					}
 				],
-				// 支付方式
-				paytypeList: [
+				// 收款方式
+				paymentMethodList: [
 					{
 						value: '1',
 						label: '月付'
@@ -440,6 +443,11 @@
 					}
 				})
 			},
+			getTimer(date){
+				if(date){
+					return  new Date(date).getTime()
+				}
+			},
 			// 第二部保存
 			submit() {
 				if(this.form.fee==''){
@@ -472,9 +480,9 @@
 					})
 					return ;
 				}
-				if(this.form.rent_date_end==''){
+				if(this.form.rent_date_start==''){
 					this.$refs.uToast.show({
-						title: '请输入租约的结束时间'
+						title: '请输入租约的开始时间'
 					})
 					return ;
 				}
@@ -484,6 +492,15 @@
 					})
 					return ;
 				}
+				console.log('time')
+				console.log(this.getTimer(this.form.rent_date_start))
+				console.log(this.getTimer(this.form.rent_date_end))
+				if(this.getTimer(this.form.rent_date_end)<this.getTimer(this.form.rent_date_start)){
+					this.$refs.uToast.show({
+						title: '租约的结束时间不能小于开始时间'
+					})
+					return ;
+				}
 				let body = {
 					"contractId": this.contractId,
 					"oldContractId": this.electContractInfo.proxy_contract_id,//续期合同id
@@ -548,10 +565,12 @@
 			// 租约期限
 			changeDate1(e){
 				this.form.rent_date_start = e.result
+				this.mindate = e.result
 			},
 			// 租约期限
 			changeDate2(e){
 				this.form.rent_date_end = e.result
+				this.maxdate = e.result
 			},
 			sexChange(){
 				console.log(this.form.sex)

src/pages/my/rentReceive.vue

@@ -71,7 +71,9 @@
 				let body = {
 					pageNo:this.pageNo,
 					pageSize:this.pageSize,
-					message: this.keyword
+					message: this.keyword,
+					startTime: this.starDate,
+					endTime: this.endDate
 				}
 				this.$u.api.customerReceivable({body:body}).then((res)=>{
 					// console.log(res)
@@ -115,6 +117,10 @@
 				}else{
 					this.endDate = e.result
 				}
+				this.pageNo =1
+				this.loadDone = false,
+				this.listData = []
+				this.getList()
 			}
 
 		},

src/pages/otherPage/jjrentDetail.vue

@@ -94,9 +94,9 @@
       },
 			openmodal(){
 				if(this.roomInfo.isStore==1){
-					this.tip = '您确认要取消关注吗'
+					this.tip = '您确认要取消关注该房源吗'
 				}else{
-					this.tip = '您确认要关注吗'
+					this.tip = '您确认要关注该房源吗'
 				}
 				this.modalShow = true
 			},

src/pages/otherPage/jjrentVisit.vue

@@ -16,7 +16,7 @@
 			<view class="item" style="border:0">
 				<view class="label">上传图片</view>
 			</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>
+			<u-upload upload-text="添加图片" ref="uUpload" :show-progress="false" max-count="6" @on-uploaded="upload" :action="action" :auto-upload="true" ></u-upload>
 		</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>
@@ -28,7 +28,6 @@
 			return {
 				modalShow: false,
 				action: 'https://erpx.2weisou.com/sjjy/file/upload.do',
-				fileList: [],
 				form: {
 					address: '',
 					person: '',
@@ -68,14 +67,14 @@
 					return;
 				}
 				let	files = this.$refs.uUpload.lists
-				// console.log(files)
-				this.fileList = files.length&&files.map(item=>{
+				let fileList = files.length&&files.map(item=>{
 					return {
-						url: item.response.result.FilePath,
-						webUrl: item.response.result.FilePath,
+						url: item.response&&item.response.result.FilePath || item.url,
+						webUrl: item.response&&item.response.result.FilePath|| item.url,
 					}
 				})
-				if(this.fileList&&this.fileList.length){
+				if(fileList&&fileList.length){
+					this.picList = fileList
 					this.modalShow = true
 				}else{
 					uni.showToast({
@@ -89,7 +88,7 @@
 				let params = {
           "masterHouseId": this.masterHouseId,
           "mediacyId": this.mediacyId,
-					"imageDetails": this.fileList
+					"imageDetails": this.picList
         }
         this.$u.api.visit({body:params}).then((res)=>{
 					if(res.ErrNo=='0000'){

src/pages/otherPage/rent.vue

@@ -15,14 +15,12 @@
 			<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}}㎡
-						<!-- 1 收定  2退定 -->
+						<!-- rentPeriod  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">
@@ -356,7 +354,7 @@
 			.house-img{
 				width: 248rpx;
 				height: 202rpx;
-				border-radius: 8rpx;
+				border-radius: 12rpx;
 				margin-right: 24rpx;
 				flex: 0 0 248rpx;
 			}

src/pages/otherPage/rentDetail.vue

@@ -65,11 +65,11 @@
 				<view class="item-text">门锁密码</view>
 			</view>
 			<view class="line"></view>
-			<view class="item" @click="topage('otherPage/shouding')">
+			<view class="item" v-if="roomInfo.rentPeriod!=1" @click="topage('otherPage/shouding')">
 				<image class="item-icon" src="/static/czDetail/money1.png" mode="" />
 				<view class="item-text">收定</view>
 			</view>
-			<view class="line"></view>
+			<view class="line" v-if="roomInfo.rentPeriod!=1"></view>
 			<view class="item" @click="topage('otherPage/ledList')">
 				<image class="item-icon" src="/static/czDetail/book.png" mode="" />
 				<view class="item-text">带看历史</view>
@@ -90,6 +90,7 @@
 			this.roomId = options.id;
 			this.roomInfo = {}
 			this.roomInfo = uni.getStorageSync('roomInfo')
+			console.log(this.roomInfo)
 			this.roomPictureList()
 		},
 		onShow() {