商城测试版v7

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

@@ -20,7 +20,8 @@ type OrderParam = {
     total_weight_error_discount: number, //空差优惠
     the_previous_status: number, //取消订单时的订单状态
     actual_amount: number, //实付金额
-    wait_pay_amount: number //待付金额
+    wait_pay_amount: number, //待付金额
+    refund_amount: number //退款金额
 }
 
 type Param = {
@@ -90,7 +91,7 @@ export default memo(({order, comfirm = false}:Param) => {
             field: 'wait_pay_amount',
             message: '扣除空差后的货款金额',
             validatarFunc: (order) => {
-                return order['wait_pay_amount'] > 0 && order['refund_amount'] <= 0
+                return order['wait_pay_amount'] > 0
             }
         },
         {

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

@@ -95,9 +95,13 @@ export default memo(({show = false, onClose, orderInfo, onSubmitSuccess}:Param)
     }
 
     //账期选择
+    const accountPeriodRef = useRef<any>(null)
     const periodSelectData = (val) => {
         setSubmitData((e) => ({...e, payment_method:val}))
     }
+    const accountPeriodSelect = () => {
+        accountPeriodRef.current.onSelectEven()
+    }
     
     //订阅消息
     const {ToPay} = SUBSCRIPTION_MESSAGE_SCENE
@@ -201,7 +205,7 @@ export default memo(({show = false, onClose, orderInfo, onSubmitSuccess}:Param)
                                 </View>
                                 <MCheckbox ref={advanceRef} status={submitData.payment_method == PaymentMethodPreDeposit.value} onSelect={() => advanceSelectData(PaymentMethodPreDeposit.value)} onClose={() => advanceSelectData(null)}/>
                             </View>
-                            {show_account_payment&&<View className={styles.payment_list_item}>
+                            {show_account_payment&&<View className={styles.payment_list_item} onClick={accountPeriodSelect}>
                                 <View className={styles.payment_list_item_left}>
                                     <View className={styles.payment_list_item_left_name}>
                                         <View className={classnames('iconfont icon-xtianzhangqi', styles.miconfont, styles.account_period)}></View>
@@ -209,7 +213,7 @@ export default memo(({show = false, onClose, orderInfo, onSubmitSuccess}:Param)
                                     </View>
                                     {account_peyment}
                                 </View>
-                                <MCheckbox  status={submitData.payment_method == PaymentMethodAccountPeriod.value} onSelect={() => periodSelectData(PaymentMethodAccountPeriod.value)} onClose={() => periodSelectData(null)}/>
+                                <MCheckbox ref={accountPeriodRef} status={submitData.payment_method == PaymentMethodAccountPeriod.value} onSelect={() => periodSelectData(PaymentMethodAccountPeriod.value)} onClose={() => periodSelectData(null)}/>
                             </View>}
                             <View className={styles.payment_list_item} onClick={onShowOfflinePay}>
                                 <View className={styles.payment_list_item_left}>

src/pages/order/index.tsx

@@ -64,7 +64,7 @@ import styles  from './index.module.scss'
             }
         }
         Taro.stopPullDownRefresh()
-        Taro.hideToast()       
+        // Taro.hideToast()       
     }
 
     //监听获取到的数据