shaogen1995 1 year ago
parent
commit
55af5a2438
3 changed files with 53 additions and 26 deletions
  1. 40 24
      public/index.html
  2. 12 1
      public/model.html
  3. 1 1
      src/pages/A3Goods/index.tsx

+ 40 - 24
public/index.html

@@ -1,25 +1,39 @@
 <!DOCTYPE html>
 <html lang="zh">
-  <head>
-    <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#000000" />
-    <meta
-      name="description"
-      content="Web site created using create-react-app"
-    />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
-
-    <!-- 打包配置 -->
-    <script src="http://192.168.20.55:8080/data.js"></script>
-
-    <!--
+
+<head>
+  <meta charset="utf-8" />
+  <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta name="theme-color" content="#000000" />
+  <meta name="description" content="Web site created using create-react-app" />
+  <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+
+  <script>
+    const scriptDom = document.createElement('script')
+
+    let src = ''
+
+    if (window.location.href.includes('localhost:')) {
+      // 本地环境
+      src = 'http://192.168.20.55:8080/data.js'
+    } else {
+      // 正式环境
+      src = './staticData/data.js'
+    }
+
+    scriptDom.src = src
+
+    document.querySelector('html').appendChild(scriptDom)
+
+  </script>
+
+  <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
 
-    <!--
+  <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
       Only files inside the `public` folder can be referenced from the HTML.
@@ -28,12 +42,13 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>黄麻起义红色基因库</title>
-  </head>
-  <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
-    <!--
+  <title>黄麻起义红色基因库</title>
+</head>
+
+<body>
+  <noscript>You need to enable JavaScript to run this app.</noscript>
+  <div id="root"></div>
+  <!--
       This HTML file is a template.
       If you open it directly in the browser, you will see an empty page.
 
@@ -43,5 +58,6 @@
       To begin the development, run `npm start` or `yarn start`.
       To create a production bundle, use `npm run build` or `yarn build`.
     -->
-  </body>
-</html>
+</body>
+
+</html>

+ 12 - 1
public/model.html

@@ -38,8 +38,19 @@
     window.autoRotate = true; // 是否自动旋转
 
     // 打包配置
+
+    let src = ''
+
+    if (window.location.href.includes('localhost:')) {
+      // 本地环境
+      src = 'http://192.168.20.55:8080/'
+    } else {
+      // 正式环境
+      src = './staticData/'
+    }
+
     // fdage.embed( number, {
-    fdage.embed(`http://192.168.20.55:8080/3Goods/${number}/main${num}.4dage`, {
+    fdage.embed(`${src}/3Goods/${number}/main${num}.4dage`, {
       transparentBackground: true,
       width: 800,
       height: 600,

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

@@ -183,7 +183,7 @@ function A3Goods() {
               showQuickJumper
               current={page}
               total={dataRes.total}
-              pageSize={10}
+              pageSize={8}
               hideOnSinglePage={true}
               onChange={pageChangeFu}
               showSizeChanger={false}