From aaaed1f83c55678bc205fcb803618e915d5b5c66 Mon Sep 17 00:00:00 2001 From: chen Date: Sat, 19 Sep 2026 12:13:40 +0800 Subject: [PATCH] =?UTF-8?q?style(commission):=20=E5=B0=86=E6=94=B6?= =?UTF-8?q?=E7=9B=8A=E4=B8=AD=E5=BF=83=E4=BF=9D=E6=B4=BB=E7=BB=AD=E6=9C=9F?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=96=87=E6=A1=88=E7=94=B1=E5=8E=BB=E8=87=AA?= =?UTF-8?q?=E8=B4=AD=E7=BB=AD=E6=9C=9F=E4=BF=AE=E6=94=B9=E4=B8=BA=E8=87=AA?= =?UTF-8?q?=E8=B4=AD=E6=88=96=E5=88=86=E4=BA=AB=E7=BB=AD=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/verify_active_countdown_spec.js | 5 +++-- uniapp/pages/commission/index.vue | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/verify_active_countdown_spec.js b/tests/verify_active_countdown_spec.js index 595bb0a..9121c03 100644 --- a/tests/verify_active_countdown_spec.js +++ b/tests/verify_active_countdown_spec.js @@ -95,7 +95,7 @@ function calculateActiveState(agent, user, nowSec) { status: 'active', title: '30天收益资格生效中', badge: '正常活跃', - btnText: '去自购续期' + btnText: '自购或分享续期' }; } @@ -115,7 +115,7 @@ function calculateCountdown(expireTime, nowSec) { } // 3. 正常场景:自购在第 2 天(剩余 28 天) -> 正常活跃 -it('正常场景:剩余28天 -> 状态为 active 且倒计时天数格式为 28', () => { +it('正常场景:剩余28天 -> 状态为 active 且倒计时天数格式为 28,按钮为自购或分享续期', () => { const now = 1700000000; const expire = now + 28 * 86400 + 3600 * 5 + 60 * 12 + 30; // 28天5小时12分30秒 const state = calculateActiveState({ expire_time: expire, last_self_order_time: now - 2 * 86400 }, {}, now); @@ -123,6 +123,7 @@ it('正常场景:剩余28天 -> 状态为 active 且倒计时天数格式为 2 assert.strictEqual(state.status, 'active'); assert.strictEqual(state.badge, '正常活跃'); + assert.strictEqual(state.btnText, '自购或分享续期'); assert.strictEqual(cd.days, '28'); assert.strictEqual(cd.hours, '05'); assert.strictEqual(cd.minutes, '12'); diff --git a/uniapp/pages/commission/index.vue b/uniapp/pages/commission/index.vue index 96e1764..dc23c28 100644 --- a/uniapp/pages/commission/index.vue +++ b/uniapp/pages/commission/index.vue @@ -184,7 +184,7 @@ status: 'active', title: '30天收益资格生效中', badge: '正常活跃', - btnText: '去自购续期', + btnText: '自购或分享续期', tip: '已满足30日保活(自购/直推有效),享有全部团队分红与奖项', lastOrderText: lastTime > 0 ? `上次有效订单: ${dayjs(lastTime * 1000).format('MM-DD HH:mm')}` : '', }; @@ -414,6 +414,8 @@ border-radius: 26rpx; font-size: 22rpx; font-weight: 500; + white-space: nowrap; + flex-shrink: 0; } }