From ca9e06082c785ca10af4da813cf4239e97b07fe4 Mon Sep 17 00:00:00 2001 From: corala <18339694416@163.com> Date: Tue, 21 Jun 2022 18:13:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 2 + pages.json | 4 +- .../center/Piabodata/Employeesstatistics.vue | 48 ++++++++--- pages/center/Piabodata/TrendAnalysis.vue | 14 ++- pages/center/Piabodata/index.vue | 6 +- pages/center/consumer/consumerDetail.vue | 26 +++--- pages/center/consumer/index.vue | 24 ++---- pages/center/records/index.vue | 29 +++---- pages/index/consumer/index.vue | 85 ++++++++++++------- pages/index/index.vue | 66 +++++++------- pages/index/personal.vue | 6 +- pages/login/index.vue | 10 +-- pages/mine/details2.vue | 17 ++-- 13 files changed, 183 insertions(+), 154 deletions(-) diff --git a/App.vue b/App.vue index 4ba4ac2..685b6f6 100644 --- a/App.vue +++ b/App.vue @@ -388,12 +388,14 @@ line-height: 92rpx; color: #666666; font-size: 28rpx; + font-weight: 400; display: flex; justify-content: center; .activecllasscet { width: 96rpx; color: #2671E2; + font-weight: 600; border-bottom: 4rpx solid #2671E2; } } diff --git a/pages.json b/pages.json index 3d1d365..653fe9d 100644 --- a/pages.json +++ b/pages.json @@ -574,8 +574,8 @@ }, "debug": false, "tabBar": { - "color": "#8E8E8E", - "selectedColor": "#1296db", + "color": "#666", + "selectedColor": "#2671E2", "borderStyle": "white", "list": [{ "pagePath": "pages/index/customer", diff --git a/pages/center/Piabodata/Employeesstatistics.vue b/pages/center/Piabodata/Employeesstatistics.vue index 8f11462..4c7fe8d 100644 --- a/pages/center/Piabodata/Employeesstatistics.vue +++ b/pages/center/Piabodata/Employeesstatistics.vue @@ -34,8 +34,8 @@ - - + + @@ -61,7 +61,7 @@ - 销讲执行率排行（TOP10） + 平均执行率排行（TOP10） @@ -73,12 +73,24 @@ 人均执行率 - - + + - {{item.name.substring(0,4)}} - + + + + + {{index+1}} + {{item.name.substring(0,4)}} + + + + + + + {{item.zxl==null?0:item.zxl}}% @@ -107,13 +119,25 @@ 人均录音时长/分钟 - - + + - {{item.name.substring(0,4)}} + + + + + {{index+1}} + {{item.name.substring(0,4)}} - + + + + + {{item.zxl==null?0:item.zxl}}分钟 @@ -142,7 +166,7 @@ 人均违禁次数 - + diff --git a/pages/center/Piabodata/TrendAnalysis.vue b/pages/center/Piabodata/TrendAnalysis.vue index ab5011e..461f451 100644 --- a/pages/center/Piabodata/TrendAnalysis.vue +++ b/pages/center/Piabodata/TrendAnalysis.vue @@ -55,7 +55,7 @@ {{item.num}}分 {{item.num||0}} - 对比：{{index==1?item.num1+'%':item.num1}} + 对比：{{item.name==='平均执行率'?item.num1+'%':item.num1}} {{item.num2+'%'}}{{(item.num2*1) > 0 ? '↑' : '↓'}} @@ -97,6 +97,12 @@ 销讲二级 + + 销讲二级 + + + 销讲二级 + @@ -1182,7 +1188,7 @@ diff --git a/pages/center/consumer/index.vue b/pages/center/consumer/index.vue index 31e7b9a..2d7fbeb 100644 --- a/pages/center/consumer/index.vue +++ b/pages/center/consumer/index.vue @@ -40,17 +40,13 @@ - A - B - C - D + A + B + C + D {{item.name}} - @@ -582,10 +578,9 @@ .left{ display: flex; .img{ - // margin-top: 19rpx; width: 52rpx; height: 52rpx; - border: 1px solid #E0E0E0; + border: 1rpx solid #E0E0E0; border-radius: 50%; text-align: center; line-height: 50rpx; @@ -593,7 +588,6 @@ } .test{ margin-top: 11rpx; - // margin-left: 20rpx; font-weight: 500; color: #333333; } @@ -614,10 +608,9 @@ } } .content-sec{ - border-top: 1px solid #E0E0E0; + border-top: 1rpx solid #E0E0E0; padding: 0 30rpx; padding-bottom: 30rpx; - // height: 270rpx; position: relative; .content-sec-lab{ margin-top: 30rpx; @@ -663,8 +656,7 @@ } .content-last{ display: flex; - border-top: 1px solid #E0E0E0; - // padding: 0 30rpx; + border-top: 1rpx solid #E0E0E0; height: 78rpx; .content-last-tab{ width: 33.4%; @@ -673,7 +665,7 @@ font-weight: 400; color: #333333; line-height: 78rpx; - border-right: 1px solid #E0E0E0; + border-right: 1rpx solid #E0E0E0; } } diff --git a/pages/center/records/index.vue b/pages/center/records/index.vue index cf3e88e..ee07b1a 100644 --- a/pages/center/records/index.vue +++ b/pages/center/records/index.vue @@ -14,13 +14,13 @@ --> - + {{ startFilterTime }} - + {{ receptionDuration }} - + {{ sortText }} @@ -317,20 +317,13 @@ }, onLoad(options) { this.isnorefresh = options.refresh; - if (options.activeTotal) { - this.activeTotal = options.activeTotal - } - if (options.markAdvisor) { - this.screen.markAdvisor = options.markAdvisor - } - if (options.validInvalid) { - this.screen.validInvalid = options.validInvalid - } + this.activeTotal = options.activeTotal + this.screen.markAdvisor = options.markAdvisor + this.screen.validInvalid = options.validInvalid if (options.staTime) { this.staTime = options.staTime; this.endtime = options.endtime; } - }, onShow() { try { @@ -663,11 +656,11 @@ } .timeview { - height: 80rpx; - line-height: 80rpx; + height: 90rpx; + line-height: 90rpx; width: 100%; text-align: center; - border-bottom: 1px solid #F8F8F8; + border-bottom: 1rpx solid #F8F8F8; } //时间切换的样式 @@ -698,6 +691,10 @@ -webkit-box-orient: vertical; /* 设置或检索伸缩盒对象的子元素的排列方式 */ } + .activeColor{ + color: #2671E2; + } + } .search-box { diff --git a/pages/index/consumer/index.vue b/pages/index/consumer/index.vue index 16b3a79..9294704 100644 --- a/pages/index/consumer/index.vue +++ b/pages/index/consumer/index.vue @@ -8,21 +8,21 @@ 输入客户姓名/手机号 - + - + {{ sortFilter }} - + {{ arriveFilter }} - + {{ receptionDuration }} @@ -31,7 +31,6 @@ - 筛选结果：{{totalRecords}} 条 @@ -71,12 +70,12 @@ 负责顾问：{{item.agentName || ''}} - + 客户意向： 暂无 @@ -246,7 +245,8 @@ - + {{ item.label }} @@ -393,20 +393,20 @@ onLoad(options) { - _this = this - this.isnorefresh = 'refresh'; - this.userInfo = uni.getStorageSync("weapp_session_userInfo_data") - console.log(this.userInfo.showPhoneStatus) - if (this.isnorefresh == 'refresh') { - this.buildingID = uni.getStorageSync('buildingID').id; - this.nextPage = 1; - this.recordList = [] - this.getFreeList() - this.getfindKeywordsList() - this.getFromSource(); - this.isRefresh = false; - this.getMyCustom() - } + // _this = this + // this.isnorefresh = 'refresh'; + // this.userInfo = uni.getStorageSync("weapp_session_userInfo_data") + // console.log(this.userInfo.showPhoneStatus) + // if (this.isnorefresh == 'refresh') { + // this.buildingID = uni.getStorageSync('buildingID').id; + // this.nextPage = 1; + // this.recordList = [] + // this.getFreeList() + // this.getfindKeywordsList() + // this.getFromSource(); + // this.isRefresh = false; + // this.getMyCustom() + // } }, onPullDownRefresh() { @@ -428,7 +428,20 @@ let newmenulist = uni.getStorageSync('weapp_session_Menu_data'); this.permissions.commonly1 = newmenulist.khgl_ck; this.permissions.commonly2 = newmenulist.khgl_gj; - + _this = this + this.isnorefresh = 'refresh'; + this.userInfo = uni.getStorageSync("weapp_session_userInfo_data") + console.log(this.userInfo.showPhoneStatus) + if (this.isnorefresh == 'refresh') { + this.buildingID = uni.getStorageSync('buildingID').id; + this.nextPage = 1; + this.recordList = [] + this.getFreeList() + this.getfindKeywordsList() + this.getFromSource(); + this.isRefresh = false; + this.getMyCustom() + } }, onReachBottom() { if (this.totalRecord == this.nextPage) { @@ -527,7 +540,7 @@ this.nextPage = 1; this.recordList = []; this.isRefresh = false; - + this.arriveFilter = this.staTime + '-' + this.endtime this.getMyCustom(); }, recordclick(i) { @@ -627,9 +640,9 @@ } this.$u.post("/customer/customerManagement", parames).then(data => { - if (this.staTime && this.endtime) { - this.receptionDuration = `${this.staTime}-${this.endtime}` - } + // if (this.staTime && this.endtime) { + // this.receptionDuration = `${this.staTime}-${this.endtime}` + // } var list = data.results || []; console.log(list) list.forEach(item => { @@ -792,11 +805,11 @@ } .timeview { - height: 80rpx; - line-height: 80rpx; + height: 90rpx; + line-height: 90rpx; width: 100%; text-align: center; - border-bottom: 1px solid #F8F8F8; + border-bottom: 1rpx solid #F8F8F8; } //时间切换的样式 @@ -827,6 +840,9 @@ -webkit-box-orient: vertical; /* 设置或检索伸缩盒对象的子元素的排列方式 */ } + .activeColor{ + color: #2671E2; + } } .soltishow { @@ -960,6 +976,7 @@ background: #FFFFFF; border-radius: 4rpx; border: 1rpx solid #FF981E; + box-sizing: border-box; } .A { @@ -967,15 +984,15 @@ } .B { - background: #F29819; + background: #FF981E; } .C { - background: #19AC09; + background: #F6BD16; } .D { - background: #1396F6; + background: #E6625B; } @@ -1066,9 +1083,11 @@ .content-last-tab { width: 214rpx; height: 70rpx; + line-height: 70rpx; background: #FFFFFF; border-radius: 8rpx; border: 1rpx solid #2671E2; + box-sizing: border-box; font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; color: #2671E2; diff --git a/pages/index/index.vue b/pages/index/index.vue index 2cb6844..c19481f 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -114,7 +114,7 @@ {{realtimeobj.fraction || 0}}% - + 平均执行率 @@ -167,7 +167,7 @@ {{Thisweekobj.fraction || 0}}% - + 平均执行率 @@ -290,7 +290,7 @@ 自定义 - + @@ -752,21 +752,20 @@ prohibitedtap(i) { if (i == 1) { uni.navigateTo({ - url: '/pages/center/prohibited/index?refresh=' + 'refresh' + '&activeTotal=' + '0' + url: '/pages/center/prohibited/index?refresh=refresh&activeTotal=0' }); } else { if (this.zhixingcenterindex == 2) { uni.navigateTo({ - url: '/pages/center/prohibited/index?refresh=' + 'refresh' + '&activeTotal=' + '2' + url: '/pages/center/prohibited/index?refresh=refresh&activeTotal=2' }); - } else if (this.zhixingcenterindex == 6) { + } else if (this.zhixingcenterindex == 6) {//近30天 uni.navigateTo({ - url: '/pages/center/prohibited/index?refresh=' + 'refresh' + '&activeTotal=' + '3' + url: '/pages/center/prohibited/index?refresh=refresh&activeTotal=3' }); - } else { + } else {// 自定义时间段 uni.navigateTo({ - url: '/pages/center/prohibited/index?refresh=' + 'refresh' + '&activeTotal=' + '4' + - '&staTime=' + this.statDateStart + '&endtime=' + this.statDateEnd + url: '/pages/center/prohibited/index?refresh=refresh&activeTotal=4&staTime=' + this.statDateStart + '&endtime=' + this.statDateEnd }); } } @@ -775,55 +774,48 @@ if (this.permissions.commonly2 == true) { if (i == 1) { uni.navigateTo({ - url: '/pages/center/records/index?refresh=' + 'refresh' + '&activeTotal=' + '0' + url: '/pages/center/records/index?refresh=refresh&activeTotal=0&validInvalid=0' }); } else if (i == 2) { uni.switchTab({ url: '/pages/index/customer' }); } else if (i == 3) { - if (this.zhixingcenterindex == 2) { + if (this.zhixingcenterindex == 2) {// 近7天 uni.navigateTo({ - url: '/pages/center/records/index?refresh=' + 'refresh' + '&activeTotal=' + '2' + url: '/pages/center/records/index?refresh=refresh&activeTotal=2&validInvalid=0' }); - } else if (this.zhixingcenterindex == 6) { + } else if (this.zhixingcenterindex == 6) {//近30天 uni.navigateTo({ - url: '/pages/center/records/index?refresh=' + 'refresh' + '&activeTotal=' + '3' + url: '/pages/center/records/index?refresh=refresh&activeTotal=3&validInvalid=0' }); - } else { + } else {// 自定义时间段 uni.navigateTo({ - url: '/pages/center/records/index?refresh=' + 'refresh' + '&activeTotal=' + '4' + - '&staTime=' + this.statDateStart + '&endtime=' + this.statDateEnd + url: '/pages/center/records/index?refresh=refresh&activeTotal=4&validInvalid=0&staTime=' + this.statDateStart + '&endtime=' + this.statDateEnd }); } } else if (i == 6) { uni.navigateTo({ - url: '/pages/center/records/index?refresh=' + 'refresh' + '&activeTotal=' + '0' + - '&validInvalid=0' + url: '/pages/center/records/index?refresh=refresh&activeTotal=0&validInvalid=0' }); } else if (i == 7) { if (this.zhixingcenterindex == 2) { uni.navigateTo({ - url: '/pages/center/records/index?refresh=' + 'refresh' + '&activeTotal=' + '2' + - '&validInvalid=0' + url: '/pages/center/records/index?refresh=refresh&activeTotal=2&validInvalid=0' }); } else if (this.zhixingcenterindex == 6) { uni.navigateTo({ - url: '/pages/center/records/index?refresh=' + 'refresh' + '&activeTotal=' + '3' + - '&validInvalid=0' + url: '/pages/center/records/index?refresh=refresh&activeTotal=3&validInvalid=0' }); } else { uni.navigateTo({ - url: '/pages/center/records/index?refresh=' + 'refresh' + '&activeTotal=' + '4' + - '&staTime=' + this.statDateStart + '&endtime=' + this.statDateEnd + - '&validInvalid=0' + url: '/pages/center/records/index?refresh=refresh&activeTotal=4&validInvalid=0&staTime=' + this.statDateStart + '&endtime=' + this.statDateEnd }); } } else { uni.navigateTo({ - url: '/pages/center/records/index?refresh=' + 'refresh' + '&activeTotal=0' + - '&markAdvisor=0' + url: '/pages/center/records/index?refresh=refresh&activeTotal=0&markAdvisor=0' }); } } @@ -879,7 +871,7 @@ }); } else if (item == '接待记录') { uni.navigateTo({ - url: '/pages/center/records/index?refresh=' + 'refresh' + url: '/pages/center/records/index?refresh=refresh' }); } else if (item == '值班顾问') { uni.navigateTo({ @@ -895,15 +887,15 @@ }); } else if (item == '违禁记录') { uni.navigateTo({ - url: '/pages/center/prohibited/index?refresh=' + 'refresh' + url: '/pages/center/prohibited/index?refresh=refresh' }); }else if (item == '日报') { uni.navigateTo({ - url: '/pages/mine/daily/dailyList?refresh=' + 'refresh' + url: '/pages/mine/daily/dailyList?refresh=refresh' }); } else { uni.navigateTo({ - url: '/pages/center/consumer/index?refresh=' + 'refresh' + url: '/pages/center/consumer/index?refresh=refresh' }); } @@ -1098,7 +1090,7 @@ width: 100%; color: #666666; text-align: center; - margin-top: 24rpx; + margin-top: 8rpx; height: 32rpx; font-size: 24rpx; font-family: PingFangSC-Regular, PingFang SC; @@ -1183,10 +1175,10 @@ } } .timeview{ - height: 80rpx; - line-height: 80rpx; + height: 90rpx; + line-height: 90rpx; width: 100%; text-align: center; - border-bottom: 1px solid #F8F8F8; + border-bottom: 1rpx solid #f8f8f8; } diff --git a/pages/index/personal.vue b/pages/index/personal.vue index 2dff5bc..a1ea304 100644 --- a/pages/index/personal.vue +++ b/pages/index/personal.vue @@ -178,8 +178,8 @@ height: 100vh; display: flex; flex-direction: column; - // background: url('https://static.quhouse.com/f5e2422890044cd1a620abd078e63442.png') no-repeat; - // background-size: 750rpx 540rpx; + background: url('https://static.quhouse.com/f5e2422890044cd1a620abd078e63442.png') no-repeat; + background-size: 750rpx 540rpx; } .header { @@ -190,6 +190,8 @@ background: url('https://static.quhouse.com/10fa8f6fe7fa4104a5c4149be4735311.png') no-repeat; background-size: 670rpx 248rpx; margin: 0 40rpx 60rpx; + border-radius: 18rpx; + box-shadow: 0 10rpx 20rpx #999; .header-zuo { width: 128rpx; height: 128rpx; diff --git a/pages/login/index.vue b/pages/login/index.vue index 30ef533..59f12b3 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -9,7 +9,7 @@ 您好， - 欢迎登录AI销管～ + 欢迎登录销讲助手～ @@ -56,10 +56,10 @@ export default { data() { return { - username: '',//用户名-测试 13388881113 1234567 - password: '',//密码 - // username: '13033782199',//用户名-生产 13033782199 654321 - // password: '654321',//密码 + // username: '13388881113',//用户名-测试 13388881113 1234567 + // password: '1234567',//密码 + username: '13033782199',//用户名-生产 13033782199 654321 + password: '654321',//密码 passwordType: true, agreeChecked: true }; diff --git a/pages/mine/details2.vue b/pages/mine/details2.vue index 44d3574..053ae08 100644 --- a/pages/mine/details2.vue +++ b/pages/mine/details2.vue @@ -1833,9 +1833,9 @@ .bottombox { width: 100%; - height: 170rpx; + // min-height: 170rpx; border-top: 1rpx solid #E0E0E0; - padding-bottom: 10rpx; + padding-bottom: 60rpx; .bottomhead { width: 100%; @@ -2402,7 +2402,6 @@ margin: 30rpx; line-height: 80rpx; display: flex; - align-items: center; } .scroll-Y .text[data-speaker="2"], @@ -2413,9 +2412,8 @@ .contentInfo { .info { - color: #ccc; - font-size: 18rpx; - font-size: 30rpx; + color: #666; + font-size: 22rpx; padding: 0 28rpx; } @@ -2477,11 +2475,9 @@ text-align: center; background: #FFFFFF; border-radius: 8rpx; - // border: 2rpx solid #E6625B; font-size: 30rpx; font-family: PingFangSC-Medium, PingFang SC; font-weight: 500; - // color: #E6625B; box-sizing: border-box; } image{ @@ -2490,9 +2486,8 @@ } } .scroll-Y .text .contentInfo .info { - color: #ccc; - font-size: 18rpx; - font-size: 30rpx; + color: #666; + font-size: 22rpx; padding: 0 28rpx; }