diff --git a/src/api/onlinePay.ts b/src/api/onlinePay.ts
index 8a9ed74..3f9da49 100644
--- a/src/api/onlinePay.ts
+++ b/src/api/onlinePay.ts
@@ -15,7 +15,7 @@ export const GetPayCode = () => {
// 本地获取二维码
// export const GetPayCode = () => {
// return useRequest({
-// url: `/caphtml`,
+// url: '/caphtml',
// base_url: CAP_HTML_TO_IMAGE_BASE_URL,
// method: 'post',
// })
@@ -35,7 +35,7 @@ export const GetReturnPayCode = () => {
// 本地获取退款码单
// export const GetReturnPayCode = () => {
// return useRequest({
-// url: `/caphtml-return`,
+// url: '/caphtml-return',
// base_url: CAP_HTML_TO_IMAGE_BASE_URL,
// method: 'post',
// })
@@ -51,3 +51,10 @@ export const GetCodePic = () => {
method: 'post',
})
}
+// export const GetCodePic = () => {
+// return useRequest({
+// url: '/caphtml-order',
+// base_url: CAP_HTML_TO_IMAGE_BASE_URL,
+// method: 'post',
+// })
+// }
diff --git a/src/common/constant.ts b/src/common/constant.ts
index 76a756d..01bfccd 100644
--- a/src/common/constant.ts
+++ b/src/common/constant.ts
@@ -28,7 +28,7 @@ export const COLLECTION_EMPTY_IMAGE = `${IMG_CND_Prefix}/mall/collection_empty.p
// 在线支付图片baseUrl
export const CAP_HTML_TO_IMAGE_BASE_URL = CURRENT_CAP_HTML_TO_IMAGE_BASE_URL
-// export const CAP_HTML_TO_IMAGE_BASE_URL = 'http://192.168.1.127:8081'
+// export const CAP_HTML_TO_IMAGE_BASE_URL = 'http://192.168.1.21:8081'
// 获取CND资源
export const getCDNSource = (suffix: string) => {
diff --git a/src/components/codeSelect/index.tsx b/src/components/codeSelect/index.tsx
index ef69f6f..b3990b2 100644
--- a/src/components/codeSelect/index.tsx
+++ b/src/components/codeSelect/index.tsx
@@ -8,7 +8,7 @@ import ViewCodeList from '@/components/viewCodeList/index'
import { GetCustomCodeDetailApi } from '@/api/codeManage'
interface param {
- y: number
+ y?: number
orderObj?: any
}
export default ({ y, orderObj = {} }: param) => {
diff --git a/src/components/viewCodeList/index.tsx b/src/components/viewCodeList/index.tsx
index 529a068..3a8abd8 100644
--- a/src/components/viewCodeList/index.tsx
+++ b/src/components/viewCodeList/index.tsx
@@ -82,7 +82,7 @@ export default (props: Props) => {
})
const query: any = {
page_size: '7',
- title: '面料销售电子确认单',
+ title: '面料优选A+码单',
company: props.orderObj.company_name, // 后端公司
order_type: props.orderObj.sale_mode_name, // 类型:大货
sale_user: props.orderObj.sale_user_name, // 业务员
@@ -113,7 +113,7 @@ export default (props: Props) => {
show_sale_price: props.orderObj.is_display_price,
show_barcode: showStatus(props.orderObj.show_barcode), // 条形码
show_qrcode: showStatus(props.orderObj.show_qrcode),
- show_pay_type: showStatus(props.orderObj.show_pay_type), // 是否显示结算方式
+ show_pay_type: false, // 是否显示结算方式
show_order_no: showStatus(props.orderObj.show_order_no), // 是否显示订单号
show_shipment_mode: showStatus(props.orderObj.show_shipment_mode), // 是否显示发货方式
diff --git a/src/pages/order/components/scanPayCheck/index.tsx b/src/pages/order/components/scanPayCheck/index.tsx
index f15ac63..7b6247c 100644
--- a/src/pages/order/components/scanPayCheck/index.tsx
+++ b/src/pages/order/components/scanPayCheck/index.tsx
@@ -9,6 +9,8 @@ import { formatDateTime, formatPriceDiv, formatRemoveHashTag, formatWeightDiv }
import useCheckAuthorize from '@/use/useCheckAuthorize'
import { GetPayCode } from '@/api/onlinePay'
import LoadingCard from '@/components/loadingCard'
+import CodeSelect from '@/components/codeSelect'
+import ViewCodeList from '@/components/viewCodeList'
interface Param {
show?: true | false
@@ -130,7 +132,7 @@ const ScanPayCheck = ({ show = true, onClose, company, orderInfo }: Param) => {
})
setDetail(() => ({
title: '面料销售电子确认单',
- company: orderInfo.company_name, // 后端公司
+ company: '面料优选A+', // 后端公司
order_type: orderInfo.sale_mode_name, // 类型:大货
sale_user: orderInfo.sale_user_name, // 业务员
order_created_time: formatDateTime(orderInfo.create_time),
@@ -172,6 +174,14 @@ const ScanPayCheck = ({ show = true, onClose, company, orderInfo }: Param) => {
}))
}
}, [orderInfo])
+
+ const [showPopup, setshowPopup] = useState(false)
+
+ const onCloseEven = () => {
+ setshowPopup(true)
+ onClose?.()
+ }
+
// 复制功能
return (
@@ -186,11 +196,12 @@ const ScanPayCheck = ({ show = true, onClose, company, orderInfo }: Param) => {
)}
-
- 保存电子确认单
+ onCloseEven()}>
+ 查看横版码单
+ setshowPopup(false)}>
)
}
diff --git a/src/pages/order/index.tsx b/src/pages/order/index.tsx
index 0c567d4..9ca06cc 100644
--- a/src/pages/order/index.tsx
+++ b/src/pages/order/index.tsx
@@ -301,7 +301,7 @@ const Order = () => {
[orderDetail],
)
return (
-
+
{(orderDetail?.status != SaleorderstatusWaitingPrePayment.value && ) || (