shaogen1995 2 هفته پیش
والد
کامیت
d754e34ae3
5فایلهای تغییر یافته به همراه10 افزوده شده و 9 حذف شده
  1. 1 1
      public/myData/egg.js
  2. 2 1
      src/components/RoutePage.tsx
  3. 1 1
      src/pages/A0base/index.tsx
  4. 1 1
      src/pages/A1home/data.ts
  5. 5 5
      src/pages/A2scene/index.tsx

+ 1 - 1
public/myData/egg.js

@@ -6,4 +6,4 @@ const publicKeyTemp =
 // const httpBaseUrl = 'http://192.168.20.61:8106/api/'
 const httpBaseUrl = 'https://sit-zonggonghui.4dage.com/api/'
 // 子页面地址前缀
-const kkUrl = 'https://www.4dkankan.com/spg.html'
+const kkUrl = 'https://houseoss.4dkankan.com/project/DEMO/qgzgg/scene/index.html#/'

+ 2 - 1
src/components/RoutePage.tsx

@@ -1,6 +1,7 @@
 import React from 'react'
 import { Route, Switch } from 'react-router-dom'
 import NotFound from './NotFound'
+import { isMobileFu } from '@/utils/history'
 
 const A1home = React.lazy(() => import('../pages/A1home'))
 const A2scene = React.lazy(() => import('../pages/A2scene'))
@@ -10,7 +11,7 @@ const ErrPage = React.lazy(() => import('../pages/ErrPage'))
 function RoutePage() {
   return (
     <Switch>
-      <Route path='/base' component={A0base} exact />
+      <Route path='/base' component={isMobileFu() ? A0base : A1home} exact />
       <Route path='/scene/:code' component={A2scene} exact />
       <Route path='/err' component={ErrPage} exact />
       <Route path='/' component={A1home} exact />

+ 1 - 1
src/pages/A0base/index.tsx

@@ -2,7 +2,7 @@ import React, { useCallback } from 'react'
 import styles from './index.module.scss'
 function A0base() {
   const toHomeFu = useCallback(() => {
-    window.location.href = window.location.href.replace('/#/base', '/#/')
+    window.location.href = window.location.href.replace('#/base', '#/')
   }, [])
 
   return (

+ 1 - 1
src/pages/A1home/data.ts

@@ -223,7 +223,7 @@ export const idChangeArr = [
   },
   {
     id: 'id_重庆',
-    code: 'id_重庆code',
+    code: 'SG-EFvRvSQWrMp',
     name: '',
     tabName: 'tag_重庆'
   },

+ 5 - 5
src/pages/A2scene/index.tsx

@@ -157,7 +157,7 @@ function A2scene() {
 
   return (
     <div className={styles.A2scene}>
-      <h1
+      {/* <h1
         style={{
           position: 'absolute',
           top: 100,
@@ -172,17 +172,17 @@ function A2scene() {
         }
       >
         111111
-      </h1>
+      </h1> */}
       {isNumFlag.flag ? (
         <div className='A2main' style={{ opacity: isNumFlag.opc }}>
-          <iframe key={code} src='./tttt.html' ref={iframeRef} title='0'></iframe>
-          {/* 
+          {/* <iframe key={code} src='./tttt.html' ref={iframeRef} title='0'></iframe> */}
+
           <iframe
             key={code}
             ref={iframeRef}
             src={`${kkUrl}?m=${code}`}
             title='scene'
-          ></iframe> */}
+          ></iframe>
 
           {/* 右下角数字人 */}
           <div