diff --git a/pages.json b/pages.json index 95bdc89..a73f226 100644 --- a/pages.json +++ b/pages.json @@ -16,7 +16,8 @@ "style": { "navigationBarTitleText": "智控管家", "navigationBarBackgroundColor": "#2671E2", - "navigationBarTextStyle": "white" + "navigationBarTextStyle": "white", + "enablePullDownRefresh":true } }, { @@ -31,7 +32,8 @@ "style": { "navigationBarTitleText": "学习", "navigationBarBackgroundColor": "#2671E2", - "navigationBarTextStyle": "white" + "navigationBarTextStyle": "white", + "enablePullDownRefresh":true } },{ "path": "pages/index/personal", @@ -196,7 +198,8 @@ "style": { "navigationBarTitleText": "值班顾问", "navigationBarBackgroundColor": "#FFFFFF", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "black", + "enablePullDownRefresh":true } }, { @@ -204,7 +207,8 @@ "style": { "navigationBarTitleText": "设备管理", "navigationBarBackgroundColor": "#FFFFFF", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "black", + "enablePullDownRefresh":true } }, { @@ -226,6 +230,36 @@ } } + ,{ + "path" : "registerCode", + "style" : + { + "navigationBarTitleText": "访客登记码", + "navigationBarBackgroundColor": "#2671E2", + "navigationBarTextStyle": "white" + } + + } + ,{ + "path" : "registerForm", + "style" : + { + "navigationBarTitleText": "访客登记表", + "navigationBarBackgroundColor": "#2671E2", + "navigationBarTextStyle": "white" + } + + }, + { + "path" : "registerResult", + "style" : + { + "navigationBarTitleText": "访客登记表", + "navigationBarBackgroundColor": "#2671E2", + "navigationBarTextStyle": "white" + } + + } ] }, { @@ -269,7 +303,8 @@ "style": { "navigationBarTitleText": "分点学习", "navigationBarBackgroundColor": "#FFFFFF", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "black", + "enablePullDownRefresh":true } }, { @@ -301,7 +336,8 @@ "style": { "navigationBarTitleText": "销讲数据", "navigationBarBackgroundColor": "#FFFFFF", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "black", + "enablePullDownRefresh":true } }, { @@ -309,7 +345,8 @@ "style": { "navigationBarTitleText": "集团对比", "navigationBarBackgroundColor": "#FFFFFF", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "black", + "enablePullDownRefresh":true } }, { @@ -317,7 +354,8 @@ "style": { "navigationBarTitleText": "团队对比", "navigationBarBackgroundColor": "#FFFFFF", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "black", + "enablePullDownRefresh":true } }, { @@ -341,7 +379,8 @@ "style": { "navigationBarTitleText": "客户画像", "navigationBarBackgroundColor": "#FFFFFF", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "black", + "enablePullDownRefresh":true } }, { @@ -349,7 +388,8 @@ "style": { "navigationBarTitleText": "趋势分析", "navigationBarBackgroundColor": "#FFFFFF", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "black", + "enablePullDownRefresh":true } }, { @@ -357,7 +397,8 @@ "style": { "navigationBarTitleText": "员工分析", "navigationBarBackgroundColor": "#FFFFFF", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "black", + "enablePullDownRefresh":true } }, @@ -390,7 +431,8 @@ "style": { "navigationBarTitleText": "顾问排名", "navigationBarBackgroundColor": "#FFFFFF", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "black", + "enablePullDownRefresh":true } }, @@ -399,7 +441,8 @@ "style": { "navigationBarTitleText": "接待记录", "navigationBarBackgroundColor": "#FFFFFF", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "black", + "enablePullDownRefresh":true } }, { @@ -415,7 +458,8 @@ "style": { "navigationBarTitleText": "违禁记录", "navigationBarBackgroundColor": "#FFFFFF", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "black", + "enablePullDownRefresh":true } }, { @@ -423,7 +467,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 9c554ae..47e1e1c 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 42e77bd..26d0b3e 100644 --- a/pages/center/Piabodata/Groupcontrast.vue +++ b/pages/center/Piabodata/Groupcontrast.vue @@ -300,6 +300,19 @@ this.getSectionList() + }, + onPullDownRefresh(){ + let that=this + uni.$on('updateGroup',function(data){ + console.log(data) + that.houseId=data.arr.join(',') + // 获取销奖能力 + that.getPowerList() + }) + this.getSectionList() + setTimeout(function () { + uni.stopPullDownRefresh(); + }, 1000); }, methods: { // 获取部门列表 diff --git a/pages/center/Piabodata/StaffAnalysis.vue b/pages/center/Piabodata/StaffAnalysis.vue index b4eecfa..372f59d 100644 --- a/pages/center/Piabodata/StaffAnalysis.vue +++ b/pages/center/Piabodata/StaffAnalysis.vue @@ -242,6 +242,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 04cad0e..fee1539 100644 --- a/pages/center/Piabodata/Theteamcompared.vue +++ b/pages/center/Piabodata/Theteamcompared.vue @@ -471,6 +471,23 @@ this.getSectionList() }, + onPullDownRefresh() { + let that=this + uni.$on('update',function(data){ + // console.log(data) + that.deptids=data.arr.join(',') + // 获取销奖能力 + that.getPowerList() + }) + // 获取项目id + this.houseId = uni.getStorageSync('buildingID').id; + // this.buildingname = uni.getStorageSync('buildingID').name; + // 请求接口获取所有置业顾问员工的列表 + this.getSectionList() + setTimeout(function () { + uni.stopPullDownRefresh(); + }, 1000); + }, methods: { //是否对比 checkboxChange(){ diff --git a/pages/center/Piabodata/TrendAnalysis.vue b/pages/center/Piabodata/TrendAnalysis.vue index fd2541f..717147f 100644 --- a/pages/center/Piabodata/TrendAnalysis.vue +++ b/pages/center/Piabodata/TrendAnalysis.vue @@ -322,6 +322,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 51e4818..2fad9ce 100644 --- a/pages/center/Piabodata/Userinsightinto.vue +++ b/pages/center/Piabodata/Userinsightinto.vue @@ -106,6 +106,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 a74946b..ca8a579 100644 --- a/pages/center/Piabodata/index.vue +++ b/pages/center/Piabodata/index.vue @@ -336,6 +336,23 @@ // 获取维度 this.getindexZxl() }, + onPullDownRefresh(){ + // 获取员工 + this.getStaffList() + // 获取团队 + this.getSectionList() + // 获取团队是否显示权限 + + // 获取简报 + this.getReport() + // 获取接待趋势 + this.getRtrent() + // 获取维度 + this.getindexZxl() + setTimeout(function () { + uni.stopPullDownRefresh(); + }, 1000); + }, methods: { queryHaveDept() { return new Promise((resolve, reject) => { diff --git a/pages/center/consumer/index.vue b/pages/center/consumer/index.vue index e98a168..ce04de8 100644 --- a/pages/center/consumer/index.vue +++ b/pages/center/consumer/index.vue @@ -26,7 +26,9 @@ 更多筛选 - + + 筛选结果：{{totalRecords}} 条 + @@ -148,7 +150,13 @@ 到访次数 - + + + {{item.label}} + + + @@ -225,7 +233,7 @@ screen:{ agentId:'', agentIdtext:'', - visitRecord:'', + visitRecord:[], record:null, cunsumerTips:'', cunsumerTipsid:'', @@ -249,7 +257,26 @@ soltishow:false, staTime:'', endtime:'', - orderBy:'' + orderBy:'', + totalRecords:'', + visitList: [{ + label: '首次到访', + value: 1, + isShow: false, + }, { + label: '2次到访', + value: 2, + isShow: false, + }, { + label: '3次到访', + value: 3, + isShow: false, + }, { + label: '3次以上', + value: 4, + isShow: false, + }, ], + isRefresh:false } }, onLoad(options) { @@ -260,6 +287,7 @@ this.buildingID = uni.getStorageSync('buildingID').id; this.nextPage=1; this.recordList=[] + this.isRefresh = false; this.getMyCustom() this.getFreeList() this.getfindKeywordsList() @@ -267,6 +295,14 @@ this.isnorefresh=''; } }, + onPullDownRefresh(){ + this.isRefresh = true; + this.nextPage = 1; + this.getMyCustom() + setTimeout(() => { + uni.stopPullDownRefresh() + }, 1000) + }, onReachBottom() { if(this.totalRecord==this.nextPage){ uni.showToast({ @@ -277,10 +313,24 @@ return }else{ this.nextPage+=1; + this.isRefresh = false; this.getMyCustom(); } }, methods:{ + 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) + } + }, tapsoltishow(){ this.soltishow=true; }, @@ -295,6 +345,7 @@ this.orderBy=e[0].value; this.nextPage=1; this.recordList=[]; + this.isRefresh = false; this.getMyCustom(); }, //选择录音时长 @@ -303,6 +354,7 @@ this.activeTotal2=index; this.nextPage=1; this.recordList=[]; + this.isRefresh = false; this.getMyCustom(); }, //时间选择 @@ -316,6 +368,7 @@ this.endtime=''; this.nextPage=1; this.recordList=[]; + this.isRefresh = false; this.getMyCustom(); } }, @@ -326,6 +379,7 @@ this.activeTotal=4; this.nextPage=1; this.recordList=[]; + this.isRefresh = false; this.getMyCustom(); }, recordclick(i){ @@ -387,8 +441,8 @@ orderBy:orderBy } }; - if (this.screen.visitRecord > 0) { - parames.query.visitRecord = this.screen.visitRecord; + if (this.screen.visitRecord.length > 0) { + parames.query.visitRecords = this.screen.visitRecord.join(','); } if(this.screen.record==0){ parames.query.levels= ["1"] @@ -421,8 +475,13 @@ }) } }) - this.recordList = [...this.recordList, ...list]; + if(this.isRefresh){ + this.recordList = list; + }else{ + this.recordList = [...this.recordList, ...list]; + } this.totalRecord=data.totalPage; + this.totalRecords = data.totalRecord; }) }, //获取顾问列表 @@ -498,6 +557,7 @@ this.nextPage=1; this.recordList=[]; this.screenShow=false; + this.isRefresh = false; this.getMyCustom(); }, //筛选确认 @@ -505,6 +565,7 @@ this.nextPage=1; this.recordList=[]; this.screenShow=false; + this.isRefresh = false; this.getMyCustom(); }, goSearch(){ @@ -527,7 +588,18 @@ height: 100%; background: #F8F8F8; } - + .count { + width: 100%; + height: 90rpx; + display: flex; + align-items: center; + justify-content: center; + background-color: #FBE4E4; + + text { + color: #F71616; + } + } .timeview{ height: 80rpx; line-height: 80rpx; diff --git a/pages/center/prohibited/index.vue b/pages/center/prohibited/index.vue index bfcb5b4..3f43ba1 100644 --- a/pages/center/prohibited/index.vue +++ b/pages/center/prohibited/index.vue @@ -14,6 +14,9 @@ 顾问 + + 筛选结果：{{totalRecords}} 条 + @@ -93,8 +96,9 @@ timeshow:false, soltishow:false, orderBy:'', - userInfo:{} - + userInfo:{}, + totalRecords:'', + isRefresh:false } }, onLoad(options) { @@ -113,6 +117,7 @@ this.buildingID = uni.getStorageSync('buildingID').id; this.recordList=[]; this.nextPage=1; + this.isRefresh = false; this.getMyCustom() this.getFreeList(); this.isnorefresh=''; @@ -121,6 +126,14 @@ pages[0].$vm.path='/pages/index/index' console.log(pages[0].$vm.path) }, + onPullDownRefresh(){ + this.nextPage=1; + this.isRefresh = true; + this.getMyCustom() + setTimeout(function () { + uni.stopPullDownRefresh(); + }, 1000); + }, onReachBottom() { if(this.totalRecord==this.nextPage){ uni.showToast({ @@ -131,6 +144,7 @@ return }else{ this.nextPage+=1; + this.isRefresh = false; this.getMyCustom(); } }, @@ -147,6 +161,7 @@ this.orderBy=e[0].value; this.nextPage=1; this.recordList=[]; + this.isRefresh = false; this.getMyCustom(); }, //时间选择 @@ -160,6 +175,7 @@ this.endtime=''; this.nextPage=1; this.recordList=[]; + this.isRefresh = false; this.getMyCustom(); } }, @@ -170,6 +186,7 @@ this.activeTotal=4; this.nextPage=1; this.recordList=[]; + this.isRefresh = false; this.getMyCustom(); }, tapThevisiting(item) { @@ -254,8 +271,13 @@ this.$u.post("/customer/findbypage", parames).then(data => { var list = data.results || []; - this.recordList = [...this.recordList, ...list]; + if(this.isRefresh){ + this.recordList = list; + }else{ + this.recordList = [...this.recordList, ...list]; + } this.totalRecord=data.totalPage; + this.totalRecords = data.totalRecord; }) }, //获取顾问列表 @@ -274,6 +296,7 @@ this.recordList=[]; this.nextPage=1; this.selectshow=false; + this.isRefresh = false; this.getMyCustom(); }, @@ -291,6 +314,18 @@ height: 100%; background: #F8F8F8; } + .count { + width: 100%; + height: 90rpx; + display: flex; + align-items: center; + justify-content: center; + background-color: #FBE4E4; + + text { + color: #F71616; + } + } .timeview{ height: 80rpx; line-height: 80rpx; diff --git a/pages/center/records/index.vue b/pages/center/records/index.vue index 2d2298d..9172663 100644 --- a/pages/center/records/index.vue +++ b/pages/center/records/index.vue @@ -27,6 +27,9 @@ 更多筛选 + + 筛选结果：{{totalRecords}} 条 + @@ -131,7 +134,13 @@ 到访次数 - + + + {{item.label}} + + + @@ -208,7 +217,7 @@ agentId:'',//顾问id record:'0', markAdvisor:null, - visitRecord:null, + visitRecord:[], validInvalid:null, clientStage:'', clientStageName:'' @@ -228,6 +237,25 @@ orderBy:'', methodsisshow:false, userInfo:{}, + visitList: [{ + label: '首次到访', + value: 1, + isShow: false, + }, { + label: '2次到访', + value: 2, + isShow: false, + }, { + label: '3次到访', + value: 3, + isShow: false, + }, { + label: '3次以上', + value: 4, + isShow: false, + }, ], + totalRecords: '', + isRefresh:false } }, onLoad(options) { @@ -260,6 +288,7 @@ this.buildingID = uni.getStorageSync('buildingID').id; this.recordList=[]; this.nextPage=1; + this.isRefresh = false; this.getMyCustom() this.getFreeList(); this.isnorefresh=''; @@ -267,6 +296,14 @@ this.getCustomPhase() }, + onPullDownRefresh(){ + this.isRefresh = true; + this.nextPage = 1; + this.getMyCustom() + setTimeout(function () { + uni.stopPullDownRefresh(); + }, 1000); + }, onReachBottom() { if(this.totalRecord==this.nextPage){ uni.showToast({ @@ -278,9 +315,23 @@ }else{ this.nextPage+=1; this.getMyCustom(); + this.isRefresh = false; } }, methods:{ + 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) + } + }, getCustomPhase(){ this.phaseList=[] this.$u.post("/customer/lifeTrackDefineList",{houseId:this.buildingID}).then(res => { @@ -312,6 +363,7 @@ this.orderBy=e[0].value; this.nextPage=1; this.recordList=[]; + this.isRefresh = false; this.getMyCustom(); }, //选择录音时长 @@ -320,6 +372,7 @@ this.activeTotal2=index; this.nextPage=1; this.recordList=[]; + this.isRefresh = false; this.getMyCustom(); }, //时间选择 @@ -333,6 +386,7 @@ this.endtime=''; this.nextPage=1; this.recordList=[]; + this.isRefresh = false; this.getMyCustom(); } }, @@ -343,6 +397,7 @@ this.activeTotal=4; this.nextPage=1; this.recordList=[]; + this.isRefresh = false; this.getMyCustom(); }, tapThevisiting(item) { @@ -433,7 +488,7 @@ time:1, staTime:this.staTime, endtime:this.endtime, - visitRecord:this.screen.visitRecord, + visitRecords:this.screen.visitRecord.join(','), markAdvisor:this.screen.markAdvisor, dateType:dateType, recDurationInterval:recDurationInterval, @@ -449,8 +504,13 @@ this.$u.post("/customer/findbypage", parames).then(data => { var list = data.results || []; - this.recordList = [...this.recordList, ...list]; + if(this.isRefresh){ + this.recordList = list; + }else{ + this.recordList = [...this.recordList, ...list]; + } this.totalRecord=data.totalPage; + this.totalRecords = data.totalRecord; }) }, //获取顾问列表 @@ -472,6 +532,7 @@ this.screenShow=false; this.recordList=[]; this.nextPage=1; + this.isRefresh = false; this.getMyCustom(); }, reset(){ @@ -515,6 +576,7 @@ this.screenShow=false; this.recordList=[]; this.nextPage=1; + this.isRefresh = false; this.getMyCustom(); }, goSearch(){ @@ -532,6 +594,18 @@ height: 100%; background: #F8F8F8; } + .count { + width: 100%; + height: 90rpx; + display: flex; + align-items: center; + justify-content: center; + background-color: #FBE4E4; + + text { + color: #F71616; + } + } .timeview{ height: 80rpx; line-height: 80rpx; diff --git a/pages/index/index.vue b/pages/index/index.vue index 9dc25f2..daa39d5 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -306,6 +306,45 @@ this.initworkThisWeek() this.initrealTimeStatistics() }, + onPullDownRefresh() { + this.getMenu() + + this.userInfo = uni.getStorageSync('weapp_session_userInfo_data'); + if (this.userInfo.dataCode == 6 || this.userInfo.dataCode == 3) { + this.methodsisshow = false; + } else { + this.methodsisshow = true; + } + if (this.userInfo.zkProperties.length == 1) { + this.buildingID = uni.getStorageSync('buildingID').id; + this.buildingname = uni.getStorageSync('buildingID').name; + this.buildingishow = false; + } else { + this.buildingishow = true; + this.buildingname = uni.getStorageSync('buildingID').name; + this.buildingID = uni.getStorageSync('buildingID').id; + this.userInfo.zkProperties.forEach(item => { + item.label = item.propertyName; + item.value = item.id + }) + this.lpanlist = this.userInfo.zkProperties + } + if (this.userInfo.dataCode == 6) { + // this.Myworkcard = true; + this.equipmentisshow = false; + this.iniodianloang() + } else { + this.equipmentisshow = true; + // this.Myworkcard = false; + this.initequipment() + // this.waitForOperation() + } + this.initworkThisWeek() + this.initrealTimeStatistics() + setTimeout(() => { + uni.stopPullDownRefresh() + }, 3000) + }, methods: { //获取权限 getMenu(){ diff --git a/pages/index/learning.vue b/pages/index/learning.vue index 02989d5..676f4cd 100644 --- a/pages/index/learning.vue +++ b/pages/index/learning.vue @@ -76,6 +76,13 @@ this.buildingID=uni.getStorageSync('buildingID').id; this.clocktab(i) }, + onPullDownRefresh() { + var i=uni.getStorageSync('fendianindex') + this.clocktab(i) + setTimeout(function () { + uni.stopPullDownRefresh(); + }, 1000); + }, methods: { //全部学习跳转 quclick(item){ diff --git a/pages/index/personal.vue b/pages/index/personal.vue index a301b77..c9827ce 100644 --- a/pages/index/personal.vue +++ b/pages/index/personal.vue @@ -50,6 +50,15 @@ + + + + 访客登记码 + + + + + @@ -101,6 +110,11 @@ this.mobile = userInfos.loginName }, methods: { + scan(){ + uni.navigateTo({ + url:"../mine/registerCode" + }) + }, //拨打电话 phone() { wx.makePhoneCall({ diff --git a/pages/learning/Equinoctiallearning.vue b/pages/learning/Equinoctiallearning.vue index 04ccbc2..cd4756e 100644 --- a/pages/learning/Equinoctiallearning.vue +++ b/pages/learning/Equinoctiallearning.vue @@ -38,6 +38,12 @@ this.biaoqian=options.biaoqian this.ceninit() }, + onPullDownRefresh() { + this.ceninit() + setTimeout(function () { + uni.stopPullDownRefresh(); + }, 1000); + }, methods: { quclick(item) { uni.showLoading({ diff --git a/pages/mine/consultanonduty/index.vue b/pages/mine/consultanonduty/index.vue index baa13ff..96796ac 100644 --- a/pages/mine/consultanonduty/index.vue +++ b/pages/mine/consultanonduty/index.vue @@ -67,6 +67,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 bfbcb37..181bdb0 100644 --- a/pages/mine/equipment/index.vue +++ b/pages/mine/equipment/index.vue @@ -1,9 +1,9 @@