🐞 fix(ID1001483销售码单，其他面料及色号都不见了，合并项有误):

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',
+//   })
+// }

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) => {

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) => {

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), // 是否显示发货方式
 

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 (
     <View className={styles.scanPay_main}>
@@ -186,11 +196,12 @@ const ScanPayCheck = ({ show = true, onClose, company, orderInfo }: Param) => {
               </ScrollView>
             )}
           </View>
-          <View className={styles.btns} onClick={saveImageCheck}>
-            保存电子确认单
+          <View className={styles.btns} onClick={() => onCloseEven()}>
+            查看横版码单
           </View>
         </View>
       </Popup>
+      <ViewCodeList orderObj={orderInfo} showPopup={showPopup} handClose={() => setshowPopup(false)}></ViewCodeList>
     </View>
   )
 }

src/pages/order/index.tsx

@@ -301,7 +301,7 @@ const Order = () => {
     [orderDetail],
   )
   return (
-    <MoveBtn orderObj={orderDetail} showList={['order', 'code']} messageTitle={orderDetail?.order_no} messagePath={`/pages/order/index?id=${orderDetail?.id}`} showCart>
+    <MoveBtn orderObj={orderDetail} showList={['order']} messageTitle={orderDetail?.order_no} messagePath={`/pages/order/index?id=${orderDetail?.id}`} showCart>
       <View className={styles.order_main}>
         {(orderDetail?.status != SaleorderstatusWaitingPrePayment.value && <OrderState picUrl={orderDetail?.picUrl} orderInfo={orderDetail} />) || (
           <AdvanceOrderState orderInfo={orderDetail} onRefresh={refresh} />