Browse Source

no message

zhejiushizhuce 2 năm trước cách đây
mục cha
commit
6de3f36ca4

+ 3 - 0
src/App.js

@@ -98,6 +98,9 @@ const App = () => {
         if (code!=null){
             localStorageSet(LOCAL_WHEEL_INVITE_CODE,code)
         }
+        else {
+            localStorageSet(LOCAL_WHEEL_INVITE_CODE,"")
+        }
     }
     //初始化
     useEffect(() => {

+ 11 - 2
src/features/api.js

@@ -27,7 +27,7 @@ import {updateGameList} from "@features/pageSlice";
 import {APP_CHANNEL} from "@constants/app";
 import {updateInsurePass, updateUserInfo} from "@features/mainSlice";
 import {localStorageGet} from "@utils/helpers";
-import {LOCAL_CUSTOM_LOCK} from "@constants/localkey";
+import {LOCAL_CUSTOM_LOCK, LOCAL_WHEEL_INVITE_CODE} from "@constants/localkey";
 import {toast} from "react-toastify";
 const i18n=global.i18n;
 export const buildReqReducer=(builder,thunk,callback,statusCB=null)=>{
@@ -117,6 +117,10 @@ export const reqRegister=createAsyncThunk(
             repassword:arg.repassword,
             lang:lang
         }
+        let act=localStorageGet(LOCAL_WHEEL_INVITE_CODE);
+        if (act!=null&&act!==""){
+            data["act"]=act;
+        }
         let params={
             url:APP_REGISTER,
             data:data
@@ -235,7 +239,6 @@ export const reqPaymentOrder=createAsyncThunk(
     APP_PAYMENT_ORDER,
     async (arg,thunkAPI)=>{
         let {user,price,goodsName,payType,GiftsID}=arg;
-        console.log(arg)
         let params={
             url:APP_PAYMENT_ORDER,
             params:{
@@ -362,9 +365,15 @@ export const reqTurnplateIndex=createAsyncThunk(
 export const reqTurnplateKan=createAsyncThunk(
     APP_TURNPLATE_KAN,
     async (arg,thunkAPI)=>{
+        let act=localStorageGet(LOCAL_WHEEL_INVITE_CODE);
         let params={
             url:APP_TURNPLATE_KAN
         }
+        if (act!=null&&act!==""){
+            params.params={
+                act:act
+            }
+        }
         const response=await Http.get(params);
         return response;
     }

+ 1 - 1
src/layout/Navbar/styles.module.scss

@@ -48,7 +48,7 @@
   overflow-y: hidden;
 }
 .btn_sign_in{
-  padding: 12px 18px !important;
+  //padding: 12px 5px !important;
   width: 7rem !important;
   height:2.75rem !important;
   margin-right: 0.5rem !important;

+ 3 - 1
src/widgets/WCashWheel/WShare/WShare.jsx

@@ -133,7 +133,9 @@ const WShare=({open,onClose})=>{
                 toast.success(i18n.t("copy_success"));
             }}>
                 <button className={styles.share_url_con}>
-                    {shareUrl}
+                    <div className={styles.share_url}>
+                        {shareUrl}
+                    </div>
                     <div className={styles.copy}>{i18n.t("turnplate.share_box.btn_copy")}</div>
                 </button>
             </CopyToClipboard>

+ 8 - 1
src/widgets/WCashWheel/WShare/styles.module.scss

@@ -51,9 +51,16 @@
     color: var(--header);
     border-radius: var(--border-radius);
     background-color: rgba(0, 0, 0, 0.1);
+    gap: 0.5rem;
     & .copy{
       color: #40a1de;
     }
+    & .share_url{
+      width: 100%;
+      white-space: nowrap;
+      overflow-x: auto;
+      user-select: text;
+    }
   }
   & .share_random_con{
     display: flex;
@@ -68,7 +75,7 @@
       & .item{
         padding: 0 .25rem;
         color: var(--text);
-        font-size: 0.75rem;
+        font-size: 0.7rem;
         &.active{
           color: #555;
         }

+ 5 - 5
src/widgets/WCashWheel/WWheel/WWheel.jsx

@@ -131,11 +131,11 @@ const WWheel=({openShare,showShare=true,onClose=null})=>{
         };
     }
     const startSpin=()=>{
-        if (!isLogin){
-            if (onClose)onClose();
-            navigate(ROUTE_PATH.SIGN_IN);
-            return;
-        }
+        // if (!isLogin){
+        //     if (onClose)onClose();
+        //     navigate(ROUTE_PATH.SIGN_IN);
+        //     return;
+        // }
         if (isLock)return;
         if (turnplate.times<=0)return;
         startTurn();

+ 1 - 1
src/widgets/WCashWheel/styles.module.scss

@@ -98,7 +98,7 @@
     align-items: center;
     justify-content: center;
     gap: 0.5rem;
-    font-size: 1rem;
+    //font-size: 1rem;
     color: var(--header);
     & .need_txt{
       color: #6ddf39;