From 8ec073a085d85923934dc8365a1ee998276469dc Mon Sep 17 00:00:00 2001 From: czm <2192718639@qq.com> Date: Mon, 4 Jul 2022 11:30:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=AD=90=E5=95=86=E5=9F=8E=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=89=88v3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/constant.js | 4 ++-- src/components/product/index.module.scss | 9 +++---- .../components/kindList/index.module.scss | 1 - src/pages/order/components/kindList/index.tsx | 1 - src/pages/order/components/payment/index.tsx | 8 ++++++- src/pages/order/components/scanPay/index.tsx | 24 +++++++++---------- .../orderList/components/order/index.tsx | 4 ++-- 7 files changed, 28 insertions(+), 23 deletions(-) diff --git a/src/common/constant.js b/src/common/constant.js index d13b4bf..3dc9ec4 100644 --- a/src/common/constant.js +++ b/src/common/constant.js @@ -9,9 +9,9 @@ // export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发 // export const BASE_URL = `https://dev.zzfzyc.com/lymarket` // 开发环境 // export const BASE_URL = `https://www.zzfzyc.com/lymarket` // 正式环境 -export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞 +// export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞 // export const BASE_URL = `http://192.168.1.7:50002/lymarket` // 添 -// export const BASE_URL = `http://192.168.1.42:50001/lymarket` // 杰 +export const BASE_URL = `http://192.168.1.42:50001/lymarket` // 杰 // CDN // 生成密钥 diff --git a/src/components/product/index.module.scss b/src/components/product/index.module.scss index 35f7693..793b028 100644 --- a/src/components/product/index.module.scss +++ b/src/components/product/index.module.scss @@ -51,15 +51,16 @@ .tag_list{ display: flex; margin-top: 16px; + flex-wrap: wrap; .tag, .tag_g{ + max-width: 150rpx; padding: 3px 10px; background-color: #CDE5FF; font-size: $font_size_min; border-radius: 5px; color: $color_main; - &:nth-child(2) { - margin-left: 10px; - } + margin-right: 10px; + margin-bottom: 10px; } .tag_g{ background-color: #FFE6CE; @@ -69,7 +70,7 @@ .introduce{ font-size: $font_size_medium; color: $color_font_two; - margin-top: 16px; + } .des{ font-size:$font_size_medium; diff --git a/src/pages/order/components/kindList/index.module.scss b/src/pages/order/components/kindList/index.module.scss index 64b65b8..052a8b5 100644 --- a/src/pages/order/components/kindList/index.module.scss +++ b/src/pages/order/components/kindList/index.module.scss @@ -90,7 +90,6 @@ .order_list_item_count{ display: flex; flex-direction: column; - justify-content: center; align-items: flex-end; .count_num{ color: $color_main; diff --git a/src/pages/order/components/kindList/index.tsx b/src/pages/order/components/kindList/index.tsx index ce8e4b6..b2c2288 100644 --- a/src/pages/order/components/kindList/index.tsx +++ b/src/pages/order/components/kindList/index.tsx @@ -173,7 +173,6 @@ export default memo(({order, comfirm = false}:Param) => { ¥{standardPrice(colorItem.sale_price)} {aboutWeight(colorItem.estimate_weight)} - ×{formatCount(colorItem)}{order.unit} diff --git a/src/pages/order/components/payment/index.tsx b/src/pages/order/components/payment/index.tsx index befa8cc..a452a89 100644 --- a/src/pages/order/components/payment/index.tsx +++ b/src/pages/order/components/payment/index.tsx @@ -156,6 +156,12 @@ export default memo(({show = false, onClose, orderInfo, onSubmitSuccess}:Param) const changeSelect = () => { } + //在线支付所需数据 + const onlinePayData = useMemo(() => { + return {...orderInfo, offline_remittance_information: payInfo?.offline_remittance_information} + + }, [orderInfo, payInfo]) + return ( @@ -225,7 +231,7 @@ export default memo(({show = false, onClose, orderInfo, onSubmitSuccess}:Param) setofflinePayShow(false)} offlineInfo={payInfo?.offline_remittance_information}/> - setScanPayShow(false)} /> + setScanPayShow(false)} /> ) diff --git a/src/pages/order/components/scanPay/index.tsx b/src/pages/order/components/scanPay/index.tsx index ba3554b..4b78bcf 100644 --- a/src/pages/order/components/scanPay/index.tsx +++ b/src/pages/order/components/scanPay/index.tsx @@ -44,11 +44,11 @@ export default memo(({show = true, onClose, company, orderInfo}:Param) => { product_name: pitem.name, product_color_code: formatHashTag(citem.code)!, product_color_name: citem.name, - num: citem.roll + '', - length: (citem.length/100) + '', - weight: formatWeightDiv(citem.estimate_weight) + '', - sale_price: formatPriceDiv(citem.sale_price) + '', - total_price: formatPriceDiv(citem.estimate_amount) + '', + num: citem.roll.toString(), + length: (citem.length/100).toString(), + weight: formatWeightDiv(citem.estimate_weight).toString(), + sale_price: formatPriceDiv(citem.sale_price).toString(), + total_price: formatPriceDiv(citem.estimate_amount).toString(), }) }) }) @@ -63,17 +63,17 @@ export default memo(({show = true, onClose, company, orderInfo}:Param) => { target_user_name: userName(orderInfo), //收件人 target_address: address(orderInfo), //收货地址 target_description: orderInfo.remark, //发货备注 - pay_account:"1234567890123450001", //专属收款账号 - bank_account_name:"佛山市浩川长盛科技有限公司", //账户名称 - bank_name:"招商银行佛山分行禅城支行", //开户银行 + pay_account: orderInfo.offline_remittance_information?.transfer_remittance_account, //专属收款账号 + bank_account_name: orderInfo.offline_remittance_information?.account_name, //账户名称 + bank_name: orderInfo.offline_remittance_information?.bank_of_deposit, //开户银行 pay_type:"", //支付方式, 可不传 client: orderInfo.purchaser_name, //客户名称 phone: userPhone(orderInfo), //收货手机号码 - order_total_length: (orderInfo.total_number/100) + '', //订单布匹长度 - order_total_price: formatPriceDiv(orderInfo.total_sale_price) + '', //订单价格 - order_total_num: orderInfo.total_number + '', + order_total_length: (orderInfo.total_number/100).toString(), //订单布匹长度 + order_total_price: formatPriceDiv(orderInfo.total_sale_price).toString(), //订单价格 + order_total_num: (orderInfo.total_number) + '', qrcode:"", //跳转链接 - order_total_weight: formatWeightDiv(orderInfo.total_estimate_weight) + '', //订单布匹重量 + order_total_weight: formatWeightDiv(orderInfo.total_estimate_weight).toString(), //订单布匹重量 list: lists })) } diff --git a/src/pages/orderList/components/order/index.tsx b/src/pages/orderList/components/order/index.tsx index b21c722..aff2e02 100644 --- a/src/pages/orderList/components/order/index.tsx +++ b/src/pages/orderList/components/order/index.tsx @@ -70,8 +70,8 @@ export default memo(({value, onClickBtn}: Param) => { goLink('/pages/order/index', {id: value?.id})}> - - {userInfo?.adminUserInfo?.user_name} + + {userInfo?.adminUserInfo?.user_name} 订单号：{value?.order_no}