浏览代码

Merge branch 'sport' into telegram

zhejiushizhuce 1 年之前
父节点
当前提交
19a5575bf8
共有 3 个文件被更改,包括 30 次插入 和 2 次删除
  1. 5 1
      src/api/request.js
  2. 20 1
      src/widgets/WPaymentOrder/index.jsx
  3. 5 0
      src/widgets/WPaymentOrder/styles.module.scss

+ 5 - 1
src/api/request.js

@@ -3,7 +3,7 @@
 import {APP_GAME_APK, BASE_API} from "./config";
 import axios from "axios";
 import {getHttpMsg, localStorageGet} from "@utils/helpers";
-import {LOCAL_ACTIVITY_C, LOCAL_SIGN} from "@constants/localkey";
+import {LOCAL_ACTIVITY_C, LOCAL_SIGN, LOCAL_WHEEL_INVITE_CODE} from "@constants/localkey";
 import {toast} from "react-toastify";
 import LZString, {compress, compressToEncodedURIComponent, compressToUTF16, decompressFromBase64} from "lz-string";
 import {isStandalone, isTWA} from "@utils/UAUtils";
@@ -29,6 +29,10 @@ const getComParams=()=>{
     if (isStandalone()||isTWA()){
         params.pwa=1;
     }
+    let act=localStorageGet(LOCAL_WHEEL_INVITE_CODE);
+    if (act!=null&&act!==""){
+        params.act=act;
+    }
     // if (window.navigator&&window.navigator.userAgent){
     //     params.ua=window.navigator.userAgent;
     // }

+ 20 - 1
src/widgets/WPaymentOrder/index.jsx

@@ -5,15 +5,34 @@ import RUPayOrder from "@widgets/WPaymentOrder/RU/RUPayOrder";
 import MXOrderQR from "@widgets/WPaymentOrder/MX/QR/MXOrderQR";
 import {useLocation} from "react-router-dom";
 import {ROUTE_PATH} from "@constants/routes";
+import React from "react";
+import {useSelector} from "react-redux";
+import {getCurrPayOrder} from "@features/paySlice";
 const WPaymentOrder=({close})=>{
     const {hash} = useLocation();
-
+    const orderInfo=useSelector(getCurrPayOrder);
     const components={
         "br":BRPayOrder,
         "mx":MXPayOrder,
         "ru":RUPayOrder
     }
+    const renderOrderRedirect=()=>{
+        return (
+            <iframe
+                id={"order"}
+                title={"order"}
+                src={orderInfo.redirectURL}
+                className={styles.order_frame}
+                allow="fullscreen"
+                sandbox='allow-same-origin allow-scripts allow-popups allow-forms'
+            >
+            </iframe>
+        )
+    }
     const renderPayOrder=()=>{
+        if (orderInfo.redirectURL != null && orderInfo.redirectURL!==""){
+            return renderOrderRedirect();
+        }
         if (hash===ROUTE_PATH.PAY_ORDER_QR){
             return <MXOrderQR close={close}/>
         }

+ 5 - 0
src/widgets/WPaymentOrder/styles.module.scss

@@ -37,3 +37,8 @@
     width: 50%;
   }
 }
+.order_frame{
+  width: 100%;
+  height: calc(100vh - 3.45rem);
+  border: none;
+}