fix(dealer): 更新佣金状态文案并修复商品价格显示
- 将佣金统计中的"冻结中"改为"待使用" - 为可提现金额添加点击跳转到提现页面的功能 - 更新商品详情页价格字段从price改为buyingPrice - 注释掉首页商品卡片中的买水票优惠按钮 - 在商品详情页价格后添加单位显示
This commit is contained in:
@@ -20,7 +20,7 @@
|
||||
|
||||
#### 新增功能
|
||||
- 用户头像和基本信息展示
|
||||
- 佣金统计(可提现、冻结中、累计收益)
|
||||
- 佣金统计(可提现、待使用、累计收益)
|
||||
- 团队统计(一级、二级、三级成员)
|
||||
- 功能导航网格(分销订单、提现申请、我的团队、推广二维码)
|
||||
|
||||
|
||||
@@ -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%)' // 累计 - 橙色
|
||||
}
|
||||
```
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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={() =>
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user