From b27421fd6ed6dbd91ab099af72e5faaaa3fb5386 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Sat, 7 Mar 2026 01:13:51 +0800
Subject: [PATCH] =?UTF-8?q?fix(dealer):=20=E6=9B=B4=E6=96=B0=E4=BD=A3?=
 =?UTF-8?q?=E9=87=91=E7=8A=B6=E6=80=81=E6=96=87=E6=A1=88=E5=B9=B6=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=95=86=E5=93=81=E4=BB=B7=E6=A0=BC=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将佣金统计中的"冻结中"改为"待使用"
- 为可提现金额添加点击跳转到提现页面的功能
- 更新商品详情页价格字段从price改为buyingPrice
- 注释掉首页商品卡片中的买水票优惠按钮
- 在商品详情页价格后添加单位显示
---
 docs/DEALER_OPTIMIZATION.md    |  2 +-
 docs/GRADIENT_DESIGN_GUIDE.md  |  2 +-
 src/dealer/index.tsx           |  4 ++--
 src/pages/index/index.tsx      | 20 ++++++++++----------
 src/shop/goodsDetail/index.tsx |  4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

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 = () => {
                 <Text className="text-lg font-bold mb-1 text-white">
                   {formatMoney(dealerUser.money)}
                 </Text>
-                <Text className="text-xs" style={{ color: 'rgba(255, 255, 255, 0.9)' }}>可提现</Text>
+                <Text className="text-xs" style={{ color: 'rgba(255, 255, 255, 0.9)' }} onClick={() => navigateToPage('/dealer/withdraw/index')}>可提现</Text>
               </View>
               <View className="text-center p-3 rounded-lg flex flex-col" style={{
                 background: businessGradients.money.frozen
@@ -146,7 +146,7 @@ const DealerIndex: React.FC = () => {
                 <Text className="text-lg font-bold mb-1 text-white">
                   {formatMoney(dealerUser.freezeMoney)}
                 </Text>
-                <Text className="text-xs" style={{ color: 'rgba(255, 255, 255, 0.9)' }}>冻结中</Text>
+                <Text className="text-xs" style={{ color: 'rgba(255, 255, 255, 0.9)' }}>待使用</Text>
               </View>
               <View className="text-center p-3 rounded-lg flex flex-col" style={{
                 background: businessGradients.money.total
diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx
index 23ada98..b55f9b6 100644
--- a/src/pages/index/index.tsx
+++ b/src/pages/index/index.tsx
@@ -329,20 +329,20 @@ function Home() {
                   <Text className="goods-card__sold">已购:{item.sales || 0}人</Text>
                   <View className="goods-card__price">
                     <Text className="goods-card__priceUnit">￥</Text>
-                    <Text className="goods-card__priceValue">{item.price}</Text>
+                    <Text className="goods-card__priceValue">{item.buyingPrice}</Text>
                   </View>
                 </View>
 
                 <View className="goods-card__actions">
-                  <View
-                    className="goods-card__btn goods-card__btn--ghost"
-                    onClick={() => {
-                      if (!ensureLoggedIn('/shop/orderConfirm/index?goodsId=10074')) return
-                      Taro.navigateTo({ url: '/shop/orderConfirm/index?goodsId=10074' })
-                    }}
-                  >
-                    <Text className="goods-card__btnText">买水票更优惠</Text>
-                  </View>
+                  {/*<View*/}
+                  {/*  className="goods-card__btn goods-card__btn--ghost"*/}
+                  {/*  onClick={() => {*/}
+                  {/*    if (!ensureLoggedIn('/shop/orderConfirm/index?goodsId=10074')) return*/}
+                  {/*    Taro.navigateTo({ url: '/shop/orderConfirm/index?goodsId=10074' })*/}
+                  {/*  }}*/}
+                  {/*>*/}
+                  {/*  <Text className="goods-card__btnText">买水票更优惠</Text>*/}
+                  {/*</View>*/}
                   <View
                     className="goods-card__btn goods-card__btn--primary"
                     onClick={() =>
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 = () => {
               <View className={'flex justify-between'}>
                 <View className={'flex text-red-500 text-xl items-baseline'}>
                   <Text className={'text-xs'}>￥</Text>
-                  <Text className={'font-bold text-2xl'}>{goods.price}</Text>
+                  <Text className={'font-bold text-2xl'}>{goods.buyingPrice}</Text>
                   <Text className={'text-xs px-1'}>会员价</Text>
-                  <Text className={'text-xs text-gray-400 line-through'}>￥{goods.salePrice}</Text>
+                  <Text className={'text-xs text-gray-400 line-through'}>￥{goods.salePrice}/{goods.unitName}</Text>
                 </View>
                 <span className={"text-gray-400 text-xs"}>已售 {goods.sales}</span>
               </View>