fix(config): 修正环境配置的接口地址
- 将开发、测试及生产环境的API和服务器地址统一更改为开发环境地址 - 修复 FreezeMoneyModal 中关闭按钮位置样式问题 - 调整 Shop 模块商品详情角标字体内边距,提高视觉舒适度 - 订单确认页调整部分字体大小,提高显示效果一致性 - 修改 Dealer 模块待使用金额弹窗逻辑,允许金额为0时也显示弹窗
This commit is contained in:
@@ -68,5 +68,5 @@
|
|||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"lastUpdated": 1775756419382
|
"lastUpdated": 1775757430292
|
||||||
}
|
}
|
||||||
@@ -8,22 +8,22 @@ const CURRENT_ENV = 'production'
|
|||||||
export const ENV_CONFIG = {
|
export const ENV_CONFIG = {
|
||||||
// 开发环境
|
// 开发环境
|
||||||
development: {
|
development: {
|
||||||
API_BASE_URL: 'https://glt-api.websoft.top/api',
|
API_BASE_URL: 'https://glt-dev-api.websoft.top/api',
|
||||||
SERVER_API_URL: 'https://glt-server.websoft.top/api',
|
SERVER_API_URL: 'https://glt-dev-server.websoft.top/api',
|
||||||
APP_NAME: '开发环境',
|
APP_NAME: '开发环境',
|
||||||
DEBUG: 'true',
|
DEBUG: 'true',
|
||||||
},
|
},
|
||||||
// 测试环境
|
// 测试环境
|
||||||
test: {
|
test: {
|
||||||
API_BASE_URL: 'https://glt-api.websoft.top/api',
|
API_BASE_URL: 'https://glt-dev-api.websoft.top/api',
|
||||||
SERVER_API_URL: 'https://glt-server.websoft.top/api',
|
SERVER_API_URL: 'https://glt-dev-server.websoft.top/api',
|
||||||
APP_NAME: '测试环境',
|
APP_NAME: '测试环境',
|
||||||
DEBUG: 'true',
|
DEBUG: 'true',
|
||||||
},
|
},
|
||||||
// 生产环境
|
// 生产环境
|
||||||
production: {
|
production: {
|
||||||
API_BASE_URL: 'https://glt-api.websoft.top/api',
|
API_BASE_URL: 'https://glt-dev-api.websoft.top/api',
|
||||||
SERVER_API_URL: 'https://glt-server.websoft.top/api',
|
SERVER_API_URL: 'https://glt-dev-server.websoft.top/api',
|
||||||
APP_NAME: '桂乐淘',
|
APP_NAME: '桂乐淘',
|
||||||
DEBUG: 'false',
|
DEBUG: 'false',
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ const FreezeMoneyModal: React.FC<FreezeMoneyModalProps> = ({
|
|||||||
待使用明细
|
待使用明细
|
||||||
</Text>
|
</Text>
|
||||||
<View
|
<View
|
||||||
className="absolute right-3 top-1/2 -translate-y-1/2 p-1"
|
className="absolute right-3 top-1 -translate-y-1 p-1"
|
||||||
onClick={onClose}
|
onClick={onClose}
|
||||||
>
|
>
|
||||||
<Close size={20} className="text-gray-400" />
|
<Close size={20} className="text-gray-400" />
|
||||||
|
|||||||
@@ -69,10 +69,10 @@ const DealerIndex: React.FC = () => {
|
|||||||
|
|
||||||
// 点击待使用金额 - 显示待使用明细弹窗
|
// 点击待使用金额 - 显示待使用明细弹窗
|
||||||
const handleFreezeMoneyClick = () => {
|
const handleFreezeMoneyClick = () => {
|
||||||
|
console.log('点击待使用金额', dealerUser?.freezeMoney)
|
||||||
const freezeMoney = Number(dealerUser?.freezeMoney ?? 0)
|
const freezeMoney = Number(dealerUser?.freezeMoney ?? 0)
|
||||||
if (freezeMoney > 0) {
|
// 只要有金额就显示弹窗,包括0元也显示(让用户知道当前状态)
|
||||||
setFreezeMoneyModalVisible(true)
|
setFreezeMoneyModalVisible(true)
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 关闭待使用明细弹窗
|
// 关闭待使用明细弹窗
|
||||||
@@ -224,7 +224,7 @@ const DealerIndex: React.FC = () => {
|
|||||||
background: businessGradients.money.frozen,
|
background: businessGradients.money.frozen,
|
||||||
opacity: Number(dealerUser.freezeMoney ?? 0) > 0 ? 1 : 0.8
|
opacity: Number(dealerUser.freezeMoney ?? 0) > 0 ? 1 : 0.8
|
||||||
}}
|
}}
|
||||||
onClick={Number(dealerUser.freezeMoney ?? 0) > 0 ? handleFreezeMoneyClick : undefined}
|
onClick={handleFreezeMoneyClick}
|
||||||
>
|
>
|
||||||
<Text className="text-lg font-bold mb-1 text-white">
|
<Text className="text-lg font-bold mb-1 text-white">
|
||||||
{formatMoney(dealerUser.freezeMoney)}
|
{formatMoney(dealerUser.freezeMoney)}
|
||||||
|
|||||||
@@ -381,10 +381,10 @@ const GoodsDetail = () => {
|
|||||||
{(goods.activityType === 1 || goods.deliveryMode === 1) && (
|
{(goods.activityType === 1 || goods.deliveryMode === 1) && (
|
||||||
<View className={"flex gap-1 py-1"}>
|
<View className={"flex gap-1 py-1"}>
|
||||||
{goods.activityType === 1 && (
|
{goods.activityType === 1 && (
|
||||||
<Text className={"text-xs bg-red-500 text-white px-2 py-0.5 rounded-full"}>新用户专享</Text>
|
<Text className={"text-xs bg-red-500 text-white px-2 py-1 rounded-full"}>新用户专享</Text>
|
||||||
)}
|
)}
|
||||||
{goods.deliveryMode === 1 && (
|
{goods.deliveryMode === 1 && (
|
||||||
<Text className={"text-xs bg-orange-500 text-white px-2 py-0.5 rounded-full"}>仅限自提</Text>
|
<Text className={"text-xs bg-orange-500 text-white px-2 py-1 rounded-full"}>仅限自提</Text>
|
||||||
)}
|
)}
|
||||||
</View>
|
</View>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -119,7 +119,7 @@
|
|||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
border: 2px solid #f0f0f0;
|
border: 2px solid #f0f0f0;
|
||||||
background: #fafafa;
|
background: #fafafa;
|
||||||
font-size: 14px;
|
font-size: 18px;
|
||||||
color: #666;
|
color: #666;
|
||||||
transition: all 0.2s ease;
|
transition: all 0.2s ease;
|
||||||
|
|
||||||
@@ -152,7 +152,7 @@
|
|||||||
padding: 8px 14px;
|
padding: 8px 14px;
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
background: #f5f5f5;
|
background: #f5f5f5;
|
||||||
font-size: 14px;
|
font-size: 18px;
|
||||||
transition: background 0.2s;
|
transition: background 0.2s;
|
||||||
|
|
||||||
&:active {
|
&:active {
|
||||||
|
|||||||
@@ -1026,7 +1026,7 @@ const OrderConfirm = () => {
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Text className={'delivery-method-icon'}>{item.icon}</Text>
|
<Text className={'delivery-method-icon'}>{item.icon}</Text>
|
||||||
<Text className={'delivery-method-text'}>{item.label}</Text>
|
<Text className={'text-sm'}>{item.label}</Text>
|
||||||
</View>
|
</View>
|
||||||
))}
|
))}
|
||||||
</View>
|
</View>
|
||||||
|
|||||||
Reference in New Issue
Block a user