1

src/order_pages/orderDetail/index.tsx

@@ -626,10 +626,6 @@ const OrderCheck = () => {
       return; // 未登录或未绑定手机号，已跳转到登录页
     }
     setPaying(true);
-    Taro.showLoading({
-      title: "支付中...",
-      mask: true,
-    });
 
     let payment_params = {};
     try {
@@ -641,7 +637,6 @@ const OrderCheck = () => {
         });
       }
       await payOrder(payment_params);
-      Taro.hideLoading();
       Taro.showToast({
         title: "支付成功",
         icon: "success",
@@ -655,7 +650,6 @@ const OrderCheck = () => {
       //   delta: 1,
       // });
     } catch (error) {
-      Taro.hideLoading();
       Taro.showToast({
         title: error.message,
         icon: "none",
@@ -717,15 +711,16 @@ const OrderCheck = () => {
       <Disclaimer />
       {(!id ||
         (order_status === OrderStatus.PENDING &&
-          cancel_type === CancelType.NONE)) &&
-        !paying && (
+          cancel_type === CancelType.NONE)) && (
           <Button
             className={styles.payButton}
             disabled={paying}
             onClick={handlePay}
+            loading={paying}
           >
-            {order_status === OrderStatus.PENDING ? "继续" : "确认"}
-            支付
+            {paying
+              ? "支付中..."
+              : `${order_status === OrderStatus.PENDING ? "继续" : "确认"}支付`}
           </Button>
         )}
     </View>