master #1

Open
gxwebsoft wants to merge 108 commits from developer/template-10584:master into master
4 changed files with 17 additions and 13 deletions
Showing only changes of commit 64d30e1b62 - Show all commits

View File

@@ -1,4 +1,4 @@
export default definePageConfig({
navigationBarTitleText: '成为经销商',
navigationBarTitleText: '注册成为会员',
navigationBarTextStyle: 'black'
})

View File

@@ -325,7 +325,7 @@ const DealerTeam: React.FC = () => {
</View>
{/* 显示手机号(仅本级可见) */}
{showPhone && member.phone && (
<Text className="text-sm text-gray-500" onClick={(e) => {
<Text className="text-sm text-gray-500 hidden" onClick={(e) => {
e.stopPropagation();
makePhoneCall(member.phone || '');
}}>

View File

@@ -858,6 +858,8 @@ const OrderConfirm = () => {
value={quantity}
min={isTicketTemplateActive ? minBuyQty : 1}
max={goods.stock || 999}
step={10}
readOnly
disabled={((goods.canBuyNumber ?? 0) !== 0) && !isTicketTemplateActive}
onChange={handleQuantityChange}
/>

View File

@@ -1033,17 +1033,19 @@ const OrderConfirm = () => {
: `最低起送 ${MIN_START_QTY} 桶(当前最多 ${maxQuantity} 桶)`
}
extra={(
<ConfigProvider theme={customTheme}>
<InputNumber
value={displayQty}
min={canStartOrder ? MIN_START_QTY : 0}
max={canStartOrder ? maxQuantity : 0}
disabled={!canStartOrder}
onChange={handleQuantityChange}
/>
</ConfigProvider>
)}
/>
<ConfigProvider theme={customTheme}>
<InputNumber
value={displayQty}
min={canStartOrder ? MIN_START_QTY : 0}
max={canStartOrder ? maxQuantity : 0}
step={10}
readOnly
disabled={!canStartOrder}
onChange={handleQuantityChange}
/>
</ConfigProvider>
)}
/>
</CellGroup>
<CellGroup>