From 296c487cbcafb3182dfb05777e758f49ab401d69 Mon Sep 17 00:00:00 2001 From: corala <18339694416@163.com> Date: Mon, 26 Sep 2022 20:14:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=99=E6=80=81=E9=A1=B5=E9=9D=A2=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 7 +- src/App.vue | 80 ++++++-- src/common/http.api.js | 124 ++++++++++++- src/common/http.interceptor.js | 10 +- src/manifest.json | 9 +- src/pages.json | 28 ++- ...panywayReport.vue => companywarReport.vue} | 0 src/pages/otherPage/login.vue | 53 ------ src/pages/otherPage/rent.vue | 85 ++++++++- src/pages/otherPage/rentDetail.vue | 89 ++++++--- src/pages/tabs/customer.vue | 7 +- src/pages/tabs/index.vue | 59 ++---- src/pages/tabs/login.vue | 172 ++++++++++++++++++ 13 files changed, 556 insertions(+), 167 deletions(-) rename src/pages/otherPage/{companywayReport.vue => companywarReport.vue} (100%) delete mode 100644 src/pages/otherPage/login.vue create mode 100644 src/pages/tabs/login.vue diff --git a/.env.development b/.env.development index 7618761..07acb8d 100644 --- a/.env.development +++ b/.env.development @@ -1,3 +1,6 @@ VUE_APP_MODE=development -VUE_APP_SERVER=https://xingao.quhouse.com -URL1=https://xingao.quhouse.com-----星奥正式 +VUE_APP_SERVER=http://114.215.78.198:8081 +url=https://wzx.2weisou.com //404 +url=https://erpx.2weisou.com/sjjy +url=http://114.215.78.198:8081/sjjy +url=https://erpx.2weisou.com //404 \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index 25677b7..b0ea0d3 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,22 +1,72 @@ diff --git a/src/common/http.api.js b/src/common/http.api.js index fdf416d..47a6574 100644 --- a/src/common/http.api.js +++ b/src/common/http.api.js @@ -1,11 +1,129 @@ -let exchangepageurl = '/box/b/exchange/page' // b端盲盒核销记录 +let loginurl = '/appLogin/login.do' //登录 +let companyReporturl = '/appReport/companyReport.do' //公司战报 +let agentRankingurl = '/appReport/agentRanking.do' //经纪人排名 +let departmentReporturl = '/appReport/departmentReport.do' //公司战报（部门） +let groupRankingurl = '/appReport/groupRanking.do' //组排名(首页) +let personReporturl = '/appReport/personReport.do' //公司战报（人员） +let addressBookurl = '/appPerson/addressBook.do' //员工通讯录（人员） +let roomListurl = '/appHouse/roomList.do' //出租房源列表 +let regionurl = '/appHouse/region.do' //出租房区域、户型、价格、房型查询 +let getRoomTypeurl = '/appHouse/getRoomType.do' //房型列表查询 +let roomPictureListurl = '/appHouse/roomPictureList.do' //出租房源图片列表 +let areaRegionurl = '/appHouse/areaRegion.do' //出租房片区查询 +let depositurl = '/appHouse/deposit.do' //出租房源收定 +let customerFindurl = '/appCustomer/customerFind.do' //客户列表 +let customerViewurl = '/appCustomer/customerView.do' //客户带看录入 +let customerAddurl = '/appCustomer/customerAdd.do' //客户录入 +let customerViewHistoryurl = '/appCustomer/customerViewHistory.do' //客源带看记录 +let getChannelurl = '/appCustomer/getChannel.do' //客源渠道列表 +let housecustomerViewHistoryurl = '/appHouse/customerViewHistory.do' //带看历史 +let intermediaryurl = '/appMediacy/intermediary.do' //居间查询 +let getFollowTypeurl = '/appMediacy/getFollowType.do' //居间跟进类别 +let intermediaryFollowurl = '/appMediacy/intermediaryFollow.do' //居间跟进 +let customerReceivableurl = '/appCustomer/customerReceivable.do' //房间应收信息查询 +let resetPasswordurl = '/appPerson/resetPassword.do' //个人密码修改 +let findProxyHouseurl = '/appNetWork/findProxyHouse.do' //网络房源查询 +let findNetWorkurl = '/appNetWork/findNetWork.do' //网络详情查询 +let cleanRepairApplyurl = '/appCleanRepair/cleanRepairApply.do' //保洁维修申请 +let cleanRepairReviewurl = '/appCleanRepair/cleanRepairReview.do' //保洁维修审核 +let findCleanRepairurl = '/appCleanRepair/findCleanRepair.do' //保洁维修审核列表 +let cleanRepairHistoryurl = '/appCleanRepair/cleanRepairHistory.do' //保洁维修带房改价申请历史列表 +let stickyPosturl = '/appMediacy/stickyPost.do' //居间置顶 +let cancelStickyPosturl = '/appMediacy/cancelStickyPost.do' //取消居间置顶 +let appChangePriceapplyurl = '/appChangePrice/apply.do' //改价申请 +let appChangePriceaccepturl = '/appChangePrice/accept.do' //改价申请审批 +let appChangePriceprocessurl = '/appChangePrice/process.do' //改价申请进度 +let appChangePricehistoryurl = '/appChangePrice/history.do' //改价历史 +let appChangePricelisturl = '/appChangePrice/list.do' //改价申请详情（判断是否自己房源） +let appChangePricecheckurl = '/appChangePrice/check.do' //改价申请校验 +let takeHouseApplyurl = '/appTakeHouse/takeHouseApply.do' //带房申请 +let takeHouseReviewurl = '/appTakeHouse/takeHouseReview.do' //带房审核 const install = (Vue, vm) => { - let exchangepage = (params) => vm.$u.get(exchangepageurl, params); + let login = (params) => vm.$u.post(loginurl, params); + let appChangePriceapply = (params) => vm.$u.post(appChangePriceapplyurl, params); + let appChangePriceaccept = (params) => vm.$u.post(appChangePriceaccepturl, params); + let appChangePriceprocess = (params) => vm.$u.post(appChangePriceprocessurl, params); + let appChangePricelist = (params) => vm.$u.post(appChangePricelisturl, params); + let appChangePricehistory = (params) => vm.$u.post(appChangePricehistoryurl, params); + let appChangePricecheck = (params) => vm.$u.post(appChangePricecheckurl, params); + let takeHouseApply = (params) => vm.$u.post(takeHouseApplyurl, params); + let takeHouseReview = (params) => vm.$u.post(takeHouseReviewurl, params); + let intermediaryFollow = (params) => vm.$u.post(intermediaryFollowurl, params); + let customerReceivable = (params) => vm.$u.post(customerReceivableurl, params); + let resetPassword = (params) => vm.$u.post(resetPasswordurl, params); + let findProxyHouse = (params) => vm.$u.post(findProxyHouseurl, params); + let findNetWork = (params) => vm.$u.post(findNetWorkurl, params); + let cleanRepairApply = (params) => vm.$u.post(cleanRepairApplyurl, params); + let cleanRepairReview = (params) => vm.$u.post(cleanRepairReviewurl, params); + let findCleanRepair = (params) => vm.$u.post(findCleanRepairurl, params); + let cleanRepairHistory = (params) => vm.$u.post(cleanRepairHistoryurl, params); + let stickyPost = (params) => vm.$u.post(stickyPosturl, params); + let cancelStickyPost = (params) => vm.$u.post(cancelStickyPosturl, params); + let companyReport = (params) => vm.$u.post(companyReporturl, params); + let agentRanking = (params) => vm.$u.post(agentRankingurl, params); + let departmentReport = (params) => vm.$u.post(departmentReporturl, params); + let groupRanking = (params) => vm.$u.post(groupRankingurl, params); + let personReport = (params) => vm.$u.post(personReporturl, params); + let addressBook = (params) => vm.$u.post(addressBookurl, params); + let roomList = (params) => vm.$u.post(roomListurl, params); + let region = (params) => vm.$u.post(regionurl, params); + let getRoomType = (params) => vm.$u.post(getRoomTypeurl, params); + let roomPictureList = (params) => vm.$u.post(roomPictureListurl, params); + let areaRegion = (params) => vm.$u.post(areaRegionurl, params); + let deposit = (params) => vm.$u.post(depositurl, params); + let customerFind = (params) => vm.$u.post(customerFindurl, params); + let customerView = (params) => vm.$u.post(customerViewurl, params); + let customerAdd = (params) => vm.$u.post(customerAddurl, params); + let customerViewHistory = (params) => vm.$u.post(customerViewHistoryurl, params); + let getChannel = (params) => vm.$u.post(getChannelurl, params); + let housecustomerViewHistory = (params) => vm.$u.post(housecustomerViewHistoryurl, params); + let intermediary = (params) => vm.$u.post(intermediaryurl, params); + let getFollowType = (params) => vm.$u.post(getFollowTypeurl, params); + vm.$u.api = { - exchangepage + login, + companyReport, + agentRanking, + departmentReport, + groupRanking, + personReport, + addressBook, + roomList, + region, + getRoomType, + roomPictureList, + areaRegion, + deposit, + customerFind, + customerView, + customerAdd, + customerViewHistory, + getChannel, + housecustomerViewHistory, + intermediary, + getFollowType, + appChangePriceapply, + appChangePriceaccept, + appChangePriceprocess, + appChangePricelist, + appChangePricehistory, + appChangePricecheck, + takeHouseApply, + takeHouseReview, + intermediaryFollow, + customerReceivable, + resetPassword, + findProxyHouse, + findNetWork, + cleanRepairApply, + cleanRepairReview, + findCleanRepair, + cleanRepairHistory, + stickyPost, + cancelStickyPost } } diff --git a/src/common/http.interceptor.js b/src/common/http.interceptor.js index 739c608..74de4c2 100644 --- a/src/common/http.interceptor.js +++ b/src/common/http.interceptor.js @@ -6,7 +6,7 @@ const install = (Vue, vm) => { timeout: 10000, // loadingText: '努力加载中~', header: { - // 'Authorization': 'Bearer '+vm.vuex_token, + 'Authorization': 'Bearer '+vm.vuex_token, } }); // 请求拦截 @@ -21,16 +21,16 @@ const install = (Vue, vm) => { Vue.prototype.$u.http.interceptor.response = (res) => { // console.log(res) if (res.statusCode == 200) { - return res.data.data; + return res.data; } else if (res.statusCode == 401) { uni.showToast({ title: res.data.msg || '未登录', icon: "none", duration: 3000 }) - uni.navigateTo({ - url: '/pages/login/type' - }); + // uni.navigateTo({ + // url: '/pages/login/type' + // }); return; } else if (res.statusCode == 500) { uni.showToast({ diff --git a/src/manifest.json b/src/manifest.json index 1c5aa64..f001312 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,6 +1,6 @@ { "name" : "8090公寓", - "appid" : "", + "appid" : "wxc72f5a997c67b668", "description" : "", "versionName" : "1.0.0", "versionCode" : "100", @@ -56,7 +56,12 @@ "mp-weixin" : { "appid" : "wxc72f5a997c67b668", "setting" : { - "urlCheck" : true + "urlCheck" : false + }, + "permission" : { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } }, "usingComponents" : true }, diff --git a/src/pages.json b/src/pages.json index ed50dc9..5d7f67f 100644 --- a/src/pages.json +++ b/src/pages.json @@ -6,7 +6,7 @@ "current": 0, "list": [{ "name": "test", - "path": "pages/tabs/gonggao", + "path": "", "query": "" }] }, @@ -15,7 +15,15 @@ "desc": "你的位置信息将用于小程序位置接口的效果展示" } }, - "pages": [{ + "pages": [ + { + "path": "pages/tabs/login", + "style": { + "navigationBarTitleText": "登录", + "navigationStyle": "custom" + } + }, + { "path": "pages/tabs/index", "style": { "navigationBarTitleText": "8090公寓", @@ -42,6 +50,13 @@ } }], + "requiredPrivateInfos": [ + "getFuzzyLocation", + "getLocation", + "onLocationChange", + "startLocationUpdateBackground", + "chooseAddress" + ], "globalStyle": { "navigationBarTextStyle": "#fff", "navigationBarTitleText": "8090公寓", @@ -123,13 +138,6 @@ }, { "root": "pages/otherPage", "pages": [{ - "path": "login", - "style": { - "navigationBarTitleText": "通讯录", - "navigationBarTextStyle": "black", - "navigationStyle": "custom" - } - }, { "path": "rent", "style": { "navigationBarTitleText": "出租专区", @@ -148,7 +156,7 @@ "navigationBarTextStyle": "black" } }, { - "path": "companywayReport", + "path": "companywarReport", "style": { "navigationBarTitleText": "公司战报", "navigationBarTextStyle": "black" diff --git a/src/pages/otherPage/companywayReport.vue b/src/pages/otherPage/companywarReport.vue similarity index 100% rename from src/pages/otherPage/companywayReport.vue rename to src/pages/otherPage/companywarReport.vue diff --git a/src/pages/otherPage/login.vue b/src/pages/otherPage/login.vue deleted file mode 100644 index f05c3fd..0000000 --- a/src/pages/otherPage/login.vue +++ /dev/null @@ -1,53 +0,0 @@ - - - - diff --git a/src/pages/otherPage/rent.vue b/src/pages/otherPage/rent.vue index bab9ab1..c8290e9 100644 --- a/src/pages/otherPage/rent.vue +++ b/src/pages/otherPage/rent.vue @@ -11,8 +11,6 @@ 开盘 更多 - - @@ -44,7 +42,7 @@ - + {{item.label}} @@ -101,8 +99,34 @@ value: 8 }, ], - kaipanList: [], - priceList: [], + kaipanList: [ + { + label:'1000~2000', + value: 1 + }, + { + label:'2000~3000', + value: 2 + }, + { + label:'3000~4000', + value: 3 + }, + ], + priceList: [ + { + label:'1000~2000', + value: 1 + }, + { + label:'2000~3000', + value: 2 + }, + { + label:'3000~4000', + value: 3 + }, + ], listData: [{},{},{},{},{}], selectorObj: [ { @@ -114,6 +138,9 @@ id: 2 } ], + pageNumber: 10, + current: 1, + loadDone: false }; }, onLoad(options) { @@ -122,14 +149,24 @@ }, methods: { + secectAddress(item){ this.searchForm.addressval = item.value + this.addressShow = false + this.current = 1 + this.getList() }, secectKaipan(item){ this.searchForm.kaipanval = item.value + this.kaipanShow = false + this.current = 1 + this.getList() }, secectPrice(item){ this.searchForm.priceval = item.value + this.priceShow = false + this.current = 1 + this.getList() }, confirm1(e) { }, @@ -137,14 +174,46 @@ }, topage(item){ uni.navigateTo({ - url: '/pages/otherPage/rentDetail?id=' + item.id - }) + url: '/pages/otherPage/rentDetail?id=' + item.id + }) + }, + 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; + // } + // } + // }); } - }, + }, onLoad: function(options) { }, onHide: function() {}, + onReachBottom() { + this.getList(); + }, }; diff --git a/src/pages/otherPage/rentDetail.vue b/src/pages/otherPage/rentDetail.vue index f189914..525f03b 100644 --- a/src/pages/otherPage/rentDetail.vue +++ b/src/pages/otherPage/rentDetail.vue @@ -1,13 +1,13 @@ + +