剪板流程

src/api/orderPay.ts

@@ -1,7 +1,7 @@
 import { useRequest } from "@/use/useHttp"
 
 /**
- * 获取订单支付方式信息
+ * 获取应收单订单支付方式信息
  */
  export const GetOrderPayApi = () => {
     return useRequest({
@@ -11,11 +11,21 @@ import { useRequest } from "@/use/useHttp"
 }
 
 /**
- * 订单支付提交
+ * 应收单订单支付提交
  */
  export const SubmitOrderPayApi = () => {
     return useRequest({
         url: `/v1/mall/orderPayment/orderPaymentSubmission`,
         method: "put",
     })
+}
+
+/**
+ * 获取应收单订单支付方式信息
+ */
+ export const GetOrderPayApi2 = () => {
+    return useRequest({
+        url: `/v1/mall/orderPayment/preCollectOrder/orderPaymentMethodInfo`,
+        method: "get",
+    })
 }

src/common/enum.ts

@@ -1,7 +1,7 @@
 
 //订单状态枚举
 export const ORDER_STATUS = {
-    SaleOrderStatusCancel : {value:10, label:'预付款'}, // 
+    SaleorderstatusWaitingPrePayment : {value:10, label:'预付款'}, // 预付款
     SaleOrderStatusBooking  : {value:0, label:'待接单'}, // 待接单
     SaleOrderStatusArranging : {value:1, label:'配布中'}, // 配布中
     SaleOrderStatusArranged : {value:2, label:'已配布'}, // 已配布

src/components/orderBtns/index.tsx

@@ -12,7 +12,6 @@ type Param = {
         orderId: number, //订单id
         actual_amount: number, //实付金额
         wait_pay_amount: number, //待付金额
-        sale_mode: number, //订单类型
     }|null,
     onClick?: (val: number) => void //点击后触发的事件，返回订单状态
 }
@@ -28,7 +27,8 @@ export default memo(({orderInfo, onClick}:Param) => {
             SaleOrderStatusRefund,
             SaleOrderStatusWaitingPayment,
             SaleOrderStatusWaitingReceipt,
-            SaleOrderStatusAlreadyReceipt
+            SaleOrderStatusAlreadyReceipt,
+            SaleorderstatusWaitingPrePayment
         } = ORDER_STATUS
     //订单按钮按订单状态归类
     const orderBtnsList = useRef([
@@ -39,7 +39,7 @@ export default memo(({orderInfo, onClick}:Param) => {
         },
         {
             id: 2,
-            value: [SaleOrderStatusWaitingPayment.value, SaleOrderStatusWaitingDelivery.value, SaleOrderStatusWaitingReceipt.value, SaleOrderStatusAlreadyReceipt.value, SaleOrderStatusComplete.value], //去付款按钮对应：待付款， 待发货, 待收货, 已收货, 已完成
+            value: [SaleorderstatusWaitingPrePayment.value, SaleOrderStatusWaitingPayment.value, SaleOrderStatusWaitingDelivery.value, SaleOrderStatusWaitingReceipt.value, SaleOrderStatusAlreadyReceipt.value, SaleOrderStatusComplete.value], //去付款按钮对应：待付款， 待发货, 待收货, 已收货, 已完成
             label: '去付款'
         },
         {

src/pages/applyAfterSales/index.module.scss

@@ -117,7 +117,7 @@
     .apply_after_sales_list{
         padding: 0 20px;
         .apply_after_sales_item{
-            margin-bottom: 30px;
+            margin-bottom: 50px;
             .apply_after_sales_title{
                 display: flex;
                 align-items: center;

src/pages/applyAfterSales/index.tsx

@@ -19,7 +19,6 @@ export default () => {
     const onShowReason = (status) => setShowReason({...showReason, status, show:true})
 
     
-
     //底部按钮
     const onSubmit = (val) => {
 
@@ -32,7 +31,8 @@ export default () => {
                 <ScrollView scrollY className={styles.scroll}>
                     <View className={styles.scroll_con}>
                         <View className={styles.apply_after_sales_list}>
-                            <View className={styles.apply_after_sales_item}>
+                            
+                            {new Array(5).fill(5).map(item => <View className={styles.apply_after_sales_item}>
                                 <View className={styles.apply_after_sales_title}>
                                     <View className={styles.tag}>大货</View>
                                     <View className={styles.title}>0770# 21S单面平纹(食毛)</View>
@@ -53,29 +53,8 @@ export default () => {
                                         </View>
                                     </View>
                                 </View>
-                            </View>
-                            <View className={styles.apply_after_sales_item}>
-                                <View className={styles.apply_after_sales_title}>
-                                    <View className={styles.tag}>大货</View>
-                                    <View className={styles.title}>0770# 21S单面平纹(食毛)</View>
-                                </View>
-                                <View className={styles.color_list}>
-                                    <View className={styles.color_item}>
-                                        <View className={styles.image}><Image src={formatImgUrl('')}/></View>
-                                        <View className={styles.name_and_number}><Text>1# 薄荷绿</Text><Text>x1</Text></View>
-                                        <View className={styles.btn_count}>
-                                            <Counter/>
-                                        </View>
-                                    </View>
-                                    <View className={styles.color_item}>
-                                        <View className={styles.image}><Image src={formatImgUrl('')}/></View>
-                                        <View className={styles.name_and_number}><Text>1# 薄荷绿</Text><Text>x1</Text></View>
-                                        <View className={styles.btn_count}>
-                                            <Counter/>
-                                        </View>
-                                    </View>
-                                </View>
-                            </View>
+                            </View>)}
+
                         </View>
                         <View className={styles.returnSaleInput}>
                             <View className={styles.returnSaleInput_item}>
@@ -124,7 +103,6 @@ export default () => {
 //图片列表
 const PictureItem = memo(() => {
     const {uploadCDNImg} = useUploadCDNImg()
-
     //图片
     const uploadImage = () => {
         Taro.chooseImage({

src/pages/order/components/kindList/index.tsx

@@ -55,6 +55,7 @@ export default memo(({order, comfirm = false}:Param) => {
         SaleOrderStatusComplete, // 已完成
         SaleOrderStatusRefund, // 已退款
         SaleOrderStatusCancel, // 已取消
+        SaleorderstatusWaitingPrePayment // 预付款
     } = ORDER_STATUS
 
     //金额列表枚举
@@ -67,7 +68,7 @@ export default memo(({order, comfirm = false}:Param) => {
         },
         {
             id:2,
-            value:[SaleOrderStatusArranged.value, SaleOrderStatusWaitingPayment.value, SaleOrderStatusWaitingDelivery.value, SaleOrderStatusWaitingReceipt.value, SaleOrderStatusAlreadyReceipt.value, SaleOrderStatusComplete.value, SaleOrderStatusRefund.value, SaleOrderStatusCancel.value],
+            value:[SaleorderstatusWaitingPrePayment.value, SaleOrderStatusArranged.value, SaleOrderStatusWaitingPayment.value, SaleOrderStatusWaitingDelivery.value, SaleOrderStatusWaitingReceipt.value, SaleOrderStatusAlreadyReceipt.value, SaleOrderStatusComplete.value, SaleOrderStatusRefund.value, SaleOrderStatusCancel.value],
             label:'合计金额',
             field: 'total_sale_price'
         },