xuan/TestRestructureWechatLymarketDist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐞 fix(ID1001354): 【面料优选&内部小程序】【色卡剪样/领取色卡】--添加色卡后，点击返回键，没弹框提示

Browse Source 
【【面料优选&内部小程序】【色卡剪样/领取色卡】--添加色卡后，点击返回键，没弹框提示】 https://www.tapd.cn/53459131/bugtrace/bugs/view/1153459131001001354
This commit is contained in:
xuan 2023-02-27 16:09:03 +08:00
parent 08b8627ec9
commit 1bfd170696
8 changed files with 174 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
project.private.config.json
View File

@ -37,6 +37,20 @@
"query": "", "query": "",
"launchMode": "default", "launchMode": "default",
"scene": null "scene": null
},
{
"name": "",
"pathName": "pages/login/index",
"query": "",
"launchMode": "default",
"scene": null
},
{
"name": "",
"pathName": "pages/getColorCard/addColorCard/index",
"query": "",
"launchMode": "default",
"scene": null
} }
] ]
} }

2
src/common/constant.ts
View File

@ -15,7 +15,7 @@ export const BASE_URL = CURRENT_BASE_URL
// export const BASE_URL = 'http://192.168.1.7:50002/lymarket' // 添 // export const BASE_URL = 'http://192.168.1.7:50002/lymarket' // 添
// export const BASE_URL = 'http://192.168.1.42:50002/lymarket' // 杰 // export const BASE_URL = 'http://192.168.1.42:50002/lymarket' // 杰
// export const BASE_URL = `http://192.168.1.95:40001/lymarket` // 华 // export const BASE_URL = `http://192.168.1.95:40001/lymarket` // 华
// export const BASE_URL = 'http://192.168.1.28:50001/lymarket' // 婷 // export const BASE_URL = 'http://192.168.1.28:50002/lymarket' // 婷
// CDN // CDN
// 生成密钥 // 生成密钥

2
src/pages/getColorCard/addColorCard/index.config.ts
View File

@ -1,3 +1,5 @@
export default { export default {
navigationBarTitleText: '领取色卡', navigationBarTitleText: '领取色卡',
disableSwipeBack: true,
navigationStyle: 'custom',
} }

3
src/pages/getColorCard/addColorCard/index.module.scss
View File

@ -4,6 +4,9 @@ page {
display: flex; display: flex;
flex-flow: column nowrap; flex-flow: column nowrap;
} }
.backIcon {
transform: rotate(180deg);
}
.layoutBlock { .layoutBlock {
padding: 24px 34px; padding: 24px 34px;
} }

237
src/pages/getColorCard/addColorCard/index.tsx
View File

