调试页面

src/common/http.api.js

@@ -48,6 +48,7 @@ let depositExamineurl= '/appHouseContract/depositExamine.do' //定金合同审
 let getDepositListurl= '/appHouseContract/getDepositList.do' //合同审核列表
 let signDepositCallbackurl= '/appHouseContract/signDepositCallback.do' //签约回调
 let djContracturl= '/appHouseContract/djContract.do' //定金合同详情 
+let htContracturl= '/appHouseContract/contract.do' //合同审核详情 
 let contractListurl= '/appHouseContract/contractList.do' //房间续租合同信息查询
 let sendCodeurl = '/appPhoneCode/sendCode.do' //手机号发短信
 let sendUserurl = '/appPhoneCode/sendUser.do' //用户名发短信
@@ -108,6 +109,7 @@ const install = (Vue, vm) => {
   let assitCount = (params) => vm.$u.post(assitCounturl, params);
   let assit = (params) => vm.$u.post(assiturl, params);
   let contract = (params) => vm.$u.post(contracturl, params);
+  let htContract = (params) => vm.$u.post(htContracturl, params);
   let process = (params) => vm.$u.post(processurl, params);
   let examine = (params) => vm.$u.post(examineurl, params);
   let deal = (params) => vm.$u.post(dealurl, params);
@@ -202,6 +204,7 @@ const install = (Vue, vm) => {
     storeUp,
     cancelStoreUp,
     contract,
+    htContract,
     process,
     examine,
     deal,

src/pages/my/apply_baojie.vue

@@ -99,7 +99,7 @@
 				})
 			},
 			dateConfirm(e){
-				console.log(e)
+				// console.log(e)
 				this.form.date = e.year + '-'+e.month + '-'+e.day+ ' '+e.hour+':'+e.minute+':'+e.second
 			},
 			submit() {
@@ -121,7 +121,7 @@
 					"serviceDate": this.form.date,
 					"serviceType": this.serviceType,//服务类别 40保洁 41维修
 					"houseId": this.form.houseId,
-					"remark":this.form.mark
+					"remark": this.form.mark
 				}
 				this.$u.api.cleanRepairApply({body:params}).then((res)=>{
 					// console.log(res)
@@ -131,13 +131,10 @@
 							icon: 'none'
 						})
 					}
-					setTimeout(()=>function (){
-						uni.navigateTo({
-							url: '/pages/my/apply'
-						})
+					setTimeout(()=>{
+						uni.navigateBack()
 					},2000)
 				})
-				
 			},
 		},
 	};

src/pages/my/contactList.vue

@@ -5,8 +5,8 @@
 		</view>
 		<view class="list-box">
 			<view class="item" v-for="(item,index) in listData" :key="index">
-				<view class="spell">{{item.first}}</view>
-				<view class="subitem" v-for="(subitem,ind) in item.cell" :key="ind">
+				<view class="spell" v-if="item.cell.length">{{item.first}}</view>
+				<view class="subitem" @click="tocall(subitem.tellPhone)" v-for="(subitem,ind) in item.cell" :key="ind">
 					<image class="avatar" v-if="subitem.personImage" :src="subitem.personImage" mode="" />
 					<view class="avatar1" v-if="!subitem.personImage">{{subitem.personName.substring(0,1)}}</view>
 					<view class="info">
