diff --git a/src/common/http.interceptor.js b/src/common/http.interceptor.js index 931767b..a7fc64c 100644 --- a/src/common/http.interceptor.js +++ b/src/common/http.interceptor.js @@ -39,7 +39,7 @@ const install = (Vue, vm) => { Vue.prototype.$u.http.interceptor.response = (res) => { if (res.data.ErrNo == '0000') { return res.data; - } else if (res.data.ErrNo == '0005'|| res.data.ErrNo == '0002') { + } else if (res.data.ErrNo == '0005') { uni.showToast({ title: res.data.ErrMsg || '未登录', icon: "none", @@ -55,7 +55,7 @@ const install = (Vue, vm) => { icon: "none", duration: 3000 }) - return ; + return res.data; } } } diff --git a/src/pages/customer/addLedlook.vue b/src/pages/customer/addLedlook.vue index 401ca16..83a0157 100644 --- a/src/pages/customer/addLedlook.vue +++ b/src/pages/customer/addLedlook.vue @@ -29,24 +29,6 @@ date: '',//带看时间 address:'',//房源地址 }, - sourceList: [ - { - value: '1', - label: '来电' - }, - { - value: '2', - label: '来访' - }, - { - value: '3', - label: '到访' - }, - { - value: '4', - label: '2来访' - }, - ], params: { year: true, month: true, @@ -73,7 +55,7 @@ if(houseSource&&houseSource.address){ this.form.address = houseSource.address this.roomId = houseSource.roomId - wx.setStorageSync('houseSource','') + uni.removeStorageSync('houseSource') } }, methods: { @@ -103,7 +85,7 @@ }) return ; } - let body={ + let body = { "viewTime": this.form.date, "customerId": this.customerId, "roomId": this.roomId, @@ -124,25 +106,8 @@ }, 1000); } }) - }, - sexChange(){ - console.log(this.form.sex) - }, - needChange(){}, - getPhonelist(){ - let that = this - // 拉起通讯录 - wx.chooseContact( - { - success:function(obj){ - that.form.name = obj.displayName - that.form.tel = obj.phoneNumber - } - } - ) - }, + } }, - }; diff --git a/src/pages/my/electContract.vue b/src/pages/my/electContract.vue index 2079e52..022aab4 100644 --- a/src/pages/my/electContract.vue +++ b/src/pages/my/electContract.vue @@ -1,138 +1,141 @@ @@ -140,6 +143,8 @@ export default { data() { return { + canEdit: true, + errText: '', step:1, calendarShow: false, starShow: false, @@ -335,11 +340,18 @@ }; }, onLoad(options) { - this.electContractInfo = uni.getStorageSync('electContractInfo') + if (options.id){ + this.roomId = options.id; + }else{ + this.electContractInfo = uni.getStorageSync('electContractInfo'); + uni.removeStorageSync('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 + } + if(!this.roomId) return; this.oneVerificationContractInfo() - 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 }, created() { this.getDeptList() @@ -375,7 +387,7 @@ }, // 获取用户信息 oneVerificationContractInfo(){ - this.$u.api.oneVerificationContractInfo({body:{"roomId": this.electContractInfo.roomId}}).then((res)=>{ + this.$u.api.oneVerificationContractInfo({body:{"roomId": this.roomId}}).then((res)=>{ if(res.ErrNo=='0000'){ let data = res.result this.contractId = data.contractId @@ -387,6 +399,10 @@ this.form.star = data.star this.form.hobby = data.hobby this.form.job = data.job + }else{ + // console.log(res) + this.canEdit = false + this.errText = res.ErrMsg } }) }, @@ -397,7 +413,7 @@ // title: '拆单金额(3010.0)与第一笔合计不等(6001.0),押金、服务费(6009.0)默认第一笔不在计算在内！', // }) let body = { - roomId: this.electContractInfo.roomId, + roomId: this.roomId, "customerName": this.form.name, "customerTel": this.form.tel, "idno": this.form.idno, @@ -510,10 +526,12 @@ .container { width: 750rpx; min-height: 100vh; - // background: #F8F8F8; padding: 20rpx 0 250rpx; + .errText{ + color: #E7483C; + padding: 0 30rpx; + } .form-box{ - // background: #fff; padding: 0 30rpx; .item{ height: 102rpx; diff --git a/src/pages/otherPage/historyList.vue b/src/pages/otherPage/historyList.vue index d9e628c..86ac886 100644 --- a/src/pages/otherPage/historyList.vue +++ b/src/pages/otherPage/historyList.vue @@ -27,10 +27,6 @@ this.mediacyId = options.mediacyId this.getList() }, - onShow() { - }, - created(){ - }, onReachBottom() { this.getList(); }, @@ -43,7 +39,7 @@ mediacyId: this.mediacyId } this.$u.api.findDetailHistory({body:params}).then((res)=>{ - console.log(res) + // console.log(res) if(res.result&&res.result.length){ if(this.pageNo==1){ this.listData = res.result diff --git a/src/pages/otherPage/jjrent.vue b/src/pages/otherPage/jjrent.vue index dd6eb7c..1353355 100644 --- a/src/pages/otherPage/jjrent.vue +++ b/src/pages/otherPage/jjrent.vue @@ -5,7 +5,6 @@ - @@ -66,7 +65,6 @@ this.currentId = item.mediacyId this.isTop = item.isTop this.showModal = true - console.log(item.isTop) }, // 置顶接口 confirmFun(){ @@ -108,7 +106,6 @@ url: '/pages/otherPage/jjrentVisit?masterHouseId='+ item.masterHouseId+'&mediacyId='+ item.mediacyId+'&address='+item.address+'&personName='+item.personName }) }, - topage(item){ uni.setStorageSync('roomInfo',item) uni.navigateTo({ @@ -151,7 +148,6 @@ this.loadDone = true; if(this.pageNo==1){ this.listData = [] - } } }) diff --git a/src/pages/otherPage/jjrentDetail.vue b/src/pages/otherPage/jjrentDetail.vue index 39cebf5..265e38a 100644 --- a/src/pages/otherPage/jjrentDetail.vue +++ b/src/pages/otherPage/jjrentDetail.vue @@ -87,7 +87,6 @@ url: '/pages/otherPage/jjrentVisit?masterHouseId='+ this.roomInfo.masterHouseId+'&mediacyId='+ this.roomInfo.mediacyId+'&address='+this.roomInfo.address+'&personName='+this.roomInfo.personName }) }, - historyList(){ uni.navigateTo({ url: '/pages/otherPage/historyList?mediacyId='+ this.roomInfo.mediacyId diff --git a/src/pages/otherPage/jjrentFollow.vue b/src/pages/otherPage/jjrentFollow.vue index f62f798..0102f3a 100644 --- a/src/pages/otherPage/jjrentFollow.vue +++ b/src/pages/otherPage/jjrentFollow.vue @@ -43,14 +43,12 @@ }, methods: { confirmType(e){ - console.log(e) this.form.type = e[0].value this.form.typeName = e[0].label }, // 居间跟进类别 getFollowType(){ this.$u.api.getFollowType({body:{}}).then((res)=>{ - // console.log(res) this.followTypeList = res.result||[] }) }, diff --git a/src/pages/otherPage/rentDetail.vue b/src/pages/otherPage/rentDetail.vue index 21a75ad..76310da 100644 --- a/src/pages/otherPage/rentDetail.vue +++ b/src/pages/otherPage/rentDetail.vue @@ -28,7 +28,7 @@ 改价历史 改价审核 - 成交合同 + 成交合同 @@ -90,7 +90,6 @@ this.roomId = options.id; this.roomInfo = {} this.roomInfo = uni.getStorageSync('roomInfo') - console.log(this.roomInfo) this.roomPictureList() }, onShow() { diff --git a/src/pages/tabs/gonggao.vue b/src/pages/tabs/gonggao.vue index 7d13cb1..a4bbd6b 100644 --- a/src/pages/tabs/gonggao.vue +++ b/src/pages/tabs/gonggao.vue @@ -39,7 +39,7 @@ getGonggao(){ if (this.loadDone) return; this.$u.api.applist({body:{pageNo:this.pageNo,pageSize:this.pageSize}}).then((res)=>{ - console.log(res) + // console.log(res) if(res.result&&res.result.length){ if(this.pageNo==1){ this.gonggaoList = res.result diff --git a/src/pages/tabs/index.vue b/src/pages/tabs/index.vue index 2a073e1..32e92f2 100644 --- a/src/pages/tabs/index.vue +++ b/src/pages/tabs/index.vue @@ -122,14 +122,12 @@ // 经纪人排名与组排名 getRanking(api){ this.$u.api[api]({body:{}}).then((res)=>{ - // console.log(res) this.rankList = res.result }) }, // 获取公告 getGonggao(){ this.$u.api.applist({body:{pageNo:1,pageSize:20}}).then((res)=>{ - console.log(res) this.gonggaoList = res.result&&res.result.map(item=>item.title) }) }, diff --git a/src/pages/tabs/login.vue b/src/pages/tabs/login.vue index 98709f0..9edebfb 100644 --- a/src/pages/tabs/login.vue +++ b/src/pages/tabs/login.vue @@ -119,7 +119,7 @@ export default { // 当前登录人信息查询 getfindPerson(){ this.$u.api.findPerson({body:{}}).then((res)=>{ - console.log(res) + // console.log(res) let userInfo = res.result this.$u.vuex("vuex_user",userInfo); uni.setStorageSync('user',userInfo) diff --git a/src/pages/tabs/me.vue b/src/pages/tabs/me.vue index 7117a4c..e33b607 100644 --- a/src/pages/tabs/me.vue +++ b/src/pages/tabs/me.vue @@ -3,7 +3,7 @@ - {{userinfo.userName}} + {{vuex_user.userName||userinfo.userName}} @@ -81,13 +81,7 @@ }; }, onLoad(options) { - if(this.vuex_user.userName){ - this.userinfo = this.vuex_user - }else{ - this.userinfo = wx.getStorageSync('user') - } - }, - onShow() { + this.userinfo = wx.getStorageSync('user') }, methods: { topage(type){