diff --git a/api/user.js b/api/user.js index 9e27b00..ecb9bd7 100644 --- a/api/user.js +++ b/api/user.js @@ -12,6 +12,9 @@ export const updateUserReq = data => put('/system/user/self', data) export const countUserIncomeReq = () => get('/system/user/countUserIncome') +// 药审核待审计数(药动销 / 跑店巡店 / 驻店填报 / 跑店填报 / 药分享 汇总) +export const auditPendingCountReq = () => get('/yxe/yxe-audit/pending-count') + export const userInfoUpdateReq = data => post('/system/user/update', data) export const userInfoUpdateDataReq = data => post('/system/user/update-data', data) diff --git a/packageUser/self-report/select.vue b/packageUser/self-report/select.vue index 3fef2da..8f16801 100644 --- a/packageUser/self-report/select.vue +++ b/packageUser/self-report/select.vue @@ -25,7 +25,10 @@ :class="['type-card', form.type === item.value ? 'type-card-active' : '']" @tap="form.type = item.value" > - + + + {{ item.title }} {{ item.desc }} @@ -217,10 +220,35 @@ export default { background: #f1fbf8; } -.type-icon { - width: 108rpx; - height: 96rpx; +/* 图标本身是纯白图形 + 透明底,直接放浅色卡片上会看不见, + 所以垫一层彩色圆角底块反衬;选中后加深,兼作选中态提示。 + 底色取偏深的绿,保证白色图形有足够对比度。 */ +.type-icon-wrap { flex-shrink: 0; + width: 112rpx; + height: 100rpx; + border-radius: 24rpx; + background: linear-gradient(135deg, #2fc6a7, #1aa88c); + display: flex; + align-items: center; + justify-content: center; +} + +.type-icon-wrap-active { + background: linear-gradient(135deg, #16a085, #0e7a66); + box-shadow: 0 8rpx 20rpx rgba(47, 198, 167, 0.32); +} + +.type-icon { + width: 62rpx; + height: 62rpx; +} + +/* 两张图源的内容占比差得多(visit 约占画布 88%×88%,store 只占 75%×50%), + 同尺寸渲染会让驻店图标明显偏小,这里按可见图形补正。 */ +.type-icon-store { + width: 92rpx; + height: 92rpx; } .type-body { diff --git a/pages/index/index.vue b/pages/index/index.vue index c3cd2c9..2cf9097 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -29,12 +29,22 @@ - - 自主填报 + + + + + 自主填报 + 便捷填报,快速提交 + - - 填报记录 + + + + + 填报记录 + 历史记录,随时查看 + @@ -43,15 +53,17 @@ - - - + + + + + {{ tab }} {{ pendingCount }} @@ -736,9 +748,29 @@ export default { line-height: 1; } +/* tab 图标是纯白图形 + 透明底,而 tab 底图接近纯白, + 未激活时白图标贴白底看不清,所以垫一层浅绿圆底反衬。 + 激活态下 .tab-main 自己已填 #2fc6a7,两层绿会透出一圈色差边, + 所以激活时改成完全透明,白图标直接坐在药丸底上。 */ +.tab-icon-wrap { + flex-shrink: 0; + width: 34rpx; + height: 34rpx; + border-radius: 999rpx; + background: #2fc6a7; + display: flex; + align-items: center; + justify-content: center; +} + +.tab.active .tab-icon-wrap { + background: none; + box-shadow: none; +} + .tab-icon { - width: 28rpx; - height: 28rpx; + width: 24rpx; + height: 24rpx; } .tab.active .tab-main { @@ -845,23 +877,56 @@ export default { .entry-btn { flex: 1; - min-height: 76rpx; - border-radius: 20rpx; - border: 1rpx solid #f2a75e; - background: #fff4de; - color: #d9661f; + min-width: 0; + box-sizing: border-box; + padding: 22rpx 20rpx; + border-radius: 24rpx; + border: 1rpx solid #f6dcb4; + background: #fff5e2; + color: #e0631a; display: flex; align-items: center; - justify-content: center; - gap: 10rpx; - font-size: 26rpx; - font-weight: 700; + gap: 14rpx; } .entry-btn.primary { - background: linear-gradient(to right, #f97316, #ef4444); + background: linear-gradient(135deg, #f9863c, #f2620f); border-color: transparent; color: #ffffff; + box-shadow: 0 8rpx 20rpx rgba(242, 98, 15, 0.25); +} + +.entry-icon { + flex-shrink: 0; + width: 72rpx; + height: 72rpx; + border-radius: 20rpx; + background: #ffffff; + display: flex; + align-items: center; + justify-content: center; +} + +.entry-text { + flex: 1; + min-width: 0; + display: flex; + flex-direction: column; + gap: 6rpx; +} + +.entry-title { + font-size: 32rpx; + font-weight: 700; + line-height: 1.2; + white-space: nowrap; +} + +.entry-desc { + font-size: 20rpx; + line-height: 1.2; + opacity: 0.72; + white-space: nowrap; } .category-wrap { diff --git a/pages/mine/index.vue b/pages/mine/index.vue index c181e75..4dea3f6 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -46,11 +46,20 @@ - - {{ pointSummary.currentPoints }} - 积分 + + + + + + {{ pointSummary.currentPoints }} + 积分 + + 我的积分 + + + 积分明细 + - 我的积分 @@ -81,17 +90,36 @@ - 自主填报 + + + + + 自主填报 + 及时上报、真实记录 + - 客户拜访 + + + + + 客户拜访 + 拜访记录、有效跟进 + - - 药审核 + + + + + 药审核 + 待审核任务 + + + {{ auditPendingCount }} + + @@ -254,7 +282,7 @@