订单售后v2

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

@@ -117,7 +117,6 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, defaultValue =
                     <View className={styles.addressList_con}>
                         <AddressList onSelect={getAddress}/>
                     </View>
-                    <View className="common_safe_area_y"></View>
                 </View>
             </Popup>
         </View>

src/pages/order/index.tsx

@@ -142,12 +142,10 @@ import styles  from './index.module.scss'
 
     //获取底部按钮点击, 获取按钮状态
     const orderStateClick = useCallback((val) => {
-        console.log('val::', val)
-        if(val == 1) {
+        if(val == 1 || val == 6) {
             //取消订单
             getSaleOrderPreView()
-        }
-        if(val == 2) {
+        }else if(val == 2) {
             //待付款
             toPay()
         }

src/pages/orderList/components/order/index.module.scss

@@ -42,6 +42,9 @@
             border-radius: 0px 20px 0px 20px;
         }
     }
+    .product_con{
+        margin-bottom: 20px;
+    }
     .product_title{
         display: flex;
         align-items: center;

src/pages/orderList/index.tsx

@@ -96,7 +96,10 @@ export default () => {
 
   //监听点击的按钮
   const clickOrderBtn = useCallback(({status, orderInfo}) => {
-    if(status == 2) {
+    console.log('status:::', status)
+    if(status == 1 || status == 6) {
+      getOrderList()
+    } else if(status == 2) {
       //去支付
       setPayOrderInfo({orderId:orderInfo.should_collect_order_id, payment_method:orderInfo.payment_method})
       toPay()