From eada6e1b4ab41d69887a0d0421dd1f10fa739009 Mon Sep 17 00:00:00 2001 From: jyt <1592211625@qq.com> Date: Tue, 1 Mar 2022 17:54:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 36 ++++++++++++------- .../center/Piabodata/Employeesstatistics.vue | 6 ++++ pages/center/Piabodata/Groupcontrast.vue | 6 ++++ pages/center/Piabodata/StaffAnalysis.vue | 6 ++++ pages/center/Piabodata/Theteamcompared.vue | 6 ++++ pages/center/Piabodata/TrendAnalysis.vue | 6 ++++ pages/center/Piabodata/Userinsightinto.vue | 6 ++++ pages/center/Piabodata/index.vue | 17 +++++++++ pages/center/prohibited/index.vue | 6 ++++ pages/center/records/index.vue | 6 ++++ pages/index/customer.vue | 7 ++++ pages/mine/consultanonduty/index.vue | 7 ++++ pages/mine/equipment/index.vue | 6 ++++ 13 files changed, 109 insertions(+), 12 deletions(-) diff --git a/pages.json b/pages.json index ff56e10..65070f6 100644 --- a/pages.json +++ b/pages.json @@ -34,7 +34,8 @@ "style": { "navigationBarTitleText": "接待", "navigationBarBackgroundColor": "#2671E2", - "navigationBarTextStyle": "white" + "navigationBarTextStyle": "white", + "enablePullDownRefresh":true } }, { "path": "pages/index/learning", @@ -192,7 +193,8 @@ "style": { "navigationBarTitleText": "值班顾问", "navigationBarBackgroundColor": "#FFFFFF", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "black", + "enablePullDownRefresh":true } }, { @@ -200,7 +202,8 @@ "style": { "navigationBarTitleText": "设备管理", "navigationBarBackgroundColor": "#FFFFFF", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "black", + "enablePullDownRefresh": true } } ,{ @@ -306,7 +309,8 @@ "style": { "navigationBarTitleText": "销讲数据", "navigationBarBackgroundColor": "#FFFFFF", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "black", + "enablePullDownRefresh":true } }, { @@ -314,7 +318,8 @@ "style": { "navigationBarTitleText": "集团对比", "navigationBarBackgroundColor": "#FFFFFF", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "black", + "enablePullDownRefresh":true } }, { @@ -322,7 +327,8 @@ "style": { "navigationBarTitleText": "团队对比", "navigationBarBackgroundColor": "#FFFFFF", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "black", + "enablePullDownRefresh":true } }, { @@ -346,7 +352,8 @@ "style": { "navigationBarTitleText": "客户画像", "navigationBarBackgroundColor": "#FFFFFF", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "black", + "enablePullDownRefresh":true } }, { @@ -354,7 +361,8 @@ "style": { "navigationBarTitleText": "趋势分析", "navigationBarBackgroundColor": "#FFFFFF", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "black", + "enablePullDownRefresh":true } }, { @@ -362,7 +370,8 @@ "style": { "navigationBarTitleText": "员工分析", "navigationBarBackgroundColor": "#FFFFFF", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "black", + "enablePullDownRefresh":true } }, @@ -395,7 +404,8 @@ "style": { "navigationBarTitleText": "顾问排名", "navigationBarBackgroundColor": "#FFFFFF", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "black", + "enablePullDownRefresh":true } }, @@ -404,7 +414,8 @@ "style": { "navigationBarTitleText": "接待记录", "navigationBarBackgroundColor": "#FFFFFF", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "black", + "enablePullDownRefresh": true } }, { @@ -420,7 +431,8 @@ "style": { "navigationBarTitleText": "违禁记录", "navigationBarBackgroundColor": "#FFFFFF", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "black", + "enablePullDownRefresh": true } }, { diff --git a/pages/center/Piabodata/Employeesstatistics.vue b/pages/center/Piabodata/Employeesstatistics.vue index 1df9581..c4d0cf9 100644 --- a/pages/center/Piabodata/Employeesstatistics.vue +++ b/pages/center/Piabodata/Employeesstatistics.vue @@ -201,6 +201,12 @@ this.houseId = uni.getStorageSync('buildingID').id; this.init() }, + onPullDownRefresh(){ + this.init() + setTimeout(function () { + uni.stopPullDownRefresh(); + }, 1000); + }, methods: { init(){ this.newlisttabinfo1={ diff --git a/pages/center/Piabodata/Groupcontrast.vue b/pages/center/Piabodata/Groupcontrast.vue index 3708868..7e2c72c 100644 --- a/pages/center/Piabodata/Groupcontrast.vue +++ b/pages/center/Piabodata/Groupcontrast.vue @@ -298,6 +298,12 @@ this.getSectionList() + }, + onPullDownRefresh(){ + this.getSectionList() + setTimeout(function () { + uni.stopPullDownRefresh(); + }, 1000); }, methods: { // 获取部门列表 diff --git a/pages/center/Piabodata/StaffAnalysis.vue b/pages/center/Piabodata/StaffAnalysis.vue index 4e1d5d5..de87339 100644 --- a/pages/center/Piabodata/StaffAnalysis.vue +++ b/pages/center/Piabodata/StaffAnalysis.vue @@ -243,6 +243,12 @@ // 请求接口获取所有置业顾问员工的列表 this.getStaffList() }, + onPullDownRefresh(){ + this.getStaffList() + setTimeout(function () { + uni.stopPullDownRefresh(); + }, 1000); + }, methods: { //是否对比 checkboxChange(){ diff --git a/pages/center/Piabodata/Theteamcompared.vue b/pages/center/Piabodata/Theteamcompared.vue index 6b87b26..501bda9 100644 --- a/pages/center/Piabodata/Theteamcompared.vue +++ b/pages/center/Piabodata/Theteamcompared.vue @@ -370,6 +370,12 @@ this.getSectionList() }, + onPullDownRefresh(){ + this.getSectionList() + setTimeout(function () { + uni.stopPullDownRefresh(); + }, 1000); + }, methods: { //是否对比 checkboxChange() { diff --git a/pages/center/Piabodata/TrendAnalysis.vue b/pages/center/Piabodata/TrendAnalysis.vue index 5b39857..03d21e5 100644 --- a/pages/center/Piabodata/TrendAnalysis.vue +++ b/pages/center/Piabodata/TrendAnalysis.vue @@ -334,6 +334,12 @@ this.pamect.houseId = uni.getStorageSync('buildingID').id; this.init() }, + onPullDownRefresh(){ + this.init() + setTimeout(function () { + uni.stopPullDownRefresh(); + }, 1000); + }, watch: { Showhiddenunits(newValue, oldValue) { this.showCanvas = !newValue diff --git a/pages/center/Piabodata/Userinsightinto.vue b/pages/center/Piabodata/Userinsightinto.vue index 100a5dc..c550fb6 100644 --- a/pages/center/Piabodata/Userinsightinto.vue +++ b/pages/center/Piabodata/Userinsightinto.vue @@ -113,6 +113,12 @@ this.buildingID=uni.getStorageSync('buildingID').id; this.gitinit() }, + onPullDownRefresh(){ + this.gitinit() + setTimeout(function () { + uni.stopPullDownRefresh(); + }, 1000); + }, methods: { anclick(i){ console.log(i) diff --git a/pages/center/Piabodata/index.vue b/pages/center/Piabodata/index.vue index efd1b28..cfe2a7d 100644 --- a/pages/center/Piabodata/index.vue +++ b/pages/center/Piabodata/index.vue @@ -362,6 +362,23 @@ // 获取维度 this.getindexZxl() }, + onPullDownRefresh(){ + // 获取员工 + this.getStaffList() + // 获取团队 + this.getSectionList() + // 获取团队是否显示权限 + + // 获取简报 + this.getReport() + // 获取接待趋势 + this.getRtrent() + // 获取维度 + this.getindexZxl() + setTimeout(function () { + uni.stopPullDownRefresh(); + }, 1000); + }, methods: { diff --git a/pages/center/prohibited/index.vue b/pages/center/prohibited/index.vue index 5b39658..8692c21 100644 --- a/pages/center/prohibited/index.vue +++ b/pages/center/prohibited/index.vue @@ -150,6 +150,12 @@ this.isnorefresh = ''; } }, + onPullDownRefresh(){ + this.getMyCustom() + setTimeout(function () { + uni.stopPullDownRefresh(); + }, 1000); + }, onReachBottom() { if (this.totalRecord == this.nextPage) { uni.showToast({ diff --git a/pages/center/records/index.vue b/pages/center/records/index.vue index 3495ed6..4ea74c4 100644 --- a/pages/center/records/index.vue +++ b/pages/center/records/index.vue @@ -324,6 +324,12 @@ this.isnorefresh = ''; } }, + onPullDownRefresh(){ + this.getMyCustom() + setTimeout(function () { + uni.stopPullDownRefresh(); + }, 1000); + }, onReachBottom() { if (this.totalRecord == this.nextPage) { uni.showToast({ diff --git a/pages/index/customer.vue b/pages/index/customer.vue index e262eda..141c512 100644 --- a/pages/index/customer.vue +++ b/pages/index/customer.vue @@ -215,6 +215,13 @@ this.init() this.queryHaveDept() }, + + onPullDownRefresh(){ + this.init() + setTimeout(function () { + uni.stopPullDownRefresh(); + }, 1000); + }, methods: { reshCustom() { this.init() diff --git a/pages/mine/consultanonduty/index.vue b/pages/mine/consultanonduty/index.vue index 73657d6..542765b 100644 --- a/pages/mine/consultanonduty/index.vue +++ b/pages/mine/consultanonduty/index.vue @@ -66,6 +66,13 @@ this.changeAgentListShow() this.changePausedAgentListShow() }, + onPullDownRefresh(){ + this.changeAgentListShow() + this.changePausedAgentListShow() + setTimeout(function () { + uni.stopPullDownRefresh(); + }, 1000); + }, computed: { activeAgentList() { return this.activeTotal == 1 ? this.agentList : this.pausedAgentList diff --git a/pages/mine/equipment/index.vue b/pages/mine/equipment/index.vue index e4ba925..9daf6f2 100644 --- a/pages/mine/equipment/index.vue +++ b/pages/mine/equipment/index.vue @@ -122,6 +122,12 @@ this.pageNum +=1; this.init() }, + onPullDownRefresh(){ + this.init() + setTimeout(function () { + uni.stopPullDownRefresh(); + }, 1000); + }, onLoad(options) { if(options.active){ this.activeClass=options.active From 95bddf147a99a00c19b66ee45166dac3cf509a50 Mon Sep 17 00:00:00 2001 From: jyt <1592211625@qq.com> Date: Wed, 2 Mar 2022 18:30:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=A5=BC=E7=9B=98?= =?UTF-8?q?=E5=8A=A0=E5=85=B3=E9=94=AE=E8=AF=8D=E6=9F=A5=E8=AF=A2=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E7=AD=9B=E9=80=89=E5=A4=9A=E9=80=89=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 10 + pages/center/records/index.vue | 44 +- pages/index/consumer/index.vue | 2200 ++++++++++++++++---------------- pages/index/index.vue | 5 +- pages/mine/selectBuilding.vue | 96 ++ 5 files changed, 1277 insertions(+), 1078 deletions(-) create mode 100644 pages/mine/selectBuilding.vue diff --git a/pages.json b/pages.json index 65070f6..5c6942e 100644 --- a/pages.json +++ b/pages.json @@ -236,6 +236,16 @@ } } + ,{ + "path" : "selectBuilding", + "style" : + { + "navigationBarTitleText": "切换楼盘", + "navigationBarBackgroundColor": "#2671E2", + "navigationBarTextStyle": "white" + } + + } ] }, { diff --git a/pages/center/records/index.vue b/pages/center/records/index.vue index 4ea74c4..d65de1e 100644 --- a/pages/center/records/index.vue +++ b/pages/center/records/index.vue @@ -149,7 +149,13 @@ 到访次数 - + + {{item.label}} + + + @@ -266,7 +272,7 @@ agentId: '', //顾问id record: '0', markAdvisor: null, - visitRecord: null, + visitRecord: [], validInvalid: null }, freeList: [], //顾问 @@ -287,6 +293,23 @@ startFilterTime: '接待时间', // s筛选状态展示 receptionDuration: '接待时长', // 筛选状态展示 sortText: '排序', // + visitList: [{ + label: '首次到访', + value: 1, + isShow: false, + }, { + label: '2次到访', + value: 2, + isShow: false, + }, { + label: '3次到访', + value: 3, + isShow: false, + }, { + label: '3次以上', + value: 4, + isShow: false, + }, ] } }, onLoad(options) { @@ -488,7 +511,7 @@ time: 1, staDate: this.staTime, endDate: this.endtime, - visitRecord: this.screen.visitRecord, + visitRecords: this.screen.visitRecord.join(","), markAdvisor: this.screen.markAdvisor, dateType: dateType, recDurationInterval: recDurationInterval, @@ -545,6 +568,19 @@ this.recordList = []; this.getMyCustom(); }, + choice(index,e) { + if (this.visitList[index].isShow == true) { + this.visitList[index].isShow = false; + for (var i = 0; i < this.screen.visitRecord.length; i++) { + if (this.screen.visitRecord[i] === e) { + this.screen.visitRecord.splice(i, 1); + } + } + } else { + this.visitList[index].isShow = true; + this.screen.visitRecord.push(e) + } + }, recordclick(i) { if (this.screen.visitRecord == i) { this.screen.visitRecord = null diff --git a/pages/index/consumer/index.vue b/pages/index/consumer/index.vue index 2391044..0b6f02c 100644 --- a/pages/index/consumer/index.vue +++ b/pages/index/consumer/index.vue @@ -1,1074 +1,1128 @@ - - - - - diff --git a/pages/index/index.vue b/pages/index/index.vue index 48d405b..7776c44 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -743,7 +743,10 @@ }, //选择楼盘弹框 piskbuilding() { - this.Showhiddenunits = true; + // this.Showhiddenunits = true; + uni.navigateTo({ + url:"../mine/selectBuilding" + }) }, // 楼盘选择确认 confirm(e) { diff --git a/pages/mine/selectBuilding.vue b/pages/mine/selectBuilding.vue new file mode 100644 index 0000000..6d7ff38 --- /dev/null +++ b/pages/mine/selectBuilding.vue @@ -0,0 +1,96 @@ + + + + +