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

🐞 fix:【ID1000610】

Browse Source 
新版内部商城测试bug-2
This commit is contained in:
Haiyi
2022-10-12 17:54:43 +08:00
parent ffa2cf377d
commit 498d8515cb
15 changed files with 648 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/orderDetails/index.module.scss
+1 -22
View File
@@ -10,7 +10,6 @@ page {
.pussName {
font-size: 28px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #000000;
}
@@ -18,7 +17,6 @@ page {
.pussPhone {
margin-left: 88px;
font-size: 28px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #000000;
}
@@ -27,7 +25,6 @@ page {
.total {
margin-top: 44px;
font-size: 24px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #000000;
margin-left: 32px;
@@ -57,7 +54,6 @@ page {
margin-left: 32px;
margin-right: 8px;
font-size: 28px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #000000;
}
@@ -69,7 +65,6 @@ page {
.shoudPay {
font-size: 28px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #F64861;
margin-right: 32px;
@@ -95,14 +90,12 @@ page {
.title {
font-size: 28px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #000000;
}
.modeName {
font-size: 28px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #337FFF;
}
@@ -127,7 +120,6 @@ page {
.goodsProduct {
font-size: 28px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #000000;
margin-left: 32px;
@@ -160,7 +152,7 @@ page {
.itemRight {
padding-bottom: 24px;
margin-right: 32px;
// width: 495px;
width: 495px;
border-bottom: 1px solid #f7f7f7;
.item_right_top {
@@ -171,14 +163,12 @@ page {
.itemName {
font-size: 28px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #000000;
}
.itemNums {
font-size: 28px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #000000;
}
@@ -191,14 +181,12 @@ page {
.itemMoney {
font-size: 28px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #000000;
}
.itemMoneyOne {
font-size: 28px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #000000;
}
@@ -234,14 +222,12 @@ page {
.itemName {
font-size: 28px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #000000;
}
.itemNums {
font-size: 28px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #000000;
}
@@ -254,14 +240,12 @@ page {
.itemMoney {
font-size: 28px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #000000;
}
.itemMoneyOne {
font-size: 28px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #000000;
}
@@ -289,7 +273,6 @@ page {
.detailRight {
font-size: 28px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #000000;
}
@@ -301,7 +284,6 @@ page {
border-radius: 8px;
border: 1PX solid #337FFF;
font-size: 24px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #337FFF;
text-align: center;
@@ -311,7 +293,6 @@ page {
.detailFont {
font-size: 28px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #000000;
}
@@ -320,7 +301,6 @@ page {
.remarkFont {
margin-top: 24px;
font-size: 28px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #000000;
}
@@ -344,7 +324,6 @@ page {
.moreFont {
font-size: 28px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(0, 0, 0, 0.8);
margin-left: 48px;
src/pages/orderDetails/index.tsx
+13 -7
View File
@@ -538,6 +538,7 @@ export default () => {
//申请退款
const handApplyMoney = () => {
Taro.navigateTo({
url: '/pages/applyMoney/index?orderId=' + infoObj.id
})
@@ -586,6 +587,14 @@ export default () => {
useEffect(() => {
setInfoObj(infoObj)
}, [infoObj])
const showRemarkFont = useMemo(() => {
if (infoObj.status === 10 || infoObj.status == 0 || infoObj.status == 1 || infoObj.status == 2 || infoObj.status == 7) {
return `${'填写/修改备注'} >`
} else {
return ''
}
}, [infoObj])
return (
<View className={styles.mainBox}>
{(infoObj?.status != 10 && <OrderState orderInfo={infoObj} />)}
@@ -616,7 +625,7 @@ export default () => {
<View className={styles.totalFont}>合计金额</View>
<IconFont name={'icon-tishi'} size={28} ></IconFont>
</View>
<View className={styles.shoudPay}>{formatPriceDiv(infoObj.total_should_collect_money)}</View>
<View className={styles.shoudPay}>{formatPriceDiv(infoObj.bill_total_sale_price)}</View>
</View>
<View className={styles.flexMoney}>
<View className={styles.flexTotalBox}>
@@ -653,12 +662,9 @@ export default () => {
}
</DefaultBox>
{
(infoObj.status != 11 && infoObj.status != 3 && infoObj.status != 8 && infoObj.status != 9 && infoObj.status != 4
) && <DefaultBox title={'备注信息'} showMode={true} modeName={`${'填写/修改备注'} >`} clickNode={() => setShowDesc(true)}>
<View className={styles.remarkFont}>{infoObj.remark === '' ? '暂无' : infoObj.remark}</View>
</DefaultBox>
}
<DefaultBox title={'备注信息'} showMode={true} modeName={showRemarkFont} clickNode={() => setShowDesc(showRemarkFont != '' ? true : false)}>
<View className={styles.remarkFont}>{infoObj.remark === '' ? '暂无' : infoObj.remark}</View>
</DefaultBox>
<Popup show={showDesc} title={'填写/编辑备注'} showTitle={true} onClose={() => setShowDesc(false)}>
<View style={{ margin: '24rpx' }}>