Merge branch 'master' into xudh

Conflicts:
	src/features/mainSlice.js

src/api/request.js

@@ -20,13 +20,11 @@ const getComParams=()=>{
     let params={};
     if (global.BFP!=null)params.bfp=global.BFP;
     let sign=getSign();
-    if (sign!=null&&sign!="")params.sign=sign;
+    if (!!sign)params.sign=sign;
     let c=getC();
-    if (c!=null&&c!=="")params.c=c;
-    params.device=global.device;
-    params.width=global.width;
-    params.height=global.height;
-    params.t=Date.now();
+    if (!!c)params.c=c;
+    params._d=global.device;
+    params._t=Date.now()+"_"+global.width+"_"+global.height;
     return params;
 }
 const checkResponse=(data)=>{
@@ -48,7 +46,7 @@ const service = axios.create({
     timeout: 10000, // Request timeout
     retry:2,//重复5次
     retryDelay:1000,
-    compress:true
+    compress:!window.location.host.includes("localhost")
 });
 //出错重试 retry
 const checkRetryRequest=(error)=>{

src/components/GameItem/index.jsx

@@ -117,7 +117,7 @@ const GameItem=({data,handleRoom,...props})=>{
             <button className={styles.favorite_con} onClick={handleLike}>
                 {
                     // like?(<LikeIcon></LikeIcon>):(<UNLikeIcon></UNLikeIcon>)
-                    <SvgIcon className={`${styles.icon} ${like?styles.icon_active:''}`} herf={"icon_Favorites1"}></SvgIcon>
+                    <SvgIcon className={`${styles.icon} ${like?styles.icon_active:''}`} herf={like?"icon_Favorites1":"icon_Favorites"}></SvgIcon>
                 }
             </button>
         </div>

src/components/GameItem/styles.module.scss

@@ -77,17 +77,23 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    top: .27rem;
-    right: .34rem;
-    border-radius: 50%;
-    background: rgba(0, 0, 0, 0.65);
-    padding: 0.25rem;
+    top: .01rem;
+    right: .01rem;
+    //border-radius: 50%;
+    background: rgba(0, 0, 0, 0.01);
+    padding: 0.3rem 0.3rem 0.5rem 0.5rem;
     & .icon{
-      width: 1.2rem;
-      height: 1.2rem;
-      fill: rgba(255, 255, 255, 0.8);;
+      width: 1.5rem;
+      height: 1.5rem;
+      //fill: rgba(255, 255, 255, 0.7);
+      fill:  rgba(0, 0, 0, 0.3);
+      //background: rgba(0, 0, 0, 0.3);
+      border-radius: 50%;
       &_active{
+        padding: 0.2rem 0.2rem 0.27rem 0.2rem;
         fill: #ffdf46;
+        background: rgba(0, 0, 0, 0.3);
+        //background: rgba(105, 81, 0, 0.6);
       }
     }
   }

src/contexts/themeContext.js

@@ -66,8 +66,8 @@ export const ThemeProvider = ({children}) => {
     const isLogin=useSelector(isLogined);
     const user=useSelector(getUserInfo);
     const initWindowSize=()=>{
-        if (isMobile())global.device="mobile";
-        else global.device="pc";
+        if (isMobile())global.device="m";
+        else global.device="d";
         global.width=width;
         global.height=height;
         changeFontScale(isMobile()?getMFontScale():1);

src/features/mainSlice.js

@@ -139,19 +139,19 @@ const parseBlocks=(data)=>{
 }
 const getFavorites=(data)=>{
     let favorites=[];
-    if (data!=null){
-        // let arr=data.split(",");
-        // if (arr){
-        //     for (let i = 0; i < arr.length; i++) {
-        //         favorites.push(parseInt(arr[i]));
-        //     }
-        // }
-        // localStorageSet(LOCAL_FAVO_IDS,JSON.stringify(favorites));
+    if (data!=null&&!!data.length){
+        let arr=data.split(",");
+        if (arr){
+            for (let i = 0; i < arr.length; i++) {
+                favorites.push(parseInt(arr[i]));
+            }
+        }
+        localStorageSet(LOCAL_FAVO_IDS,JSON.stringify(favorites));
     }
     else
     {
-        // let localFavorites=localStorageGet(LOCAL_FAVO_IDS,"");
-        // if (localFavorites!=="")favorites=JSON.parse(localFavorites)
+        let localFavorites=localStorageGet(LOCAL_FAVO_IDS,"");
+        if (localFavorites!=="")favorites=JSON.parse(localFavorites)
     }
     return favorites;
 }
@@ -183,12 +183,12 @@ const reducerRoutes=(state,action)=>{
             //平台配置
             if(!!conf.pf&&!!conf.pf.id){
                 let {type,id}=conf.pf;
-                initTrackAll(type,id)
+                initTrackAll(type,id,isLogin?userInfo.UserID:null)
             }
         }
         //favorites
-        // let favorites=getFavorites(json.favorites);
-        Object.assign(state, {routes:state.routes,asyncRoutes:data,styles:styles,blocks:blocks,...generData,isLogin:isLogin,userInfo:userInfo,hallServerUrl:hallServerUrl});
+        let favorites=getFavorites(json.favorites);
+        Object.assign(state, {routes:state.routes,asyncRoutes:data,styles:styles,blocks:blocks,...generData,isLogin:isLogin,userInfo:userInfo,hallServerUrl:hallServerUrl,favorites:favorites});
     }
 }
 const routesStatus=(state,status,arg)=>{
@@ -441,7 +441,7 @@ export const Main=createSlice({
                     state.favorites=favorites;
                 }
             }
-            // localStorageSet(LOCAL_FAVO_IDS,JSON.stringify(favorites));
+            localStorageSet(LOCAL_FAVO_IDS,JSON.stringify(favorites));
         }
     },
     extraReducers: (builder) => {

src/tracking/FacebookPixel.js

@@ -1,6 +1,6 @@
 // FacebookPixel.js
 import React, { useEffect } from "react";
-export const fb_setPixelID = (pixelID) => {
+export const fb_setPixelID = (pixelID,ex_id) => {
     if (!pixelID) return;
 
     const initFbq=(f, b, e, v, n, t, s)=>{
@@ -28,7 +28,12 @@ export const fb_setPixelID = (pixelID) => {
         "https://connect.facebook.net/en_US/fbevents.js"
     )
     window.fbq('set', 'autoConfig', false, pixelID);
-    window.fbq("init", pixelID);
+    if(!!ex_id){
+        window.fbq("init", pixelID, {'external_id': ex_id});
+    }else{
+        window.fbq("init", pixelID);
+
+    }
     window.fbq("track", "PageView");
 };
 

src/tracking/TrackAll.js

@@ -1,8 +1,8 @@
 import {fb_trackEvent,fb_trackPageView,fb_setPixelID} from "./FacebookPixel";
 
-export const initTrackAll = (pf_type,pf_id) => {
+export const initTrackAll = (pf_type,pf_id,ex_id) => {
     if(pf_type==="fb"){
-        fb_setPixelID(pf_id)
+        fb_setPixelID(pf_id,ex_id)
     }
 }