@ -17,6 +17,7 @@ import Remark from '@/pages/orderDetails/components/remark'
import { formatRemoveHashTag } from '@/common/format' import { formatRemoveHashTag } from '@/common/format'
import { SubmitColorCardOrder } from '@/api/colorCard' import { SubmitColorCardOrder } from '@/api/colorCard'
import MoveBtn from '@/components/moveBtn' import MoveBtn from '@/components/moveBtn'
import NavBar from '@/pages/order/components/NavBar'
const AddColorCard = () => { const AddColorCard = () => {
// 获取选择的客户 // 获取选择的客户
@ -263,123 +264,141 @@ const AddColorCard = () => {
setRemark(value) setRemark(value)
}, []) }, [])
return <MoveBtn showList={['businessManager']}> const onClickBack = () => {
<View className={styles.main}> Taro.showModal({
<View className={styles.context}> content: '返回后页面数据将不回保留，确认返回？',
{/* 客户信息 */} confirmColor: '#4a8dff',
<LayoutBlock circle onClick={handleSelectCustomer} customStyle={{ marginTop: '12px' }} customClassName={styles.layoutBlock}> success: ({ confirm }) => {
<View className={styles.customerTop}> if (confirm) {
<View>客户信息</View> Taro.navigateBack({
</View> delta: 1,
<Divider direction="horizontal" customStyles={{ margin: '12px 0' }}></Divider> })
<View className={styles.customerBottom}>
{
clientInfo.clientId !== -1
? (<>
<Text>
{clientInfo.clientName}
</Text>
<Text>
{clientInfo.clientPhone}
</Text>
</>
)
: <View>选择领取客户</View>
}
<IconFont name="icon-chakanquanbukehu" color="#444444" size={32}></IconFont>
</View>
</LayoutBlock>
{
clientInfo.clientId !== -1 && <AddressDetailBox
showBtn={false}
showWhatFont="物流"
navSelect={handSelect}
obj={addressInfo}
receivingStatus={2}
icon={<IconFont name="icon-dizhi1" size={60}></IconFont>}
></AddressDetailBox>
} }
},
})
}
<NormalButton customClassName={styles.addButton} circle onClick={handleAddColorCard} plain size="normal" type="primary">添加色卡</NormalButton> return <View className={styles.main}>
{/* 色卡信息 */} <NavBar hasLeft leftSlot={
<LayoutBlock customStyle={{ marginTop: '12px' }} circle customClassName={styles.layoutBlock}> <View onClick={onClickBack}>
<View className={styles.colorCardTop}>色卡信息</View> <IconFont customClassName={styles.backIcon} name="icon-chakanquanbukehu" size={48} color="#191919"></IconFont>
<Divider direction="horizontal" customStyles={{ margin: '12px 0' }}></Divider> </View>
} title="领取色卡"
></NavBar>
<View className={styles.context}>
{/* 客户信息 */}
<LayoutBlock circle onClick={handleSelectCustomer} customStyle={{ marginTop: '12px' }} customClassName={styles.layoutBlock}>
<View className={styles.customerTop}>
<View>客户信息</View>
</View>
<Divider direction="horizontal" customStyles={{ margin: '12px 0' }}></Divider>
<View className={styles.customerBottom}>
{ {
order.map((item) => { clientInfo.clientId !== -1
return ( ? (<>
<View className={styles.colorCardBottom} key={item.id}> <Text>
<View style={{ minWidth: '24%' }}> {clientInfo.clientName}
<View className={styles.leftCont}> </Text>
<LabAndImg value={labAndImgObj(item)} /> <Text>
</View> {clientInfo.clientPhone}
</View> </Text>
<View className={styles.rightCont}> </>
<View className={styles.rightCont__top}> )
{item.color_card_name} : <View>选择领取客户</View>
</View> }
<View className={styles.rightCont__bottom}> <IconFont name="icon-chakanquanbukehu" color="#444444" size={32}></IconFont>
<View className={styles.rightCont__left}> </View>
{ </LayoutBlock>
item.affiliation_product.map((product_color, index) => { {
return <Tag customStyle={{ marginRight: '5px', marginBottom: '2px', padding: '5px', background: '#e3ecff', color: '#558cff', borderColor: '#e3ecff' }} key={index} size="small" circle>{formatRemoveHashTag(product_color.code)}</Tag> clientInfo.clientId !== -1 && <AddressDetailBox
}) showBtn={false}
} showWhatFont="物流"
</View> navSelect={handSelect}
<View className={styles.rightCont__right}> obj={addressInfo}
<Counter receivingStatus={2}
onBlue={getInputValue} icon={<IconFont name="icon-dizhi1" size={60}></IconFont>}
defaultNum={item?.count || 1} ></AddressDetailBox>
onChange={e => handleCountChange(e, item.id)} }
onClickBtn={getInputValue}
unit="本" <NormalButton customClassName={styles.addButton} circle onClick={handleAddColorCard} plain size="normal" type="primary">添加色卡</NormalButton>
minNum={0} {/* 色卡信息 */}
maxNum={999} <LayoutBlock customStyle={{ marginTop: '12px' }} circle customClassName={styles.layoutBlock}>
/> <View className={styles.colorCardTop}>色卡信息</View>
</View> <Divider direction="horizontal" customStyles={{ margin: '12px 0' }}></Divider>
</View> {
<Divider direction="horizontal" customStyles={{ margin: '12px 0 0 ' }}></Divider> order.map((item) => {
return (
<View className={styles.colorCardBottom} key={item.id}>
<View style={{ minWidth: '24%' }}>
<View className={styles.leftCont}>
<LabAndImg value={labAndImgObj(item)} />
</View> </View>
</View> </View>
) <View className={styles.rightCont}>
}) <View className={styles.rightCont__top}>
} {item.color_card_name}
<View className={styles.paymentMethod}>快递到付</View> </View>
</LayoutBlock> <View className={styles.rightCont__bottom}>
{/* 备注信息 */} <View className={styles.rightCont__left}>
<LayoutBlock circle customClassName={styles.layoutBlock} onClick={handleShowDesc}> {
<View className={styles.remarkTop}> item.affiliation_product.map((product_color, index) => {
<View className={styles.remarkTitle}>备注信息</View> return <Tag customStyle={{ marginRight: '5px', marginBottom: '2px', padding: '5px', background: '#e3ecff', color: '#558cff', borderColor: '#e3ecff' }} key={index} size="small" circle>{formatRemoveHashTag(product_color.code)}</Tag>
<View className={styles.remarkTag}> })
<Text>填写/修改备注</Text> }
<IconFont name="icon-chakanquanbukehu" color="#444444" size={32}></IconFont> </View>
</View> <View className={styles.rightCont__right}>
<Counter
onBlue={getInputValue}
defaultNum={item?.count || 1}
onChange={e => handleCountChange(e, item.id)}
onClickBtn={getInputValue}
unit="本"
minNum={0}
maxNum={999}
/>
</View>
</View>
<Divider direction="horizontal" customStyles={{ margin: '12px 0 0 ' }}></Divider>
</View>
</View>
)
})
}
<View className={styles.paymentMethod}>快递到付</View>
</LayoutBlock>
{/* 备注信息 */}
<LayoutBlock circle customClassName={styles.layoutBlock} onClick={handleShowDesc}>
<View className={styles.remarkTop}>
<View className={styles.remarkTitle}>备注信息</View>
<View className={styles.remarkTag}>
<Text>填写/修改备注</Text>
<IconFont name="icon-chakanquanbukehu" color="#444444" size={32}></IconFont>
</View> </View>
<Divider direction="horizontal" customStyles={{ margin: '12px 0' }}></Divider>
<View className={styles.remarkBottom}>
<View className={styles.remarkContent}>{ remark || '尚未备注信息' }</View>
</View>
</LayoutBlock>
</View>
<View className={styles.bottomBar}>
<View className={styles.bottomTotal}>
当前共 {order.length} 种色卡,共 {order.reduce((total, curr) => total + (curr.count || 1), 0)} 本
</View> </View>
<NormalButton <Divider direction="horizontal" customStyles={{ margin: '12px 0' }}></Divider>
customClassName={styles.bottomBar__button} <View className={styles.remarkBottom}>
type="primary" <View className={styles.remarkContent}>{ remark || '尚未备注信息' }</View>
round </View>
onClick={handleSubmitOrder} </LayoutBlock>
>
提交订单
</NormalButton>
</View>
<Popup show={showDesc} showTitle={false} onClose={() => setShowDesc(false)}>
<Remark onSave={getRemark} defaultValue={remark} showInput={!!showDesc} />
</Popup>
</View> </View>
</MoveBtn> <View className={styles.bottomBar}>
<View className={styles.bottomTotal}>
当前共 {order.length} 种色卡,共 {order.reduce((total, curr) => total + (curr.count || 1), 0)} 本
</View>
<NormalButton
customClassName={styles.bottomBar__button}
type="primary"
round
onClick={handleSubmitOrder}
>
提交订单
</NormalButton>
</View>
<Popup show={showDesc} showTitle={false} onClose={() => setShowDesc(false)}>
<Remark onSave={getRemark} defaultValue={remark} showInput={!!showDesc} />
</Popup>
</View>
} }
export default AddColorCard export default AddColorCard

