diff --git a/components/uniapp-zaudio/static/pausebtn.png b/components/uniapp-zaudio/static/pausebtn.png index f2bc86c..05e76dd 100644 Binary files a/components/uniapp-zaudio/static/pausebtn.png and b/components/uniapp-zaudio/static/pausebtn.png differ diff --git a/components/uniapp-zaudio/static/playbtn.png b/components/uniapp-zaudio/static/playbtn.png index 3f51b61..26ae9ba 100644 Binary files a/components/uniapp-zaudio/static/playbtn.png and b/components/uniapp-zaudio/static/playbtn.png differ diff --git a/components/uniapp-zaudio/zaudio.vue b/components/uniapp-zaudio/zaudio.vue index 4b4250e..c7656af 100644 --- a/components/uniapp-zaudio/zaudio.vue +++ b/components/uniapp-zaudio/zaudio.vue @@ -7,9 +7,9 @@ @@ -41,9 +41,9 @@ @@ -69,9 +69,9 @@ @@ -145,7 +145,7 @@ }, themeColor: { type: String, - default: '#42b983' + default: '#2671E2' }, duration: { type: String, @@ -366,10 +366,9 @@ } .play { - width: 48rpx; - height: 48rpx; + width: 44rpx; + height: 44rpx; z-index: 99; - background: rgba(0, 0, 0, 0.4); border-radius: 50%; position: absolute; top: 50%; diff --git a/pages.json b/pages.json index 176b6a7..e4f41f6 100644 --- a/pages.json +++ b/pages.json @@ -50,6 +50,7 @@ "style": { "navigationBarTitleText": "我的", "navigationBarBackgroundColor": "#F8F8F8", + "navigationStyle":"custom", "navigationBarTextStyle": "black" } } diff --git a/pages/center/consumer/consumerDetail.vue b/pages/center/consumer/consumerDetail.vue index 0359bb7..5ea59d6 100644 --- a/pages/center/consumer/consumerDetail.vue +++ b/pages/center/consumer/consumerDetail.vue @@ -4,13 +4,13 @@ - - A - B - C - D {{customerInfo.name || '--'}} + + A + B + C + D {{ customerInfo.clientStageName }} @@ -28,26 +28,32 @@ {{customerInfo.phone | phoneText}} + + 顾问姓名：{{customerInfo.agentName}} + 客户标签： 暂无 {{che.name}} - + 添加时间：{{customerInfo.createTime}} - {{customerInfo.visitRecord || '--'}}次到访 + 到访{{customerInfo.visitRecord || '--'}}次 + + {{customerInfo.mm || '0'}}min/{{customerInfo.fraction || '0'}}% + + + @@ -89,7 +95,7 @@ {{item.agentName || '--'}} 代接待 - @@ -97,12 +103,11 @@ - 客户：{{item.name || ''}} | - {{item.visitRecord || '--'}}次到访 + 客户：{{item.name || ''}} | + {{item.visitRecord==1?'首':item.visitRecord || '--'}}次到访 {{item.fraction || '0'}}% - {{item.createTime}} | {{item.mm || '--'}}min @@ -142,29 +147,26 @@ 执行总览 - {{customerInfo.visitRecord || '--'}}次 - 接待次数 + {{customerInfo.visitRecord || '--'}}次 + 接待次数 - - {{customerInfo.fraction}}% + + {{customerInfo.fraction}}% - 销讲执行率 + 销讲执行率 - {{customerInfo.mm}}min - 接待时长 + {{customerInfo.mm}}min + 接待时长 - - 指标 - 执行率 - + + 指标 + 执行率 - @@ -194,7 +196,7 @@ {{subitem.name}} 已执行 - 未执行 {{ subitem.selected }} + 未执行 话术内容 - {{inc+1}}.{{che.name}} + {{inc+1}}、{{che.name}} @@ -214,7 +216,6 @@ - @@ -624,21 +625,17 @@ .Level-box { padding-bottom: 2rpx; - + border-bottom: 1rpx solid #E0E0E0; .hhhbox { width: 100%; - padding-left: 30rpx; - padding-right: 30rpx; - border-bottom: 1rpx solid #E0E0E0; - background: #FFFFFF; - - // padding-bottom: 32rpx; + padding: 0 30rpx; + background: #f8f8f8; .hsnrtest { - height: 24rpx; + height: 36rpx; font-size: 24rpx; font-weight: 400; color: #666666; - line-height: 24rpx; + line-height: 36rpx; } .Level3che { @@ -647,7 +644,7 @@ display: flex; line-height: 28rpx; align-items: center; - margin-top: 30rpx; + margin-top: 24rpx; .title1 { flex: 1; @@ -681,7 +678,7 @@ flex: 2; font-size: 28rpx; color: #333333; - font-weight: 400; + font-weight: 500; } .leve1-jindu { @@ -691,25 +688,25 @@ align-items: center; .zhixing { - width: 108rpx; - height: 44rpx; + width: 116rpx; + height: 48rpx; + line-height: 48rpx; background: #2671E2; border-radius: 4rpx; font-size: 28rpx; text-align: center; - line-height: 44rpx; color: #FFFFFF; } .zhixing2 { - width: 108rpx; - height: 44rpx; - background: #F8F8F8; + width: 116rpx; + height: 48rpx; + line-height: 48rpx; border-radius: 4rpx; font-size: 28rpx; text-align: center; - line-height: 44rpx; - color: #999999; + color: #FFFFFF; + background: #D8D8D8; } } @@ -728,13 +725,12 @@ .Level1che { width: 100%; - height: 94rpx; - background: #F5F5F5; + height: 98rpx; + background: #fff; display: flex; - line-height: 94rpx; + line-height: 98rpx; align-items: center; - padding-left: 30rpx; - padding-right: 30rpx; + padding:0 30rpx; .title1 { flex: 2; @@ -749,14 +745,13 @@ .jindutiao { width: 96%; height: 28rpx; - background: #D5EEE2; line-height: 28rpx; border-radius: 14rpx; position: relative; - + background: rgba(7, 183, 157, 0.2); .huanxing { height: 100%; - background: #4FC78F; + background: #07B79D; border-radius: 14rpx; } @@ -784,51 +779,64 @@ } } } - - - - .cccccc { - text-align: center; - height: 140rpx; - line-height: 140rpx; - font-size: 30rpx; - } - .ratecenter { background-color: #FFFFFF; padding-bottom: 30rpx; width: 100%; - .ratetetle { - padding: 30rpx; + height: 42rpx; font-size: 30rpx; - font-weight: 400; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; color: #333333; - padding-bottom: 6rpx; + line-height: 42rpx; + padding: 24rpx 30rpx; } - .rateyuanbox { width: 100%; height: 210rpx; padding-bottom: 30rpx; - border-bottom: 1rpx solid #E0E0E0; display: flex; padding-left: 80rpx; padding-right: 80rpx; - .rateyuanboxzuo { width: 30%; height: 100%; } - .rateyuanboxyou { width: 40%; height: 100%; } - .boxzuoview { width: 100%; height: 140rpx; + line-height: 140rpx; + text-align: center; + } + .ratetetle-desc{ + color: #666; + font-size:30rpx; + font-weight: 400; + text-align: center; + } + } + .middle-title{ + height: 78rpx; + line-height: 78rpx; + display: flex; + // justify-content: space-around; + align-items: center; + background: #F4F8FD; + font-size: 30rpx; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #333333; + .item-title1 { + width: 450rpx; + padding-left: 30rpx; + } + .item-title { + flex: 1; } } } @@ -850,14 +858,14 @@ flex: 1; height: 100%; text-align: center; - line-height: 92rpx; + line-height: 88rpx; color: #666666; - font-size: 28rpx; + font-size: 30rpx; display: flex; justify-content: center; - + box-shadow: 0px 1rpx 0px 0px #E0E0E0; .activecllasscet { - border-bottom: 2px solid #2671E2; + border-bottom: 6rpx solid #2671E2; color: #2671E2; font-weight: 600; } @@ -894,39 +902,47 @@ justify-content: space-between; .img { - flex-shrink: 0; - width: 52rpx; - height: 52rpx; - border: 1px solid #E0E0E0; - border-radius: 50%; + width: 48rpx; + height: 48rpx; + line-height: 48rpx; text-align: center; - line-height: 50rpx; - margin-right: 20rpx; + margin-left: 16rpx; + background: #E6625B; + border-radius: 6rpx; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #FFFFFF; } .test { - flex-grow: 1; + height: 42rpx; + font-size: 30rpx; + font-family: PingFangSC-Medium, PingFang SC; font-weight: 500; color: #333333; + line-height: 42rpx; + margin-right: 16rpx; display: flex; - align-items: center; - - .clientStageName { - margin-left: 20rpx; - padding: 5rpx 20rpx; - border: 1px solid #F29819; - border-radius: 32rpx 32rpx 32rpx 0; - color: #F29819; - font-size: 20rpx; - } + } + .clientStageName { + margin-left: 16rpx; + padding: 0 16rpx; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #FF981E; + height: 48rpx; + line-height: 48rpx; + background: #FFFFFF; + border-radius: 4rpx; + border: 1rpx solid #FF981E; } .edit { flex-shrink: 0; height: 40rpx; width: 40rpx; - margin-left: 30rpx; - image { width: 100%; height: 100%; @@ -964,57 +980,56 @@ display: flex; font-size: 30rpx; font-weight: 400; - color: #666666; - line-height: 46rpx; + color: #333; + line-height: 42rpx; .content-sec-lab1 { color: #333333; } .content-sec-tips { - max-width: 120rpx; - height: 46rpx; - background: #F2F2F2; - border-radius: 6rpx; + max-width: 175rpx; text-align: center; - line-height: 26rpx; + line-height: 48rpx; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; font-size: 26rpx; font-weight: 400; - color: #333333; - margin-right: 20rpx; + color: #2671E2; + margin-right: 12rpx; box-sizing: border-box; - padding: 10rpx 24rpx; + padding: 0 20rpx; + height: 48rpx; + background: #F4F8FD; + border-radius: 6rpx; } } .content-sec-num { position: absolute; - width: 200rpx; - height: 90rpx; + width: 196rpx; + height: 112rpx; background: #F4F8FD; - border-radius: 12rpx; - font-weight: 400; - color: #2671E2; - line-height: 45rpx; - bottom: 15rpx; + border-radius: 8rpx; + top: 28rpx; right: 30rpx; + padding: 16rpx 20rpx; + color: #2671E2; + line-height: 40rpx; text-align: center; } } .content-last { padding: 30rpx; - height: 168rpx; - + margin-top: 28rpx; .content-last-con { width: 690rpx; - height: 108rpx; + min-height: 112rpx; background: #F8F8F8; border-radius: 8rpx; - padding: 14rpx 20rpx; + padding: 16rpx 20rpx; font-size: 28rpx; font-weight: 400; color: #333333; @@ -1108,35 +1123,36 @@ .cus { font-size: 30rpx; font-weight: 400; - color: #666666; - line-height: 30rpx; + color: #333; + line-height: 42rpx; } .arriveNum { font-size: 30rpx; font-weight: 400; - line-height: 30rpx; margin-left: 10rpx; + color: #2671E2; } } .right { - width: 192rpx; - height: 46rpx; + height: 56rpx; background: #F4F8FD; border-radius: 6rpx; text-align: center; - line-height: 46rpx; + line-height: 56rpx; font-weight: 400; color: #2671E2; + font-size: 28rpx; + padding: 0 20rpx; } } .content-last { - margin: 30rpx 0; + margin: 28rpx 0; font-size: 30rpx; font-weight: 400; - color: #666666; + color: #333; line-height: 30rpx; } @@ -1161,7 +1177,6 @@ display: flex; justify-content: space-between; - // height: 75rpx; .tab2-first-left { display: flex; align-items: center; @@ -1183,9 +1198,9 @@ } .clientStageName { - margin-left: 20rpx; + margin-right: 20rpx; padding: 5rpx 20rpx; - border: 1px solid #F29819; + border: 1rpx solid #F29819; border-radius: 32rpx 32rpx 32rpx 0; color: #F29819; font-size: 20rpx; @@ -1292,23 +1307,18 @@ .A { - color: #FFF; - background: #19AC09; - border: 1px solid #19AC09 !important; - } - .B { - color: #FFF; - background: #F29819; - border: 1px solid #F29819 !important; - } - .C { - color: #FFF; - background: #F2D01A; - border: 1px solid #F2D01A !important; - } - .D { - color: #FFF; - background: #1396F6; - border: 1px solid #1396F6 !important; - } + background: #E6625B; + } + + .B { + background: #F29819; + } + + .C { + background: #19AC09; + } + + .D { + background: #1396F6; + } diff --git a/pages/center/consumer/index.vue b/pages/center/consumer/index.vue index d0d856a..31e7b9a 100644 --- a/pages/center/consumer/index.vue +++ b/pages/center/consumer/index.vue @@ -630,7 +630,7 @@ color: #333333; } .content-sec-tips{ - max-width:160rpx ; + max-width:160rpx; height: 46rpx; background: #F2F2F2; border-radius: 6rpx; diff --git a/pages/index/consumer/index.vue b/pages/index/consumer/index.vue index 5981efe..16b3a79 100644 --- a/pages/index/consumer/index.vue +++ b/pages/index/consumer/index.vue @@ -8,6 +8,7 @@ 输入客户姓名/手机号 + @@ -46,18 +47,17 @@ 暂无数据 - + {{item.name}} - {{item.name}} {{ item.clientStageName }} - {{item.fraction || '0'}}% @@ -80,21 +80,26 @@ - 添加时间：{{item.createTime | formatTime}} - {{item.visitRecord || '--'}}次到访 | {{item.mm || '0'}}min + 到访{{item.visitRecord || '--'}}次 + + {{item.mm || '0'}}min/{{item.fraction || '0'}}% + - @@ -440,6 +445,9 @@ } }, methods: { + filterFun(){ + + }, // 过滤 resetFilter() { this.sortFilter = '排序'; @@ -797,9 +805,8 @@ top: var(--window-top); z-index: 999; width: 100; - height: 92rpx; + height: 72rpx; background: #FFFFFF; - border: 1px solid #E0E0E0; flex-shrink: 0; display: flex; align-items: center; @@ -808,7 +815,7 @@ flex: 1; height: 100%; text-align: center; - line-height: 92rpx; + line-height: 72rpx; color: #666666; font-size: 28rpx; overflow: hidden; @@ -842,9 +849,14 @@ display: flex; align-items: center; justify-content: center; + .filter{ + width: 40rpx; + height: 40rpx; + margin-left: 30rpx; + } .search { - width: 94%; + width: 620rpx; height: 70rpx; display: flex; align-items: center; @@ -887,14 +899,19 @@ .count { width: 100%; - height: 90rpx; + height: 82rpx; + line-height: 82rpx; display: flex; align-items: center; justify-content: center; - background-color: #FBE4E4; + background-color: #f8f8f8; + font-size: 30rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #333333; text { - color: #F71616; + color: #E7483C; } } @@ -902,8 +919,7 @@ .content { .content-tips { background: #fff; - margin-top: 20rpx; - + margin-bottom: 20rpx; .content-first { padding: 19rpx 30rpx; display: flex; @@ -919,54 +935,58 @@ align-items: center; .img { - width: 52rpx; - height: 52rpx; - border: 1px solid #E0E0E0; - border-radius: 50%; - margin-right: 20rpx; - display: flex; - align-items: center; - justify-content: center; + width: 48rpx; + height: 48rpx; + line-height: 48rpx; + text-align: center; + margin-right: 16rpx; + background: #E6625B; + border-radius: 6rpx; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #FFFFFF; } .clientStageName { - margin-left: 20rpx; - padding: 5rpx 20rpx; - border: 1px solid #F29819; - border-radius: 32rpx 32rpx 32rpx 0; - color: #F29819; - font-size: 20rpx; + margin-right: 20rpx; + padding: 0 16rpx; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #FF981E; + height: 48rpx; + line-height: 48rpx; + background: #FFFFFF; + border-radius: 4rpx; + border: 1rpx solid #FF981E; } - // '#19AC09', '#F29819', '#F2D01A', '#1396F6', .A { - color: #FFF; - background: #19AC09; - border: 1px solid #19AC09; + background: #E6625B; } .B { - color: #FFF; background: #F29819; - border: 1px solid #F29819; } .C { - color: #FFF; - background: #F2D01A; - border: 1px solid #F2D01A; + background: #19AC09; } .D { - color: #FFF; background: #1396F6; - border: 1px solid #1396F6; } .test { + height: 42rpx; + font-size: 30rpx; + font-family: PingFangSC-Medium, PingFang SC; font-weight: 500; color: #333333; + line-height: 42rpx; + margin-right: 16rpx; } } @@ -991,45 +1011,48 @@ position: relative; .content-sec-lab { - margin-top: 30rpx; + margin-top: 28rpx; display: flex; font-size: 30rpx; font-weight: 400; - color: #666666; - line-height: 46rpx; + color: #333; + line-height: 42rpx; .content-sec-lab1 { color: #333333; } .content-sec-tips { - max-width: 160rpx; - height: 46rpx; - background: #F2F2F2; + padding: 0 20rpx; + height: 48rpx; + background: #F4F8FD; border-radius: 6rpx; + max-width: 160rpx; text-align: center; - line-height: 26rpx; + line-height: 48rpx; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - font-size: 26rpx; font-weight: 400; - color: #333333; - margin-right: 20rpx; + margin-right: 12rpx; box-sizing: border-box; - padding: 10rpx 24rpx; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + color: #2671E2; } } .content-sec-num { position: absolute; - bottom: 25rpx; + width: 196rpx; + height: 112rpx; + border-radius: 8rpx; + top: 28rpx; right: 30rpx; - padding: 3rpx 12rpx; + padding: 16rpx 20rpx; background: #F4F8FD; - border-radius: 6rpx; color: #2671E2; - line-height: 45rpx; + line-height: 40rpx; text-align: center; } } @@ -1039,19 +1062,26 @@ display: flex; justify-content: flex-end; align-items: center; - border-top: 1px solid #E0E0E0; .content-last-tab { - margin-right: 30rpx; - width: 156rpx; - height: 60rpx; + width: 214rpx; + height: 70rpx; + background: #FFFFFF; + border-radius: 8rpx; + border: 1rpx solid #2671E2; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #2671E2; font-size: 30rpx; - color: #333333; - border-radius: 30rpx; - border: 1px solid #999999; + margin-right: 30rpx; display: flex; align-items: center; justify-content: center; + image{ + width: 40rpx; + height: 40rpx; + margin-right: 12rpx; + } } } diff --git a/pages/index/customer.vue b/pages/index/customer.vue index 8fc83db..2820956 100644 --- a/pages/index/customer.vue +++ b/pages/index/customer.vue @@ -152,7 +152,7 @@ - diff --git a/pages/index/index.vue b/pages/index/index.vue index 8edde70..940cdae 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -113,7 +113,9 @@ - {{realtimeobj.fraction || 0}}% + {{realtimeobj.fraction || 0}}% + + 平均执行率 @@ -164,7 +166,9 @@ - {{Thisweekobj.fraction || 0}}% + {{Thisweekobj.fraction || 0}}% + + 平均执行率 @@ -985,7 +989,7 @@ width: 100%; background: #FFFFFF; height: 154rpx; - box-shadow: 0px 0px 12px 0px rgba(224, 224, 224, 0.3); + box-shadow: 0px 0px 12rpx 0px rgba(224, 224, 224, 0.3); border-radius: 12rpx; display: flex; @@ -1129,6 +1133,11 @@ font-weight: bold; color: #333333; line-height: 50rpx; + .qushi-icon{ + width: 28rpx; + height: 14rpx; + margin-left: 2rpx; + } } .realtext { diff --git a/pages/index/personal.vue b/pages/index/personal.vue index 1aeadcd..d7cb9ea 100644 --- a/pages/index/personal.vue +++ b/pages/index/personal.vue @@ -1,6 +1,6 @@