Merge commit 'f3a29a76' into dev

@@ -55,6 +55,7 @@ const props = defineProps({
 
 
 let timer = null;
 let timer = null;
 const startCheckSuccessListener = (orderSn, actId) => {
 const startCheckSuccessListener = (orderSn, actId) => {
+  console.log(123);
   timer = setInterval(() => {
   timer = setInterval(() => {
     checkPaySuccess({ orderSn }).then((res) => {
     checkPaySuccess({ orderSn }).then((res) => {
       if (res.data) {
       if (res.data) {
@@ -125,7 +126,7 @@ const detail = reactive({
   payment() {
   payment() {
     if (detail.pay_loading) return;
     if (detail.pay_loading) return;
     detail.pay_loading = true;
     detail.pay_loading = true;
-    if (language.value) {
+    if (language.value == 0) {
       // 中文支付
       // 中文支付
       immediatePay({ orderSn: detail.data.orderSn, payType: 1 })
       immediatePay({ orderSn: detail.data.orderSn, payType: 1 })
         .then((res) => {
         .then((res) => {
@@ -136,8 +137,8 @@ const detail = reactive({
                 detail.qrCodeData = url;
                 detail.qrCodeData = url;
               }
               }
             });
             });
-            startCheckSuccessListener(detail.data.orderSn);
             detail.showCodeDialog = true;
             detail.showCodeDialog = true;
+            startCheckSuccessListener(detail.data.orderSn);
           }
           }
         })
         })
         .finally(() => (detail.pay_loading = false));
         .finally(() => (detail.pay_loading = false));

@@ -16,6 +16,7 @@ const http = axios.create({
   timeout,
   timeout,
   headers: {
   headers: {
     "Content-Type": "application/json",
     "Content-Type": "application/json",
+    Language: 'zh-cn'
   },
   },
 });
 });