From c7da1a1b25bdcfecdc5634889bf5033ca0729b43 Mon Sep 17 00:00:00 2001 From: czm <2192718639@qq.com> Date: Tue, 13 Dec 2022 14:53:54 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=88=20perf(=E6=94=AF=E4=BB=98=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E4=BC=98=E5=8C=96):?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/constant.ts | 4 +- src/components/closeBtn/index.tsx | 2 +- src/components/popup/index.module.scss | 158 +++++++++---------- src/pages/order/components/payment/index.tsx | 5 +- 4 files changed, 84 insertions(+), 85 deletions(-) diff --git a/src/common/constant.ts b/src/common/constant.ts index 2f06165..32af514 100644 --- a/src/common/constant.ts +++ b/src/common/constant.ts @@ -1,4 +1,4 @@ -export const BASE_URL = CURRENT_BASE_URL +// export const BASE_URL = CURRENT_BASE_URL // export const BASE_URL = `http://192.168.0.75:50001/lymarket` // export const BASE_URL = `http://192.168.0.89:50001/lymarket` // export const BASE_URL = `http://10.0.0.5:50001/lymarket` @@ -12,7 +12,7 @@ export const BASE_URL = CURRENT_BASE_URL // 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.7:50002/lymarket' // 添 +export const BASE_URL = 'http://192.168.1.7:50002/lymarket' // 添 // export const BASE_URL = 'http://192.168.1.28:50002/lymarket' // 婷 // export const BASE_URL = `http://192.168.1.42:50002/lymarket` // 杰 diff --git a/src/components/closeBtn/index.tsx b/src/components/closeBtn/index.tsx index 8e3d377..ddc30a1 100644 --- a/src/components/closeBtn/index.tsx +++ b/src/components/closeBtn/index.tsx @@ -12,7 +12,7 @@ const CloseBtn = ({ onClose, styleObj = {} }: Params) => { onClose?.()} > diff --git a/src/components/popup/index.module.scss b/src/components/popup/index.module.scss index 00efd3c..3b63c9d 100644 --- a/src/components/popup/index.module.scss +++ b/src/components/popup/index.module.scss @@ -1,91 +1,89 @@ $am-ms: 200ms; -.drawer_main{ - .drawer { - position:fixed; - left: 0; - top:0; +.drawer_main { + .drawer { + position: fixed; + left: 0; + top: 0; + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; + width: 100%; + height: 100vh; + margin: 0 auto; + z-index: 1000; + visibility: hidden; + transition: visibility $am-ms ease-in-out; + .drawer_mask { + display: flex; + position: absolute; + top: 0; + left: 0; + width: 100vw; + height: 100vh; + background: rgba(0, 0, 0, 0.6); + z-index: 1011; + opacity: 0; + transition: opacity $am-ms ease-in; + .drawer_container { display: flex; - align-items: center; - justify-content: center; flex-direction: column; - width: 100%; - height: 100vh; - margin: 0 auto; - z-index: 1000; - visibility: hidden; - transition: visibility $am-ms ease-in-out; - .drawer_mask{ - display: flex; - position: absolute; - top: 0; - left: 0; - width: 100vw; - height: 100vh; - background: rgba(0, 0, 0, 0.6); - z-index: 1011; - opacity: 0; - transition: opacity $am-ms ease-in; - .drawer_container{ - display: flex; - flex-direction: column; - position: absolute; - background-color: #fff; - z-index: 1012; - transition: transform $am-ms ease-in-out; - .drawer_container_title { - display: flex; - align-items: center; - justify-content: center; - height: 80px; - font-size: 29px; - color: #000000; - padding-top: 10px; - } - .common_close_btn_icon{ - position: absolute; - top: 10px; - left: 10px; - } - } - .drawer_container_active{ - transform: translate3d(0, 0, 0); - } + position: absolute; + background-color: #fff; + z-index: 1012; + transition: transform $am-ms ease-in-out; + .drawer_container_title { + display: flex; + align-items: center; + justify-content: center; + height: 80px; + font-size: 29px; + color: #000000; + padding-top: 10px; } - .drawer_mask_active{ - opacity: 1; + .common_close_btn_icon { + position: absolute; + top: 10px; + left: 10px; + z-index: 1000; } + } + .drawer_container_active { + transform: translate3d(0, 0, 0); + } } - .drawer_active { - visibility:visible; + .drawer_mask_active { + opacity: 1; } + } + .drawer_active { + visibility: visible; + } - .drawer_container_bottom{ - bottom: 0; - left: 0; - min-height: 200px; - width: 100vw; - border-radius: 20px 20px 0px 0px; - transform: translate3d(0, 100%, 0); - } + .drawer_container_bottom { + bottom: 0; + left: 0; + min-height: 200px; + width: 100vw; + border-radius: 20px 20px 0px 0px; + transform: translate3d(0, 100%, 0); + } - .drawer_container_top{ - top: 0; - left: 0; - min-height: 200px; - width: 100vw; - border-radius: 0 0 20px 20px; - transform: translate3d(0, -100%, 0); - } + .drawer_container_top { + top: 0; + left: 0; + min-height: 200px; + width: 100vw; + border-radius: 0 0 20px 20px; + transform: translate3d(0, -100%, 0); + } - .drawer_container_right{ - bottom: 0; - right: 0; - height: 100vh; - min-width: 300px; - border-radius: 20px 0 0 20px; - transform: translate3d(100%, 0, 0); - } - + .drawer_container_right { + bottom: 0; + right: 0; + height: 100vh; + min-width: 300px; + border-radius: 20px 0 0 20px; + transform: translate3d(100%, 0, 0); + } } - - diff --git a/src/pages/order/components/payment/index.tsx b/src/pages/order/components/payment/index.tsx index f68d6a1..c2677e2 100644 --- a/src/pages/order/components/payment/index.tsx +++ b/src/pages/order/components/payment/index.tsx @@ -153,6 +153,7 @@ const Payment = ({ show = false, onClose, orderInfo, onSubmitSuccess }: Param) = // 是否显示七天账期 const show_account_payment = useMemo(() => { + if (!payInfo?.account_period) { return false } // 剪板和散剪不显示 if (orderInfo?.sale_mode != 0) { return false } // 支付方式是账期支付,不显示 @@ -189,7 +190,7 @@ const Payment = ({ show = false, onClose, orderInfo, onSubmitSuccess }: Param) = return ( - + {/* */} 待支付款项 @@ -218,7 +219,7 @@ const Payment = ({ show = false, onClose, orderInfo, onSubmitSuccess }: Param) = - 预存款 + 预存货款 {advance_payment}