huangyicao/banban
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(ui): align binding headers and unify handoff buttons

Browse Source
This commit is contained in:
stu2not
2026-09-23 20:47:20 +08:00
parent 3fd750989f
commit a9769fb9c6
11 changed files with 394 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
banban-mini/src/pages/bind/index.scss
+7 -16
View File
@@ -1,3 +1,5 @@
@import '../../styles/binding-controls';
.bind-page {
min-height: 100%;
background: #F5F7FA;
@@ -28,12 +30,13 @@
.bind-header {
padding: 80px 32px 32px;
position: relative;
box-sizing: border-box;
text-align: center;
.back-btn {
position: absolute;
left: 32px;
top: 80px;
position: static;
flex-shrink: 0;
box-sizing: border-box;
display: flex;
align-items: center;
padding: 12px 18px;
@@ -53,14 +56,6 @@
color: #1A1A1A;
font-weight: 500;
}
.title {
font-size: 44px;
font-weight: 700;
color: #1A1A1A;
display: block;
padding: 0 120px;
}
}
.scan-area {
@@ -411,11 +406,7 @@
.bind-countdown-label { margin-top: 12px; font-size: 22px; color: #aa8154; }
.bind-instruction { padding: 28px; border: 2px solid #d2b48c; border-radius: 46px; background: #fffdf7; }
.bind-instruction-title { font-size: 34px; font-weight: 600; color: #895731; }
.bind-result-button { min-height: 92px; margin-top: 28px; border-radius: 46px; display: flex; align-items: center; justify-content: center; font-size: 30px; font-weight: 600; box-sizing: border-box; }
.bind-result-button::after { display: none; }
.bind-result-button.primary { background: linear-gradient(#ffce8d, #efa05a); border: 2px solid #cf935a; color: #895731; }
.bind-result-button.secondary { background: #fffdf7; border: 2px solid #cf935a; color: #ad8054; }
.bind-result-button.waiting { background: linear-gradient(#eeede9, #c9c7c1); border: 2px solid #aaa69c; color: #777168; }
.bind-result-button { @include binding-action-button; }
.bind-device-summary { margin-top: 32px; padding: 12px 28px; border: 2px solid #d2b48c; border-radius: 28px; background: #fffdf7; text-align: left; }
.bind-device-row { display: flex; align-items: center; justify-content: space-between; padding: 20px 0; color: #a68d74; font-size: 26px; }
.bind-device-row + .bind-device-row { border-top: 1px solid #eee3d5; }
banban-mini/src/pages/traffic-binding/index.scss
+3 -1
View File
@@ -1,7 +1,9 @@
@import '../../styles/binding-controls';
.traffic-binding-page {
min-height: 100vh; box-sizing: border-box; padding: 72rpx 40rpx;
.title { display: block; font-size: 38rpx; font-weight: bold; margin-bottom: 30rpx; }
.description { display: block; font-size: 28rpx; line-height: 1.7; margin-bottom: 30rpx; }
.error { display: block; color: #a52a2a; margin-bottom: 24rpx; }
button { margin-top: 24rpx; }
.traffic-action { @include binding-action-button; }
}
banban-mini/src/pages/traffic-binding/index.tsx
+2 -2
View File
@@ -75,7 +75,7 @@ export default function TrafficBindingPage() {
{operation?.last_error === 'TRAFFIC_UNBIND_REQUIRED' && <Text className='description'>原流量绑定仍有效，请继续前往流量管理小程序解绑。</Text>}
{operation?.status === 'partial_failed' && <Text className='description'>上次流量操作未完成，可以继续重试。</Text>}
{error && <Text className='error'>{error}</Text>}
{!completed && <Button disabled={busy} onClick={proceed}>{busy ? '处理中…' : finalUnbind ? '完成伴伴解绑' : '继续处理'}</Button>}
<Button disabled={busy} onClick={() => Taro.switchTab({ url: '/pages/sleep/index' })}>{completed ? '返回管理' : '稍后处理'}</Button>
{!completed && <Button className='traffic-action primary' disabled={busy} onClick={proceed}>{busy ? '处理中…' : finalUnbind ? '完成伴伴解绑' : '继续处理'}</Button>}
<Button className='traffic-action secondary' disabled={busy} onClick={() => Taro.switchTab({ url: '/pages/sleep/index' })}>{completed ? '返回管理' : '稍后处理'}</Button>
</View>
}
banban-mini/src/styles/_binding-controls.scss
+37
View File
@@ -0,0 +1,37 @@
@mixin binding-action-button {
width: 100%;
min-height: 92px;
margin-top: 28px;
padding: 18px 28px;
border-radius: 46px;
display: flex;
align-items: center;
justify-content: center;
font-family: var(--bb-body-font);
font-size: 30px;
font-weight: 600;
line-height: 1.5;
box-sizing: border-box;
&::after { display: none; }
&.primary {
background: linear-gradient(#ffce8d, #efa05a);
border: 2px solid #cf935a;
color: #895731;
}
&.secondary {
background: #fffdf7;
border: 2px solid #cf935a;
color: #ad8054;
}
&.waiting {
background: linear-gradient(#eeede9, #c9c7c1);
border: 2px solid #aaa69c;
color: #777168;
}
&[disabled] { opacity: 0.55; }
}
banban-mini/src/styles/ui-theme.scss
+17 -7
View File
@@ -63,7 +63,6 @@ textarea {
text-align: center;
}
.bind-header .title,
.login-header .title {
color: var(--bb-brown) !important;
font-family: 'MuyaoSoftbrush', -apple-system, BlinkMacSystemFont, 'PingFang SC', sans-serif;
@@ -108,11 +107,22 @@ textarea {
}
.bind-header .title {
font-size: 38px !important;
color: #895731 !important;
font-family: var(--bb-body-font);
font-size: 36px !important;
font-weight: 400;
line-height: 1.4;
letter-spacing: 0;
min-height: 76px;
box-sizing: border-box;
display: flex;
align-items: center;
justify-content: center;
padding: 10px 64px !important;
border: 2px solid var(--bb-border);
border-radius: 46% 54% 52% 48%;
background: rgba(255, 253, 247, 0.95);
border: 2px solid rgba(237, 201, 148, 0.72);
border-radius: 18px;
background: rgba(255, 253, 247, 0.96);
box-shadow: 0 5px 0 rgba(237, 201, 148, 0.22);
}
.bind-header .back-btn,
@@ -765,9 +775,9 @@ page { background-image: url('../assets/ui/page-pattern.png') !important; backgr
.feature-item .feature-icon-image { width: 72px; height: 64px; padding: 6px; background: transparent; margin-bottom: 12px; }
.feature-item .feature-text { font-size: 22px; text-align: center; }
.login-btn-wrapper .login-btn { border-radius: 48px !important; background: linear-gradient(#e4f598, #bad83b) !important; border-color: #97ad3b !important; }
.bind-header { display: flex; align-items: center; gap: 12px; padding: 22px 24px 32px !important; }
.bind-header { display: flex; align-items: center; gap: 12px; padding: 22px 48px 32px !important; }
.bind-header .back-btn { position: static; flex-shrink: 0; padding: 10px 14px; }
.bind-header .title { flex: 1; min-width: 0; margin: 0; padding: 12px !important; font-size: 32px !important; }
.bind-header .title { flex: 1; min-width: 0; margin: 0; padding: 12px !important; }
.status-card { margin-top: 16px; min-height: 340px; padding: 32px !important; }
.status-card .status-badge { margin-bottom: 24px; }
.status-card .battery-section { max-width: 58%; }