From e0418df018d3c0eddb1c0ad44433d4dcde22cab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Fri, 10 Apr 2026 02:08:56 +0800 Subject: [PATCH] =?UTF-8?q?fix(config):=20=E4=BF=AE=E6=AD=A3=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E9=85=8D=E7=BD=AE=E7=9A=84=E6=8E=A5=E5=8F=A3=E5=9C=B0?= =?UTF-8?q?=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将开发、测试及生产环境的API和服务器地址统一更改为开发环境地址 - 修复 FreezeMoneyModal 中关闭按钮位置样式问题 - 调整 Shop 模块商品详情角标字体内边距，提高视觉舒适度 - 订单确认页调整部分字体大小，提高显示效果一致性 - 修改 Dealer 模块待使用金额弹窗逻辑，允许金额为0时也显示弹窗 --- .workbuddy/expert-history.json | 2 +- config/env.js | 12 ++++++------ src/dealer/components/FreezeMoneyModal.tsx | 2 +- src/dealer/index.tsx | 8 ++++---- src/shop/goodsDetail/index.tsx | 4 ++-- src/shop/orderConfirm/index.scss | 4 ++-- src/shop/orderConfirm/index.tsx | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.workbuddy/expert-history.json b/.workbuddy/expert-history.json index 4bf7e64..59a066f 100644 --- a/.workbuddy/expert-history.json +++ b/.workbuddy/expert-history.json @@ -68,5 +68,5 @@ } ] }, - "lastUpdated": 1775756419382 + "lastUpdated": 1775757430292 } \ No newline at end of file diff --git a/config/env.js b/config/env.js index 2010f0f..70a95c7 100644 --- a/config/env.js +++ b/config/env.js @@ -8,22 +8,22 @@ const CURRENT_ENV = 'production' export const ENV_CONFIG = { // 开发环境 development: { - API_BASE_URL: 'https://glt-api.websoft.top/api', - SERVER_API_URL: 'https://glt-server.websoft.top/api', + API_BASE_URL: 'https://glt-dev-api.websoft.top/api', + SERVER_API_URL: 'https://glt-dev-server.websoft.top/api', APP_NAME: '开发环境', DEBUG: 'true', }, // 测试环境 test: { - API_BASE_URL: 'https://glt-api.websoft.top/api', - SERVER_API_URL: 'https://glt-server.websoft.top/api', + API_BASE_URL: 'https://glt-dev-api.websoft.top/api', + SERVER_API_URL: 'https://glt-dev-server.websoft.top/api', APP_NAME: '测试环境', DEBUG: 'true', }, // 生产环境 production: { - API_BASE_URL: 'https://glt-api.websoft.top/api', - SERVER_API_URL: 'https://glt-server.websoft.top/api', + API_BASE_URL: 'https://glt-dev-api.websoft.top/api', + SERVER_API_URL: 'https://glt-dev-server.websoft.top/api', APP_NAME: '桂乐淘', DEBUG: 'false', }, diff --git a/src/dealer/components/FreezeMoneyModal.tsx b/src/dealer/components/FreezeMoneyModal.tsx index aa0ec82..43c6792 100644 --- a/src/dealer/components/FreezeMoneyModal.tsx +++ b/src/dealer/components/FreezeMoneyModal.tsx @@ -40,7 +40,7 @@ const FreezeMoneyModal: React.FC = ({ 待使用明细 diff --git a/src/dealer/index.tsx b/src/dealer/index.tsx index 068250e..4c67665 100644 --- a/src/dealer/index.tsx +++ b/src/dealer/index.tsx @@ -69,10 +69,10 @@ const DealerIndex: React.FC = () => { // 点击待使用金额 - 显示待使用明细弹窗 const handleFreezeMoneyClick = () => { + console.log('点击待使用金额', dealerUser?.freezeMoney) const freezeMoney = Number(dealerUser?.freezeMoney ?? 0) - if (freezeMoney > 0) { - setFreezeMoneyModalVisible(true) - } + // 只要有金额就显示弹窗，包括0元也显示（让用户知道当前状态） + setFreezeMoneyModalVisible(true) } // 关闭待使用明细弹窗 @@ -224,7 +224,7 @@ const DealerIndex: React.FC = () => { background: businessGradients.money.frozen, opacity: Number(dealerUser.freezeMoney ?? 0) > 0 ? 1 : 0.8 }} - onClick={Number(dealerUser.freezeMoney ?? 0) > 0 ? handleFreezeMoneyClick : undefined} + onClick={handleFreezeMoneyClick} > {formatMoney(dealerUser.freezeMoney)} diff --git a/src/shop/goodsDetail/index.tsx b/src/shop/goodsDetail/index.tsx index 40c8632..a84fe6f 100644 --- a/src/shop/goodsDetail/index.tsx +++ b/src/shop/goodsDetail/index.tsx @@ -381,10 +381,10 @@ const GoodsDetail = () => { {(goods.activityType === 1 || goods.deliveryMode === 1) && ( {goods.activityType === 1 && ( - 新用户专享 + 新用户专享 )} {goods.deliveryMode === 1 && ( - 仅限自提 + 仅限自提 )} )} diff --git a/src/shop/orderConfirm/index.scss b/src/shop/orderConfirm/index.scss index 174e864..b68ee51 100644 --- a/src/shop/orderConfirm/index.scss +++ b/src/shop/orderConfirm/index.scss @@ -119,7 +119,7 @@ border-radius: 10px; border: 2px solid #f0f0f0; background: #fafafa; - font-size: 14px; + font-size: 18px; color: #666; transition: all 0.2s ease; @@ -152,7 +152,7 @@ padding: 8px 14px; border-radius: 8px; background: #f5f5f5; - font-size: 14px; + font-size: 18px; transition: background 0.2s; &:active { diff --git a/src/shop/orderConfirm/index.tsx b/src/shop/orderConfirm/index.tsx index 0f92c87..cc87a16 100644 --- a/src/shop/orderConfirm/index.tsx +++ b/src/shop/orderConfirm/index.tsx @@ -1026,7 +1026,7 @@ const OrderConfirm = () => { }} > {item.icon} - {item.label} + {item.label} ))}