@@ -53,6 +53,11 @@
 			this.getList();
 		},
 		methods: {
+			tocall(phone){
+				uni.makePhoneCall({
+					phoneNumber: phone
+				})
+			},
 			search(){
 				this.pageNo=1
 				this.listData = []

src/pages/my/contact_check.vue

@@ -35,7 +35,7 @@
 				</view>
 			</view>
 		</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">
+		<u-modal title="确认操作" @confirm="confirm" show-cancel-button confirm-color="#FF6D25" confirm-text="确定" :mask-close-able="true" v-model="showmodal" :title-style="titleStyle">
 			<view class="slot-content">
 				<view class="my-tip">您确认要{{pass==1?'通过':'拒绝'}}该审核吗？</view>
 			</view>
@@ -91,7 +91,7 @@
 			// 定金合同详情 
 			djContract(id){
 				// 审批状态0未审核 1通过 2 拒绝
-				this.$u.api.djContract({body:{contractId:id}}).then((res)=>{
+				this.$u.api.htContract({body:{contractId:id}}).then((res)=>{
 					// console.log(res)
 					if(res.ErrNo=='0000'){
 						wx.navigateTo({
@@ -174,7 +174,6 @@
 				line-height: 40rpx;
 				&.canclick:hover{
 					background: #eee;
-
 				}
 				.name{
 					flex: 0 0 112rpx;

src/pages/my/dingjin_check.vue

@@ -2,7 +2,7 @@
 	<view class="container">
 		<view class="list-box">
 			<view class="list-item" v-for="(item,index) in listData" :key="index">
-				<view class="item-info">
+				<view class="item-info" hover-class="canclick" @click="djContract(item.contractId)" style="padding: 12rpx 0;margin-bottom: 0">
 					<view class="name">合同地址</view>
 					<view class="value u-line-1">{{item.contractAddress}}</view>
 					<image class="path" src="/static/path.png" mode="" />
@@ -42,13 +42,13 @@
 				<view class="btn-box">
 					<!-- 审核状态 0 未审核 1 已审核 2 拒绝 -->
 					<view class="btn pass" @click="checkFun(item,1)">通过</view>
-					<view class="btn refuse" @click="checkFun(item,0)">驳回</view>
+					<view class="btn refuse" @click="checkFun(item,2)">驳回</view>
 				</view>
 			</view>
 		</view>
-		<u-modal title="确认操作" @confirm="confirm" show-cancel-button confirm-color="#FF6D25" confirm-text="通过" :mask-close-able="true" v-model="showmodal" :title-style="titleStyle">
+		<u-modal title="确认操作" @confirm="confirm" show-cancel-button confirm-color="#FF6D25" confirm-text="确定" :mask-close-able="true" v-model="showmodal" :title-style="titleStyle">
 			<view class="slot-content">
-				<view class="my-tip">您确认通过该审核吗？</view>
+				<view class="my-tip">您确认{{status==1?'通过':'驳回'}}该审核吗？</view>
 			</view>
 		</u-modal>
 		<view class="loading" v-if="loading">
@@ -73,6 +73,7 @@
 				pageNo: 1,
 				pageSize: 10,
 				loadDone: false,
+				status:''
 			};
 		},
 		onLoad(options) {
@@ -88,6 +89,18 @@
 			this.getList();
 		},
 		methods: {
+			// 定金合同详情 
+			djContract(id){
+				// 审批状态0未审核 1通过 2 拒绝
+				this.$u.api.djContract({body:{contractId:id}}).then((res)=>{
+					// console.log(res)
+					if(res.ErrNo=='0000'){
+						wx.navigateTo({
+							url: '/pages/my/contact_check_page?src='+res.result
+						})
+					}
+				})
+			},
 			getList(){
 				if (this.loadDone) return;
 				this.loading = true;
@@ -128,13 +141,13 @@
 					if(res.ErrNo=='0000'){
 						this.showmodal = false;
 						uni.showToast({
-							title: '审核成功',
+							title: res.ErrMsg,
 							icon:'none'
 						})
 					}
 					this.listData = []
-						this.pageNo = 1
-						this.loadDone = false
+					this.pageNo = 1
+					this.loadDone = false
 					this.getList()
 				})
 			}
@@ -165,6 +178,9 @@
 				font-family: PingFangSC-Regular, PingFang SC;
 				font-weight: 400;
 				line-height: 40rpx;
+				&.canclick:hover{
+					background: #eee;
+				}
 				.name{
 					flex: 0 0 112rpx;
 					color: #666666;

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" max-date="2099-12-31" mode="date" @change="changeDate1"></u-calendar>
+							<u-picker mode="time" confirm-color="#FF6D25" :default-time="form.rent_date_start" v-model="calendarShow1" :params="params" @confirm="dateConfirm1"></u-picker>
 						</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" max-date="2099-12-31" mode="date" @change="changeDate2"></u-calendar>
+							<u-picker mode="time" confirm-color="#FF6D25" :default-time="form.rent_date_end" v-model="calendarShow2" :params="params" @confirm="dateConfirm2"></u-picker>
 						</view>
 					</view>
 					<view class="item">
@@ -154,8 +154,11 @@
 	export default {
 		data() {
 			return {
-				mindate: '',
-				maxdate: '2099-12-31',
+				params: {
+					year: true,
+					month: true,
+					day: true
+				},
 				canEdit: true,
 				errText: '',
 				step:1,
@@ -507,9 +510,9 @@
 					})
 					return ;
 				}
-				this.$refs.uToast.show({
-					title: '提交预览中...'
-				})
+				// this.$refs.uToast.show({
+				// 	title: '提交预览中...'
+				// })
 				let body = {
 					"contractId": this.contractId,
 					"oldContractId": this.electContractInfo.proxy_contract_id,//续期合同id
@@ -577,14 +580,12 @@
 			},
 			
 			// 租约期限
-			changeDate1(e){
-				this.form.rent_date_start = e.result
-				this.mindate = e.result
+			dateConfirm1(e){
+				this.form.rent_date_start = e.year + '-'+e.month + '-'+e.day
 			},
 			// 租约期限
-			changeDate2(e){
-				this.form.rent_date_end = e.result
-				this.maxdate = e.result
+			dateConfirm2(e){
+				this.form.rent_date_end = e.year + '-'+e.month + '-'+e.day
 			},
 			sexChange(){
 				console.log(this.form.sex)

src/pages/my/goonContract.vue

@@ -19,11 +19,11 @@
 				{{item.address||''}}({{item.account_num}})
 				<view class="goon" @click="topage(item)">续期</view>
 			</view>
-			<view class="time">合同时间：{{item.rent_date_end}} - {{item.rent_date_end}}</view>
+			<view class="time">合同时间：{{item.rent_date_start}}至{{item.rent_date_end}}</view>
 			<view class="bot">
 				<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 class="tel" @click="tocall(item.customer_tel)"><image class="tel-icon" src="/static/my/tel.png" mode="" />{{formatPhone(item.customer_tel)}}</view>
 			</view>
 		</view>
 		<view class="empty-box" v-if="listData.length==0&&!loading">
@@ -67,6 +67,21 @@
 			this.getList();
 		},
 		methods: {
+			formatPhone(phone){
+				if(phone){
+					let left = phone.substring(0,3)
+					// let mid = phone.substring(3,7)
+					let right = phone.substring(7,4)
+					return left+'****' + right
+				}else{
+					return ''
+				}
+			},
+			tocall(phone){
+				uni.makePhoneCall({
+					phoneNumber: phone
+				})
+			},
 			openCalendar(type){
 				if(type==0){
 					this.type = 0

src/pages/otherPage/jjrentDetail.vue

@@ -5,7 +5,7 @@
 		</view>
 		<view class="house-info">
 			<view class="top-cont">
-				<view class="title"><view class="u-line-1">{{roomInfo.address}}</view>
+				<view class="title"><view class="u-line-1">{{roomInfo.address||''}}</view>
 				</view>
 				<view class="call-info" @click="call(item.tellPhone)">
 					<image class="call" src="/static/czDetail/call.png" mode="" />{{roomInfo.personName}}
@@ -13,15 +13,15 @@
 			</view>
 			<view class="mid-cont">
 				<view class="item">
-					<view class="item-val">{{roomInfo.masterHouseType}}</view>
+					<view class="item-val">{{roomInfo.masterHouseType||''}}</view>
 					<view class="item-type">房型</view>
 				</view>
 				<view class="item">
-					<view class="item-val">{{roomInfo.roomType}}</view>
+					<view class="item-val">{{roomInfo.masterHouseType||''}}</view>
 					<view class="item-type">户型</view>
 				</view>
 				<view class="item">
-					<view class="item-val">{{roomInfo.area}}㎡</view>
+					<view class="item-val">{{roomInfo.area||0}}㎡</view>
 					<view class="item-type">面积</view>
 				</view>
 			</view>
@@ -79,8 +79,20 @@
 					item.pictureUrl
 				)
 			}
+			this.personalIntermediaryView()
 		},
 		methods: {
+			personalIntermediaryView(){
+				this.$u.api.personalIntermediaryView({body:{mediacyId: this.roomInfo.mediacyId,isStore: this.roomInfo.isStore}}).then((res)=>{
+						if(res.ErrNo=='0000'){
+							// this.roomInfo.isStore =0
+							// uni.showToast({
+							// 	title: res.ErrMsg,
+							// 	icon: 'none'
+							// })
+						}
+					})
+			},
 			//拜访
 				visitFun(){
         uni.navigateTo({

src/pages/otherPage/rent.vue

@@ -131,9 +131,14 @@
 			};
 		},
 		created(){
+			
+		},
+		onShow(){
+			this.pageNo = 1
+			this.listData = []
+			this.loadDone = false
 			this.getList()
 			this.getbaseData()
-			// this.getRoomType()
 		},
 		onReachBottom() {
 			this.getList();
@@ -150,15 +155,6 @@
 					this.addressListRight = this.addressList[0].children
 				})
 			},
-
-			getRoomType(){
-				this.$u.api.getRoomType({body:{}}).then((res)=>{
-					// console.log(res)
-					if(res.result&&res.result.length){
-						this.buildTypeList = this.buildTypeList.concat(res.result)
-					}
-				})
-			},
 			secectAddressQu(item,index){
 				if(index==0) {// 不限
 					this.searchForm.addressQuval = ''

src/pages/otherPage/rentDetail.vue

@@ -90,7 +90,6 @@
 			this.roomId = options.id;
 			this.roomInfo = {}
 			this.roomInfo = uni.getStorageSync('roomInfo')
-			console.log(this.roomInfo)
 			this.roomPictureList()
 		},
 		onShow() {

src/pages/otherPage/shouding.vue

@@ -188,13 +188,7 @@
 					"idno": this.form.idno,
 				}
 				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'
-						// })
 						uni.navigateBack()
 					}
 				})