wjx hai 1 ano
pai
achega
0b67752989
Modificáronse 3 ficheiros con 7 adicións e 7 borrados
  1. 4 4
      src/App.tsx
  2. 1 1
      src/components/floatingWindow.tsx
  3. 2 2
      src/pages/loginSucc/index.tsx

+ 4 - 4
src/App.tsx

@@ -117,13 +117,13 @@ function App() {
 		getInitApplet.run().then(res => {
 			setIsLoding(false)
 			if (res?.data) {
-				let h5WeChatControl = res?.data?.h5GameConfigDTO?.h5WeChatControl || 'UN_CONTROL'
+				let h5WeChatControl = res?.data?.h5GameConfigMap?.h5WeChatControl || 'UN_CONTROL'
 				dispatch({ type: 'setIsPut', params: { isPut: (res.data.isPut && res.data.appId) || false } })
 				document.title = (res.data?.gameName || '游戏-登录')
-				dispatch({ type: 'setInitData', params: { initData: { ...res.data, ...res.data?.h5GameConfigDTO } } })
-				if (res.data?.h5GameConfigDTO?.h5SignLogo) {
+				dispatch({ type: 'setInitData', params: { initData: { ...res.data, ...res.data?.h5GameConfigMap } } })
+				if (res.data?.h5GameConfigMap?.h5SignLogo) {
 					let iconLink: any = document.querySelector('link[rel="icon"]');
-					iconLink.href = res.data?.h5GameConfigDTO?.h5SignLogo
+					iconLink.href = res.data?.h5GameConfigMap?.h5SignLogo
 				}
 				if (isWx() && ['ios', 'android'].includes(isOs()) && h5WeChatControl === 'UN_WE_CHAT') {
 					setIsPhoneWxShow(false)

+ 1 - 1
src/components/floatingWindow.tsx

@@ -13,7 +13,7 @@ interface Props {
  * @returns 
  */
 const FloatingWindow: React.FC<Props> = ({ isVer, onClick }) => {
-
+    console.log('isVer--->', isVer)
     /**********************************/
     const { state: { initData: { h5SignLogo } } } = useContext(DispatchContext)!;
     const [isDragging, setIsDragging] = useState(false);

+ 2 - 2
src/pages/loginSucc/index.tsx

@@ -24,7 +24,7 @@ import showModal from "../../components/showModal"
 const LoginSucc: React.FC = () => {
 
     /*************************************/
-    const { dispatch, state: { initData: { h5GameUrl, h5SignShow }, userData, isBind, isAuth, orientation }, getDetails } = useContext(DispatchContext)!;
+    const { dispatch, state: { initData: { h5GameUrl, h5SignShow, orientation: isOrientationServer }, userData, isBind, isAuth, orientation }, getDetails } = useContext(DispatchContext)!;
     const { userId, authentication, checkSwitch, bindPhone } = userData
     const [open, setOpen] = useState<boolean>(false)
     const [openPhone, setOpenPhone] = useState<boolean>(false)
@@ -58,7 +58,7 @@ const LoginSucc: React.FC = () => {
 
     useEffect(() => {
         let os = isOs()
-        if (['ios', 'android'].includes(os) && orientation === 'VERTICAL') {
+        if (['ios', 'android'].includes(os) && orientation === 'VERTICAL' && !isOrientationServer) {
             setIsVer(true)
         } else {
             setIsVer(false)