feat: ui update

This commit is contained in:
2026-09-15 16:01:59 +08:00
parent 1a11816839
commit 26c392d612
89 changed files with 10377 additions and 4861 deletions
+6
View File
@@ -3,6 +3,7 @@ import { QuotaItem, UserInfo, GoodsItem, QuotaFlowItem, PagedResult, VirtualPayR
import { QUOTA_NAMES, GoodsType, GOODS_TYPE_NAMES } from '../../utils/config'
import { fenToYuan, formatDate, formatDateTime } from '../../utils/format'
import { normalizePaged } from '../../utils/paged'
import { navScroll } from '../../utils/nav'
import { logger } from '../../utils/logger'
// 日志模块名
@@ -55,8 +56,13 @@ Page({
orderGoods: null as GoodsItem | null,
submitting: false, // 下单防连点:连点「立即支付」会重复创建虚拟支付订单
loading: true,
// 滚动收缩:由 utils/nav.ts 的共享 handler 驱动
navScrolled: false,
},
// scroll-view 滚动 → 导航收缩为玻璃小标题
onNavScroll: navScroll,
onLoad(query: Record<string, string>) {
logger.debug(LOG, 'onLoad, query=', JSON.stringify(query))
if (query.tab === 'flow') this.setData({ view: 'flow' })
+92 -64
View File
@@ -1,95 +1,123 @@
<view class="page mall-page">
<navigation-bar title="额度与会员" />
<view class="page page-flex">
<navigation-bar title="额度与会员" scrolled="{{navScrolled}}" />
<!-- 商城视图 -->
<scroll-view wx:if="{{view === 'mall'}}" scroll-y class="scroll-body">
<!-- 会员卡 -->
<view class="card member-card">
<view class="member-left">
<view class="icon icon-crown member-icon"></view>
<view>
<view class="member-name">{{isVip ? '月度会员' : '开通会员'}}</view>
<view class="member-desc">{{isVip ? vipExpireText : '开通会员,解锁更多 AI 与上传权益'}}</view>
</view>
</view>
<view class="member-btn" bindtap="onTapMember">{{isVip ? '立即续费' : '立即开通'}}</view>
<scroll-view wx:if="{{view === 'mall'}}" scroll-y class="scroll-body pb-safe" bindscroll="onNavScroll">
<view class="head">
<view class="eyebrow">Membership</view>
<view class="display">额度与会员</view>
</view>
<!-- 额度网格 -->
<view class="quota-grid">
<view class="quota-cell" wx:for="{{quotas}}" wx:key="quota_type">
<view class="quota-name">{{item._name}}</view>
<view class="quota-num">{{item.remain}}<text class="quota-total">/ {{item.total}}</text></view>
<view class="quota-bar">
<view class="quota-fill {{item._percent >= 80 ? 'warn' : ''}}" style="width: {{item._percent}}%"></view>
<!-- 会员卡:全稿唯一深色块 -->
<view class="ml-member">
<view class="ml-member-l">
<view class="icon icon-crown"></view>
<view class="ml-member-body">
<view class="ml-member-n">{{isVip ? '月度会员' : '开通会员'}}</view>
<view class="ml-member-d">{{isVip ? vipExpireText : '开通会员,解锁更多 AI 与上传权益'}}</view>
</view>
</view>
<view class="ml-member-b" bindtap="onTapMember">{{isVip ? '立即续费' : '立即开通'}}</view>
</view>
<!-- 我的额度:四栏发丝线数字条 -->
<view class="grp-hd ml-grp"><text class="gh-cn">我的额度</text><text class="gh-en">Quota</text></view>
<view class="stats">
<view class="stat" wx:for="{{quotas}}" wx:key="quota_type">
<view class="stat-n num">{{item.remain}}<text class="unit">/{{item.total}}</text></view>
<view class="stat-l">{{item._name}}</view>
<view class="track ml-track">
<view class="bar" style="width: {{item._percent}}%;"></view>
</view>
</view>
</view>
<!-- 额度明细入口 -->
<view class="card flow-entry" bindtap="onSwitchFlow">
<text>额度明细</text>
<view class="icon icon-chevron-right"></view>
<view class="rows ml-flow-entry">
<view class="row" bindtap="onSwitchFlow">
<view class="icon row-ic icon-doc"></view>
<text class="row-lb">额度明细</text>
<view class="icon row-ch icon-chevron-right"></view>
</view>
</view>
<!-- 商品筛选 -->
<scroll-view scroll-x class="goods-filter" show-scrollbar="{{false}}">
<view class="filter-row">
<view
wx:for="{{goodsFilters}}"
wx:key="name"
class="filter-item {{activeFilter === index ? 'active' : ''}}"
data-index="{{index}}"
bindtap="onGoodsFilter"
>{{item.name}}</view>
</view>
</scroll-view>
<view class="ml-filters">
<scroll-view scroll-x class="seg-scroll" show-scrollbar="{{false}}">
<view class="seg">
<view
wx:for="{{goodsFilters}}"
wx:key="name"
class="seg-item {{activeFilter === index ? 'is-on' : ''}}"
data-index="{{index}}"
bindtap="onGoodsFilter"
>{{item.name}}</view>
</view>
</scroll-view>
</view>
<!-- 商品列表 -->
<view class="goods-list">
<view class="goods-card card" wx:for="{{goods}}" wx:key="goods_code">
<view class="icon {{item._icon}} goods-icon"></view>
<view class="goods-info">
<view class="goods-name">{{item.goods_name}}</view>
<view class="goods-desc">{{item.description}}</view>
<!-- 商品列表:左线稿图标 / 中名称描述 / 右价格 + 黑胶囊购买 -->
<view class="rows">
<view class="row ml-goods" wx:for="{{goods}}" wx:key="goods_code">
<view class="icon row-ic {{item._icon}}"></view>
<view class="ml-goods-body">
<view class="ml-goods-n">{{item.goods_name}}</view>
<view class="ml-goods-d">{{item.description}}</view>
</view>
<view class="goods-right">
<view class="goods-price num">{{item._priceText}}</view>
<view class="goods-origin num" wx:if="{{item.price > item.discount_price}}">{{item._originText}}</view>
<view class="buy-btn" data-goods="{{item}}" bindtap="onBuy">购买</view>
<view class="ml-goods-r">
<view class="ml-price num">{{item._priceText}}</view>
<view class="ml-origin num" wx:if="{{item.price > item.discount_price}}">{{item._originText}}</view>
</view>
<view class="btn btn--ink btn--sm ml-buy" data-goods="{{item}}" bindtap="onBuy">购买</view>
</view>
</view>
<view class="footer-space"></view>
<view class="gap-64"></view>
</scroll-view>
<!-- 额度明细视图 -->
<scroll-view wx:else scroll-y class="scroll-body">
<view class="flow-head" bindtap="onSwitchMall">← 返回商城</view>
<view class="flow-list">
<view class="flow-row card" wx:for="{{flowList}}" wx:key="quota_flow_uuid">
<view class="flow-left">
<view class="flow-reason">{{item.reason || item._name}}</view>
<view class="flow-time">{{item._time}}</view>
<scroll-view wx:else scroll-y class="scroll-body pb-safe" bindscroll="onNavScroll">
<view class="head">
<view class="eyebrow">Quota Ledger</view>
<view class="display">额度明细</view>
<view class="ml-back" bindtap="onSwitchMall">← 返回商城</view>
</view>
<view class="ml-flows">
<view class="ml-flow-row" wx:for="{{flowList}}" wx:key="quota_flow_uuid">
<view class="ml-flow-l">
<view class="ml-flow-reason">{{item.reason || item._name}}</view>
<view class="ml-flow-time num">{{item._time}}</view>
</view>
<view class="flow-right">
<view class="flow-num {{item.change_num > 0 ? 'plus' : ''}}">{{item._sign}}</view>
<view class="flow-after">剩余 {{item.new_value}}</view>
<view class="ml-flow-r">
<view class="ml-flow-n num">{{item._sign}}</view>
<view class="ml-flow-after num">剩余 {{item.new_value}}</view>
</view>
</view>
</view>
<empty-state wx:if="{{!flowList.length}}" icon="icon-doc" title="暂无额度明细" />
<view class="gap-64"></view>
</scroll-view>
<!-- 订单确认弹窗 -->
<view wx:if="{{orderVisible}}" class="mask" bindtap="onCloseOrder">
<!-- 订单确认:底部玻璃抽屉 -->
<view wx:if="{{orderVisible}}" class="scrim" bindtap="onCloseOrder"></view>
<view wx:if="{{orderVisible}}" class="sheet-wrap">
<view class="sheet" catchtap="noop">
<view class="sheet-grabber"></view>
<view class="order-goods">{{orderGoods.goods_name}}</view>
<view class="order-desc">{{orderGoods.description}}</view>
<view class="order-amount">实付 <text class="order-price num">{{orderGoods._priceText}}</text></view>
<view class="btn btn-primary {{submitting ? 'disabled' : ''}}" bindtap="confirmPay">{{submitting ? '下单中…' : '立即支付'}}</view>
<view class="sheet-grab"></view>
<view class="sheet-hd">
<text class="sheet-t">{{orderGoods.goods_name}}</text>
<text class="sheet-x" bindtap="onCloseOrder">取消</text>
</view>
<view class="sheet-body">
<view class="ml-order-d">{{orderGoods.description}}</view>
<view class="ml-order-a">实付 <text class="num">{{orderGoods._priceText}}</text></view>
</view>
<view class="sheet-foot">
<view
class="btn btn--ink btn--block {{submitting ? 'is-off' : ''}}"
bindtap="confirmPay"
>{{submitting ? '下单中…' : '立即支付'}}</view>
</view>
</view>
</view>
</view>
+137 -252
View File
@@ -1,7 +1,9 @@
.mall-page {
/** 额度与会员:唯一深色会员卡 + 四栏额度条 + 商品行 **/
.page-flex {
height: 100vh;
display: flex;
flex-direction: column;
overflow: hidden;
}
.scroll-body {
@@ -9,322 +11,205 @@
height: 0;
}
/* 会员卡 */
.member-card {
margin: 24rpx;
background: #E8F2FF;
/* 会员卡(全稿唯一深色块) */
.ml-member {
margin: 40rpx var(--pad) 0;
padding: 40rpx 36rpx;
border-radius: var(--r-ctrl);
background: var(--block);
color: #fff;
display: flex;
align-items: center;
justify-content: space-between;
gap: 24rpx;
}
.member-left {
.ml-member-l {
flex: 1;
min-width: 0;
display: flex;
align-items: center;
gap: 24rpx;
}
.member-icon {
width: 72rpx;
height: 72rpx;
color: #007AFF;
margin-right: 24rpx;
}
.member-name {
font-size: 32rpx;
font-weight: 600;
color: #007AFF;
}
.member-desc {
font-size: 24rpx;
color: #8E8E93;
margin-top: 8rpx;
}
.member-btn {
height: 64rpx;
padding: 0 32rpx;
border: 1rpx solid #007AFF;
border-radius: 32rpx;
color: #007AFF;
font-size: 24rpx;
display: flex;
align-items: center;
.ml-member-l .icon {
width: 52rpx;
height: 52rpx;
flex-shrink: 0;
opacity: .9;
}
/* 额度网格 */
.quota-grid {
display: flex;
flex-wrap: wrap;
padding: 0 24rpx;
gap: 20rpx;
.ml-member-body {
min-width: 0;
}
.quota-cell {
width: calc(50% - 10rpx);
.ml-member-n {
font-family: var(--serif);
font-size: 36rpx;
font-weight: 500;
letter-spacing: -.005em;
}
.ml-member-d {
margin-top: 10rpx;
font-size: 23rpx;
line-height: 1.5;
color: rgba(255, 255, 255, .66);
}
.ml-member-b {
flex-shrink: 0;
height: 68rpx;
padding: 0 30rpx;
border-radius: var(--r-pill);
background: #fff;
border-radius: 24rpx;
padding: 24rpx;
box-sizing: border-box;
}
.quota-name {
font-size: 24rpx;
color: #8E8E93;
}
.quota-num {
font-size: 48rpx;
font-weight: 700;
color: #000;
margin-top: 8rpx;
}
.quota-total {
font-size: 24rpx;
color: #C7C7CC;
font-weight: 400;
}
.quota-bar {
height: 10rpx;
background: #F2F2F7;
border-radius: 5rpx;
margin-top: 16rpx;
overflow: hidden;
}
.quota-fill {
height: 100%;
background: #007AFF;
border-radius: 5rpx;
}
.quota-fill.warn {
background: #FF9500;
}
.flow-entry {
margin: 24rpx;
color: var(--block);
font-size: 26rpx;
font-weight: 500;
display: flex;
align-items: center;
justify-content: space-between;
font-size: 28rpx;
color: #000;
transition: opacity .18s var(--ease);
}
.flow-entry .icon {
width: 28rpx;
height: 28rpx;
color: #C7C7CC;
.ml-member-b:active {
opacity: .7;
}
/* 额度 */
.ml-grp {
margin-top: 64rpx;
}
.ml-track {
margin: 18rpx 24rpx 0;
}
.ml-flow-entry {
margin-top: 32rpx;
}
/* 商品筛选 */
.goods-filter {
background: #fff;
white-space: nowrap;
margin-bottom: 20rpx;
.ml-filters {
margin-top: 64rpx;
border-bottom: 1rpx solid var(--hairline);
}
.filter-row {
display: inline-flex;
padding: 20rpx 24rpx;
/* 商品行 */
.ml-goods {
min-height: 152rpx;
padding-top: 20rpx;
padding-bottom: 20rpx;
}
.filter-item {
flex-shrink: 0;
padding: 0 28rpx;
height: 56rpx;
line-height: 56rpx;
border-radius: 28rpx;
font-size: 24rpx;
color: #3C3C43;
background: #F2F2F7;
margin-right: 16rpx;
}
.filter-item.active {
background: #007AFF;
color: #fff;
}
/* 商品列表 */
.goods-list {
padding: 0 24rpx;
}
.goods-card {
display: flex;
align-items: center;
margin-bottom: 20rpx;
padding: 24rpx;
}
.goods-icon {
width: 72rpx;
height: 72rpx;
color: #007AFF;
margin-right: 20rpx;
flex-shrink: 0;
}
.goods-info {
.ml-goods-body {
flex: 1;
min-width: 0;
}
.goods-name {
font-size: 30rpx;
font-weight: 600;
color: #000;
.ml-goods-n {
font-size: 29rpx;
color: var(--ink);
}
.goods-desc {
font-size: 24rpx;
color: #8E8E93;
margin-top: 6rpx;
.ml-goods-d {
margin-top: 8rpx;
font-size: 23rpx;
color: var(--ink-3);
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.goods-right {
display: flex;
flex-direction: column;
align-items: flex-end;
.ml-goods-r {
text-align: right;
flex-shrink: 0;
}
.goods-price {
font-size: 30rpx;
font-weight: 700;
color: #007AFF;
.ml-price {
font-family: var(--serif);
font-size: 34rpx;
color: var(--ink);
}
.goods-origin {
font-size: 22rpx;
color: #C7C7CC;
.ml-origin {
margin-top: 4rpx;
font-size: 21rpx;
color: var(--ink-4);
text-decoration: line-through;
}
.buy-btn {
margin-top: 12rpx;
height: 56rpx;
padding: 0 32rpx;
border-radius: 28rpx;
background: #007AFF;
color: #fff;
font-size: 24rpx;
display: flex;
align-items: center;
.ml-buy {
flex-shrink: 0;
margin-left: 20rpx;
}
.footer-space {
height: 40rpx;
}
/* 额度明细视图 */
.flow-head {
padding: 24rpx;
/* 额度明细 */
.ml-back {
margin-top: 20rpx;
font-size: 26rpx;
color: #007AFF;
color: var(--ink-2);
}
.flow-list {
padding: 0 24rpx;
.ml-flows {
padding: 40rpx var(--pad) 0;
}
.flow-row {
.ml-flow-row {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 16rpx;
padding: 24rpx;
align-items: flex-start;
gap: 24rpx;
padding: 32rpx 0;
border-bottom: 1rpx solid var(--hairline);
}
.flow-reason {
font-size: 28rpx;
color: #000;
.ml-flow-l {
flex: 1;
min-width: 0;
}
.flow-time {
font-size: 22rpx;
color: #C7C7CC;
.ml-flow-reason {
font-size: 29rpx;
color: var(--ink);
}
.ml-flow-time {
margin-top: 8rpx;
}
.flow-right {
text-align: right;
}
.flow-num {
font-size: 32rpx;
font-weight: 600;
color: #8E8E93;
}
.flow-num.plus {
color: #34C759;
}
.flow-after {
font-size: 22rpx;
color: #C7C7CC;
margin-top: 4rpx;
color: var(--ink-3);
}
/* 订单弹窗 */
.mask {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.4);
z-index: 200;
.ml-flow-r {
text-align: right;
flex-shrink: 0;
}
.sheet {
position: absolute;
left: 0;
right: 0;
bottom: 0;
background: #fff;
border-radius: 32rpx 32rpx 0 0;
padding: 20rpx 32rpx;
padding-bottom: calc(32rpx + env(safe-area-inset-bottom));
}
.sheet-grabber {
width: 72rpx;
height: 10rpx;
border-radius: 5rpx;
background: #E5E5EA;
margin: 0 auto 24rpx;
}
.order-goods {
.ml-flow-n {
font-family: var(--serif);
font-size: 34rpx;
font-weight: 600;
color: #000;
text-align: center;
color: var(--ink);
}
.order-desc {
font-size: 24rpx;
color: #8E8E93;
text-align: center;
margin-top: 12rpx;
.ml-flow-after {
margin-top: 6rpx;
font-size: 22rpx;
color: var(--ink-3);
}
.order-amount {
/* 订单抽屉 */
.ml-order-d {
padding: 0 var(--pad);
font-size: 26rpx;
line-height: 1.7;
color: var(--ink-2);
}
.ml-order-a {
margin: 40rpx var(--pad) 32rpx;
font-size: 28rpx;
color: #000;
text-align: center;
margin: 32rpx 0;
color: var(--ink-2);
}
.order-price {
font-size: 44rpx;
font-weight: 700;
color: #FF9500;
.ml-order-a .num {
font-family: var(--serif);
font-size: 48rpx;
color: var(--ink);
}