diff --git a/src/api/onlinePay.ts b/src/api/onlinePay.ts index 3f9da49..77bf0a5 100644 --- a/src/api/onlinePay.ts +++ b/src/api/onlinePay.ts @@ -4,57 +4,57 @@ import { useRequest } from '@/use/useHttp' /** * 线上获取在线支付二维码 */ -export const GetPayCode = () => { - return useRequest({ - url: '/xima-caphtml/caphtml', - base_url: CAP_HTML_TO_IMAGE_BASE_URL, - method: 'post', - }) -} - -// 本地获取二维码 // export const GetPayCode = () => { // return useRequest({ -// url: '/caphtml', +// url: '/xima-caphtml/caphtml', // base_url: CAP_HTML_TO_IMAGE_BASE_URL, // method: 'post', // }) // } +// 本地获取二维码 +export const GetPayCode = () => { + return useRequest({ + url: '/caphtml', + base_url: CAP_HTML_TO_IMAGE_BASE_URL, + method: 'post', + }) +} + /** * 获取退款码单 */ -export const GetReturnPayCode = () => { - return useRequest({ - url: '/xima-caphtml/caphtml-return', - base_url: CAP_HTML_TO_IMAGE_BASE_URL, - method: 'post', - }) -} - -// 本地获取退款码单 // export const GetReturnPayCode = () => { // return useRequest({ -// url: '/caphtml-return', +// url: '/xima-caphtml/caphtml-return', // base_url: CAP_HTML_TO_IMAGE_BASE_URL, // method: 'post', // }) // } +// 本地获取退款码单 +export const GetReturnPayCode = () => { + return useRequest({ + url: '/caphtml-return', + base_url: CAP_HTML_TO_IMAGE_BASE_URL, + method: 'post', + }) +} + /** * 获取传统码单 */ -export const GetCodePic = () => { - return useRequest({ - url: '/xima-caphtml/caphtml-order', - base_url: CAP_HTML_TO_IMAGE_BASE_URL, - method: 'post', - }) -} // export const GetCodePic = () => { // return useRequest({ -// url: '/caphtml-order', +// url: '/xima-caphtml/caphtml-order', // base_url: CAP_HTML_TO_IMAGE_BASE_URL, // 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 74bd374..9a6edfc 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` // 发 @@ -27,8 +27,8 @@ export const SEARCH_EMPTY_IMAGE = `${IMG_CND_Prefix}/search_empty.png` export const COLLECTION_EMPTY_IMAGE = `${IMG_CND_Prefix}/mall/collection_empty.png` // 在线支付图片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.21:8081' +// 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.21:8081' // 获取CND资源 export const getCDNSource = (suffix: string) => { diff --git a/src/components/viewCodeList/index.tsx b/src/components/viewCodeList/index.tsx index 4ac7262..b8c47a9 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: '面料优选A+码单', + title: '面料销售电子确认单', company: props.orderObj.company_name, // 后端公司 order_type: props.orderObj.sale_mode_name, // 类型:大货 sale_user: props.orderObj.sale_user_name, // 业务员