From c6e6d5b390a771658129f6c44d1368c3dfad8ed2 Mon Sep 17 00:00:00 2001 From: corala <18339694416@163.com> Date: Mon, 17 Oct 2022 19:05:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/customer/addCustomer.vue | 19 +- src/pages/my/contactList.vue | 36 ++- src/pages/my/modifyPassword.vue | 9 + src/pages/my/networkquery.vue | 61 +++-- src/pages/my/networkquery_detail.vue | 9 + src/pages/my/rentReceive.vue | 59 +++- src/pages/otherPage/companywarReport.vue | 53 +++- src/pages/otherPage/rent.vue | 326 ++++++++++++++--------- src/pages/tabs/customer.vue | 126 ++++++--- src/pages/tabs/gonggao.vue | 8 +- src/pages/tabs/index.vue | 52 +++- src/pages/tabs/me.vue | 4 +- 12 files changed, 535 insertions(+), 227 deletions(-) diff --git a/src/pages/customer/addCustomer.vue b/src/pages/customer/addCustomer.vue index 3d81336..25f4f1c 100644 --- a/src/pages/customer/addCustomer.vue +++ b/src/pages/customer/addCustomer.vue @@ -49,10 +49,10 @@ 备注内容 - + - 提交 + 提交 diff --git a/src/pages/my/modifyPassword.vue b/src/pages/my/modifyPassword.vue index 01708dc..5fb5425 100644 --- a/src/pages/my/modifyPassword.vue +++ b/src/pages/my/modifyPassword.vue @@ -47,6 +47,15 @@ }, methods: { submit() { + let body = { + mobile: this.account, + newPassword: this.newPassword, + checkNewPassword: this.checkPassword, + } + this.$u.api.resetPassword({body:body}).then((res)=>{ + console.log(res) + // if(res.result&&res.result.length){} + }) }, }, }; diff --git a/src/pages/my/networkquery.vue b/src/pages/my/networkquery.vue index c9842cd..2aac0be 100644 --- a/src/pages/my/networkquery.vue +++ b/src/pages/my/networkquery.vue @@ -7,11 +7,11 @@ - {{item.name}} + {{item.personName}} {{item.address}} - {{item.person}} + {{item.accountNum}} @@ -23,30 +23,57 @@ data() { return { keyword: '', - listData: [{ - address:'惠中北里 106号楼 24层', - name:'张晨张', - person: '张26D' - },{address:'惠中北里 106号楼 24层', - name:'zhangzj',person: '张26D'}, - {address:'惠中北里惠中北里惠中北里惠中北里惠中北里 106号楼 24层', - name:'张晨',person: '张26D'}, - {address:'惠中北里 106号楼 24层', - name:'张晨',person: '张26D'}] + pageNo: 1, + pageSize: 10, + loadDone: false, + listData: [] }; }, onLoad(options) { }, onShow() { + }, + created() { + this.getList() + }, + onReachBottom() { + this.getList(); }, methods: { selectItem(item){ - wx.setStorageSync('houseSource',item) - // wx.navigateTo({ - // url:'/pages/customer/addLedlook' - // }) - wx.navigateBack() + wx.navigateTo({ + url:'/pages/my/networkquery_detail?id='+item.houseId + }) + }, + getList(){ + if (this.loadDone) return; + let body = { + pageNo:this.pageNo, + pageSize:this.pageSize, + message: this.keyword + } + this.$u.api.findProxyHouse({body:body}).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{ + console.log(res) + // if(res.result&&res.result.length){} + }) + + } }, }; diff --git a/src/pages/my/rentReceive.vue b/src/pages/my/rentReceive.vue index c314efc..7aa0db8 100644 --- a/src/pages/my/rentReceive.vue +++ b/src/pages/my/rentReceive.vue @@ -13,14 +13,17 @@ - 刘506 - 应收日期：2024.01.31 - 未收 + {{item.roomNum}} + 应收日期：{{item.payableDate.replace(/-/g,'.')}} + + 未收 + 已收 + 未缴清 - 租客：赵彩云 - 租金6001 - 18322783146 + 租客：{{item.customerName}} + 租金{{item.payableMoney}} + {{item.customerMobile}} @@ -35,15 +38,53 @@ calendarShow: false, mindate: '', maxdate: '2099-12-31', - listData: [{},{},{},{}] + pageNo: 1, + pageSize: 10, + loadDone: false, + listData: [] }; }, onLoad(options) { }, onShow() { + }, + created() { + this.getList() + }, + onReachBottom() { + this.getList(); }, methods: { + getList(){ + if (this.loadDone) return; + let body = { + pageNo:this.pageNo, + pageSize:this.pageSize, + message: this.keyword + } + this.$u.api.customerReceivable({body:body}).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 - 芍药居一店一部 + {{item.deptName}} 我的战报 @@ -20,27 +20,27 @@ - 32 + {{item.deal||0}} 新增成交/单 - 32 + {{item.customer||0}} 新增客户/位 - 32 + {{item.see||0}} 新增带看/位 - 32 + {{item.agent||0}} 新增代理合同/单 - 32 + {{item.follow||0}} 新增客户跟进/位 - 32 + {{item.visit}} 新增拜访/位 @@ -60,20 +60,49 @@ name: '本月' }], current: 0, - listData: [{},{},{}], + listData: [], + pageNo: 1, + pageSize: 10, + loadDone: false, }; }, - onLoad(options) { + created(){ + this.getList() }, - onShow() { - + onReachBottom() { + this.getList(); }, methods: { + getList(){ + if (this.loadDone) return; + // type： 今日：0，本周：1，本月：2 + this.$u.api.departmentReport({body:{pageNo:this.pageNo,pageSize:this.pageSize,type: this.current}}).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 diff --git a/src/pages/otherPage/rent.vue b/src/pages/otherPage/rent.vue index c8290e9..324fe04 100644 --- a/src/pages/otherPage/rent.vue +++ b/src/pages/otherPage/rent.vue @@ -2,50 +2,65 @@ - + 位置 价格 - 开盘 - 更多 + 房型 + 户型 - + - 吉利家园 3号楼21层 - 3改4 / 20㎡ - 剩余租期：11个月 + {{item.address}} + {{item.houseType}} / {{item.area}}㎡ + 剩余租期：{{item.remainderPeriod}}个月 - 邵海波 - 3600/月 + {{item.personName}} + {{item.rentPrice}}/月 - - - {{item.label}} + + + + {{item.text}} + + + + + {{item.text}} + - - {{item.label}} + + {{item.text}} - - + + - - {{item.label}} + + {{item.text}} + + + + + + + + {{item.text}} @@ -57,154 +72,192 @@ return { addressShow: false, priceShow: false, - kaipanShow: false, - moreShow: false, + houseTypeShow: false, + buildTypeShow: false, keyword: '', searchForm: { - addressval: '', - kaipanval: '', - priceval: '' + addressQuval: '', + buildTypeval: '', + priceval: '', + priceLabel: '', + houseTypeval: '', + addressIndex: '', + addressCityval: '' }, addressList: [ { - label: '北京', - value: 1 - }, - { - label:'郑州', - value: 2 - }, - { - label:'天津', - value: 3 - }, - { - label:'宁波', - value: 4 - }, - { - label:'信阳', - value: 5 - }, - { - label:'沙溪', - value: 6 - }, - { - label:'信阳1', - value: 7 - }, - { - label:'沙溪2', - value: 8 - }, + text: '不限', + code: '', + children:[] + } ], - kaipanList: [ - { - label:'1000~2000', - value: 1 - }, + addressListRight: [], + buildTypeList: [ { - label:'2000~3000', - value: 2 - }, - { - label:'3000~4000', - value: 3 - }, + text: '不限', + code: '' + } ], priceList: [ { - label:'1000~2000', - value: 1 - }, - { - label:'2000~3000', - value: 2 - }, - { - label:'3000~4000', - value: 3 - }, + text: '不限', + code: '' + } ], - listData: [{},{},{},{},{}], - selectorObj: [ - { - cateName: '1', - id: 1 - }, + houseTypeList: [ { - cateName: '2', - id: 2 + text: '不限', + code: '' } ], - pageNumber: 10, - current: 1, - loadDone: false + listData: [], + pageNo: 1, + pageSize: 10, + loadDone: false, }; }, onLoad(options) { }, onShow() { + }, + created(){ + this.getList() + this.getbaseData() + }, + onReachBottom() { + this.getList(); }, methods: { - - secectAddress(item){ - this.searchForm.addressval = item.value + // 获取筛选下拉的数据 + getbaseData(){ + this.$u.api.region({body:{}}).then((res)=>{ + // console.log(res) + this.addressList = this.addressList.concat(res.result.area) + this.buildTypeList = this.buildTypeList.concat(res.result.buildType) + this.priceList = this.priceList.concat(res.result.rentMoney) + this.houseTypeList = this.houseTypeList.concat(res.result.houseType) + this.addressListRight = this.addressList[0].children + }) + }, + secectAddressQu(item,index){ + if(index==0) {// 不限 + this.searchForm.addressQuval = '' + this.searchForm.addressCityval = '' + this.addressShow = false + this.pageNo = 1 + this.loadDone = false + this.getList() + return ; + } + this.searchForm.addressQuval = item.code + this.addressListRight = this.addressList[index].children + this.searchForm.addressIndex = index + }, + secectAddressCity(item){ + this.searchForm.addressCityval = item.code this.addressShow = false - this.current = 1 + this.pageNo = 1 + this.loadDone = false this.getList() }, - secectKaipan(item){ - this.searchForm.kaipanval = item.value - this.kaipanShow = false - this.current = 1 + // 房型选择 + selectBuildType(item,index){ + if(index==0) {// 不限 + this.searchForm.buildTypeval = '' + this.buildTypeShow = false + this.pageNo = 1 + this.loadDone = false + this.getList() + return ; + } + this.searchForm.buildTypeval = item.code + this.buildTypeShow = false + this.pageNo = 1 + this.loadDone = false this.getList() }, - secectPrice(item){ - this.searchForm.priceval = item.value + // 价格选择 + secectPrice(item,index){ + if(index==0) {// 不限 + this.searchForm.priceval = '' + this.searchForm.priceLabel = item.text + this.pageNo = 1 + this.loadDone = false + this.priceShow = false + this.getList() + return ; + } + this.searchForm.priceval = item.code + this.searchForm.priceLabel = item.text this.priceShow = false - this.current = 1 + this.pageNo = 1 + this.loadDone = false this.getList() }, - confirm1(e) { - }, - confirm2(e) { + // 户型选择 + secectHouseType(item,index){ + if(index==0) {// 不限 + this.searchForm.houseTypeval = '' + this.pageNo = 1 + this.loadDone = false + this.houseTypeShow = false + this.getList() + return ; + } + this.searchForm.houseTypeval = item.code + this.houseTypeShow = false + this.pageNo = 1 + this.loadDone = false + this.getList() }, topage(item){ uni.navigateTo({ url: '/pages/otherPage/rentDetail?id=' + item.id }) }, + searchFun(){ + this.loadDone = false + this.pageNo = 1 + this.getList() + }, getList(){ if (this.loadDone) return; let params = { - current: this.current, - size: this.pageNumber - }; - // if (this.pageNum == 1) { - // this.showLoading = true; - // } - // this.$u.api.roomList(params).then((res) => { - // this.showLoading = false; - // if (res.data.records && res.data.records.length) { - // res.data.records.forEach((item) => { - // if (item.labelName) { - // item.labelName = item.labelName.split(",") || []; - // } - // }); - // this.total = res.data.total; - // this.listData = [...this.listData, ...res.data.records]; - // this.pageNum += 1; - // // if (this.listData.length == 0) { - // // this.noneData = true; - // // } - // if (this.listData.length == res.data.total) { - // this.loadDone = true; - // } - // } - // }); + pageNo:this.pageNo, + pageSize:this.pageSize, + message:this.keyword, + priceMin:this.searchForm.priceval?this.searchForm.priceLabel.split('~')[0]:'', + priceMax:this.searchForm.priceval?this.searchForm.priceLabel.split('~')[1]:'', + rentStatus:"",//出租状态 1,出租中 2,收定金 + districtId:this.searchForm.addressQuval,//区域 + roomType:this.searchForm.houseTypeval,//户型 + subDistrictId: this.searchForm.addressCityval,//片区 + buildType: this.searchForm.buildTypeval//房型 + } + + this.$u.api.roomList({body:params}).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 - + 增加客户 - 户型 - 租金 + {{searchForm.huxingval?searchForm.huxinglabel:'户型'}} + + + {{searchForm.zujinval?searchForm.zujinlabel:'租金'}} + + @@ -33,16 +37,16 @@ - - {{item.label}} + + {{item.text}} - - {{item.label}} + + {{item.text}} @@ -53,27 +57,23 @@ data() { return { keyword: '', - listData: [{},{},{},{},{}], + listData: [], searchForm: { huxingval: '', - zujinval: '' + zujinval: '', + huxinglabel: '', + zujinlabel: '', }, huxingList: [ { - label: '不限', - value: '2' - },{ - label: '独卫', - value: '1' + text: '不限', + code: '' } ], zujinList: [ { - label: '不限', - value: '2' - },{ - label: '独卫', - value: '1' + text: '不限', + code: '' } ], zujinshow: false, @@ -84,17 +84,28 @@ }; }, onLoad(options) { - }, - onShow() { - }, created() { this.getcustomerList() + this.getbaseData() }, onReachBottom() { this.getcustomerList(); }, methods: { + // 获取筛选下拉的数据 + getbaseData(){ + this.$u.api.region({body:{}}).then((res)=>{ + // console.log(res) + this.zujinList = this.zujinList.concat(res.result.rentMoney) + this.huxingList = this.huxingList.concat(res.result.houseType) + }) + }, + search(){ + this.pageNo = 1 + this.loadDone = false + this.getcustomerList() + }, tocall(phone){ uni.makePhoneCall({ phoneNumber: phone @@ -105,13 +116,12 @@ let body = { pageNo:this.pageNo, pageSize:this.pageSize, - houseType: '',//房型： 1,开间 2,一居 3,二居 4,三居 5,四居 6,其他 - rentPriceMin: '',//最小租金 - rentPriceMax:'' + 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.listData = res.result + // console.log(res) if(res.result&&res.result.length){ if(this.pageNo==1){ this.listData = res.result @@ -126,18 +136,45 @@ this.loadDone = false }else{ this.loadDone = true; + if(this.pageNo==1){ + this.listData = [] + } } }) }, - secectZujin(item){ - this.searchForm.zujinval = item.value - }, - secectHuxingval(item){ - this.searchForm.huxingval = item.value - }, - confirm1(e) { + secectZujin(item,index){ + if(index==0) {// 不限 + this.searchForm.zujinval = '' + this.searchForm.zujinlabel = '' + this.zujinshow = false + this.pageNo = 1 + this.loadDone = false + this.getcustomerList() + return ; + } + this.searchForm.zujinval = item.code + this.searchForm.zujinlabel = item.text + this.zujinshow = false + this.pageNo = 1 + this.loadDone = false + this.getcustomerList() }, - confirm2(e) { + secectHuxingval(item,index){ + if(index==0) {// 不限 + this.searchForm.huxingval = '' + this.searchForm.huxinglabel = '' + this.huxingshow = false + this.pageNo = 1 + this.loadDone = false + this.getcustomerList() + return ; + } + this.searchForm.huxingval = item.code + this.searchForm.huxinglabel = item.text + this.huxingshow = false + this.pageNo = 1 + this.loadDone = false + this.getcustomerList() }, toaddCustomer(){ uni.navigateTo({ @@ -181,6 +218,8 @@ background: #fff; padding: 30rpx 0; .select-item{ + flex:1; + text-align: center; height: 36rpx; font-size: 26rpx; font-family: PingFangSC-Regular, PingFang SC; @@ -188,13 +227,18 @@ color: #333333; line-height: 36rpx; letter-spacing: 1px; - position: relative; - &::after{ - position: absolute; - content: ''; - top: 16rpx; - right: -24rpx; + display: flex; + align-items: center; + justify-content: center; + // position: relative; + &.selected{ + color: #FF6D25; + } + .sanjiao{ + margin: 12rpx 0 0 12rpx; border-color: #969696; + width: 0; + height: 0; border: 8rpx solid transparent; border-top: 8rpx solid #969696; } diff --git a/src/pages/tabs/gonggao.vue b/src/pages/tabs/gonggao.vue index 4d3abe4..7d13cb1 100644 --- a/src/pages/tabs/gonggao.vue +++ b/src/pages/tabs/gonggao.vue @@ -28,11 +28,6 @@ pageSize: 10, loadDone: false, }; - }, - onLoad(options) { - }, - onShow() { - }, created(){ this.getGonggao() @@ -59,6 +54,9 @@ this.loadDone = false }else{ this.loadDone = true; + if(this.pageNo==1){ + this.gonggaoList = [] + } } }) }, diff --git a/src/pages/tabs/index.vue b/src/pages/tabs/index.vue index e6ed099..f7d3874 100644 --- a/src/pages/tabs/index.vue +++ b/src/pages/tabs/index.vue @@ -47,12 +47,13 @@ - - 王柏翘 + + {{item.personName||item.deptName}} - 7套 - 累计成交 + {{item.num}}套 + + 累计{{item.status==0?'代房':item.status==1?'成交':'新业绩'}} @@ -78,22 +79,28 @@ tongjiList: [ { num: 29, + label: 'deal', text: '新增成交' }, { num: 5, + + label: 'agent', text: '新增代理合同' }, { num: 0, + label: 'see', text: '新增带看' }, { num: 9, + label: 'customer', text: '新增客户' } ], - rankList: [{},{},{}], + companyReport: {}, + rankList: [], current: 0, current1: 0, }; @@ -102,25 +109,52 @@ }, created(){ - if(this.vuex_token){ - this.getGonggao() - } + this.getGonggao() + this.getRanking('agentRanking') // 经纪人排名 + this.getcompanyReport(0) }, onShow() { }, methods: { + // 经纪人排名与组排名 + 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.map(item=>item.title) + this.gonggaoList = res.result&&res.result.map(item=>item.title) + }) + }, + // 获取战报 + getcompanyReport(type){ + // 今日：0，本周：1，本月：2 + this.$u.api.companyReport({body:{type: type}}).then((res)=>{ + console.log(res) + this.tongjiList[0].num = res.result.deal||0 + this.tongjiList[1].num = res.result.agent||0 + this.tongjiList[2].num = res.result.see||0 + this.tongjiList[3].num = res.result.customer||0 }) }, change(index){ this.current = index + this.getcompanyReport(index) }, change1(index){ this.current1 = index + let apitype = '' + if(index==0){ + apitype = 'agentRanking' + }else{ + apitype = 'groupRanking' + } + this.getRanking(apitype) }, topage(type){ uni.navigateTo({ diff --git a/src/pages/tabs/me.vue b/src/pages/tabs/me.vue index 3847163..146a087 100644 --- a/src/pages/tabs/me.vue +++ b/src/pages/tabs/me.vue @@ -20,14 +20,14 @@ - + 应收房租 - + 续期合同