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

🐞 fix(ID1000942):订单详情的合计金额进位规则，应与应收单一致

Browse Source
This commit is contained in:
Haiyi 2022-12-08 20:00:44 +08:00
parent e68b97e104
commit c2335d5d73
3 changed files with 622 additions and 639 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/pages/orderDetails/index.module.scss
View File

@ -34,7 +34,7 @@ page {
.productBox { .productBox {
// width: 702px; // width: 702px;
margin-right: 24px; margin-right: 24px;
background: #FFFFFF; background: #ffffff;
border-radius: 16px; border-radius: 16px;
margin-left: 24px; margin-left: 24px;
padding-bottom: 36px; padding-bottom: 36px;
@ -66,18 +66,17 @@ page {
.shoudPay { .shoudPay {
font-size: 28px; font-size: 28px;
font-weight: 500; font-weight: 500;
color: #F64861; color: #f64861;
margin-right: 32px; margin-right: 32px;
} }
} }
} }
} }
.defaltBox { .defaltBox {
margin: 24px; margin: 24px;
padding: 24px 32px 24px 24px; padding: 24px 32px 24px 24px;
background: #FFFFFF; background: #ffffff;
border-radius: 16px; border-radius: 16px;
.titleBox { .titleBox {
@ -97,7 +96,7 @@ page {
.modeName { .modeName {
font-size: 28px; font-size: 28px;
font-weight: 500; font-weight: 500;
color: #337FFF; color: #337fff;
} }
} }
@ -110,13 +109,12 @@ page {
background: #000000; background: #000000;
opacity: 0.1; opacity: 0.1;
} }
} }
.goodsBox { .goodsBox {
margin-top: 24px; margin-top: 24px;
overflow: hidden; overflow: hidden;
border-bottom: 8px solid #F7F7F7; border-bottom: 8px solid #f7f7f7;
.goodsProduct { .goodsProduct {
font-size: 28px; font-size: 28px;
@ -145,7 +143,7 @@ page {
margin-right: 42px; margin-right: 42px;
width: 108px; width: 108px;
height: 108px; height: 108px;
background: #322F2F; // background: #322F2F;
border-radius: 8px; border-radius: 8px;
} }
@ -192,8 +190,6 @@ page {
} }
} }
} }
} }
.itemGoods:last-child { .itemGoods:last-child {
@ -205,7 +201,7 @@ page {
margin-right: 42px; margin-right: 42px;
width: 108px; width: 108px;
height: 108px; height: 108px;
background: #322F2F; // background: #322F2F;
border-radius: 8px; border-radius: 8px;
} }
@ -251,8 +247,6 @@ page {
} }
} }
} }
} }
} }
@ -271,7 +265,6 @@ page {
align-items: center; align-items: center;
.detailRight { .detailRight {
font-size: 28px; font-size: 28px;
font-weight: 400; font-weight: 400;
color: #000000; color: #000000;
@ -282,10 +275,10 @@ page {
width: 65px; width: 65px;
height: 32px; height: 32px;
border-radius: 8px; border-radius: 8px;
border: 1PX solid #337FFF; border: 1px solid #337fff;
font-size: 24px; font-size: 24px;
font-weight: 400; font-weight: 400;
color: #337FFF; color: #337fff;
text-align: center; text-align: center;
line-height: 32px; line-height: 32px;
} }
@ -316,7 +309,7 @@ page {
// width: 750px; // width: 750px;
width: 100%; width: 100%;
height: 160px; height: 160px;
background: #FFFFFF; background: #ffffff;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
padding-bottom: 24px; padding-bottom: 24px;
@ -333,8 +326,6 @@ page {
} }
} }
.posssBox { .posssBox {
position: absolute; position: absolute;
left: 32px; left: 32px;

2
src/pages/orderDetails/index.tsx
View File

@ -104,7 +104,7 @@ const GoodsItem = (porps: PropGoods) => {
<View className={styles.itemNums}>x{obj?.sale_mode === 0 ? it.roll : it.length / 100}{obj?.sale_mode === 0 ? '条' : 'm'}</View> <View className={styles.itemNums}>x{obj?.sale_mode === 0 ? it.roll : it.length / 100}{obj?.sale_mode === 0 ? '条' : 'm'}</View>
</View> </View>
<View className={styles.item_right_Bottom}> <View className={styles.item_right_Bottom}>
<View className={styles.itemMoney}>¥{it.sale_price / 100}/{obj?.sale_mode === 1 ? 'm' : 'kg'}</View> <View className={styles.itemMoney}>¥{formatPriceDiv(it.sale_price)}/{obj?.sale_mode === 1 ? 'm' : 'kg'}</View>
<View className={styles.itemMoneyOne}>¥{formatPriceDiv(it.total_sale_price)}</View> <View className={styles.itemMoneyOne}>¥{formatPriceDiv(it.total_sale_price)}</View>
</View> </View>
</View> </View>

34
src/pages/submitOrder/index.module.scss
View File

@ -36,7 +36,7 @@ page {
.productBox { .productBox {
width: 702px; width: 702px;
background: #FFFFFF; background: #ffffff;
border-radius: 16px; border-radius: 16px;
margin-left: 24px; margin-left: 24px;
padding-bottom: 36px; padding-bottom: 36px;
@ -70,18 +70,17 @@ page {
font-size: 28px; font-size: 28px;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #F64861; color: #f64861;
margin-right: 32px; margin-right: 32px;
} }
} }
} }
} }
.defaltBox { .defaltBox {
margin: 24px; margin: 24px;
padding: 24px 32px 24px 24px; padding: 24px 32px 24px 24px;
background: #FFFFFF; background: #ffffff;
border-radius: 16px; border-radius: 16px;
.titleBox { .titleBox {
@ -101,7 +100,7 @@ page {
font-size: 28px; font-size: 28px;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #337FFF; color: #337fff;
} }
} }
@ -112,13 +111,12 @@ page {
background: #000000; background: #000000;
opacity: 0.1; opacity: 0.1;
} }
} }
.goodsBox { .goodsBox {
margin-top: 24px; margin-top: 24px;
overflow: hidden; overflow: hidden;
border-bottom: 8px solid #F7F7F7; border-bottom: 8px solid #f7f7f7;
.goodsProduct { .goodsProduct {
font-size: 28px; font-size: 28px;
@ -146,7 +144,7 @@ page {
margin-right: 42px; margin-right: 42px;
width: 108px; width: 108px;
height: 108px; height: 108px;
background: #322F2F; // background: #322F2F;
border-radius: 8px; border-radius: 8px;
} }
@ -196,8 +194,6 @@ page {
} }
} }
} }
} }
.itemGoods:last-child { .itemGoods:last-child {
@ -209,7 +205,7 @@ page {
margin-right: 42px; margin-right: 42px;
width: 108px; width: 108px;
height: 108px; height: 108px;
background: #322F2F; // background: #322F2F;
border-radius: 8px; border-radius: 8px;
} }
@ -259,8 +255,6 @@ page {
} }
} }
} }
} }
} }
@ -279,7 +273,6 @@ page {
align-items: center; align-items: center;
.detailRight { .detailRight {
font-size: 28px; font-size: 28px;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
@ -291,11 +284,11 @@ page {
width: 65px; width: 65px;
height: 32px; height: 32px;
border-radius: 8px; border-radius: 8px;
border: 1PX solid #337FFF; border: 1px solid #337fff;
font-size: 24px; font-size: 24px;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #337FFF; color: #337fff;
text-align: center; text-align: center;
line-height: 32px; line-height: 32px;
} }
@ -324,7 +317,7 @@ page {
.bottomBox { .bottomBox {
width: 750px; width: 750px;
height: 160px; height: 160px;
background: #FFFFFF; background: #ffffff;
display: flex; display: flex;
// padding-top: 16px; // padding-top: 16px;
position: fixed; position: fixed;
@ -352,7 +345,7 @@ page {
font-size: 24px; font-size: 24px;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #F64861; color: #f64861;
} }
} }
@ -365,17 +358,16 @@ page {
} }
} }
.rightBottom { .rightBottom {
margin-top: 16px; margin-top: 16px;
width: 224px; width: 224px;
height: 80px; height: 80px;
background: #4581FF; background: #4581ff;
border-radius: 40px; border-radius: 40px;
font-size: 32px; font-size: 32px;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #ffffff;
text-align: center; text-align: center;
line-height: 80px; line-height: 80px;
margin-right: 24px; margin-right: 24px;