diff --git a/config.js b/config.js index 72d9e33..be10eb6 100644 --- a/config.js +++ b/config.js @@ -2,9 +2,9 @@ * 小程序配置文件 */ // 此处主机域名修改成腾讯云解决方案分配的域名 -// var host = 'http://121.42.63.138:9091/autoSR/api'; // 测试站 +var host = 'http://121.42.63.138:9091/autoSR/api'; // 测试站 // var host = 'http://192.168.31.163:8080/autoSR/api'; // 长龙 -var host = 'http://192.168.31.128:8080/autoSR/api'; // 佳豪 +// var host = 'http://192.168.31.128:8080/autoSR/api'; // 佳豪 // var host = 'http://10.2.1.104:8081/autoSR/api'; // 刘敏 // var host = 'https://zkgj.quhouse.com/api'; // 质控正式 // var host = 'https://hfju.com/api'; // 数智正式 diff --git a/pages/center/consumer/consumerDetail.vue b/pages/center/consumer/consumerDetail.vue index 4db71a4..029959b 100644 --- a/pages/center/consumer/consumerDetail.vue +++ b/pages/center/consumer/consumerDetail.vue @@ -93,8 +93,8 @@ - 客户:{{item.name || ''}} | - {{item.visitRecord || '--'}}次到访 + 客户:{{item.name || ''}} | + {{item.visitRecord || '--'}}次到访 {{item.fraction || '0'}}% @@ -147,7 +147,7 @@ 销讲执行率 - {{customerInfo.mm}}分 + {{customerInfo.mm}}min 接待时长 diff --git a/pages/center/consumer/consumerSearch.vue b/pages/center/consumer/consumerSearch.vue index 32fe447..e0aff2e 100644 --- a/pages/center/consumer/consumerSearch.vue +++ b/pages/center/consumer/consumerSearch.vue @@ -104,12 +104,11 @@ .box { width: 100%; height: 100%; - background: #F8F8F8; + background: #FFFFFF; } .content{ - // height: 1000rpx;/ overflow: hidden; - border-top: 1px solid #E0E0E0; + margin-top: 10rpxs; .content-tips{ background: #fff; // box-sizing: border-box; diff --git a/pages/center/consumer/index.vue b/pages/center/consumer/index.vue index 11d09ca..8aff43a 100644 --- a/pages/center/consumer/index.vue +++ b/pages/center/consumer/index.vue @@ -44,7 +44,7 @@ 手机号码:{{item.phone || '--'}} - + 客户标签: 暂无 {{che.name}} @@ -94,17 +94,17 @@ 客户等级 - - + + A - + B - + C - + D @@ -126,16 +126,16 @@ 到访次数 - + 首次到访 - + 第二次 - + 第三次 - + 三次以上 @@ -205,6 +205,20 @@ } }, methods:{ + recordclick(i){ + if(this.screen.record==i){ + this.screen.record=null + }else{ + this.screen.record=i + } + }, + screenvisitRecord(i){ + if(this.screen.visitRecord==i){ + this.screen.visitRecord='' + }else{ + this.screen.visitRecord=i + } + }, // 客户详情 gotoDetail(id) { uni.navigateTo({ @@ -567,11 +581,13 @@ } } .screen-foot{ + width: 100%; height: 88rpx; display: flex; .screen-foot-reset{ width: 50%; text-align: center; + height: 88rpx; line-height: 88rpx; font-size: 30rpx; font-weight: 400; @@ -581,6 +597,7 @@ width: 50%; text-align: center; line-height: 88rpx; + height: 88rpx; font-size: 30rpx; font-weight: 400; color: #FFFFFF; diff --git a/pages/center/records/index.vue b/pages/center/records/index.vue index 037462d..46d0532 100644 --- a/pages/center/records/index.vue +++ b/pages/center/records/index.vue @@ -71,7 +71,7 @@ - + @@ -489,7 +489,7 @@ // padding: 40rpx 30rpx 36rpx 30rpx; padding: 0 30rpx; box-sizing: border-box; - border-bottom: 1px solid #CCCCCC; + border-bottom: 1px solid #EEEEEE; .screen-text{ margin: 40rpx 0 36rpx 0; font-size: 30rpx; @@ -518,7 +518,7 @@ overflow: hidden; padding: 0 30rpx; box-sizing: border-box; - border-bottom: 1px solid #CCCCCC; + border-bottom: 1px solid #EEEEEE; .screen-record-text{ margin-top: 36rpx; font-size: 30rpx; @@ -554,15 +554,14 @@ } } .screen-foot{ - position: relative; - left: 0rpx; - bottom: 0rpx; - height: 88rpx; + width: 100%; + height: 100rpx; display: flex; .screen-foot-reset{ width: 50%; text-align: center; - line-height: 88rpx; + height: 100rpx; + line-height: 100rpx; font-size: 30rpx; font-weight: 400; color: #666666; @@ -570,7 +569,8 @@ .screen-foot-sure{ width: 50%; text-align: center; - line-height: 88rpx; + line-height: 100rpx; + height: 100rpx; font-size: 30rpx; font-weight: 400; color: #FFFFFF; diff --git a/pages/center/records/recordSearch.vue b/pages/center/records/recordSearch.vue index e073b6c..1d593b6 100644 --- a/pages/center/records/recordSearch.vue +++ b/pages/center/records/recordSearch.vue @@ -134,7 +134,7 @@ .box { width: 100%; height: 100vh; - background: #F8F8F8; + background: #FFFFFF; } .content{ .content-tips{ diff --git a/pages/index/index.vue b/pages/index/index.vue index ee56864..cf326f3 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -84,43 +84,43 @@ 实时统计 + {{realtimeobj.receptionCount || 0}} 接待量 - - {{realtimeobj.receivingCustomer || 0}} - 正在接待 - {{realtimeobj.sumCustomer|| 0}} 接待客户 - {{realtimeobj.sumDuration || 0}} - 录音时长 + + {{realtimeobj.tagCustomer || 0}} + 未标顾问 + + + - {{realtimeobj.tagCustomer || 0}} - 未标顾问 + {{realtimeobj.sumDuration || 0}} + 接待时长 - {{realtimeobj.fraction || 0}} + {{realtimeobj.fraction || 0}}% 平均执行率 - - - - + + + + 本周工作 @@ -129,31 +129,19 @@ 接待量 - {{Thisweekobj.sumCustomer || 0}} - 接待客户 - - - {{Thisweekobj.sumDuration || 0}} - 录音时长 + {{realtimeobj.receivingCustomer || 0}} + 正在接待 - - - - {{Thisweekobj.fraction || 0}} + {{Thisweekobj.fraction || 0}}% 平均执行率 - - - - + {{Thisweekobj.sumDuration || 0}} + 录音时长 - 常用功能 @@ -277,7 +265,7 @@ sumCustomer: data.data.data.sumCustomer, receivingCustomer: data.data.data.receivingCustomer, activeCustomer: data.data.data.activeCustomer, - sumDuration: Math.floor(data.data.data.sumDuration), + sumDuration: Math.floor(data.data.data.sumDuration/60) ||0, tagCustomer: data.data.data.tagCustomer, fraction: data.data.data.fraction, receptionCount:data.data.data.receptionCount diff --git a/pages/index/personal.vue b/pages/index/personal.vue index 9df8979..48eb672 100644 --- a/pages/index/personal.vue +++ b/pages/index/personal.vue @@ -6,7 +6,7 @@ diff --git a/pages/mine/Myprofile.vue b/pages/mine/Myprofile.vue index 198224e..7d5a564 100644 --- a/pages/mine/Myprofile.vue +++ b/pages/mine/Myprofile.vue @@ -6,7 +6,7 @@ diff --git a/pages/mine/consultanonduty/index.vue b/pages/mine/consultanonduty/index.vue index 758835d..baa13ff 100644 --- a/pages/mine/consultanonduty/index.vue +++ b/pages/mine/consultanonduty/index.vue @@ -34,7 +34,7 @@ --> - + 今日接待:{{item.receiveNum||0}} diff --git a/pages/mine/equipment/index.vue b/pages/mine/equipment/index.vue index 013aee8..238d2e3 100644 --- a/pages/mine/equipment/index.vue +++ b/pages/mine/equipment/index.vue @@ -1,10 +1,13 @@ @@ -99,7 +100,11 @@ shifoinfo:0, freeList:[], Showhid:false, - text:null + text:null, + show:false, + content: '东临碣石,以观沧海', + confirmtext:'1',//确认文字 + canceltext:'2',//取消文字 }; }, onShow: function() { @@ -108,11 +113,15 @@ this.getFreeList(); }, methods: { + //取消 + confirmA(){ + console.log("1") + }, + // 确认 + confirmB(){ + console.log("2") + }, save() { - const { - dataCode - } = uni.getStorageSync("weapp_session_userInfo_data"); - if (this.parames.name.length==0) { uni.showToast({ icon: "none", @@ -127,6 +136,33 @@ }) return; } + const that = this; + this.$u.post("customer/daitiReception", { + phone: that.parames.phone, + projectId: that.parames.projectId, + agentId:that.parames.agentId + }).then(res => { + if(res.unchecked==0){ + that.baochunfun() + }else{ + if(res.zs==0){ + that.parames.agentId=res.owner.accountId; + that.baochunfun() + }else{ + if(res.owner==null&&res.replacement==null){ + that.baochunfun() + }else{ + + } + // that.content=res + } + } + }) + }, + baochunfun(){ + const { + dataCode + } = uni.getStorageSync("weapp_session_userInfo_data"); uni.showLoading({ title: "保存中", mask: true @@ -138,7 +174,6 @@ icon: "none", title: "保存成功" }) - // uni.setStorageSync('addcustomer', true) uni.navigateBack() }) } else { @@ -148,7 +183,6 @@ icon: "none", title: "保存成功" }) - // uni.setStorageSync('addcustomer', true) uni.navigateBack() }) } diff --git a/pages/mine/reception/consultant.vue b/pages/mine/reception/consultant.vue index 467e5d3..3393a06 100644 --- a/pages/mine/reception/consultant.vue +++ b/pages/mine/reception/consultant.vue @@ -21,7 +21,7 @@ - @@ -36,6 +36,7 @@ 保存 + @@ -48,7 +49,11 @@ freeList: [], current: null, chosedAgentId: '', - textcdhSKJ: '' + textcdhSKJ: '', + show:false, + content: '东临碣石,以观沧海', + confirmtext:'1',//确认文字 + canceltext:'2',//取消文字 } }, onLoad(option) { @@ -56,9 +61,17 @@ }, onShow() { this.buildingID = uni.getStorageSync('buildingID').id; - this.getFreeList(); + this.getFreeList(); }, methods: { + //取消 + confirmA(){ + console.log("1") + }, + // 确认 + confirmB(){ + console.log("2") + }, getFreeList() { this.$u.get("/zkAgentPool/freeList?itemId=" + this.buildingID).then(res => { if (res.length == 0) { diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js b/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js index 6ce72c5..3c83023 100644 --- a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js +++ b/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js @@ -298,7 +298,7 @@ module.exports = { "enableScroll": true, "touchMoveLimit": 60, "enableMarkLine": false, - "dataLabel": true, + "dataLabel": false, "dataPointShape": true, "dataPointShapeType": "solid", "tapLegend": true, diff --git a/utils/http.js b/utils/http.js index 120a504..e87e90a 100644 --- a/utils/http.js +++ b/utils/http.js @@ -1,7 +1,7 @@ -// const baseUrl = 'http://121.42.63.138:9091/autoSR/api';// 测试站 +const baseUrl = 'http://121.42.63.138:9091/autoSR/api';// 测试站 // const baseUrl = 'http://192.168.31.161:8080/autoSR/api'; // 长龙 -const baseUrl = 'http://192.168.31.128:8080/autoSR/api'; // 佳豪 +// const baseUrl = 'http://192.168.31.128:8080/autoSR/api'; // 佳豪 // const baseUrl = 'http://10.2.1.104:8081/autoSR/api'; // 刘敏 // const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式 // const baseUrl = 'https://hfju.com/api'; // 数智正式