From e546aa0db69fe114831e27001e711b0b783cb3fd Mon Sep 17 00:00:00 2001 From: xuan Date: Fri, 17 Mar 2023 20:52:18 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=88=20perf(ID1000943):=20=E9=9D=A2?= =?UTF-8?q?=E6=96=99=E4=BC=98=E9=80=89=E5=B9=B3=E5=8F=B0=E7=9A=84=E9=93=B6?= =?UTF-8?q?=E8=A1=8C=E8=B4=A6=E6=88=B7=E6=98=BE=E7=A4=BA=E5=86=9C=E8=A1=8C?= =?UTF-8?q?=E8=B4=A6=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【面料优选平台的银行账户显示农行账户】 https://www.tapd.cn/53459131/prong/stories/view/1153459131001000943 --- src/common/constant.ts | 4 ++-- src/pages/depositBeforehand/index.config.ts | 2 +- src/pages/depositBeforehand/index.tsx | 12 ++++++------ src/pages/order/components/offlinePay/index.tsx | 12 ++++++------ src/pages/order/components/scanPayCheck/index.tsx | 11 ++++++++++- src/pages/user/index.tsx | 4 ++-- 6 files changed, 27 insertions(+), 18 deletions(-) diff --git a/src/common/constant.ts b/src/common/constant.ts index c78c402..15c3ac3 100644 --- a/src/common/constant.ts +++ b/src/common/constant.ts @@ -1,11 +1,11 @@ -// 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` // export const BASE_URL = `http://192.168.0.89:40001/lymarket` // export const BASE_URL = `http://192.168.1.165:40001/lymarket` // 王霞 // export const BASE_URL = 'https://test.zzfzyc.com/lymarket' // 测试环境 -export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布 +// export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布 // export const BASE_URL = `http://192.168.1.9:40001/lymarket` // 发 // export const BASE_URL = `http://192.168.1.9:50005/lymarket` // 发 // export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发 diff --git a/src/pages/depositBeforehand/index.config.ts b/src/pages/depositBeforehand/index.config.ts index f76fc15..e6607a1 100644 --- a/src/pages/depositBeforehand/index.config.ts +++ b/src/pages/depositBeforehand/index.config.ts @@ -1,4 +1,4 @@ export default { - navigationBarTitleText: '预存货款', + navigationBarTitleText: '货款余额', enableShareAppMessage: true, } diff --git a/src/pages/depositBeforehand/index.tsx b/src/pages/depositBeforehand/index.tsx index 7b8e41f..0b9fd3d 100644 --- a/src/pages/depositBeforehand/index.tsx +++ b/src/pages/depositBeforehand/index.tsx @@ -23,7 +23,7 @@ const DepositBeforehand = () => { }, []) // 复制 const handleCopy = () => { - setClipboardData({ data: state.data?.transfer_remittance_account }) + setClipboardData({ data: '4443 2201 0400 1476 5' }) } const [showModal, setShowModal] = useState(false) @@ -59,21 +59,21 @@ const DepositBeforehand = () => { - 预存款充值 + 货款充值 复制 开户名称 - {state.data?.account_name} + 中国农业银行股份有限公司佛山张搓开发区支行 开户银行 - {state.data?.bank_of_deposit} + 中国农业银行 - 专属汇款账号 - {state.data?.transfer_remittance_account} + 汇款账号 + 4443 2201 0400 1476 5 diff --git a/src/pages/order/components/offlinePay/index.tsx b/src/pages/order/components/offlinePay/index.tsx index b9686e1..13f5a68 100644 --- a/src/pages/order/components/offlinePay/index.tsx +++ b/src/pages/order/components/offlinePay/index.tsx @@ -58,16 +58,16 @@ const OfflinePay = ({ show = true, onClose, offlineInfo }: Param) => { - {offlineInfo?.account_name} - handCopy(offlineInfo?.account_name)}>复制 + 中国农业银行股份有限公司佛山张搓开发区支行 + handCopy('中国农业银行股份有限公司佛山张搓开发区支行')}>复制 - {offlineInfo?.bank_of_deposit} - handCopy(offlineInfo?.bank_of_deposit)}>复制 + 中国农业银行 + handCopy('中国农业银行')}>复制 - {offlineInfo?.transfer_remittance_account} - handCopy(offlineInfo?.transfer_remittance_account)}>复制 + 4443 2201 0400 1476 5 + handCopy('4443 2201 0400 1476 5')}>复制 复制信息 diff --git a/src/pages/order/components/scanPayCheck/index.tsx b/src/pages/order/components/scanPayCheck/index.tsx index 7b6247c..c0bdd37 100644 --- a/src/pages/order/components/scanPayCheck/index.tsx +++ b/src/pages/order/components/scanPayCheck/index.tsx @@ -11,6 +11,7 @@ import { GetPayCode } from '@/api/onlinePay' import LoadingCard from '@/components/loadingCard' import CodeSelect from '@/components/codeSelect' import ViewCodeList from '@/components/viewCodeList' +import { ENUM_SALE_MODE } from '@/common/enum' interface Param { show?: true | false @@ -178,7 +179,15 @@ const ScanPayCheck = ({ show = true, onClose, company, orderInfo }: Param) => { const [showPopup, setshowPopup] = useState(false) const onCloseEven = () => { - setshowPopup(true) + if (orderInfo.sale_mode === ENUM_SALE_MODE.SALE_MODE_BULK) { + setshowPopup(true) + } + else { + return Taro.showToast({ + title: '该功能开发中', + icon: 'none', + }) + } onClose?.() } diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx index 669c7b3..afc8d7c 100644 --- a/src/pages/user/index.tsx +++ b/src/pages/user/index.tsx @@ -38,12 +38,12 @@ export default () => { console.log('priceState::', priceState.data) return [ { - label: '预存货款(元)', + label: '货款余额(元)', value: formatPriceDiv(priceState?.data?.wallet_money || 0, 100, true), url: '/pages/depositBeforehand/index', }, { - label: '账期货款(元)', + label: '账期授信(元)', value: formatPriceDiv(priceState?.data.credit_line || 0, 100, true), url: '/pages/creditLine/index', },