2
src/pages/sampleCutting/addSampleCutting/index.config.ts
View File

@ -1,3 +1,5 @@
export default { export default {
navigationBarTitleText: '领取剪样', navigationBarTitleText: '领取剪样',
disableSwipeBack: true,
navigationStyle: 'custom',
} }

3
src/pages/sampleCutting/addSampleCutting/index.module.scss
View File

@ -4,6 +4,9 @@ page {
display: flex; display: flex;
flex-flow: column nowrap; flex-flow: column nowrap;
} }
.backIcon {
transform: rotate(180deg);
}
.layoutBlock { .layoutBlock {
padding: 24px 34px; padding: 24px 34px;
} }

21
src/pages/sampleCutting/addSampleCutting/index.tsx
View File

@ -16,6 +16,7 @@ import Popup from '@/components/popup'
import Remark from '@/pages/orderDetails/components/remark' import Remark from '@/pages/orderDetails/components/remark'
import { formatRemoveHashTag } from '@/common/format' import { formatRemoveHashTag } from '@/common/format'
import { SubmitCutSampleOrder } from '@/api/sampleCutting' import { SubmitCutSampleOrder } from '@/api/sampleCutting'
import NavBar from '@/pages/order/components/NavBar'
const AddColorCard = () => { const AddColorCard = () => {
// 获取选择的客户 // 获取选择的客户
@ -310,7 +311,27 @@ const AddColorCard = () => {
}, 0) }, 0)
}, [order]) }, [order])
const onClickBack = () => {
Taro.showModal({
content: '返回后页面数据将不回保留，确认返回？',
confirmColor: '#4a8dff',
success: ({ confirm }) => {
if (confirm) {
Taro.navigateBack({
delta: 1,
})
}
},
})
}
return <View className={styles.main}> return <View className={styles.main}>
<NavBar hasLeft leftSlot={
<View onClick={onClickBack}>
<IconFont customClassName={styles.backIcon} name="icon-chakanquanbukehu" size={48} color="#191919"></IconFont>
</View>
} title="领取剪样"
></NavBar>
<View className={styles.context}> <View className={styles.context}>
{/* 客户信息 */} {/* 客户信息 */}
<LayoutBlock circle onClick={handleSelectCustomer} customStyle={{ marginTop: '12px' }} customClassName={styles.layoutBlock}> <LayoutBlock circle onClick={handleSelectCustomer} customStyle={{ marginTop: '12px' }} customClassName={styles.layoutBlock}>