diff --git a/docs/DEALER_OPTIMIZATION.md b/docs/DEALER_OPTIMIZATION.md index d6f384a..b52633c 100644 --- a/docs/DEALER_OPTIMIZATION.md +++ b/docs/DEALER_OPTIMIZATION.md @@ -20,7 +20,7 @@ #### 新增功能 - 用户头像和基本信息展示 -- 佣金统计(可提现、冻结中、累计收益) +- 佣金统计(可提现、待使用、累计收益) - 团队统计(一级、二级、三级成员) - 功能导航网格(分销订单、提现申请、我的团队、推广二维码) diff --git a/docs/GRADIENT_DESIGN_GUIDE.md b/docs/GRADIENT_DESIGN_GUIDE.md index 926cbf6..e362e6e 100644 --- a/docs/GRADIENT_DESIGN_GUIDE.md +++ b/docs/GRADIENT_DESIGN_GUIDE.md @@ -35,7 +35,7 @@ dealer: { // 金额相关 money: { available: 'linear-gradient(135deg, #10b981 0%, #059669 100%)', // 可提现 - 绿色 - frozen: 'linear-gradient(135deg, #3b82f6 0%, #2563eb 100%)', // 冻结中 - 蓝色 + frozen: 'linear-gradient(135deg, #3b82f6 0%, #2563eb 100%)', // 待使用 - 蓝色 total: 'linear-gradient(135deg, #f59e0b 0%, #d97706 100%)' // 累计 - 橙色 } ``` diff --git a/src/dealer/index.tsx b/src/dealer/index.tsx index 64b67a7..66ccce6 100644 --- a/src/dealer/index.tsx +++ b/src/dealer/index.tsx @@ -138,7 +138,7 @@ const DealerIndex: React.FC = () => { {formatMoney(dealerUser.money)} - 可提现 + navigateToPage('/dealer/withdraw/index')}>可提现 { {formatMoney(dealerUser.freezeMoney)} - 冻结中 + 待使用 已购:{item.sales || 0}人 - {item.price} + {item.buyingPrice} - { - if (!ensureLoggedIn('/shop/orderConfirm/index?goodsId=10074')) return - Taro.navigateTo({ url: '/shop/orderConfirm/index?goodsId=10074' }) - }} - > - 买水票更优惠 - + {/* {*/} + {/* if (!ensureLoggedIn('/shop/orderConfirm/index?goodsId=10074')) return*/} + {/* Taro.navigateTo({ url: '/shop/orderConfirm/index?goodsId=10074' })*/} + {/* }}*/} + {/*>*/} + {/* 买水票更优惠*/} + {/**/} diff --git a/src/shop/goodsDetail/index.tsx b/src/shop/goodsDetail/index.tsx index c62b9a4..bdbf3d2 100644 --- a/src/shop/goodsDetail/index.tsx +++ b/src/shop/goodsDetail/index.tsx @@ -366,9 +366,9 @@ const GoodsDetail = () => { - {goods.price} + {goods.buyingPrice} 会员价 - ¥{goods.salePrice} + ¥{goods.salePrice}/{goods.unitName} 已售 {goods.sales}