Browse Source

本地化1,改了data1

lanxin 1 tháng trước cách đây
mục cha
commit
538db3aef1
39 tập tin đã thay đổi với 391432 bổ sung424087 xóa
  1. 13 13
      hot/package-lock.json
  2. 11 11
      hot/src/views/Home.vue
  3. 6 6
      hot/yarn.lock
  4. 13 13
      scene/package-lock.json
  5. 2 2
      scene/public/css/main.css
  6. 4 4
      scene/public/hottemp/css/style.css
  7. 229 184
      scene/public/hottemp/js/main.js
  8. 1 1
      scene/public/js/ZGYH/ZHYHmain_2018.js
  9. 47255 50362
      scene/public/js/ZGYH/main_2018.js
  10. 1 1
      scene/public/js/edit.js
  11. 3465 3501
      scene/public/js/edit_zh.js
  12. 1 1
      scene/public/js/loadCAD.js
  13. 48129 51424
      scene/public/js/main_2020_edit.js
  14. 8 8
      scene/public/js/main_2020_show.js
  15. 37 161
      scene/public/js/manage.js
  16. 1992 2140
      scene/public/js/备份/app-preheater.js
  17. 2 2
      scene/public/js/备份/app-preheater.js.bak
  18. 47609 52136
      scene/public/js/备份/main.js
  19. 6 6
      scene/public/js/备份/main.js.bak
  20. 10 10
      scene/public/js/备份/mainEdit.js.bak
  21. 1 1
      scene/public/js/备份/main_2018.js
  22. 47420 51964
      scene/public/js/备份/main_2019.js
  23. 6 6
      scene/public/js/备份/main看看的.js
  24. 6 6
      scene/public/js/备份/main看看的.js.bak
  25. 47419 51963
      scene/public/js/备份/小程序/main_2018.js
  26. 1 1
      scene/public/service/static/js/vendor.1dd6740429bc6398415c.js.map
  27. 1 1
      scene/public/service/static/js/vendor.cdae95eacd205733d16b.js.map
  28. 1 1
      scene/public/service/static/js/vendor.dd0b7858d414866b4262.js.map
  29. 1 1
      scene/public/showa/index_nologo.html
  30. 2556 2594
      scene/public/showa/js/edit.js
  31. 3 3
      scene/public/showa/js/loadCAD.js
  32. 1 1
      scene/public/showa/js/main_2018.js
  33. 47938 52443
      scene/public/showa/js/main_2018_b.js
  34. 47627 50815
      scene/public/showa/js/main_2020_edit.js
  35. 49234 53853
      scene/public/showa/js/main_2020_show.js
  36. 340 369
      scene/public/showa/js/manage.js
  37. 53 50
      scene/public/showa/js/myShow.js
  38. 25 24
      scene/src/pages/A2main/index.tsx
  39. 5 5
      scene/yarn.lock

+ 13 - 13
hot/package-lock.json

@@ -41,7 +41,7 @@
     },
     "node_modules/@babel/compat-data": {
       "version": "7.11.0",
-      "resolved": "https://registry.npm.taobao.org/@babel/compat-data/download/@babel/compat-data-7.11.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/@babel/compat-data1/download/@babel/compat-data-7.11.0.tgz",
       "integrity": "sha1-6fc+/gmvE1W3I6fzmxG61jfXyZw=",
       "dev": true,
       "dependencies": {
@@ -1608,7 +1608,7 @@
     },
     "node_modules/@types/normalize-package-data": {
       "version": "2.4.0",
-      "resolved": "https://registry.npm.taobao.org/@types/normalize-package-data/download/@types/normalize-package-data-2.4.0.tgz?cache=0&sync_timestamp=1596839391651&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnormalize-package-data%2Fdownload%2F%40types%2Fnormalize-package-data-2.4.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/@types/normalize-package-data1/download/@types/normalize-package-data-2.4.0.tgz?cache=0&sync_timestamp=1596839391651&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnormalize-package-data%2Fdownload%2F%40types%2Fnormalize-package-data-2.4.0.tgz",
       "integrity": "sha1-5IbQ2XOW15vu3QpuM/RTT/a0lz4=",
       "dev": true
     },
@@ -4830,7 +4830,7 @@
     },
     "node_modules/csso/node_modules/mdn-data": {
       "version": "2.0.6",
-      "resolved": "https://registry.npm.taobao.org/mdn-data/download/mdn-data-2.0.6.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmdn-data%2Fdownload%2Fmdn-data-2.0.6.tgz",
+      "resolved": "https://registry.npm.taobao.org/mdn-data1/download/mdn-data-2.0.6.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmdn-data%2Fdownload%2Fmdn-data-2.0.6.tgz",
       "integrity": "sha1-hS3GD8ql2qLoz2yRicRA7T4EKXg=",
       "dev": true
     },
@@ -6562,7 +6562,7 @@
     },
     "node_modules/form-data": {
       "version": "2.3.3",
-      "resolved": "https://registry.npm.taobao.org/form-data/download/form-data-2.3.3.tgz",
+      "resolved": "https://registry.npm.taobao.org/form-data1/download/form-data-2.3.3.tgz",
       "integrity": "sha1-3M5SwF9kTymManq5Nr1yTO/786Y=",
       "dev": true,
       "dependencies": {
@@ -8638,7 +8638,7 @@
     },
     "node_modules/mdn-data": {
       "version": "2.0.4",
-      "resolved": "https://registry.npm.taobao.org/mdn-data/download/mdn-data-2.0.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmdn-data%2Fdownload%2Fmdn-data-2.0.4.tgz",
+      "resolved": "https://registry.npm.taobao.org/mdn-data1/download/mdn-data-2.0.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmdn-data%2Fdownload%2Fmdn-data-2.0.4.tgz",
       "integrity": "sha1-aZs8OKxvHXKAkaZGULZdOIUC/Vs=",
       "dev": true
     },
@@ -9179,7 +9179,7 @@
     },
     "node_modules/normalize-package-data": {
       "version": "2.5.0",
-      "resolved": "https://registry.npm.taobao.org/normalize-package-data/download/normalize-package-data-2.5.0.tgz?cache=0&sync_timestamp=1602547447569&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnormalize-package-data%2Fdownload%2Fnormalize-package-data-2.5.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/normalize-package-data1/download/normalize-package-data-2.5.0.tgz?cache=0&sync_timestamp=1602547447569&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnormalize-package-data%2Fdownload%2Fnormalize-package-data-2.5.0.tgz",
       "integrity": "sha1-5m2xg4sgDB38IzIl0SyzZSDiNKg=",
       "dev": true,
       "dependencies": {
@@ -14463,7 +14463,7 @@
     },
     "@babel/compat-data": {
       "version": "7.11.0",
-      "resolved": "https://registry.npm.taobao.org/@babel/compat-data/download/@babel/compat-data-7.11.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/@babel/compat-data1/download/@babel/compat-data-7.11.0.tgz",
       "integrity": "sha1-6fc+/gmvE1W3I6fzmxG61jfXyZw=",
       "dev": true,
       "requires": {
@@ -15780,7 +15780,7 @@
     },
     "@types/normalize-package-data": {
       "version": "2.4.0",
-      "resolved": "https://registry.npm.taobao.org/@types/normalize-package-data/download/@types/normalize-package-data-2.4.0.tgz?cache=0&sync_timestamp=1596839391651&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnormalize-package-data%2Fdownload%2F%40types%2Fnormalize-package-data-2.4.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/@types/normalize-package-data1/download/@types/normalize-package-data-2.4.0.tgz?cache=0&sync_timestamp=1596839391651&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnormalize-package-data%2Fdownload%2F%40types%2Fnormalize-package-data-2.4.0.tgz",
       "integrity": "sha1-5IbQ2XOW15vu3QpuM/RTT/a0lz4=",
       "dev": true
     },
@@ -18498,7 +18498,7 @@
         },
         "mdn-data": {
           "version": "2.0.6",
-          "resolved": "https://registry.npm.taobao.org/mdn-data/download/mdn-data-2.0.6.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmdn-data%2Fdownload%2Fmdn-data-2.0.6.tgz",
+          "resolved": "https://registry.npm.taobao.org/mdn-data1/download/mdn-data-2.0.6.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmdn-data%2Fdownload%2Fmdn-data-2.0.6.tgz",
           "integrity": "sha1-hS3GD8ql2qLoz2yRicRA7T4EKXg=",
           "dev": true
         },
@@ -19930,7 +19930,7 @@
     },
     "form-data": {
       "version": "2.3.3",
-      "resolved": "https://registry.npm.taobao.org/form-data/download/form-data-2.3.3.tgz",
+      "resolved": "https://registry.npm.taobao.org/form-data1/download/form-data-2.3.3.tgz",
       "integrity": "sha1-3M5SwF9kTymManq5Nr1yTO/786Y=",
       "dev": true,
       "requires": {
@@ -21601,7 +21601,7 @@
     },
     "mdn-data": {
       "version": "2.0.4",
-      "resolved": "https://registry.npm.taobao.org/mdn-data/download/mdn-data-2.0.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmdn-data%2Fdownload%2Fmdn-data-2.0.4.tgz",
+      "resolved": "https://registry.npm.taobao.org/mdn-data1/download/mdn-data-2.0.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmdn-data%2Fdownload%2Fmdn-data-2.0.4.tgz",
       "integrity": "sha1-aZs8OKxvHXKAkaZGULZdOIUC/Vs=",
       "dev": true
     },
@@ -22067,7 +22067,7 @@
     },
     "normalize-package-data": {
       "version": "2.5.0",
-      "resolved": "https://registry.npm.taobao.org/normalize-package-data/download/normalize-package-data-2.5.0.tgz?cache=0&sync_timestamp=1602547447569&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnormalize-package-data%2Fdownload%2Fnormalize-package-data-2.5.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/normalize-package-data1/download/normalize-package-data-2.5.0.tgz?cache=0&sync_timestamp=1602547447569&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnormalize-package-data%2Fdownload%2Fnormalize-package-data-2.5.0.tgz",
       "integrity": "sha1-5m2xg4sgDB38IzIl0SyzZSDiNKg=",
       "dev": true,
       "requires": {
@@ -26496,4 +26496,4 @@
       }
     }
   }
-}
+}

+ 11 - 11
hot/src/views/Home.vue

@@ -164,13 +164,13 @@ export default {
   methods: {
     // 本地化 url 适配
     urlToFitFu(url) {
-      return url;
-      // const resUrl = url;
-      // if (url.includes("https://super.4dage.com")) {
-      //   return url.replace("https://super.4dage.com", this.baseUrl);
-      // } else if (url.includes("http://super.4dage.com")) {
-      //   return url.replace("http://super.4dage.com", this.baseUrl);
-      // } else return resUrl;
+      // return url;
+      const resUrl = url;
+      if (url.includes("https://super.4dage.com")) {
+        return url.replace("https://super.4dage.com", this.baseUrl);
+      } else if (url.includes("http://super.4dage.com")) {
+        return url.replace("http://super.4dage.com", this.baseUrl);
+      } else return resUrl;
     },
 
     // 点击左右箭头
@@ -188,10 +188,10 @@ export default {
     async getData() {
       // https://www.4dmodel.com/
 
-      let url = `https://super.4dage.com/data/${
-        // 线上数据
+      // let url = `https://super.4dage.com/data1/${
+      // 线上数据
 
-        // let url = `../scene/data/${
+      let url = `../scene/data1/${
         //本地化部署
         this.id
       }/hot/js/data.js?time=${Math.random()}`;
@@ -254,7 +254,7 @@ export default {
     },
   },
   mounted() {
-    // this.baseUrl = window.location.href.split("hot")[0] + "scene/";
+    this.baseUrl = window.location.href.split("hot")[0] + "scene/";
     this.getData();
   },
 };

+ 6 - 6
hot/yarn.lock

@@ -29,7 +29,7 @@
 
 "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.25.7", "@babel/compat-data@^7.25.8":
   version "7.25.8"
-  resolved "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.25.8.tgz#0376e83df5ab0eb0da18885c0140041f0747a402"
+  resolved "https://registry.npmmirror.com/@babel/compat-data1/-/compat-data-7.25.8.tgz#0376e83df5ab0eb0da18885c0140041f0747a402"
   integrity sha512-ZsysZyXY4Tlx+Q53XdnOFmqwfB9QDTHYxaZYajWRoBLuLEAwI2UIbtxOjWh/cFaa9IKUlcB+DDuoskLuKu56JA==
 
 "@babel/core@^7.11.0":
@@ -1061,7 +1061,7 @@
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.4"
-  resolved "https://registry.npmmirror.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901"
+  resolved "https://registry.npmmirror.com/@types/normalize-package-data1/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901"
   integrity sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==
 
 "@types/q@^1.5.1":
@@ -4192,7 +4192,7 @@ forever-agent@~0.6.1:
 
 form-data@~2.3.2:
   version "2.3.3"
-  resolved "https://registry.npmmirror.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  resolved "https://registry.npmmirror.com/form-data1/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
   integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
   dependencies:
     asynckit "^0.4.0"
@@ -5667,12 +5667,12 @@ md5.js@^1.3.4:
 
 mdn-data@2.0.14:
   version "2.0.14"
-  resolved "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
+  resolved "https://registry.npmmirror.com/mdn-data1/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
   integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
 
 mdn-data@2.0.4:
   version "2.0.4"
-  resolved "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b"
+  resolved "https://registry.npmmirror.com/mdn-data1/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b"
   integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==
 
 media-typer@0.3.0:
@@ -6014,7 +6014,7 @@ node-releases@^2.0.18:
 
 normalize-package-data@^2.5.0:
   version "2.5.0"
-  resolved "https://registry.npmmirror.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+  resolved "https://registry.npmmirror.com/normalize-package-data1/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
   dependencies:
     hosted-git-info "^2.1.4"

+ 13 - 13
scene/package-lock.json

@@ -136,7 +136,7 @@
     },
     "node_modules/@babel/compat-data": {
       "version": "7.20.0",
-      "resolved": "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.20.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/compat-data1/-/compat-data-7.20.0.tgz",
       "integrity": "sha512-Gt9jszFJYq7qzXVK4slhc6NzJXnOVmRECWcVjF/T23rNXD9NtWQ0W3qxdg+p9wWIB+VQw3GYV/U2Ha9bRTfs4w==",
       "engines": {
         "node": ">=6.9.0"
@@ -5037,7 +5037,7 @@
     },
     "node_modules/axios/node_modules/form-data": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmmirror.com/form-data/-/form-data-4.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/form-data1/-/form-data-4.0.0.tgz",
       "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
       "dependencies": {
         "asynckit": "^0.4.0",
@@ -6269,7 +6269,7 @@
     },
     "node_modules/csso/node_modules/mdn-data": {
       "version": "2.0.14",
-      "resolved": "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.0.14.tgz",
+      "resolved": "https://registry.npmmirror.com/mdn-data1/-/mdn-data-2.0.14.tgz",
       "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
     },
     "node_modules/csso/node_modules/source-map": {
@@ -8082,7 +8082,7 @@
     },
     "node_modules/form-data": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmmirror.com/form-data/-/form-data-3.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/form-data1/-/form-data-3.0.1.tgz",
       "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
       "dependencies": {
         "asynckit": "^0.4.0",
@@ -11423,7 +11423,7 @@
     },
     "node_modules/mdn-data": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.0.4.tgz",
+      "resolved": "https://registry.npmmirror.com/mdn-data1/-/mdn-data-2.0.4.tgz",
       "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="
     },
     "node_modules/media-typer": {
@@ -13226,7 +13226,7 @@
     },
     "node_modules/postcss-svgo/node_modules/mdn-data": {
       "version": "2.0.14",
-      "resolved": "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.0.14.tgz",
+      "resolved": "https://registry.npmmirror.com/mdn-data1/-/mdn-data-2.0.14.tgz",
       "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
     },
     "node_modules/postcss-svgo/node_modules/source-map": {
@@ -17278,7 +17278,7 @@
     },
     "@babel/compat-data": {
       "version": "7.20.0",
-      "resolved": "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.20.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/compat-data1/-/compat-data-7.20.0.tgz",
       "integrity": "sha512-Gt9jszFJYq7qzXVK4slhc6NzJXnOVmRECWcVjF/T23rNXD9NtWQ0W3qxdg+p9wWIB+VQw3GYV/U2Ha9bRTfs4w=="
     },
     "@babel/core": {
@@ -20929,7 +20929,7 @@
       "dependencies": {
         "form-data": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmmirror.com/form-data/-/form-data-4.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/form-data1/-/form-data-4.0.0.tgz",
           "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
           "requires": {
             "asynckit": "^0.4.0",
@@ -21896,7 +21896,7 @@
         },
         "mdn-data": {
           "version": "2.0.14",
-          "resolved": "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.0.14.tgz",
+          "resolved": "https://registry.npmmirror.com/mdn-data1/-/mdn-data-2.0.14.tgz",
           "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
         },
         "source-map": {
@@ -23332,7 +23332,7 @@
     },
     "form-data": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmmirror.com/form-data/-/form-data-3.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/form-data1/-/form-data-3.0.1.tgz",
       "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
       "requires": {
         "asynckit": "^0.4.0",
@@ -25942,7 +25942,7 @@
     },
     "mdn-data": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.0.4.tgz",
+      "resolved": "https://registry.npmmirror.com/mdn-data1/-/mdn-data-2.0.4.tgz",
       "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="
     },
     "media-typer": {
@@ -27166,7 +27166,7 @@
         },
         "mdn-data": {
           "version": "2.0.14",
-          "resolved": "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.0.14.tgz",
+          "resolved": "https://registry.npmmirror.com/mdn-data1/-/mdn-data-2.0.14.tgz",
           "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
         },
         "source-map": {
@@ -30267,4 +30267,4 @@
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
     }
   }
-}
+}

