From fa2275f15abd010f5c219eb1a3dbc8913ffa7ea1 Mon Sep 17 00:00:00 2001
From: czm <2192718639@qq.com>
Date: Wed, 15 Mar 2023 14:08:40 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=88=20perf(=E3=80=90ID1000946=E3=80=91?=
 =?UTF-8?q?=20=E3=80=90=E9=9D=A2=E6=96=99=E4=BC=98=E9=80=89=E3=80=91?=
 =?UTF-8?q?=E5=A4=A7=E8=B4=A7=E7=A0=81=E5=8D=95=E6=AF=8F=E9=A1=B5=E5=BA=95?=
 =?UTF-8?q?=E9=83=A8=E4=BD=8D=E7=BD=AE=E8=A1=A5=E5=85=85=E6=B8=A9=E9=A6=A8?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/onlinePay.ts                  | 56 +++++++++++++--------------
 src/common/constant.ts                |  4 +-
 src/components/viewCodeList/index.tsx |  3 ++
 3 files changed, 33 insertions(+), 30 deletions(-)

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..fb5b418 100644
--- a/src/common/constant.ts
+++ b/src/common/constant.ts
@@ -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 3a8abd8..4ac7262 100644
--- a/src/components/viewCodeList/index.tsx
+++ b/src/components/viewCodeList/index.tsx
@@ -116,6 +116,9 @@ export default (props: Props) => {
       show_pay_type: false, // 是否显示结算方式
       show_order_no: showStatus(props.orderObj.show_order_no), // 是否显示订单号
       show_shipment_mode: showStatus(props.orderObj.show_shipment_mode), // 是否显示发货方式
+      show_tips: true,
+      tips: `<b>温馨提示:</b>请核对本单后验收， <b>如发现质量问题，请于收到货之日起3天内与平台客服联系协商解决，</b>逾期不作处理即表示购方默认对货物无异议；<b>购方确认无任何问题方可裁剪/加工，一经裁剪，缩水等工艺，平台概不负责；</b>
+        看布购货，请先试缩水，并注意分缸裁布！如需撞色拼接，请先试色牢度。非质量问题，恕不退换，谢谢合作！`,
 
     }
     const res = await fetchData(query)