[TBID:ECX-9138] refactor: improve code formatting and consistency across multiple files

This commit is contained in:
lukaijie
2026-07-03 13:57:05 +08:00
parent af925aa2ae
commit b71d79dbb1
14 changed files with 244 additions and 240 deletions

View File

@@ -130,28 +130,30 @@ export function getGlobalBaseStyle(baseStyle) {
const bgType = baseStyle.bgType
const style = {}
style.padding = `${Taro.pxTransform(baseStyle.paddedt || 0)} ${Taro.pxTransform(baseStyle.paddedr || 0)} ${Taro.pxTransform(baseStyle.paddedb || 0)} ${Taro.pxTransform(baseStyle.paddedl || 0)}`
style.padding = `${Taro.pxTransform(baseStyle.paddedt || 0)} ${Taro.pxTransform(
baseStyle.paddedr || 0
)} ${Taro.pxTransform(baseStyle.paddedb || 0)} ${Taro.pxTransform(baseStyle.paddedl || 0)}`
if (bgType === 'color' && baseStyle.bgColor) {
if(isWeb){
if (isWeb) {
style['background-color'] = baseStyle.bgColor
} else {
style.backgroundColor = baseStyle.bgColor
}
} else if (bgType === 'pic' && baseStyle.bgPic) {
if(isWeb){
if (isWeb) {
style['background-image'] = `url('${baseStyle.bgPic}')`
style['background-size'] = '100% 100%'
style['background-position'] = 'center'
style['background-repeat'] = 'no-repeat'
} else {
style.backgroundImage = `url('${baseStyle.bgPic}')`
style.backgroundSize = '100% 100%'
style.backgroundPosition = 'center'
style.backgroundRepeat = 'no-repeat'
style.backgroundImage = `url('${baseStyle.bgPic}')`
style.backgroundSize = '100% 100%'
style.backgroundPosition = 'center'
style.backgroundRepeat = 'no-repeat'
}
} else if (bgType === 'gradient' && baseStyle.startColor) {
const endColor = baseStyle.endColor || baseStyle.startColor
if(isWeb){
if (isWeb) {
style['background-image'] = `linear-gradient(${baseStyle.startColor}, ${endColor})`
style['background-size'] = 'cover'
} else {

View File

@@ -238,7 +238,7 @@ function PurchaseAuth() {
draft.activity_id = _id || ''
draft.enterprise_id = enterprise_id || ''
})
return { id:_id, enterprise_id, code }
return { id: _id, enterprise_id, code }
} catch (error) {
return {}
}

View File

@@ -89,10 +89,16 @@ function GuideRecommendDetail(props) {
})
}
}
const { itemId, title, summary, articleFocusNum, content, updated, isPraise, articlePraiseNum } = pickBy(
res,
doc.article.ARTICLE_ITEM
)
const {
itemId,
title,
summary,
articleFocusNum,
content,
updated,
isPraise,
articlePraiseNum
} = pickBy(res, doc.article.ARTICLE_ITEM)
setState((draft) => {
draft.itemId = itemId

View File

@@ -61,8 +61,7 @@ function CompDianwuSelectMember({ open, onClose, onAfterSelect, distributor_id }
showError: false
})
} catch (e) {
const msg =
e?.message || e?.res?.data?.data?.message || $t('09e29d60.g3q6mc')
const msg = e?.message || e?.res?.data?.data?.message || $t('09e29d60.g3q6mc')
showToast(msg)
}
const { couponNum, point, vipDiscount } = pickBy(userInfo, doc.dianwu.MEMBER_INFO)

View File

@@ -79,7 +79,7 @@ function PurchaseActivityList() {
if (pageIndex === 1) {
if (VERSION_IN_PURCHASE) {
const data = await api.purchase.getUserEnterprises({
disabled: 0,
disabled: 0
})
const validIdentityLen = data.filter((item) => item.disabled == 0).length
if (!validIdentityLen) {
@@ -264,7 +264,11 @@ function PurchaseActivityList() {
return (
<View key={item.id} className='activity-card'>
<View className='activity-card__cover'>
<SpImage className='activity-card__img' mode='aspectFill' src={item.list_pic} />
<SpImage
className='activity-card__img'
mode='aspectFill'
src={item.list_pic}
/>
<View
className={classNames(
'activity-card__badge',

View File

@@ -140,7 +140,7 @@ function PurchaseCheckout(props) {
const load = async () => {
try {
const data = await api.purchase.getUserEnterprises({
disabled: 0,
disabled: 0
})
const found = data?.find((x) => x.enterprise_id == eid)
setEnterpriseName(found?.name || found?.enterprise_name || '')

View File

@@ -253,7 +253,7 @@ function EspierDetail(props) {
const loadEnterpriseName = async () => {
try {
const data = await api.purchase.getUserEnterprises({
disabled: 0,
disabled: 0
})
const found = data?.find((x) => x.enterprise_id == eid)
setEnterpriseName(found?.name || found?.enterprise_name || '')

View File

@@ -154,7 +154,7 @@ function CartIndex() {
const load = async () => {
try {
const data = await api.purchase.getUserEnterprises({
disabled: 0,
disabled: 0
})
const found = data?.find((x) => x.enterprise_id == eid)
setEnterpriseName(found?.name || found?.enterprise_name || '')

View File

@@ -141,7 +141,7 @@ function ItemList() {
const loadEnterpriseName = async () => {
try {
const data = await api.purchase.getUserEnterprises({
disabled: 0,
disabled: 0
})
const found = data?.find((x) => x.enterprise_id == eid)
setEnterpriseName(found?.name || found?.enterprise_name || '')

View File

@@ -79,7 +79,7 @@ function PurchaseAuthEmail() {
const syncEnterpriseName = async () => {
try {
const list = await api.purchase.getUserEnterprises({
disabled: 0,
disabled: 0
})
const found = (list || []).find(
(item) => String(item?.id ?? item?.enterprise_id) === String(enterprise_id)
@@ -235,11 +235,7 @@ function PurchaseAuthEmail() {
return (
<SpPage className='purchase-email-auth'>
<SpImage
src={curEnterpriseLogo}
className='purchase-email-auth__cover-img'
mode='widthFix'
/>
<SpImage src={curEnterpriseLogo} className='purchase-email-auth__cover-img' mode='widthFix' />
<SpPurchaseEnterpriseBar
name={enterpriseName || appName || $t('c2581d4c.6fb7d0')}

View File

@@ -81,7 +81,7 @@ function SelectIdentity(props) {
if (VERSION_IN_PURCHASE) {
const pdata = await api.purchase.getUserEnterprises({
disabled: 0,
disabled: 0
})
const validIdentityLen = pdata.filter((item) => item.disabled == 0).length
if (!validIdentityLen) {

View File

@@ -62,7 +62,7 @@ export default class PurchaseIndex extends Component {
}
try {
const data = await api.purchase.getUserEnterprises({
disabled: 0,
disabled: 0
})
const found = data?.find((x) => x.enterprise_id == eid)
this.setState({

View File

@@ -112,8 +112,7 @@ const LocationRegionPicker = memo(function LocationRegionPicker({
onConfirm({
province: province?.label || PLACEHOLDER_PROVINCE,
city: city?.label || PLACEHOLDER_CITY,
district:
districtIndex === 0 ? DISTRICT_UNLIMITED : district?.label || PLACEHOLDER_DISTRICT
district: districtIndex === 0 ? DISTRICT_UNLIMITED : district?.label || PLACEHOLDER_DISTRICT
})
}

View File

@@ -279,237 +279,235 @@ function TradeAfterSale(props) {
}
>
<View className='page-content'>
<SpTabs
current={curTabIdx}
tablist={OnlyRefundShow ? tabList : tabList1}
onChange={(e) => {
setState((draft) => {
draft.curTabIdx = e
})
}}
/>
<SpTabs
current={curTabIdx}
tablist={OnlyRefundShow ? tabList : tabList1}
onChange={(e) => {
setState((draft) => {
draft.curTabIdx = e
})
}}
/>
<View className='refund-items'>
<View className='items-container'>
{info?.items.map((item, index) => (
<View className='item-wrap' key={`item-wrap__${index}`}>
<View className='item-hd'>
<SpCheckbox
disabled={!item.leftAftersalesNum}
checked={item.checked}
onChange={onChangeItemCheck.bind(this, item, index)}
/>
</View>
<View className='item-bd'>
<SpImage
mode='aspectFit'
src={item.pic}
width={128}
height={128}
radius={8}
circle={8}
/>
<View className='goods-info'>
<View className='goods-info-hd'>
<Text className='goods-title'>
{item?.isPrescription == 1 && (
<Text className='prescription-drug'>{$t('44d65d28.e8b7e1')}</Text>
)}
{item.itemName}
</Text>
<View className='refund-items'>
<View className='items-container'>
{info?.items.map((item, index) => (
<View className='item-wrap' key={`item-wrap__${index}`}>
<View className='item-hd'>
<SpCheckbox
disabled={!item.leftAftersalesNum}
checked={item.checked}
onChange={onChangeItemCheck.bind(this, item, index)}
/>
</View>
<View className='item-bd'>
<SpImage
mode='aspectFit'
src={item.pic}
width={128}
height={128}
radius={8}
circle={8}
/>
<View className='goods-info'>
<View className='goods-info-hd'>
<Text className='goods-title'>
{item?.isPrescription == 1 && (
<Text className='prescription-drug'>{$t('44d65d28.e8b7e1')}</Text>
)}
{item.itemName}
</Text>
</View>
<View className='goods-info-bd'>
<View>
{item.itemSpecDesc && (
<Text className='sku-info'>{`${item.itemSpecDesc}`}</Text>
)}
</View>
<View className='goods-info-bd'>
<View>
{item.itemSpecDesc && (
<Text className='sku-info'>{`${item.itemSpecDesc}`}</Text>
)}
</View>
<View>
<SpPrice size={28} value={item.price / item.num} /> x{' '}
<Text className='num'>{item.num}</Text>
</View>
</View>
<View className='goods-info-ft'>
<Text>{$t('44d65d28.3a1664')}</Text>
<SpInputNumber
disabled={!item.leftAftersalesNum}
value={item.refundNum}
max={item.leftAftersalesNum}
min={1}
onChange={(e) => onChangeItemNum(e, index)}
/>
<View>
<SpPrice size={28} value={item.price / item.num} /> x{' '}
<Text className='num'>{item.num}</Text>
</View>
</View>
<View className='goods-info-ft'>
<Text>{$t('44d65d28.3a1664')}</Text>
<SpInputNumber
disabled={!item.leftAftersalesNum}
value={item.refundNum}
max={item.leftAftersalesNum}
min={1}
onChange={(e) => onChangeItemNum(e, index)}
/>
</View>
</View>
</View>
))}
</View>
</View>
<View className='picker-reason'>
<Picker
mode='selector'
range={reasons}
onChange={(e) => {
setState((draft) => {
draft.reasonIndex = e.detail.value
})
}}
>
<SpCell
title={$t('44d65d28.220bc2')}
isLink
value={<Text>{`${reasons?.[reasonIndex] || $t('44d65d28.cf234c')}`}</Text>}
></SpCell>
</Picker>
</View>
<View className='refund-detail'>
{/* 输入的运费不能大于可退款的运费 */}
{info?.freightFee != 0 && offline_freight_status && (
<View className='refund-amount'>
<SpCell
border
title={
info?.freightType == 'cash' ? $t('44d65d28.093620') : $t('44d65d28.e4f346')
}
value={
<AtInput
name='offline_freight'
value={offline_freight}
placeholder={$t('44d65d28.5b78b0')}
onChange={(e) => {
setState((draft) => {
draft.offline_freight = e
})
}}
/>
}
></SpCell>
</View>
)}
<View className='refund-amount'>
<SpCell title={$t('44d65d28.a0cd4c')} value={realRefundFee} />
</View>
<View className='refund-point'>
{/* <SpCell title='退积分' value={info?.point} /> */}
<SpCell title={$t('44d65d28.401595')} value={realRefundPoint} />
</View>
))}
</View>
</View>
{currentAftersalesType === 'REFUND_GOODS' && (
<View className='return-goods-type'>
<View className='picker-reason'>
<Picker
mode='selector'
range={reasons}
onChange={(e) => {
setState((draft) => {
draft.reasonIndex = e.detail.value
})
}}
>
<SpCell
title={$t('44d65d28.220bc2')}
isLink
value={<Text>{`${reasons?.[reasonIndex] || $t('44d65d28.cf234c')}`}</Text>}
></SpCell>
</Picker>
</View>
<View className='refund-detail'>
{/* 输入的运费不能大于可退款的运费 */}
{info?.freightFee != 0 && offline_freight_status && (
<View className='refund-amount'>
<SpCell
border
title={$t('44d65d28.b85b43')}
value={getRefundTypeName()}
isLink
onClick={() => {
setState((draft) => {
draft.openRefundType = true
draft.selectRefundValue = refundType
})
}}
title={info?.freightType == 'cash' ? $t('44d65d28.093620') : $t('44d65d28.e4f346')}
value={
<AtInput
name='offline_freight'
value={offline_freight}
placeholder={$t('44d65d28.5b78b0')}
onChange={(e) => {
setState((draft) => {
draft.offline_freight = e
})
}}
/>
}
></SpCell>
{refundType == 'offline' &&
((offlineAftersalesIsOpen && VERSION_STANDARD) ||
(VERSION_PLATFORM && offlineAftersales)) && (
<>
<SpCell
border
title={$t('44d65d28.611301')}
isLink
value={
<Text
className={classNames({
'placeholder': !refundStore
})}
>
{refundStore ? refundStore.name : $t('44d65d28.504d95')}
</Text>
}
onClick={() => {
Taro.navigateTo({
url: `/subpages/trade/store-picker?distributor_id=${info.distributorId}&refund_store=${refundStore?.address_id}`
})
}}
/>
<SpCell
border
title={$t('44d65d28.52409d')}
value={
<AtInput
name='contact'
value={contact}
placeholder={$t('44d65d28.12761a')}
onChange={(e) => {
setState((draft) => {
draft.contact = e
})
}}
/>
}
></SpCell>
<SpCell
title={$t('44d65d28.09a1f6')}
value={
<AtInput
name='mobile'
value={mobile}
placeholder={$t('44d65d28.a5e898')}
onChange={(e) => {
setState((draft) => {
draft.mobile = e
})
}}
/>
}
></SpCell>
</>
)}
</View>
)}
<View className='desc-container'>
<View className='title'>{$t('44d65d28.f55683')}</View>
<View className='desc-content'>
<Text className='iconfont icon-bianji1'></Text>
<AtTextarea
type='textarea'
name='description'
value={description}
placeholder={$t('44d65d28.4ab433')}
maxLength={200}
placeholderStyle='padding-left: 10px;'
onChange={(e) => {
setState((draft) => {
draft.description = e
})
}}
/>
</View>
<SpUpload
value={pic}
max={3}
onChange={(val) => {
<View className='refund-amount'>
<SpCell title={$t('44d65d28.a0cd4c')} value={realRefundFee} />
</View>
<View className='refund-point'>
{/* <SpCell title='退积分' value={info?.point} /> */}
<SpCell title={$t('44d65d28.401595')} value={realRefundPoint} />
</View>
</View>
{currentAftersalesType === 'REFUND_GOODS' && (
<View className='return-goods-type'>
<SpCell
border
title={$t('44d65d28.b85b43')}
value={getRefundTypeName()}
isLink
onClick={() => {
setState((draft) => {
draft.pic = val
draft.openRefundType = true
draft.selectRefundValue = refundType
})
}}
></SpCell>
{refundType == 'offline' &&
((offlineAftersalesIsOpen && VERSION_STANDARD) ||
(VERSION_PLATFORM && offlineAftersales)) && (
<>
<SpCell
border
title={$t('44d65d28.611301')}
isLink
value={
<Text
className={classNames({
'placeholder': !refundStore
})}
>
{refundStore ? refundStore.name : $t('44d65d28.504d95')}
</Text>
}
onClick={() => {
Taro.navigateTo({
url: `/subpages/trade/store-picker?distributor_id=${info.distributorId}&refund_store=${refundStore?.address_id}`
})
}}
/>
<SpCell
border
title={$t('44d65d28.52409d')}
value={
<AtInput
name='contact'
value={contact}
placeholder={$t('44d65d28.12761a')}
onChange={(e) => {
setState((draft) => {
draft.contact = e
})
}}
/>
}
></SpCell>
<SpCell
title={$t('44d65d28.09a1f6')}
value={
<AtInput
name='mobile'
value={mobile}
placeholder={$t('44d65d28.a5e898')}
onChange={(e) => {
setState((draft) => {
draft.mobile = e
})
}}
/>
}
></SpCell>
</>
)}
</View>
)}
<View className='desc-container'>
<View className='title'>{$t('44d65d28.f55683')}</View>
<View className='desc-content'>
<Text className='iconfont icon-bianji1'></Text>
<AtTextarea
type='textarea'
name='description'
value={description}
placeholder={$t('44d65d28.4ab433')}
maxLength={200}
placeholderStyle='padding-left: 10px;'
onChange={(e) => {
setState((draft) => {
draft.description = e
})
}}
/>
</View>
<SpUpload
value={pic}
max={3}
onChange={(val) => {
setState((draft) => {
draft.pic = val
})
}}
/>
</View>
{afterSaleDesc.is_open && (
<View className='after-sale-desc'>
<View className='desc-title'>
<Text className='iconfont icon-xinxi'></Text>
{$t('44d65d28.be1476')}
</View>
<SpHtml content={afterSaleDesc.intro} />
{afterSaleDesc.is_open && (
<View className='after-sale-desc'>
<View className='desc-title'>
<Text className='iconfont icon-xinxi'></Text>
{$t('44d65d28.be1476')}
</View>
)}
<SpHtml content={afterSaleDesc.intro} />
</View>
)}
</View>
<SpFloatLayout