+ 2 - 2
scene/public/css/main.css

@@ -4241,8 +4241,8 @@ a.tag-link {
 #gui-fullscreen > a,
 #gui-fullscreen-exit > a {
   display: flex;
-  width: 48px;
-  height: 48px;
+  width: 30px;
+  height: 30px;
   justify-content: center;
   align-items: center;
 }

+ 4 - 4
scene/public/hottemp/css/style.css

@@ -82,16 +82,16 @@ body {
   text-align: justify;
 }
 .img-icon {
-  background: url("https://super.4dage.com/data/388/hot/images/img-icon.png")no-repeat left top;
+  background: url("https://super.4dage.com/data1/388/hot/images/img-icon.png")no-repeat left top;
 }
 .video-icon {
-  background: url("https://super.4dage.com/data/388/hot/images/video-icon.png")no-repeat left top;
+  background: url("https://super.4dage.com/data1/388/hot/images/video-icon.png")no-repeat left top;
 }
 .model-icon {
-  background: url("https://super.4dage.com/data/388/hot/images/model-icon.png")no-repeat left top;
+  background: url("https://super.4dage.com/data1/388/hot/images/model-icon.png")no-repeat left top;
 }
 .iframe-icon {
-  background: url("https://super.4dage.com/data/388/hot/images/iframe-icon.png")no-repeat left top;
+  background: url("https://super.4dage.com/data1/388/hot/images/iframe-icon.png")no-repeat left top;
 }
 .footer-btn i {
   display: inline-block;

+ 229 - 184
scene/public/hottemp/js/main.js

@@ -1,102 +1,130 @@
-$(window).on("load",function(){
+$(window).on('load', function () {
   //获取页面url后面的参数
-  var number = function(variable) {
-    var query = window.location.search.substring(1);
-      var vars = query.split("&");
-      for (var i=0;i<vars.length;i++) {
-              var pair = vars[i].split("=");
-              if(pair[0] == variable){return pair[1];}
+  var number = function (variable) {
+    var query = window.location.search.substring(1)
+    var vars = query.split('&')
+    for (var i = 0; i < vars.length; i++) {
+      var pair = vars[i].split('=')
+      if (pair[0] == variable) {
+        return pair[1]
       }
-      return(false);
-  };
-  var HotContent = function(url){
-    this.screenHeight = $(document.body).height() * 0.6;
-    this.url = url;
-    this.data = null;
+    }
+    return false
+  }
+  var HotContent = function (url) {
+    this.screenHeight = $(document.body).height() * 0.6
+    this.url = url
+    this.data = null
     this.wrap = {
-      images: "wrap-img",
-      video: "wrap-video",
-      model: "wrap-model",
-      iframe: "wrap-iframe"
+      images: 'wrap-img',
+      video: 'wrap-video',
+      model: 'wrap-model',
+      iframe: 'wrap-iframe'
     }
-    this.ajax();
-  };
-  HotContent.prototype.ajax = function(){
-    var that = this;
+    this.ajax()
+  }
+  HotContent.prototype.ajax = function () {
+    var that = this
     $.ajax({
-      url:that.url,
-      dataType: "json",
+      url: that.url,
+      dataType: 'json',
       success: function (data) {
-        that.data = data;
-        that.init();
+        that.data = data
+        that.init()
         //移动端自动播放
-        setTimeout(function() {
-          parent.loaddingSuccess && parent.loaddingSuccess();
+        setTimeout(function () {
+          parent.loaddingSuccess && parent.loaddingSuccess()
         }, 16)
       },
       error: function (msg) {
-        console.log("错误:"+msg);
+        console.log('错误:' + msg)
       }
     })
-  };
+  }
 
-  HotContent.prototype.init = function(){
-    var num = number("m");
-    this.data[num].images ? this.createElements(this.data[num].images,this.wrap.images) : '';
-    this.data[num].video ? this.createElements(this.data[num].video,this.wrap.video) : '';
-    this.data[num].model ? this.createElements(this.data[num].model,this.wrap.model) : '';
-    this.data[num].iframe ? this.createElements(this.data[num].iframe,this.wrap.iframe) : '';
-    this.footer();
-    this.onlyType();
+  HotContent.prototype.init = function () {
+    var num = number('m')
+    this.data[num].images ? this.createElements(this.data[num].images, this.wrap.images) : ''
+    this.data[num].video ? this.createElements(this.data[num].video, this.wrap.video) : ''
+    this.data[num].model ? this.createElements(this.data[num].model, this.wrap.model) : ''
+    this.data[num].iframe ? this.createElements(this.data[num].iframe, this.wrap.iframe) : ''
+    this.footer()
+    this.onlyType()
     //加载视频
-    $.getScript("js/vedio.js");
+    $.getScript('js/vedio.js')
 
     //默认初始化显示的类型
-    this.InitialDefaultDisplay($(".footer-btn > button:first").attr("data-name"));
-    var that = this;
-    $(".footer-btn > button").on("click",function(){
-      that.InitialDefaultDisplay($(this).attr("data-name"));
-    });
-    $(".o-slider-header img").on("pointerdown",function(e){
-      e.preventDefault();
+    this.InitialDefaultDisplay($('.footer-btn > button:first').attr('data-name'))
+    var that = this
+    $('.footer-btn > button').on('click', function () {
+      that.InitialDefaultDisplay($(this).attr('data-name'))
     })
-  };
-  HotContent.prototype.InitialDefaultDisplay = function(id){
-    $("."+id).show().siblings().hide();
-    $('[data-name='+id+']').addClass("active").siblings().removeClass("active");
-    if($("."+id).find("video").length < 1){
-      if($("."+id).siblings().find("video").length > 0)$("."+id).siblings().find("video")[0].pause();
+    $('.o-slider-header img').on('pointerdown', function (e) {
+      e.preventDefault()
+    })
+  }
+  HotContent.prototype.InitialDefaultDisplay = function (id) {
+    $('.' + id)
+      .show()
+      .siblings()
+      .hide()
+    $('[data-name=' + id + ']')
+      .addClass('active')
+      .siblings()
+      .removeClass('active')
+    if ($('.' + id).find('video').length < 1) {
+      if (
+        $('.' + id)
+          .siblings()
+          .find('video').length > 0
+      )
+        $('.' + id)
+          .siblings()
+          .find('video')[0]
+          .pause()
     }
-  };
+  }
 
-  HotContent.prototype.createElements = function(data,classname){
-    var contioner = $(".contioner");
-    function createChildrenElements(){
-      var children = [];
+  HotContent.prototype.createElements = function (data, classname) {
+    var contioner = $('.contioner')
+    function createChildrenElements() {
+      var children = []
       switch (classname) {
         case this.wrap.images:
-        data.forEach(function(currentValue){ children.push('<img src='+currentValue+' alt=图片 />') ;  })
-        break;
+          data.forEach(function (currentValue) {
+            children.push('<img src=' + currentValue + ' alt=图片 />')
+          })
+          break
         case this.wrap.video:
-        data.forEach(function(currentValue){ children.push(videoEle(currentValue.url,currentValue.img));  })
-        break;
+          data.forEach(function (currentValue) {
+            children.push(videoEle(currentValue.url, currentValue.img))
+          })
+          break
         case this.wrap.model:
-        data.forEach(function(currentValue){ children.push('<iframe src='+currentValue+' ></iframe>');  })
-        break;
+          data.forEach(function (currentValue) {
+            children.push('<iframe src=' + currentValue + ' ></iframe>')
+          })
+          break
         case this.wrap.iframe:
-        data.forEach(function(currentValue){ children.push('<iframe src='+currentValue+' ></iframe>');  })
-        break;
+          data.forEach(function (currentValue) {
+            children.push('<iframe src=' + currentValue + ' ></iframe>')
+          })
+          break
       }
-      return children;
+      return children
     }
 
-    function videoEle(src,img){
-
-      if(/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)){
-        return '<div class="video-index" >\
+    function videoEle(src, img) {
+      if (/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) {
+        return (
+          '<div class="video-index" >\
                 <div class="js-video">\
-                    <video class="js-media" poster='+img+' webkit-playsinline="true" x-webkit-airplay="true" playsinline="true" >\
-                          <source src='+src+' type="video/mp4" />\
+                    <video class="js-media" poster=' +
+          img +
+          ' webkit-playsinline="true" x-webkit-airplay="true" playsinline="true" >\
+                          <source src=' +
+          src +
+          ' type="video/mp4" />\
                         <p>你的浏览器不支持 HTML5 Video。</p>\
                     </video>\
                     <i data-playPause class="playPause fa  ui-icon">\
@@ -125,147 +153,164 @@ $(window).on("load",function(){
                     </div>\
                     <i data-fullscreen class="fullscreen iconicfill-fullscreen" title="fullscreen"></i>\
                 </div>\
-            </div>';
-      }else{
-        return '<video src='+src+' controls="controls" autoplay poster='+img+'></video>'
+            </div>'
+        )
+      } else {
+        return '<video src=' + src + ' controls="controls" autoplay poster=' + img + '></video>'
       }
     }
 
-    function singleElement(){
-      var SE = createChildrenElements.call(this);
-      contioner.append('<div class='+classname+'>'+SE+'</div>').css("height",this.screenHeight);
-      this.Zoom(classname);
-    };
-    function doubleElement(){
-      var DE = createChildrenElements.call(this);
-      var _doubleElement = this.generateElements().mainElements(classname,this.generateElements(data,DE).multiElement());
-      contioner.append(_doubleElement).css("height",this.screenHeight);
-      this.build(classname);
-      this.Zoom(classname);
-    };
-
-    if(data.length > 1)
-    {
-      doubleElement.call(this,classname);
+    function singleElement() {
+      var SE = createChildrenElements.call(this)
+      contioner.append('<div class=' + classname + '>' + SE + '</div>').css('height', this.screenHeight)
+      this.Zoom(classname)
+    }
+    function doubleElement() {
+      var DE = createChildrenElements.call(this)
+      var _doubleElement = this.generateElements().mainElements(classname, this.generateElements(data, DE).multiElement())
+      contioner.append(_doubleElement).css('height', this.screenHeight)
+      this.build(classname)
+      this.Zoom(classname)
     }
-    else
-    {
-      singleElement.call(this,classname);
+
+    if (data.length > 1) {
+      doubleElement.call(this, classname)
+    } else {
+      singleElement.call(this, classname)
     }
-  };
+  }
 
-  HotContent.prototype.generateElements = function(data,ele){
-    function combination(SingleOriginal){
-      if(!data) return;
-      return '<div class="o-slider--item"  >\
+  HotContent.prototype.generateElements = function (data, ele) {
+    function combination(SingleOriginal) {
+      if (!data) return
+      return (
+        '<div class="o-slider--item"  >\
                 <div class="o-slider-bg">\
-                  <div  class="o-slider-header" >'
-                    +SingleOriginal+
-                  '</div>\
+                  <div  class="o-slider-header" >' +
+        SingleOriginal +
+        '</div>\
                 </div>\
-              </div>';
+              </div>'
+      )
     }
     return {
-      mainElements : function(classname,children){
-        return  '<div class='+classname+'>\
-                  <div class="o-sliderContainer" id=pbSliderWrap-'+classname+'>\
-                    <div class="o-slider" id=pbSlider-'+classname+'>'
-                    +children+
-                    '</div>\
+      mainElements: function (classname, children) {
+        return (
+          '<div class=' +
+          classname +
+          '>\
+                  <div class="o-sliderContainer" id=pbSliderWrap-' +
+          classname +
+          '>\
+                    <div class="o-slider" id=pbSlider-' +
+          classname +
+          '>' +
+          children +
+          '</div>\
                   </div>\
-                </div>';
+                </div>'
+        )
       },
-      multiElement : function(){
-        var _multiElement = "";
+      multiElement: function () {
+        var _multiElement = ''
         for (var i = 0; i < data.length; i++) {
-          _multiElement += combination(ele[i]);
+          _multiElement += combination(ele[i])
         }
-        return _multiElement;
+        return _multiElement
       }
-    };
-  };
+    }
+  }
   //启动轮播
-  HotContent.prototype.build = function(id) {
-      var screenHeight = this.screenHeight;
-      $('#pbSlider-'+id).pbTouchSlider({
-        slider_Wrap: '#pbSliderWrap-'+id,
-        slider_Threshold: 10,
-        slider_Speed:600,
-        slider_Ease:'ease-out',
-        slider_Drag : true,
-        slider_Arrows: {
-          enabled : true
-        },
+  HotContent.prototype.build = function (id) {
+    var screenHeight = this.screenHeight
+    $('#pbSlider-' + id).pbTouchSlider({
+      slider_Wrap: '#pbSliderWrap-' + id,
+      slider_Threshold: 10,
+      slider_Speed: 600,
+      slider_Ease: 'ease-out',
+      slider_Drag: true,
+      slider_Arrows: {
+        enabled: true
+      },
 
-        slider_Dots: {
-          class :'.o-slider-pagination',
-          enabled : true,
-          preview : false
+      slider_Dots: {
+        class: '.o-slider-pagination',
+        enabled: true,
+        preview: false
+      },
+      slider_Breakpoints: {
+        default: {
+          height: screenHeight
+        },
+        tablet: {
+          height: screenHeight,
+          media: 1024
         },
-        slider_Breakpoints: {
-            default: {
-                height: screenHeight
-            },
-            tablet: {
-                height: screenHeight,
-                media: 1024
-            },
-            smartphone: {
-                height: screenHeight,
-                media: 768
-            }
+        smartphone: {
+          height: screenHeight,
+          media: 768
         }
-      });
-  };
+      }
+    })
+  }
   // 启动图片的放大缩小
-  HotContent.prototype.Zoom = function(classname) {
-    if(/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)){
-      if(classname != "wrap-img") return;
-      console.log($(".o-slider-header").height());
-      $("."+classname).find(".o-slider-header").each(function(){
-        new RTP.PinchZoom(this, {});
-      })
+  HotContent.prototype.Zoom = function (classname) {
+    if (/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) {
+      if (classname != 'wrap-img') return
+      console.log($('.o-slider-header').height())
+      $('.' + classname)
+        .find('.o-slider-header')
+        .each(function () {
+          new RTP.PinchZoom(this, {})
+        })
     }
-  };
+  }
 
-  
-  HotContent.prototype.footer = function() {
-    $(".footer").append(this.footerCreateEle());
-  };
-  HotContent.prototype.footerCreateEle = function() {
-    var num = number("m");
-    var footerH3 = this.data[num].text ||  "";
-    var footerText = this.data[num].content || "";
-    var footerBtn = "";
+  HotContent.prototype.footer = function () {
+    $('.footer').append(this.footerCreateEle())
+  }
+  HotContent.prototype.footerCreateEle = function () {
+    var num = number('m')
+    var footerH3 = this.data[num].text || ''
+    var footerText = this.data[num].content || ''
+    var footerBtn = ''
     var btnIcon = {
-      "img":["img-icon","图片"],
-      "video":["video-icon","视频"],
-      "model":["model-icon","3D"],
-      "iframe":["iframe-icon","网页"]
-    };
-    function btnBuild(id,classname,text){
-      return '<button data-name='+id+'><i class='+classname+'></i>'+text+'</button>'
+      img: ['img-icon', '图片'],
+      video: ['video-icon', '视频'],
+      model: ['model-icon', '3D'],
+      iframe: ['iframe-icon', '网页']
+    }
+    function btnBuild(id, classname, text) {
+      return '<button data-name=' + id + '><i class=' + classname + '></i>' + text + '</button>'
     }
 
-    this.data[num].model ? footerBtn += btnBuild(this.wrap.model,btnIcon.model[0],btnIcon.model[1]) : '';
-    this.data[num].video ? footerBtn += btnBuild(this.wrap.video,btnIcon.video[0],btnIcon.video[1]) : '';
-    this.data[num].iframe ? footerBtn += btnBuild(this.wrap.iframe,btnIcon.iframe[0],btnIcon.iframe[1]): '';
-    this.data[num].images ? footerBtn += btnBuild(this.wrap.images,btnIcon.img[0],btnIcon.img[1]) : '';
-    
-    return  '<div class="footer-title"><h3>'+footerH3+'</h3><div class=footer-btn>'+footerBtn+'</div></div>\
-                        <div class=footer-text>'+footerText+'<div class=footer-mask></div></div>';
+    this.data[num].model ? (footerBtn += btnBuild(this.wrap.model, btnIcon.model[0], btnIcon.model[1])) : ''
+    this.data[num].video ? (footerBtn += btnBuild(this.wrap.video, btnIcon.video[0], btnIcon.video[1])) : ''
+    this.data[num].iframe ? (footerBtn += btnBuild(this.wrap.iframe, btnIcon.iframe[0], btnIcon.iframe[1])) : ''
+    this.data[num].images ? (footerBtn += btnBuild(this.wrap.images, btnIcon.img[0], btnIcon.img[1])) : ''
+
+    return (
+      '<div class="footer-title"><h3>' +
+      footerH3 +
+      '</h3><div class=footer-btn>' +
+      footerBtn +
+      '</div></div>\
+                        <div class=footer-text>' +
+      footerText +
+      '<div class=footer-mask></div></div>'
+    )
   }
-  HotContent.prototype.onlyType = function() {
-    var footerBtn = $(".footer-btn");
-    if(footerBtn.children().length > 1 ) return;
-    if(/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)){
-      if(!this.data[number("m")].text ){
-        $(".contioner").css("height",$(document.body).height() * 0.96);
+  HotContent.prototype.onlyType = function () {
+    var footerBtn = $('.footer-btn')
+    if (footerBtn.children().length > 1) return
+    if (/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) {
+      if (!this.data[number('m')].text) {
+        $('.contioner').css('height', $(document.body).height() * 0.96)
       }
-      $(".footer-btn").hide();
+      $('.footer-btn').hide()
     }
   }
 
-  //new HotContent("https://super.4dage.com/data/"+number("id")+"/hot/js/data2.js");
-  new HotContent("/data/" + number("id") +"/hot/js/data.js");
+  //new HotContent("https://super.4dage.com/data1/"+number("id")+"/hot/js/data2.js");
+  new HotContent('/data1//' + number('id') + '/hot/js/data.js')
 })

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 1
scene/public/js/ZGYH/ZHYHmain_2018.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 47255 - 50362
scene/public/js/ZGYH/main_2018.js


+ 1 - 1
scene/public/js/edit.js

@@ -921,7 +921,7 @@ $('input[name="show-cad"]').on('change', function(ev) {
     let taht = this
     if (!taht.floorJSON) {
         $.ajax({
-            url: '//super.4dage.com/data/'+ window.number +'/floor.json', 
+            url: '//super.4dage.com/data1/'+ window.number +'/floor.json', 
             method: 'GET',
             success(res) {
                 taht.floorJSON = res

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 3465 - 3501
scene/public/js/edit_zh.js


+ 1 - 1
scene/public/js/loadCAD.js

@@ -15,7 +15,7 @@ window.grendCAD = (function grendCAD() {
     if (initScript) return cb()
 
     let $script = document.createElement('script')
-    $script.src = '//www.4dmodel.com/CAD/bundle.js'
+    $script.src = 'CAD/bundle.js'
     $script.onload = function () {
       initScript = true
       cb()

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 48129 - 51424
scene/public/js/main_2020_edit.js


+ 8 - 8
scene/public/js/main_2020_show.js

@@ -14488,7 +14488,7 @@ window.Modernizr = (function (n, e, t) {
           $('#gui-loading').fadeIn(200)
           progressUpdate(0.1)
           var fileName = g_version ? 'modeldata.js' : 'someData.json'
-          $.ajax(g_Prefix + 'data/' + window.number + '/' + fileName + '?' + randomTime().getTime(), { dataType: 'json' })
+          $.ajax(g_Prefix + 'data1/' + window.number + '/' + fileName + '?' + randomTime().getTime(), { dataType: 'json' })
             .done(function (e) {
               //改
 
@@ -17482,7 +17482,7 @@ window.Modernizr = (function (n, e, t) {
                 if (!f.tags.enabled)
                     return e.resolve();
                 //var t = this.options.urlBase + "/api/v1/jsonstore/model/tags/" + this.sid;
-				t = "data/" + this.sid + "/tags.json"
+				t = "data1//" + this.sid + "/tags.json"
                 return a.get(t, {
                     responseType: "json",
                     auth: this.isPublic ? null : f.authorizationHeader
@@ -17537,7 +17537,7 @@ window.Modernizr = (function (n, e, t) {
               //xzw
               initHot(this)
               var r = $.Deferred()
-              var t = g_Prefix + 'data/' + this.sid + '/data2.js' + '?' + randomTime().getTime()
+              var t = g_Prefix + 'data1//' + this.sid + '/data2.js' + '?' + randomTime().getTime()
 
               return (
                 a
@@ -17576,7 +17576,7 @@ window.Modernizr = (function (n, e, t) {
 
                           if (e.overlays) {
                             e.overlays.forEach(info => {
-                              //if(info.file.includes('m/data/762/edit/20210312_112357584.mp4') )return;
+                              //if(info.file.includes('m/data1//762/edit/20210312_112357584.mp4') )return;
                               new Hot(info, 'byOverlay')
                             })
                           }
@@ -17602,7 +17602,7 @@ window.Modernizr = (function (n, e, t) {
                       }
                       /***************************方奕卓 请求data.js数据, 用于初始化热点列表 ****************************/
                       /* var dataJsPromise = $.Deferred();
-                    var dataJsUrl = g_Prefix+"data/" + this.sid + "/hot/js/data.js" +'?'+ randomTime().getTime();
+                    var dataJsUrl = g_Prefix+"data1//" + this.sid + "/hot/js/data.js" +'?'+ randomTime().getTime();
                     a.get(dataJsUrl,{
                         responseType: "json",
                         auth: this.isPublic ? null : f.authorizationHeader
@@ -17674,7 +17674,7 @@ window.Modernizr = (function (n, e, t) {
               //xzw
               var e = $.Deferred(),
                 //   , t = this.options.urlBase + "/api/v1/jsonstore/model/highlights/" + this.sid + "/active_reel";
-                t = this.options.urlBase + 'data/' + this.sid + '/active_reel.json'
+                t = this.options.urlBase + 'data1//' + this.sid + '/active_reel.json'
               return (
                 a
                   .get(t, {
@@ -18040,7 +18040,7 @@ window.Modernizr = (function (n, e, t) {
             window.DATA.showingLabels ? (this.showingLabels = true) : ''
             if (!this.showingLabels) return e.resolve()
             // var t = this.options.urlBase + "/api/v1/jsonstore/model/labels/" + this.sid;
-            var t = g_Prefix + 'data/' + this.sid + '/labels.json'
+            var t = g_Prefix + 'data1//' + this.sid + '/labels.json'
 
             return (
               this.labels
@@ -31334,7 +31334,7 @@ window.Modernizr = (function (n, e, t) {
                   //t = window.location.protocol + "//" + window.location.host,	//MP
                   t = g_Prefix
                   //i = t + "/api/player/models/" + e;					//MP
-                  i = t + 'data/' + e
+                  i = t + 'data1//' + e
                 }
                 return {
                   urlBase: t,

+ 37 - 161
scene/public/js/manage.js

@@ -1,11 +1,9 @@
-var g_ProjectName = window.location.pathname.substring(
-  window.location.pathname.indexOf('/') + 1,
-  window.location.pathname.lastIndexOf('/')
-)
-var g_Prefix = 'https://super.4dage.com/'
-// var g_Prefix=window.location.href.substring(0,window.location.href.indexOf("/index.html")+1);
+var g_ProjectName = window.location.pathname.substring(window.location.pathname.indexOf('/') + 1, window.location.pathname.lastIndexOf('/'))
+// var g_Prefix = 'https://super.4dage.com/'
+var g_Prefix = window.location.href.substring(0, window.location.href.indexOf('/index.html') + 1)
 var s = window.location.href.split('/')
 s.pop()
+window.isLocal = true
 //var g_Prefix = s.join('/');
 var g_index = null
 var g_modeldata = null
@@ -76,24 +74,14 @@ window.browser = {
     )
   },
   isFullscreen: function () {
-    return (
-      document.fullscreenElement ||
-      document.mozFullscreenElement ||
-      document.mozFullScreenElement ||
-      document.webkitFullscreenElement ||
-      document.msFullscreenElement
-    )
+    return document.fullscreenElement || document.mozFullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement || document.msFullscreenElement
   },
   valueFromHash: function (e, t) {
     var i = new RegExp('[#&?]' + e + '=([^#&?]*)'),
       n = i.exec(window.location.href)
     if (!n) return t
     var r = n[1]
-    return 'boolean' == typeof t
-      ? 'true' === r || '1' === r
-      : 'number' == typeof t
-      ? parseFloat(r)
-      : window.decodeURIComponent(r)
+    return 'boolean' == typeof t ? 'true' === r || '1' === r : 'number' == typeof t ? parseFloat(r) : window.decodeURIComponent(r)
   },
   urlHasValue: function (key, isGetValue) {
     let querys = window.location.search.substr(1).split('&')
@@ -145,7 +133,7 @@ var settings = {
   hotFastTran: false,
   transparentBg: false,
   bgImg: null,
-
+  localPrefix: '',
   tileClass: {
     //默认全景贴图加载的清晰度
     pc: {
@@ -207,11 +195,7 @@ var toPrecision = function (e, t) {
 var dealMap = (map, o = {}) => {
   //使不resize  when   image is not power of two  ,但缩小时会有锯齿
   if (!o.ignoreResize) {
-    if (
-      !map.image ||
-      !THREE.Math.isPowerOfTwo(map.image.width) ||
-      !THREE.Math.isPowerOfTwo(map.image.height)
-    ) {
+    if (!map.image || !THREE.Math.isPowerOfTwo(map.image.width) || !THREE.Math.isPowerOfTwo(map.image.height)) {
       map.wrapS = map.wrapT = THREE.ClampToEdgeWrapping
       map.minFilter = THREE.LinearFilter
       //map.generateMipmaps = true;
@@ -354,10 +338,7 @@ var convertTool = {
     /* if(config.isEdit && publicObjectSet.editor.mainDesign.editing){
 			var o = ray.intersectObjects(publicObjectSet.editor.mainDesign.wallMeshes);
 		}else{ */
-    let colliders = player.model.allFloorsVisible
-      ? player.model.colliders
-      : (floorIndex != void 0 ? player.model.floors.index[floorIndex] : player.model.currentFloor)
-          .collider.children
+    let colliders = player.model.allFloorsVisible ? player.model.colliders : (floorIndex != void 0 ? player.model.floors.index[floorIndex] : player.model.currentFloor).collider.children
     //let colliders = (floorIndex == void 0 ) ? player.model.colliders : player.model.floors.index[floorIndex].collider.children
     var o = ray.intersectObjects(colliders)
     //}
@@ -387,19 +368,12 @@ var convertTool = {
 
       var y = info.y
 
-      if (
-        player.mode ==
-        'floorplan' /*  ||  Math.abs(O.x-pos.x)<0.0001 && Math.abs(O.z-pos.z)<0.0001) */
-      ) {
+      if (player.mode == 'floorplan' /*  ||  Math.abs(O.x-pos.x)<0.0001 && Math.abs(O.z-pos.z)<0.0001) */) {
         //intersectPlane和地面平行,无交点
         var x = pos.x,
           z = pos.z
       } else {
-        if (
-          y < player.camera.position.y &&
-          O.y <= A.y /* || y>player.camera.position.y && O.y >= A.y  */
-        )
-          return null //鼠标射线向上。因为相机一定位于地面以上(地面不会抬高到相机上吧?),所以无交点。
+        if (y < player.camera.position.y && O.y <= A.y /* || y>player.camera.position.y && O.y >= A.y  */) return null //鼠标射线向上。因为相机一定位于地面以上(地面不会抬高到相机上吧?),所以无交点。
         if (O.y == A.y) {
           console.log('一样??')
           return
@@ -550,9 +524,7 @@ var convertTool = {
       op.resolution = { x: renderSize.width, y: renderSize.height }
     }
     if (!op.camera) {
-      let camera = player.cameraControls.activeControl
-        ? player.cameraControls.activeControl.camera
-        : player.camera
+      let camera = player.cameraControls.activeControl ? player.cameraControls.activeControl.camera : player.camera
       let camera2 = camera.clone()
       camera2.matrixWorld.copy(player.camera.matrixWorld) //因为其他原因该camera的matrixWorld被还原了,而player.camera的是正确的
       op.camera = camera2
@@ -567,9 +539,7 @@ var convertTool = {
       } else {
         currentDis = op.position.distanceTo(op.camera.position)
       }
-      w =
-        op.maxSize -
-        (op.maxSize - op.minSize) * THREE.Math.smoothstep(currentDis, op.nearBound, op.farBound)
+      w = op.maxSize - (op.maxSize - op.minSize) * THREE.Math.smoothstep(currentDis, op.nearBound, op.farBound)
       //maxSize : mesh要表现的最大像素宽度;   nearBound: 最近距离,若比nearBound近,则使用maxSize
     }
     i.copy(op.position).project(op.camera), //tag中心在屏幕上的二维坐标
@@ -710,12 +680,7 @@ window.expandCommon = function (common) {
 
         for (let i = 0; i < posLength; i++) {
           var B = posB[i]
-          var ray = new THREE.Raycaster(
-            A.clone(),
-            B.clone().sub(A).normalize(),
-            0,
-            A.distanceTo(B) - (options.tolerance || 0)
-          )
+          var ray = new THREE.Raycaster(A.clone(), B.clone().sub(A).normalize(), 0, A.distanceTo(B) - (options.tolerance || 0))
           var o = ray.intersectObjects(options.model || player.model.colliders, true)
 
           if (!o || !o.length) {
@@ -783,10 +748,9 @@ window.expandMath = function (math) {
 //管理js文件 获取modeldata.js 判断是否有特殊的字段,如果有就先加载SpecialScene.js 里面有对特殊场景处理的代码 否则就直接加载main
 
 var Manage = function () {
-  ;(this.weixinURL = 'https://res.wx.qq.com/open/js/jweixin-1.2.0.js'),
-    (this.time = '?' + new Date().getTime())
+  ;(this.weixinURL = 'https://res.wx.qq.com/open/js/jweixin-1.2.0.js'), (this.time = '?' + new Date().getTime())
   this.loadAudio()
-  this.loadWeixin()
+  // this.loadWeixin()
 }
 //动态加载js文件
 Manage.prototype.LoadJs = function (_files, succes) {
@@ -820,8 +784,7 @@ Manage.prototype.LoadJs = function (_files, succes) {
   function loadFile(url, success) {
     if (!FileIsExt(classcodes, url)) {
       var _ThisType = GetFileType(url)
-      var ThisType =
-        _ThisType.indexOf('?') == -1 ? _ThisType : _ThisType.substring(0, _ThisType.indexOf('?'))
+      var ThisType = _ThisType.indexOf('?') == -1 ? _ThisType : _ThisType.substring(0, _ThisType.indexOf('?'))
       var fileObj = null
       if (ThisType == '.js') {
         fileObj = document.createElement('script')
@@ -1024,8 +987,8 @@ Manage.prototype.weixinShare = function () {
 }
 
 Manage.prototype.dealURL = function (src, type) {
-  //music: "///super.4dage.com/data/LYW/edit/20200928_151633415.mp3"
-  //"https://super.4dage.com/data/LYW/edit/20200928_165319399.jpg"]
+  //music: "///super.4dage.com/data1/LYW/edit/20200928_151633415.mp3"
+  //"https://super.4dage.com/data1/LYW/edit/20200928_165319399.jpg"]
 
   if (window.isLocal && settings.localPrefix != void 0) {
     //本地将线上的前缀替换
@@ -1404,12 +1367,7 @@ function initByTHREE(THREE) {
       this.enabled = true
       //draw coverTex
       this.quad.material.uniforms.progress.value = 1
-      sceneRenderer.renderer.render(
-        sceneRenderer.scene,
-        sceneRenderer.camera,
-        this.coverRenderTarget,
-        true
-      )
+      sceneRenderer.renderer.render(sceneRenderer.scene, sceneRenderer.camera, this.coverRenderTarget, true)
       console.log('start111')
     },
     stop: function () {
@@ -1542,12 +1500,7 @@ function initByTHREE(THREE) {
     update(currentFloor) {
       if (!this.position) return
 
-      if (
-        !this.visible &&
-        this.unvisibleReasons.some(e => e.level == 1) &&
-        !this.unvisibleReasons.some(e => e.level > 1)
-      )
-        return
+      if (!this.visible && this.unvisibleReasons.some(e => e.level == 1) && !this.unvisibleReasons.some(e => e.level > 1)) return
       /*
                 规定一下level共四层
                 level3 是notTrueSide层,权重最高。
@@ -1570,20 +1523,13 @@ function initByTHREE(THREE) {
       //判断label是否被模型遮挡,遮挡则消失(如果是漫游模式最好提前计算visiblePanos)
       if (player.mode != 'panorama') {
         currentFloor = currentFloor || player.model.currentFloor
-        if (
-          !player.model.allFloorsVisible &&
-          this.floorIndex != void 0 &&
-          this.floorIndex != currentFloor.floorIndex
-        ) {
+        if (!player.model.allFloorsVisible && this.floorIndex != void 0 && this.floorIndex != currentFloor.floorIndex) {
           this.setVisible(false, 'shelter', 0, null, true)
           //this.elem.css('display','none');	return;
           if (!this.visible) return
         }
 
-        if (
-          this.shelterByModel &&
-          convertTool.ifShelter(this.position, p.vector, player.camera, this.floorIndex)
-        ) {
+        if (this.shelterByModel && convertTool.ifShelter(this.position, p.vector, player.camera, this.floorIndex)) {
           //this.elem.css('display','none');	return;
           this.setVisible(false, 'shelter', 0, null, true)
           if (!this.visible) return
@@ -1852,8 +1798,7 @@ function initByTHREE(THREE) {
 
       //this.needsUpdate = false
 
-      let camera =
-        player.mode == 'floorplan' ? player.cameraControls.activeControl.camera : player.camera //floorplan 时要用到OrthographicCamera
+      let camera = player.mode == 'floorplan' ? player.cameraControls.activeControl.camera : player.camera //floorplan 时要用到OrthographicCamera
 
       if (!this.fixOrient) {
         let parentQua = this.root.parent.getWorldQuaternion(new THREE.Quaternion())
@@ -1863,10 +1808,7 @@ function initByTHREE(THREE) {
       if (this.sizeInfo) {
         var s = convertTool.getScaleForConstantSize(
           Object.assign({}, this.sizeInfo, {
-            farBound:
-              player.mode == 'floorplan'
-                ? this.sizeInfo.farBoundPlan || this.sizeInfo.farBound
-                : this.sizeInfo.farBound,
+            farBound: player.mode == 'floorplan' ? this.sizeInfo.farBoundPlan || this.sizeInfo.farBound : this.sizeInfo.farBound,
             position: this.root.getWorldPosition(new THREE.Vector3())
           })
         )
@@ -1929,16 +1871,11 @@ function initByTHREE(THREE) {
         textMaxWidth = Math.max(textMaxWidth, textWidth)
       }
 
-      let margin =
-        this.margin || new THREE.Vector2(this.fontsize, Math.max(this.fontsize * 0.4, 10))
+      let margin = this.margin || new THREE.Vector2(this.fontsize, Math.max(this.fontsize * 0.4, 10))
       const lineSpace = (this.fontsize + margin.y) * 0.5
 
       let spriteWidth = 2 * margin.x + textMaxWidth + 2 * this.rectBorderThick
-      let spriteHeight =
-        2 * margin.y +
-        this.fontsize * this.text.length +
-        2 * this.rectBorderThick +
-        lineSpace * (this.text.length - 1)
+      let spriteHeight = 2 * margin.y + this.fontsize * this.text.length + 2 * this.rectBorderThick + lineSpace * (this.text.length - 1)
       context.canvas.width = spriteWidth
       context.canvas.height = spriteHeight
       context.font = this.fontWeight + ' ' + this.fontsize + 'px ' + this.fontface
@@ -1946,58 +1883,21 @@ function initByTHREE(THREE) {
       //canvas原点在左上角
       context.textBaseline = 'alphabetic' //  "middle"  //设置文字基线。当起点y设置为0时,只有该线以下的部分被绘制出来。middle时文字显示一半(但是对该字体所有字的一半,有的字是不一定显示一半的,尤其汉字),alphabetic时是英文字母的那条基线。
       // border color
-      context.strokeStyle =
-        'rgba(' +
-        this.borderColor.r +
-        ',' +
-        this.borderColor.g +
-        ',' +
-        this.borderColor.b +
-        ',' +
-        this.borderColor.a +
-        ')'
+      context.strokeStyle = 'rgba(' + this.borderColor.r + ',' + this.borderColor.g + ',' + this.borderColor.b + ',' + this.borderColor.a + ')'
 
       context.lineWidth = this.rectBorderThick
       // background color
-      context.fillStyle =
-        'rgba(' +
-        this.backgroundColor.r +
-        ',' +
-        this.backgroundColor.g +
-        ',' +
-        this.backgroundColor.b +
-        ',' +
-        this.backgroundColor.a +
-        ')'
-      this.roundRect(
-        context,
-        this.rectBorderThick / 2,
-        this.rectBorderThick / 2,
-        spriteWidth - this.rectBorderThick,
-        spriteHeight - this.rectBorderThick,
-        this.borderRadius
-      )
+      context.fillStyle = 'rgba(' + this.backgroundColor.r + ',' + this.backgroundColor.g + ',' + this.backgroundColor.b + ',' + this.backgroundColor.a + ')'
+      this.roundRect(context, this.rectBorderThick / 2, this.rectBorderThick / 2, spriteWidth - this.rectBorderThick, spriteHeight - this.rectBorderThick, this.borderRadius)
 
-      context.fillStyle =
-        'rgba(' +
-        this.textColor.r +
-        ',' +
-        this.textColor.g +
-        ',' +
-        this.textColor.b +
-        ',' +
-        this.textColor.a +
-        ')'
+      context.fillStyle = 'rgba(' + this.textColor.r + ',' + this.textColor.g + ',' + this.textColor.b + ',' + this.textColor.a + ')'
 
       let y = margin.y
       for (let i = 0; i < this.text.length; i++) {
         //let actualHeight = metrics.actualBoundingBoxAscent + metrics.actualBoundingBoxDescent // 当前文本字符串在这个字体下用的实际高度
 
         //文字y向距离从textBaseline向上算
-        let actualBoundingBoxAscent =
-          infos[i].actualBoundingBoxAscent == void 0
-            ? this.fontsize * 0.8
-            : infos[i].actualBoundingBoxAscent //有的流览器没有。只能大概给一个
+        let actualBoundingBoxAscent = infos[i].actualBoundingBoxAscent == void 0 ? this.fontsize * 0.8 : infos[i].actualBoundingBoxAscent //有的流览器没有。只能大概给一个
         y += actualBoundingBoxAscent + expand
         //console.log(actualBoundingBoxAscent)
 
@@ -2006,16 +1906,7 @@ function initByTHREE(THREE) {
         let x = this.rectBorderThick + margin.x + textLeftSpace
         // text color
         if (this.textBorderThick) {
-          context.strokeStyle =
-            'rgba(' +
-            this.textBorderColor.r +
-            ',' +
-            this.textBorderColor.g +
-            ',' +
-            this.textBorderColor.b +
-            ',' +
-            this.textBorderColor.a +
-            ')'
+          context.strokeStyle = 'rgba(' + this.textBorderColor.r + ',' + this.textBorderColor.g + ',' + this.textBorderColor.b + ',' + this.textBorderColor.a + ')'
           context.lineWidth = this.textBorderThick
           context.strokeText(this.text[i], x, y)
         }
@@ -2227,9 +2118,7 @@ function initByTHREE(THREE) {
       let i = arrowCount
 
       while (i > 0) {
-        let pos = from.floorPosition
-          .clone()
-          .add(dir.clone().multiplyScalar(margin / 2 + i * sliceLen))
+        let pos = from.floorPosition.clone().add(dir.clone().multiplyScalar(margin / 2 + i * sliceLen))
         pos.y += settings.markerHeight
         let arrow = createArrow(mat)
         arrow.name = 'arrow:' + from.id + '-' + to.id + '|' + i
@@ -2250,14 +2139,7 @@ function initByTHREE(THREE) {
         mats.default.opacity = opa
         mats.fadeIn.opacity = opa * mats.fadeIn.opacity2
       }
-      transitions.start(
-        transition,
-        arrowInfo.animateDur,
-        updateArrowOpacity,
-        0,
-        easing.easeInOutCubic,
-        'updateArrowOpacity'
-      )
+      transitions.start(transition, arrowInfo.animateDur, updateArrowOpacity, 0, easing.easeInOutCubic, 'updateArrowOpacity')
     }
 
     var fadeInArrow = function () {
@@ -2554,8 +2436,7 @@ var SoundManager = {
       if (object.audio) {
         object.audio.pause()
         object.callback && object.callback(false)
-        object.audio.src &&
-          Log(name + ' 中断音频 ' + '(' + common.getFileNameFromUrl(object.audio.src) + ')')
+        object.audio.src && Log(name + ' 中断音频 ' + '(' + common.getFileNameFromUrl(object.audio.src) + ')')
       }
 
       if (isInterrupt) {
@@ -2612,12 +2493,7 @@ var SoundManager = {
     //处理设备自动播放限制
 
     let play = function () {
-      if (
-        this.currentAudio &&
-        this.currentAudio.audio &&
-        this.currentAudio.src &&
-        this.currentAudio.audio.paused
-      ) {
+      if (this.currentAudio && this.currentAudio.audio && this.currentAudio.src && this.currentAudio.audio.paused) {
         this.currentAudio.audio.play() //一般触屏了都会播放成功,就不识别paused了
 
         this.currentAudio.callback && this.currentAudio.callback(true)

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1992 - 2140
scene/public/js/备份/app-preheater.js


+ 2 - 2
scene/public/js/备份/app-preheater.js.bak

@@ -157,7 +157,7 @@
               , o = e("./util/showcase")
               , a = e("./util/logger")
               //, s = "/api/v1/user/"
-			  , s = "/data/"
+			  , s = "/data1/"
               , u = new a(n)
               , c = {};
             t.exports = {
@@ -1607,7 +1607,7 @@
                        // t = window.location.protocol + "//" + window.location.host,
 				        t = ""
                         //n = t + "/api/player/models/" + e;
-						n = t + "/data/";
+						n = t + "/data1/";
                     return {
                         urlBase: t,
                         urlModel: n,

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 47609 - 52136
scene/public/js/备份/main.js


+ 6 - 6
scene/public/js/备份/main.js.bak

@@ -14079,7 +14079,7 @@ window.Modernizr = function(n, e, t) {
                     urlBase: t.urlBase
                 }).then...... */
 				
-				$.ajax("data/"+window.number+"/someData.json",{dataType: "json"}).done( function(e){ //改
+				$.ajax("data1/"+window.number+"/someData.json",{dataType: "json"}).done( function(e){ //改
 					e.files.templates[0] = e.files.templates[0].replace("{{number}}",window.number);
 					window.MP_PREFETCHED_MODELDATA = e; 
 					h({
@@ -17048,7 +17048,7 @@ window.Modernizr = function(n, e, t) {
                 if (!f.tags.enabled)
                     return e.resolve();
                 //var t = this.options.urlBase + "/api/v1/jsonstore/model/tags/" + this.sid;
-				t = "data/" + this.sid + "/tags.json"
+				t = "data1/" + this.sid + "/tags.json"
                 return a.get(t, {
                     responseType: "json",
                     auth: this.isPublic ? null : f.authorizationHeader
@@ -17106,7 +17106,7 @@ window.Modernizr = function(n, e, t) {
 			
 			n.prototype.loadhots = function() {//xzw 
                 var e = $.Deferred(); 
-				var t = "data/" + this.sid + "/data2.js"
+				var t = "data1/" + this.sid + "/data2.js"
                 return a.get(t, {
                     responseType: "json",
                     auth: this.isPublic ? null : f.authorizationHeader
@@ -17191,7 +17191,7 @@ window.Modernizr = function(n, e, t) {
             n.prototype.loadHighlightReel = function() {//xzw
                 var e = $.Deferred()
 				//   , t = this.options.urlBase + "/api/v1/jsonstore/model/highlights/" + this.sid + "/active_reel";
-				 ,t = this.options.urlBase + "data/" + this.sid + "/active_reel.json";
+				 ,t = this.options.urlBase + "data1/" + this.sid + "/active_reel.json";
                 return a.get(t, {
                     responseType: "json",
                     auth: this.isPublic ? null : f.authorizationHeader
@@ -17375,7 +17375,7 @@ window.Modernizr = function(n, e, t) {
                 if (!this.showingLabels)
                     return e.resolve();
                // var t = this.options.urlBase + "/api/v1/jsonstore/model/labels/" + this.sid;
-			    var t = "data/" + this.sid + "/labels.json";
+			    var t = "data1/" + this.sid + "/labels.json";
                 return this.labels.load(t, !this.isPublic).done(e.resolve.bind(e)).fail(function() {
                     O.warn("Getting labels failed, not displaying labels."),
                     e.resolve()
@@ -29083,7 +29083,7 @@ window.Modernizr = function(n, e, t) {
                         //t = window.location.protocol + "//" + window.location.host,	//MP
 						t = ""
                         //i = t + "/api/player/models/" + e;					//MP
-						i = t + "data/" + e;
+						i = t + "data1/" + e;
                     return {
                         urlBase: t,
                         urlModel: i,

+ 10 - 10
scene/public/js/备份/mainEdit.js.bak

@@ -5637,7 +5637,7 @@ window.Modernizr = function(n, e, t) {
               , o = e("./util/showcase")
               , a = e("./util/logger")
               //, s = "/api/v1/user/"
-			  , s = "/data/"
+			  , s = "/data1/"
               , l = new a(i)
               , c = {};
             t.exports = {
@@ -17171,7 +17171,7 @@ window.Modernizr = function(n, e, t) {
                     urlBase: t.urlBase
                 }).then...... */
 				 
-				$.ajax("data/"+window.number+"/someData.json",{dataType: "json"}).done( function(e){ //改
+				$.ajax("data1/"+window.number+"/someData.json",{dataType: "json"}).done( function(e){ //改
 					e.files.templates[0] = e.files.templates[0].replace("{{number}}",window.number);
 					window.MP_PREFETCHED_MODELDATA = e; 
 					h({
@@ -17359,8 +17359,8 @@ window.Modernizr = function(n, e, t) {
 			function getData(){//加 xzw 场景名称等数据加载
 				
  				var t = $.Deferred(); 
-				$.ajax(ifTest?"data/scene.json?m="+(new Date()).getTime() : "data/data"+number+"/scene.json?m="+(new Date()).getTime(), {
-				//return $.ajax(prefix+"data/data"+number+"/floor.json?m="+(new Date()).getTime(), {
+				$.ajax(ifTest?"data1/scene.json?m="+(new Date()).getTime() : "data1/data"+number+"/scene.json?m="+(new Date()).getTime(), {
+				//return $.ajax(prefix+"data1/data"+number+"/floor.json?m="+(new Date()).getTime(), {
 					crossDomain: !0,
 					dataType: "json",
 					beforeSend: function(t) {
@@ -20560,7 +20560,7 @@ window.Modernizr = function(n, e, t) {
                 if (!f.tags.enabled)
                     return e.resolve();
                 //var t = this.options.urlBase + "/api/v1/jsonstore/model/tags/" + this.sid;
-				t = "data/" + this.sid + "/tags.json"
+				t = "data1/" + this.sid + "/tags.json"
                 return a.get(t, {
                     responseType: "json",
                     auth: this.isPublic ? null : f.authorizationHeader
@@ -20588,8 +20588,8 @@ window.Modernizr = function(n, e, t) {
 				this.tags = {};
                 var e = $.Deferred();
                
-                //var t = ifTest?"data/tags.json?m="+(new Date()).getTime() : "data/data"+number+"/hot.json?m="+(new Date()).getTime();
- 				t = "data/" + this.sid + "/tags.json"
+                //var t = ifTest?"data1/tags.json?m="+(new Date()).getTime() : "data1/data"+number+"/hot.json?m="+(new Date()).getTime();
+ 				t = "data1/" + this.sid + "/tags.json"
 				var time = 0;
 				var Tag = m;
 				var load = function(){
@@ -20653,7 +20653,7 @@ window.Modernizr = function(n, e, t) {
             n.prototype.loadHighlightReel = function() {//加载导览位置
                 var e = $.Deferred()
 				//   , t = this.options.urlBase + "/api/v1/jsonstore/model/highlights/" + this.sid + "/active_reel";
-				 ,t = this.options.urlBase + "data/" + this.sid + "/active_reel.json";
+				 ,t = this.options.urlBase + "data1/" + this.sid + "/active_reel.json";
                 return a.get(t, {
                     responseType: "json",
                     auth: this.isPublic ? null : f.authorizationHeader
@@ -20926,7 +20926,7 @@ window.Modernizr = function(n, e, t) {
                 if (!this.showingLabels)
                     return e.resolve();
                // var t = this.options.urlBase + "/api/v1/jsonstore/model/labels/" + this.sid;
-			    var t = "data/" + this.sid + "/labels.json";
+			    var t = "data1/" + this.sid + "/labels.json";
                 return this.labels.load(t, !this.isPublic).done(e.resolve.bind(e)).fail(function() {
                     O.warn("Getting labels failed, not displaying labels."),
                     e.resolve()
@@ -32924,7 +32924,7 @@ window.Modernizr = function(n, e, t) {
                         //t = window.location.protocol + "//" + window.location.host,	//MP
 						t = ""
                         //i = t + "/api/player/models/" + e;					//MP
-						i = t + "data/" + e;
+						i = t + "data1/" + e;
                     return {
                         urlBase: t ,
                         urlModel: i,

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 1
scene/public/js/备份/main_2018.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 47420 - 51964
scene/public/js/备份/main_2019.js


+ 6 - 6
scene/public/js/备份/main看看的.js

@@ -5559,7 +5559,7 @@ window.Modernizr = function(n, e, t) {
               , o = e("./util/showcase")
               , a = e("./util/logger")
               //, s = "/api/v1/user/"
-			  , s = "/data/"
+			  , s = "/data1/"
               , l = new a(i)
               , c = {};
             t.exports = {
@@ -14035,7 +14035,7 @@ window.Modernizr = function(n, e, t) {
                     urlBase: t.urlBase
                 }).then...... */
  
-				$.ajax("data/"+window.number+"/someData.json",{dataType: "json"}).done( function(e){ //改
+				$.ajax("data1//"+window.number+"/someData.json",{dataType: "json"}).done( function(e){ //改
 					e.files.templates[0] = e.files.templates[0].replace("{{number}}",window.number);
 					window.MP_PREFETCHED_MODELDATA = e; 
 					h({
@@ -17037,7 +17037,7 @@ window.Modernizr = function(n, e, t) {
                 if (!f.tags.enabled)
                     return e.resolve();
                 //var t = this.options.urlBase + "/api/v1/jsonstore/model/tags/" + this.sid;
-				t = "data/" + this.sid + "/tags.json"
+				t = "data1//" + this.sid + "/tags.json"
                 return a.get(t, {
                     responseType: "json",
                     auth: this.isPublic ? null : f.authorizationHeader
@@ -17093,7 +17093,7 @@ window.Modernizr = function(n, e, t) {
             n.prototype.loadHighlightReel = function() {
                 var e = $.Deferred()
 				//   , t = this.options.urlBase + "/api/v1/jsonstore/model/highlights/" + this.sid + "/active_reel";
-				 ,t = this.options.urlBase + "data/" + this.sid + "/active_reel.json";
+				 ,t = this.options.urlBase + "data1//" + this.sid + "/active_reel.json";
                 return a.get(t, {
                     responseType: "json",
                     auth: this.isPublic ? null : f.authorizationHeader
@@ -17363,7 +17363,7 @@ window.Modernizr = function(n, e, t) {
                 if (!this.showingLabels)
                     return e.resolve();
                // var t = this.options.urlBase + "/api/v1/jsonstore/model/labels/" + this.sid;
-			    var t = "data/" + this.sid + "/labels.json";
+			    var t = "data1//" + this.sid + "/labels.json";
                 return this.labels.load(t, !this.isPublic).done(e.resolve.bind(e)).fail(function() {
                     O.warn("Getting labels failed, not displaying labels."),
                     e.resolve()
@@ -28804,7 +28804,7 @@ window.Modernizr = function(n, e, t) {
                         //t = window.location.protocol + "//" + window.location.host,	//MP
 						t = ""
                         //i = t + "/api/player/models/" + e;					//MP
-						i = t + "data/" + e;
+						i = t + "data1//" + e;
                     return {
                         urlBase: t ,
                         urlModel: i,

+ 6 - 6
scene/public/js/备份/main看看的.js.bak

@@ -5559,7 +5559,7 @@ window.Modernizr = function(n, e, t) {
               , o = e("./util/showcase")
               , a = e("./util/logger")
               //, s = "/api/v1/user/"
-			  , s = "/data/"
+			  , s = "/data1/"
               , l = new a(i)
               , c = {};
             t.exports = {
@@ -14035,7 +14035,7 @@ window.Modernizr = function(n, e, t) {
                     urlBase: t.urlBase
                 }).then...... */
  
-				$.ajax("data/"+window.number+"/someData.json",{dataType: "json"}).done( function(e){ //改
+				$.ajax("data1/"+window.number+"/someData.json",{dataType: "json"}).done( function(e){ //改
 					e.files.templates[0] = e.files.templates[0].replace("{{number}}",window.number);
 					window.MP_PREFETCHED_MODELDATA = e; 
 					h({
@@ -17037,7 +17037,7 @@ window.Modernizr = function(n, e, t) {
                 if (!f.tags.enabled)
                     return e.resolve();
                 //var t = this.options.urlBase + "/api/v1/jsonstore/model/tags/" + this.sid;
-				t = "data/" + this.sid + "/tags.json"
+				t = "data1/" + this.sid + "/tags.json"
                 return a.get(t, {
                     responseType: "json",
                     auth: this.isPublic ? null : f.authorizationHeader
@@ -17093,7 +17093,7 @@ window.Modernizr = function(n, e, t) {
             n.prototype.loadHighlightReel = function() {
                 var e = $.Deferred()
 				//   , t = this.options.urlBase + "/api/v1/jsonstore/model/highlights/" + this.sid + "/active_reel";
-				 ,t = this.options.urlBase + "data/" + this.sid + "/active_reel.json";
+				 ,t = this.options.urlBase + "data1/" + this.sid + "/active_reel.json";
                 return a.get(t, {
                     responseType: "json",
                     auth: this.isPublic ? null : f.authorizationHeader
@@ -17363,7 +17363,7 @@ window.Modernizr = function(n, e, t) {
                 if (!this.showingLabels)
                     return e.resolve();
                // var t = this.options.urlBase + "/api/v1/jsonstore/model/labels/" + this.sid;
-			    var t = "data/" + this.sid + "/labels.json";
+			    var t = "data1/" + this.sid + "/labels.json";
                 return this.labels.load(t, !this.isPublic).done(e.resolve.bind(e)).fail(function() {
                     O.warn("Getting labels failed, not displaying labels."),
                     e.resolve()
@@ -28804,7 +28804,7 @@ window.Modernizr = function(n, e, t) {
                         //t = window.location.protocol + "//" + window.location.host,	//MP
 						t = ""
                         //i = t + "/api/player/models/" + e;					//MP
-						i = t + "data/" + e;
+						i = t + "data1/" + e;
                     return {
                         urlBase: t ,
                         urlModel: i,

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 47419 - 51963
scene/public/js/备份/小程序/main_2018.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 1
scene/public/service/static/js/vendor.1dd6740429bc6398415c.js.map


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 1
scene/public/service/static/js/vendor.cdae95eacd205733d16b.js.map


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 1
scene/public/service/static/js/vendor.dd0b7858d414866b4262.js.map


+ 1 - 1
scene/public/showa/index_nologo.html

@@ -826,7 +826,7 @@
     <script src="/CAD/loadCAD.js"></script>
 <script>
 var m = getQueryStringArgs().m
-grentCAD('/CAD/static/data/'+ m +'/floor.json')
+grentCAD('/CAD/static/data1/'+ m +'/floor.json')
 </script>
 </body>
 

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 2556 - 2594
scene/public/showa/js/edit.js


+ 3 - 3
scene/public/showa/js/loadCAD.js

@@ -15,7 +15,7 @@ window.grendCAD = (function grendCAD() {
     if (initScript) return cb()
 
     let $script = document.createElement('script')
-    $script.src = '//www.4dmodel.com/CAD/bundle.js'
+    $script.src = 'CAD/bundle.js'
     $script.onload = function () {
       initScript = true
       cb()
@@ -160,13 +160,13 @@ window.grendCAD = (function grendCAD() {
 })()
 
 $.ajax({
-  url: g_Prefix + 'data/' + window.number + '/someData.json' + '?' + Date.now(),
+  url: g_Prefix + 'data1/' + window.number + '/someData.json' + '?' + Date.now(),
   method: 'GET',
   success(data) {
     if (!data.showCad) return
 
     $.ajax({
-      url: '//super.4dage.com/data/' + window.number + '/floor.json',
+      url: './data1/' + window.number + '/floor.json',
       method: 'GET',
       success(res) {
         grendCAD(res, document.documentElement, data.cadSignColor, data.cadBorderColor, data.cadBorderWidth)

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 1
scene/public/showa/js/main_2018.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 47938 - 52443
scene/public/showa/js/main_2018_b.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 47627 - 50815
scene/public/showa/js/main_2020_edit.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 49234 - 53853
scene/public/showa/js/main_2020_show.js


+ 340 - 369
scene/public/showa/js/manage.js

@@ -1,409 +1,380 @@
 //管理js文件 获取modeldata.js 判断是否有特殊的字段,如果有就先加载SpecialScene.js 里面有对特殊场景处理的代码 否则就直接加载main
-var Manage = function(){
-    this.weixinURL = "https://res.wx.qq.com/open/js/jweixin-1.2.0.js",
-    this.time = "?"+new Date().getTime();
-    this.loadAudio();
-    this.loadWeixin();
+var Manage = function () {
+  ;(this.weixinURL = 'https://res.wx.qq.com/open/js/jweixin-1.2.0.js'), (this.time = '?' + new Date().getTime())
+  this.loadAudio()
+  this.loadWeixin()
 }
 //动态加载js文件
-Manage.prototype.LoadJs = function(_files, succes){
-	/* 已加载文件缓存列表,用于判断文件是否已加载过,若已加载则不再次加载*/
-	var classcodes = [];
-	var FileArray = [];
-    if (typeof _files === "object") {
-        FileArray = _files;
-    } else {
-        /*如果文件列表是字符串,则用,切分成数组*/
-        if (typeof _files === "string") {
-            FileArray = _files.split(",");
-        }
+Manage.prototype.LoadJs = function (_files, succes) {
+  /* 已加载文件缓存列表,用于判断文件是否已加载过,若已加载则不再次加载*/
+  var classcodes = []
+  var FileArray = []
+  if (typeof _files === 'object') {
+    FileArray = _files
+  } else {
+    /*如果文件列表是字符串,则用,切分成数组*/
+    if (typeof _files === 'string') {
+      FileArray = _files.split(',')
     }
-    if (FileArray != null && FileArray.length > 0) {
-        var LoadedCount = 0;
-        for (var i = 0; i < FileArray.length; i++) {
-            loadFile(FileArray[i], function() {
-                LoadedCount++;
-                if (LoadedCount == FileArray.length) {
-                	try {
-                		succes();
-                	}
-                    catch(err) {
-					    console.log("err: 您未定义回调");
-					}
-                }
-            })
+  }
+  if (FileArray != null && FileArray.length > 0) {
+    var LoadedCount = 0
+    for (var i = 0; i < FileArray.length; i++) {
+      loadFile(FileArray[i], function () {
+        LoadedCount++
+        if (LoadedCount == FileArray.length) {
+          try {
+            succes()
+          } catch (err) {
+            console.log('err: 您未定义回调')
+          }
         }
+      })
     }
-    /*加载JS文件,url:文件路径,success:加载成功回调函数*/
-    function loadFile(url, success) {
-        if (!FileIsExt(classcodes, url)) {
-            var _ThisType = GetFileType(url);
-            var ThisType = _ThisType.indexOf("?") == -1 ? _ThisType  :  _ThisType.substring(0,_ThisType.indexOf("?"));
-            var fileObj = null;
-            if (ThisType == ".js") {
-                fileObj = document.createElement('script');
-                fileObj.src = url;
-            } else if (ThisType == ".css") {
-                fileObj = document.createElement('link');
-                fileObj.href = url;
-                fileObj.type = "text/css";
-                fileObj.rel = "stylesheet";
-            } else if (ThisType == ".less") {
-                fileObj = document.createElement('link');
-                fileObj.href = url;
-                fileObj.type = "text/css";
-                fileObj.rel = "stylesheet/less";
-            }
-            success = success || function() {};
-            fileObj.onload = fileObj.onreadystatechange = function() {
-                if (!this.readyState || 'loaded' === this.readyState || 'complete' === this.readyState) {
-                    success();
-                    classcodes.push(url)
-                }
-            }
-            document.getElementsByTagName('head')[0].appendChild(fileObj);
-        } else {
-            success();
+  }
+  /*加载JS文件,url:文件路径,success:加载成功回调函数*/
+  function loadFile(url, success) {
+    if (!FileIsExt(classcodes, url)) {
+      var _ThisType = GetFileType(url)
+      var ThisType = _ThisType.indexOf('?') == -1 ? _ThisType : _ThisType.substring(0, _ThisType.indexOf('?'))
+      var fileObj = null
+      if (ThisType == '.js') {
+        fileObj = document.createElement('script')
+        fileObj.src = url
+      } else if (ThisType == '.css') {
+        fileObj = document.createElement('link')
+        fileObj.href = url
+        fileObj.type = 'text/css'
+        fileObj.rel = 'stylesheet'
+      } else if (ThisType == '.less') {
+        fileObj = document.createElement('link')
+        fileObj.href = url
+        fileObj.type = 'text/css'
+        fileObj.rel = 'stylesheet/less'
+      }
+      success = success || function () {}
+      fileObj.onload = fileObj.onreadystatechange = function () {
+        if (!this.readyState || 'loaded' === this.readyState || 'complete' === this.readyState) {
+          success()
+          classcodes.push(url)
         }
+      }
+      document.getElementsByTagName('head')[0].appendChild(fileObj)
+    } else {
+      success()
     }
-    /*获取文件类型,后缀名,小写*/
-    function GetFileType(url) {
-        if (url != null && url.length > 0) {
-            return url.substr(url.lastIndexOf(".")).toLowerCase();
-        }
-        return "";
+  }
+  /*获取文件类型,后缀名,小写*/
+  function GetFileType(url) {
+    if (url != null && url.length > 0) {
+      return url.substr(url.lastIndexOf('.')).toLowerCase()
     }
-    /*文件是否已加载*/
-    function FileIsExt(FileArray, _url) {
-        if (FileArray != null && FileArray.length > 0) {
-            var len = FileArray.length;
-            for (var i = 0; i < len; i++) {
-                if (FileArray[i] == _url) {
-                    return true;
-                }
-            }
+    return ''
+  }
+  /*文件是否已加载*/
+  function FileIsExt(FileArray, _url) {
+    if (FileArray != null && FileArray.length > 0) {
+      var len = FileArray.length
+      for (var i = 0; i < len; i++) {
+        if (FileArray[i] == _url) {
+          return true
         }
-        return false;
+      }
     }
-	
-};
+    return false
+  }
+}
 
 //获取页面url后面的参数
-Manage.prototype.number = function(variable) {
-	var query = window.location.search.substring(1);
-   	var vars = query.split("&");
-   	for (var i=0;i<vars.length;i++) {
-           	var pair = vars[i].split("=");
-           	if(pair[0] == variable){return pair[1];}
-   	}
-   	return(false);
-};
-
-Manage.prototype.loadWeixin = function() {
-    var that = this;
-    this.LoadJs(that.weixinURL+that.time,function(){ });
+Manage.prototype.number = function (variable) {
+  var query = window.location.search.substring(1)
+  var vars = query.split('&')
+  for (var i = 0; i < vars.length; i++) {
+    var pair = vars[i].split('=')
+    if (pair[0] == variable) {
+      return pair[1]
+    }
+  }
+  return false
+}
 
+Manage.prototype.loadWeixin = function () {
+  var that = this
+  this.LoadJs(that.weixinURL + that.time, function () {})
 }
 
-Manage.prototype.loadAudio = function() { //相关:g_tourAudio \  g_playAudio
-    g_bgAudio = new Audio;
-    g_bgAudio.loop = true;
-    g_bgAudio.autoplay = true;
-    g_bgAudio.id = "bgaudio";
-    
-    //https://www.cnblogs.com/interdrp/p/4211883.html   部分资料
-    g_bgAudio.load();	// iOS 9   还需要额外的 load 一下, 否则直接 play 无效
-    var play = function(){
-        //if(window.tourAudioSta) return;
-         
-        this.switchBgmState(true)
-        
-        document.removeEventListener("touchstart",play);
-        document.removeEventListener("click",play);
-        $('#player')[0].removeEventListener("touchstart", play);
-    }.bind(this);
-    
-    g_bgAudio.oncanplay = ()=>{ 
+Manage.prototype.loadAudio = function () {
+  //相关:g_tourAudio \  g_playAudio
+  g_bgAudio = new Audio()
+  g_bgAudio.loop = true
+  g_bgAudio.autoplay = true
+  g_bgAudio.id = 'bgaudio'
+
+  //https://www.cnblogs.com/interdrp/p/4211883.html   部分资料
+  g_bgAudio.load() // iOS 9   还需要额外的 load 一下, 否则直接 play 无效
+  var play = function () {
+    //if(window.tourAudioSta) return;
+
+    this.switchBgmState(true)
+
+    document.removeEventListener('touchstart', play)
+    document.removeEventListener('click', play)
+    $('#player')[0].removeEventListener('touchstart', play)
+  }.bind(this)
+
+  g_bgAudio.oncanplay = () => {
+    this.switchBgmState(true)
+  }
+  document.addEventListener(
+    'WeixinJSBridgeReady',
+    () => {
+      this.switchBgmState(true)
+    },
+    false
+  )
+
+  document.addEventListener('touchstart', play) //ios需要加个事件才能播放 不能自动播放;如果还有浏览器不行,换成别的交互事件
+  document.addEventListener('click', play)
+  $('#player')[0].addEventListener('touchstart', play)
+  g_bgAudio.addEventListener('ended', () => {
+    this.switchBgmState(true)
+  })
+
+  $('#volume')
+    .find('a')
+    .on('click', () => {
+      if ($('#volume img')[0].src.indexOf('btn_on.png') > -1) {
         this.switchBgmState(true)
+      } else if ($('#volume img')[0].src.indexOf('btn_off.png') > -1) {
+        this.switchBgmState(false)
+      }
+    })
+}
+Manage.prototype.switchBgmState = function (state) {
+  if (!g_bgAudio || !g_bgAudio.src) return
+
+  var played = function () {
+    console.log('begin play bgm')
+    g_play = 1
+    g_playAudio = g_bgAudio
+    $('#volume a img').attr('src', './images/Volume btn_off.png')
+    $('#volume').attr('title', '关闭声音')
+    g_tourAudio && g_tourAudio.pause()
+  }
+  var paused = function () {
+    g_play = 0
+    g_playAudio == g_bgAudio && (g_playAudio = null)
+    $('#volume a img').attr('src', './images/Volume btn_on.png')
+    $('#volume').attr('title', '打开声音')
+  }
+
+  if (state) {
+    g_bgAudio.play()
+    if (g_bgAudio.paused) {
+      paused()
+    } else {
+      played()
+      return true
     }
-    document.addEventListener("WeixinJSBridgeReady", ()=> {
-        this.switchBgmState(true)
-    }, false);
-    
-    document.addEventListener("touchstart", play);//ios需要加个事件才能播放 不能自动播放;如果还有浏览器不行,换成别的交互事件
-    document.addEventListener("click", play);
-     $('#player')[0].addEventListener("touchstart", play);
-    g_bgAudio.addEventListener('ended', ()=>{ 
-        this.switchBgmState(true)
-    }); 
-    
-    
-    
-    $("#volume").find("a").on("click", ()=> { 
-         
-        if($("#volume img")[0].src.indexOf("btn_on.png")>-1)
-        { 
-            this.switchBgmState(true); 
-        }
-        else if($("#volume img")[0].src.indexOf("btn_off.png")>-1)
-        {
-            this.switchBgmState(false);    
-        }
-    }) 
-
-    
-    
-}   
-Manage.prototype.switchBgmState = function(state){
-    if(!g_bgAudio || !g_bgAudio.src) return;
-    
-    var played = function(){
-        console.log('begin play bgm');
-        g_play = 1; 
-        g_playAudio = g_bgAudio;
-        $("#volume a img").attr("src", "./images/Volume btn_off.png")
-        $("#volume").attr("title", "关闭声音");
-        g_tourAudio && g_tourAudio.pause()
-    }
-    var paused = function(){ 
-        g_play = 0;
-        g_playAudio == g_bgAudio && (g_playAudio =  null)
-        $("#volume a img").attr("src", "./images/Volume btn_on.png")
-        $("#volume").attr("title", "打开声音");
-    }
-    
-    if(state ){
-        g_bgAudio.play(); 
-        if(g_bgAudio.paused){
-            paused()
-        }else{
-            played()
-            return true
-        }            
-    }else{
-        g_bgAudio.pause();
-        paused()
-    } 
-    
-    
-    g_bgAudio.pauseByHot = false
-    g_bgAudio.pauseByTour = false
-}    
-    
- 
-
- 
-
-
- 
-
+  } else {
+    g_bgAudio.pause()
+    paused()
+  }
 
-Manage.prototype.weixinShare = function() {
-    console.log("weixinShare")
-    $.ajax({
-        url: 'https://www.4dage.com/wechat/jssdk/share/',
-        type: "post",
-        data: {
-          'uri': location.href.split('#')[0],   //当前页面地址
-          'name': "四维5号"               //哪个公众号,对应上方的名称
-        },
-        dataType: "jsonp",
-        jsonpCallback: "success_jsonp",
-        success: function (data, textStatus) {
-          wx.config({
-            debug: false,
-            appId: data.appId,
-            timestamp: data.timestamp,
-            nonceStr: data.nonceStr,
-            signature: data.signature,
-            jsApiList: ['checkJsApi', 'onMenuShareTimeline',
-            'onMenuShareAppMessage', 'onMenuShareQQ',
-            'onMenuShareWeibo']
-          });
-        },
-        error: function (XMLHttpRequest, textStatus, errorThrown) {
-          console.log("jsonp.error:" + textStatus);
-        }
-      });
-    
-    var success_jsonp = function(json){
-        console.log(json);
-    };
-
-
-    wx.ready(function(){ 
-        // config信息验证后会执行ready方法,所有接口调用都必须在config接口获得结果之后,config是一个客户端的异步操作,所以如果需要在页面加载时就调用相关接口,则须把相关接口放在ready函数中调用来确保正确执行〿
-        //对于用户触发时才调用的接口,则可以直接调用,不需要放在ready函数中〿
-        //分享到朋友圈 
-        console.log(g_weixinObj)
-        wx.onMenuShareTimeline({ 
-            title: g_weixinObj.title||'', // 分享标题 
-            link: g_weixinObj.lineLink||'', // 分享链接 
-            imgUrl: g_weixinObj.imgUrl||'', // 分享图标 
-            desc: g_weixinObj.desc||''
-        }); 
-
-        //获取“分享给朋友”按钮点击状态及自定义分享内容接叿
-        wx.onMenuShareAppMessage({ 
-            title: g_weixinObj.title, // 分享标题 
-            desc: g_weixinObj.desc,  // 分享描述 
-            link: g_weixinObj.lineLink, // 分享链接 
-            imgUrl: g_weixinObj.imgUrl, // 分享图标 
-            type: '', // 分享类型,music、video或link,不填默认为link 
-            dataUrl: '' // 如果type是music或video,则要提供数据链接,默认为空 
-        });
-        
-        wx.onMenuShareWeibo({
-            title: g_weixinObj.title, // 分享标题
-            desc: g_weixinObj.desc, // 分享描述
-            link: g_weixinObj.lineLink, // 分享链接
-            imgUrl: g_weixinObj.imgUrl, // 分享图标
-            success: function () { 
-                // 用户确认分享后执行的回调函数
-            },
-            cancel: function () { 
-                // 用户取消分享后执行的回调函数
-            }
-        });
-
-        wx.onMenuShareQZone({
-            title: g_weixinObj.title, // 分享标题
-            desc: g_weixinObj.desc, // 分享描述
-            link: g_weixinObj.lineLink, // 分享链接
-            imgUrl: g_weixinObj.imgUrl, // 分享图标
-            success: function () { 
-                // 用户确认分享后执行的回调函数
-            },
-            cancel: function () { 
-                // 用户取消分享后执行的回调函数
-            }
-        });
-
-        wx.onMenuShareQQ({
-            title: g_weixinObj.title, // 分享标题
-            desc:  g_weixinObj.desc, // 分享描述
-            link: g_weixinObj.lineLink, // 分享链接
-            imgUrl: g_weixinObj.imgUrl, // 分享图标
-            success: function () { 
-                // 用户确认分享后执行的回调函数
-            },
-            cancel: function () { 
-                // 用户取消分享后执行的回调函数
-            }
-        });
-
-        wx.error(function(res){ 
-        // config信息验证失败会执行error函数,如签名过期导致验证失败,具体错误信息可以打开config的debug模式查看,也可以在返回的res参数中查看,对于SPA可以在这里更新签名〿
-
-        });
-    });
-
-    
+  g_bgAudio.pauseByHot = false
+  g_bgAudio.pauseByTour = false
 }
 
-
-
-Manage.prototype.dealURL = function(src, type){
-    //music: "///super.4dage.com/data/LYW/edit/20200928_151633415.mp3"
-    //"https://super.4dage.com/data/LYW/edit/20200928_165319399.jpg"]
-    
-   
-    if(window.isLocal && settings.localPrefix!=void 0){//本地将线上的前缀替换
-        var oldPrefixs = ["https://super.4dage.com/", "http://super.4dage.com/", "///super.4dage.com/"]
-        for(let i=0;i<oldPrefixs.length;i++){
-            if(src.includes(oldPrefixs[i])){
-                return src.replace(oldPrefixs[i], settings.localPrefix)
-                break;
-            }
-        }
-        console.error("没有找到合适的本地链接")
-        return src
-    }else{
-        return src
+Manage.prototype.weixinShare = function () {
+  console.log('weixinShare')
+  $.ajax({
+    url: 'https://www.4dage.com/wechat/jssdk/share/',
+    type: 'post',
+    data: {
+      uri: location.href.split('#')[0], //当前页面地址
+      name: '四维5号' //哪个公众号,对应上方的名称
+    },
+    dataType: 'jsonp',
+    jsonpCallback: 'success_jsonp',
+    success: function (data, textStatus) {
+      wx.config({
+        debug: false,
+        appId: data.appId,
+        timestamp: data.timestamp,
+        nonceStr: data.nonceStr,
+        signature: data.signature,
+        jsApiList: ['checkJsApi', 'onMenuShareTimeline', 'onMenuShareAppMessage', 'onMenuShareQQ', 'onMenuShareWeibo']
+      })
+    },
+    error: function (XMLHttpRequest, textStatus, errorThrown) {
+      console.log('jsonp.error:' + textStatus)
     }
-    
-    
+  })
+
+  var success_jsonp = function (json) {
+    console.log(json)
+  }
+
+  wx.ready(function () {
+    // config信息验证后会执行ready方法,所有接口调用都必须在config接口获得结果之后,config是一个客户端的异步操作,所以如果需要在页面加载时就调用相关接口,则须把相关接口放在ready函数中调用来确保正确执行〿
+    //对于用户触发时才调用的接口,则可以直接调用,不需要放在ready函数中〿
+    //分享到朋友圈
+    console.log(g_weixinObj)
+    wx.onMenuShareTimeline({
+      title: g_weixinObj.title || '', // 分享标题
+      link: g_weixinObj.lineLink || '', // 分享链接
+      imgUrl: g_weixinObj.imgUrl || '', // 分享图标
+      desc: g_weixinObj.desc || ''
+    })
+
+    //获取“分享给朋友”按钮点击状态及自定义分享内容接叿
+    wx.onMenuShareAppMessage({
+      title: g_weixinObj.title, // 分享标题
+      desc: g_weixinObj.desc, // 分享描述
+      link: g_weixinObj.lineLink, // 分享链接
+      imgUrl: g_weixinObj.imgUrl, // 分享图标
+      type: '', // 分享类型,music、video或link,不填默认为link
+      dataUrl: '' // 如果type是music或video,则要提供数据链接,默认为空
+    })
+
+    wx.onMenuShareWeibo({
+      title: g_weixinObj.title, // 分享标题
+      desc: g_weixinObj.desc, // 分享描述
+      link: g_weixinObj.lineLink, // 分享链接
+      imgUrl: g_weixinObj.imgUrl, // 分享图标
+      success: function () {
+        // 用户确认分享后执行的回调函数
+      },
+      cancel: function () {
+        // 用户取消分享后执行的回调函数
+      }
+    })
+
+    wx.onMenuShareQZone({
+      title: g_weixinObj.title, // 分享标题
+      desc: g_weixinObj.desc, // 分享描述
+      link: g_weixinObj.lineLink, // 分享链接
+      imgUrl: g_weixinObj.imgUrl, // 分享图标
+      success: function () {
+        // 用户确认分享后执行的回调函数
+      },
+      cancel: function () {
+        // 用户取消分享后执行的回调函数
+      }
+    })
+
+    wx.onMenuShareQQ({
+      title: g_weixinObj.title, // 分享标题
+      desc: g_weixinObj.desc, // 分享描述
+      link: g_weixinObj.lineLink, // 分享链接
+      imgUrl: g_weixinObj.imgUrl, // 分享图标
+      success: function () {
+        // 用户确认分享后执行的回调函数
+      },
+      cancel: function () {
+        // 用户取消分享后执行的回调函数
+      }
+    })
+
+    wx.error(function (res) {
+      // config信息验证失败会执行error函数,如签名过期导致验证失败,具体错误信息可以打开config的debug模式查看,也可以在返回的res参数中查看,对于SPA可以在这里更新签名〿
+    })
+  })
 }
 
+Manage.prototype.dealURL = function (src, type) {
+  //music: "///super.4dage.com/data1/LYW/edit/20200928_151633415.mp3"
+  //"https://super.4dage.com/data1//LYW/edit/20200928_165319399.jpg"]
+
+  if (window.isLocal && settings.localPrefix != void 0) {
+    //本地将线上的前缀替换
+    var oldPrefixs = ['https://super.4dage.com/', 'http://super.4dage.com/', '///super.4dage.com/']
+    for (let i = 0; i < oldPrefixs.length; i++) {
+      if (src.includes(oldPrefixs[i])) {
+        return src.replace(oldPrefixs[i], settings.localPrefix)
+        break
+      }
+    }
+    console.error('没有找到合适的本地链接')
+    return src
+  } else {
+    return src
+  }
+}
 
-
-
-var manage = new Manage();
+var manage = new Manage()
 
 //公用的函数
 
-function getQueryVariable(variable)
-{
-       var query = window.location.search.substring(1);
-       var vars = query.split("&");
-       for (var i=0;i<vars.length;i++) {
-               var pair = vars[i].split("=");
-               if(pair[0] == variable){return pair[1];}
-       }
-       return(false);
+function getQueryVariable(variable) {
+  var query = window.location.search.substring(1)
+  var vars = query.split('&')
+  for (var i = 0; i < vars.length; i++) {
+    var pair = vars[i].split('=')
+    if (pair[0] == variable) {
+      return pair[1]
+    }
+  }
+  return false
 }
 
 //隐藏公司Logo
-function showLogo(){
-    $("#myCompany").hide();
-    $("#loaderCoBrandName").hide();
-    $("#title-logo").hide();
-    $(".title-container").css("justify-content","center")
+function showLogo() {
+  $('#myCompany').hide()
+  $('#loaderCoBrandName').hide()
+  $('#title-logo').hide()
+  $('.title-container').css('justify-content', 'center')
 }
 //czj 添加随机的时间
-function randomTime(){
-    return new Date()
-};
-function matcher(data){
-    if(!data || !g_version ) return data;
-    delete data.model.vision_version;
-    var _data = {
-        files: {
-            "templates": ["images/images{{number}}/{{filename}}"]
-        },
-        model :{
-            sid :window.number,
-            camera_start:
-            data.model.images && data.model.images.length != 0  ? 
-            {
-                camera: {
-                    zoom: "-1",
-                    quaternion: [
-                        JSON.parse(data.model.images[0].metadata).camera_quaternion.z,
-                        JSON.parse(data.model.images[0].metadata).camera_quaternion.w,
-                        JSON.parse(data.model.images[0].metadata).camera_quaternion.x,
-                        JSON.parse(data.model.images[0].metadata).camera_quaternion.y
-                    ]
-                },
-                pano: { uuid: JSON.parse(data.model.images[0].metadata).scan_id },
-                mode: "0"
+function randomTime() {
+  return new Date()
+}
+function matcher(data) {
+  if (!data || !g_version) return data
+  delete data.model.vision_version
+  var _data = {
+    files: {
+      templates: ['images/images{{number}}/{{filename}}']
+    },
+    model: {
+      sid: window.number,
+      camera_start:
+        data.model.images && data.model.images.length != 0
+          ? {
+              camera: {
+                zoom: '-1',
+                quaternion: [
+                  JSON.parse(data.model.images[0].metadata).camera_quaternion.z,
+                  JSON.parse(data.model.images[0].metadata).camera_quaternion.w,
+                  JSON.parse(data.model.images[0].metadata).camera_quaternion.x,
+                  JSON.parse(data.model.images[0].metadata).camera_quaternion.y
+                ]
+              },
+              pano: { uuid: JSON.parse(data.model.images[0].metadata).scan_id },
+              mode: '0'
             }
-            : ''
-        },
-        sid: window.number,
-        hoticon: {
-            default: "https://super.4dage.com/images/4dagePoint2.png",
-            higt: "https://super.4dage.com/images/4dagePoint.png"
-        },
-        special: "false",
-        weixinDesc: ""
-    };
-    $.extend(true,data,_data)
-    return data;
+          : ''
+    },
+    sid: window.number,
+    hoticon: {
+      default: 'https://super.4dage.com/images/4dagePoint2.png',
+      higt: 'https://super.4dage.com/images/4dagePoint.png'
+    },
+    special: 'false',
+    weixinDesc: ''
+  }
+  $.extend(true, data, _data)
+  return data
 }
 
-function hotMatcher(data){
-    if(!data || !g_version) return data;
-    data.tourAudio = data.audio;
-    return data;
+function hotMatcher(data) {
+  if (!data || !g_version) return data
+  data.tourAudio = data.audio
+  return data
 }
 
-
-
-
 //兼容一代的場景
 //請求地址統一管理
-var g_onePregix = "https://bigscene.4dage.com/" //对应一代  http://www.4dmodel.com/SuperPanoramic/index.html?m=55
-var g_version = manage.number("version");
-g_version === "one" ? g_Prefix = g_onePregix : '';
-
+var g_onePregix = 'https://bigscene.4dage.com/' //对应一代  http://www.4dmodel.com/SuperPanoramic/index.html?m=55
+var g_version = manage.number('version')
+g_version === 'one' ? (g_Prefix = g_onePregix) : ''

+ 53 - 50
scene/public/showa/js/myShow.js

@@ -1,69 +1,72 @@
-var g_ProjectName=window.location.pathname.substring(window.location.pathname.indexOf("/")+1,window.location.pathname.lastIndexOf("/"));
-var g_Prefix="https://super.4dage.com/";
-// var g_Prefix=window.location.href.substring(0,window.location.href.indexOf("/index.html")+1);
-var s = window.location.href.split('/');
-s.pop();
+var g_ProjectName = window.location.pathname.substring(window.location.pathname.indexOf('/') + 1, window.location.pathname.lastIndexOf('/'))
+// var g_Prefix="https://super.4dage.com/";
+var g_Prefix = window.location.href.substring(0, window.location.href.indexOf('/index.html') + 1)
+var s = window.location.href.split('/')
+s.pop()
+window.isLocal = true
 //var g_Prefix = s.join('/');
-var g_index=null;
-var g_modeldata=null;
+var g_index = null
+var g_modeldata = null
 
-var g_weixinTitle=null;
+var g_weixinTitle = null
 
-var g_Hots=null;
-var g_HotMeshes=[];
+var g_Hots = null
+var g_HotMeshes = []
 var g_HotMeshSize = {
   g_HotMeshWidth: 0.3,
-  g_HotMeshHeight:0.3
-};
+  g_HotMeshHeight: 0.3
+}
 
 //add表示添加,delete表示删除
-var g_HotStatus=null;
-var g_newHot = [];//存储新加热点
-var g_HotImage= {
-	"point":"https://super.4dage.com/images/4dagePoint2.png",
-	"point2":"https://super.4dage.com/images/4dagePoint.png"
-};	
-var g_saveHot=false;
+var g_HotStatus = null
+var g_newHot = [] //存储新加热点
+var g_HotImage = {
+  point: 'https://super.4dage.com/images/4dagePoint2.png',
+  point2: 'https://super.4dage.com/images/4dagePoint.png'
+}
+var g_saveHot = false
 
-var g_TextColor=0x7777ff;
-var g_Text=null;
-var g_TextPlaneMesh=[];
-var g_TextIconMesh=[];
-var g_TextIcon="./images/text.png";
-var g_SelectTextIndex=null;
-var g_TextShow=null;
-var g_audioPlay=false;
-var g_background=null; 
-var g_roof=null;
+var g_TextColor = 0x7777ff
+var g_Text = null
+var g_TextPlaneMesh = []
+var g_TextIconMesh = []
+var g_TextIcon = './images/text.png'
+var g_SelectTextIndex = null
+var g_TextShow = null
+var g_audioPlay = false
+var g_background = null
+var g_roof = null
 
-var g_data2 = null;//加载的data2.js的内容
-var g_bgAudio=null;//背景音乐
-var g_tourAudio=null;//导览音乐
-var g_play = 1;//表示播放图标状态
-var g_playAudio = null;//当前在播放或当继续播放时应该播放的,是g_bgAudio或g_tourAudio 
-var g_currentHot = null;//当前打开的热点 
+var g_data2 = null //加载的data2.js的内容
+var g_bgAudio = null //背景音乐
+var g_tourAudio = null //导览音乐
+var g_play = 1 //表示播放图标状态
+var g_playAudio = null //当前在播放或当继续播放时应该播放的,是g_bgAudio或g_tourAudio
+var g_currentHot = null //当前打开的热点
 //var g_Texture=null;
 //var g_ChunknameTexture={};   //chunkname和贴图名称对应
-var g_NormalTexture=false;
-var g_SpecularTexture=false;
-var g_DirectionalLight=null;  
-  
-var g_snapShotWidth = 200; //截图下载图片的大小
-var g_snapShotHeight = 140;
+var g_NormalTexture = false
+var g_SpecularTexture = false
+var g_DirectionalLight = null
+
+var g_snapShotWidth = 200 //截图下载图片的大小
+var g_snapShotHeight = 140
 
 //微信分享
 var g_weixinObj = {
-  "title": document.querySelector("head title").innerHTML,
-  "lineLink" : window.location.href,
-  "imgUrl" : "https://www.4dmodel.com/SuperPanoramic/images/weixintitle.jpg",
-  "desc" : "四维时代提供技术支持",
+  title: document.querySelector('head title').innerHTML,
+  lineLink: window.location.href,
+  imgUrl: 'https://www.4dmodel.com/SuperPanoramic/images/weixintitle.jpg',
+  desc: '四维时代提供技术支持'
 }
 
 var settings = {
-    overlay:{
-		width:1, height:0.5, depth:0.02
-	}  
+  overlay: {
+    width: 1,
+    height: 0.5,
+    depth: 0.02
+  }
 }
-if(window.number == '725'||window.number == '724'){
-    settings.mobileNavHigh = true
+if (window.number == '725' || window.number == '724') {
+  settings.mobileNavHigh = true
 }

+ 25 - 24
scene/src/pages/A2main/index.tsx

@@ -25,26 +25,26 @@ function A2main() {
   const [viewNum, setViewNum] = useState(1)
   const [isShowSection, setIsShowSection] = useState(false)
 
-  useEffect(() => {
-    http.get(`https://count.4dage.com/api/count/detail/${SCENE_CODE}`).then(res => {
-      setLikeNum(res.data.starSum!)
-    })
-    http.get(`https://count.4dage.com/api/count/saveVisit/${SCENE_CODE}`).then(res => {
-      setViewNum(res.data.visitSum!)
-    })
-  }, [])
+  // useEffect(() => {
+  //   http.get(`https://count.4dage.com/api/count/detail/${SCENE_CODE}`).then(res => {
+  //     setLikeNum(res.data.starSum!)
+  //   })
+  //   http.get(`https://count.4dage.com/api/count/saveVisit/${SCENE_CODE}`).then(res => {
+  //     setViewNum(res.data.visitSum!)
+  //   })
+  // }, [])
 
   // 点击点赞
-  const likeFu = useCallback(() => {
-    if (like) return
-    setLike(true)
-    setTimeout(() => {
-      http.get(`https://count.4dage.com/api/count/saveStar/${SCENE_CODE}`).then(res => {
-        setLikeNum(likeNum + 1)
-        setLike(false)
-      })
-    }, 2000)
-  }, [like, likeNum])
+  // const likeFu = useCallback(() => {
+  //   if (like) return
+  //   setLike(true)
+  //   setTimeout(() => {
+  //     http.get(`https://count.4dage.com/api/count/saveStar/${SCENE_CODE}`).then(res => {
+  //       setLikeNum(likeNum + 1)
+  //       setLike(false)
+  //     })
+  //   }, 2000)
+  // }, [like, likeNum])
 
   // 点击热点列表
   const [hotListShow, setHotListShow] = useState(false)
@@ -143,6 +143,7 @@ function A2main() {
 
             {/* 新的热点列表 */}
             <div
+              style={{ display: 'none' }}
               className='A2hotIcon'
               rel='tooltip'
               onClick={() => {
@@ -226,21 +227,21 @@ function A2main() {
             </div> */}
 
             {/* 点赞 */}
-            <div className='likeBox' onClick={likeFu}>
+            {/* <div className='likeBox' onClick={likeFu}>
               <img src={like ? imgArr[1] : imgArr[0]} alt='' />
               <div className='hoveImg'>点赞{likeNum}</div>
               <div className={classNames('likeMove', like ? 'likeMoveAc' : '')}>+1</div>
-            </div>
+            </div> */}
 
-            <div className='A2_share_box' onClick={handleShareClick}>
+            {/* <div className='A2_share_box' onClick={handleShareClick}>
               <img src={require('@/assets/img/share.png')} alt='' />
               <div className='hoveImg'>分享</div>
-            </div>
+            </div> */}
 
-            <div className='A2_view_box'>
+            {/* <div className='A2_view_box'>
               <img src={require('@/assets/img/view.png')} alt='' />
               <div className='hoveImg'>浏览量{viewNum}</div>
-            </div>
+            </div> */}
 
             <div id='vr' className='ui-icon wide hidden' style={{ display: 'none' }}>
               {/* eslint-disable-next-line jsx-a11y/anchor-is-valid */}

+ 5 - 5
scene/yarn.lock

@@ -91,7 +91,7 @@
 
 "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9", "@babel/compat-data@^7.23.2":
   version "7.23.2"
-  resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.2.tgz#6a12ced93455827037bfb5ed8492820d60fc32cc"
+  resolved "https://registry.npmjs.org/@babel/compat-data1/-/compat-data-7.23.2.tgz#6a12ced93455827037bfb5ed8492820d60fc32cc"
   integrity sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==
 
 "@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.12.3", "@babel/core@^7.16.0", "@babel/core@^7.7.2", "@babel/core@^7.8.0":
@@ -5125,7 +5125,7 @@ fork-ts-checker-webpack-plugin@^6.5.0:
 
 form-data@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
+  resolved "https://registry.npmjs.org/form-data1/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
   integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
   dependencies:
     asynckit "^0.4.0"
@@ -5134,7 +5134,7 @@ form-data@^3.0.0:
 
 form-data@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  resolved "https://registry.npmjs.org/form-data1/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
   integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
   dependencies:
     asynckit "^0.4.0"
@@ -6940,12 +6940,12 @@ makeerror@1.0.12:
 
 mdn-data@2.0.14:
   version "2.0.14"
-  resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
+  resolved "https://registry.npmjs.org/mdn-data1/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
   integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
 
 mdn-data@2.0.4:
   version "2.0.4"
-  resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b"
+  resolved "https://registry.npmjs.org/mdn-data1/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b"
   integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==
 
 media-typer@0.3.0: