Ver código fonte

Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/yangshi_cloudExbition

xzw 3 anos atrás
pai
commit
77b773b085
100 arquivos alterados com 59 adições e 17 exclusões
  1. 4 2
      package.json
  2. 10 0
      public/index.html
  3. 10 1
      public/mobile.html
  4. 1 1
      public/model/application.js
  5. 1 1
      public/model/assets/main/import/08/08be024f5.json
  6. 1 1
      public/model/assets/main/index.js
  7. 10 0
      public/model/index.html
  8. 1 1
      public/model/src/settings.json
  9. 10 0
      public/scene.html
  10. 1 0
      public/static/css/main.css
  11. 10 10
      public/static/js/main_2020_show.js
  12. BIN
      src/assets/images/mobile/bg.png
  13. BIN
      src/assets/images/mobile/bgdownload.png
  14. BIN
      src/assets/images/mobile/mobile_units.png
  15. BIN
      src/assets/images/mobile/qrcodetitle.png
  16. BIN
      src/assets/images/pc_step1.png
  17. BIN
      src/assets/images/pc_step2.png
  18. BIN
      src/assets/images/phone_step1.png
  19. BIN
      src/assets/images/phone_step2.png
  20. BIN
      src/assets/images/project/bg.png
  21. BIN
      src/assets/images/project/enter_bg.jpg
  22. BIN
      src/assets/images/project/list_a.jpg
  23. BIN
      src/assets/images/project/list_a.png
  24. BIN
      src/assets/images/project/list_b.jpg
  25. BIN
      src/assets/images/project/list_b.png
  26. BIN
      src/assets/images/project/list_c.jpg
  27. BIN
      src/assets/images/project/list_c.png
  28. BIN
      src/assets/images/project/list_d.jpg
  29. BIN
      src/assets/images/project/list_d.png
  30. BIN
      src/assets/images/project/list_e.jpg
  31. BIN
      src/assets/images/project/list_e.png
  32. BIN
      src/assets/images/project/list_xuting.jpg
  33. BIN
      src/assets/images/project/list_xuting.png
  34. BIN
      src/assets/images/project/mascot.gif
  35. BIN
      src/assets/images/project/pc_units.png
  36. BIN
      src/assets/images/project/qrcode/11.jpg
  37. BIN
      src/assets/images/project/qrcode/110.jpg
  38. BIN
      src/assets/images/project/qrcode/111.jpg
  39. BIN
      src/assets/images/project/qrcode/112.jpg
  40. BIN
      src/assets/images/project/qrcode/113.jpg
  41. BIN
      src/assets/images/project/qrcode/114.jpg
  42. BIN
      src/assets/images/project/qrcode/115.jpg
  43. BIN
      src/assets/images/project/qrcode/116.jpg
  44. BIN
      src/assets/images/project/qrcode/117.jpg
  45. BIN
      src/assets/images/project/qrcode/118.jpg
  46. BIN
      src/assets/images/project/qrcode/119.jpg
  47. BIN
      src/assets/images/project/qrcode/12.jpg
  48. BIN
      src/assets/images/project/qrcode/120.jpg
  49. BIN
      src/assets/images/project/qrcode/121.jpg
  50. BIN
      src/assets/images/project/qrcode/122.jpg
  51. BIN
      src/assets/images/project/qrcode/123.jpg
  52. BIN
      src/assets/images/project/qrcode/124.jpg
  53. BIN
      src/assets/images/project/qrcode/125.jpg
  54. BIN
      src/assets/images/project/qrcode/126.jpg
  55. BIN
      src/assets/images/project/qrcode/127.jpg
  56. BIN
      src/assets/images/project/qrcode/128.jpg
  57. BIN
      src/assets/images/project/qrcode/129.jpg
  58. BIN
      src/assets/images/project/qrcode/13.jpg
  59. BIN
      src/assets/images/project/qrcode/14.jpg
  60. BIN
      src/assets/images/project/qrcode/15.jpg
  61. BIN
      src/assets/images/project/qrcode/16.jpg
  62. BIN
      src/assets/images/project/qrcode/17.jpg
  63. BIN
      src/assets/images/project/qrcode/18.jpg
  64. BIN
      src/assets/images/project/qrcode/19.jpg
  65. BIN
      src/assets/images/project/qrcode/21.jpg
  66. BIN
      src/assets/images/project/qrcode/210.jpg
  67. BIN
      src/assets/images/project/qrcode/211.jpg
  68. BIN
      src/assets/images/project/qrcode/212.jpg
  69. BIN
      src/assets/images/project/qrcode/213.jpg
  70. BIN
      src/assets/images/project/qrcode/214.jpg
  71. BIN
      src/assets/images/project/qrcode/215.jpg
  72. BIN
      src/assets/images/project/qrcode/216.jpg
  73. BIN
      src/assets/images/project/qrcode/217.jpg
  74. BIN
      src/assets/images/project/qrcode/218.jpg
  75. BIN
      src/assets/images/project/qrcode/219.jpg
  76. BIN
      src/assets/images/project/qrcode/22.jpg
  77. BIN
      src/assets/images/project/qrcode/220.jpg
  78. BIN
      src/assets/images/project/qrcode/221.jpg
  79. BIN
      src/assets/images/project/qrcode/222.jpg
  80. BIN
      src/assets/images/project/qrcode/223.jpg
  81. BIN
      src/assets/images/project/qrcode/224.jpg
  82. BIN
      src/assets/images/project/qrcode/225.jpg
  83. BIN
      src/assets/images/project/qrcode/23.jpg
  84. BIN
      src/assets/images/project/qrcode/24.jpg
  85. BIN
      src/assets/images/project/qrcode/25.jpg
  86. BIN
      src/assets/images/project/qrcode/26.jpg
  87. BIN
      src/assets/images/project/qrcode/27.jpg
  88. BIN
      src/assets/images/project/qrcode/28.jpg
  89. BIN
      src/assets/images/project/qrcode/29.jpg
  90. BIN
      src/assets/images/project/qrcode/31.jpg
  91. BIN
      src/assets/images/project/qrcode/310.jpg
  92. BIN
      src/assets/images/project/qrcode/311.jpg
  93. BIN
      src/assets/images/project/qrcode/312.jpg
  94. BIN
      src/assets/images/project/qrcode/313.jpg
  95. BIN
      src/assets/images/project/qrcode/314.jpg
  96. BIN
      src/assets/images/project/qrcode/315.jpg
  97. BIN
      src/assets/images/project/qrcode/316.jpg
  98. BIN
      src/assets/images/project/qrcode/317.jpg
  99. BIN
      src/assets/images/project/qrcode/318.jpg
  100. 0 0
      src/assets/images/project/qrcode/319.jpg

+ 4 - 2
package.json

@@ -9,15 +9,17 @@
   },
   "dependencies": {
     "@panzoom/panzoom": "^4.4.1",
-    "axios": "^0.21.1",
+    "axios": "^0.22.0",
     "core-js": "^3.6.5",
+    "dom-to-image": "^2.6.0",
     "qs": "^6.10.1",
     "swiper": "^5.3.8",
     "v-viewer": "^1.6.4",
     "vue": "^2.6.11",
     "vue-awesome-swiper": "^4.1.1",
     "vue-infinite-scroll": "^2.0.2",
-    "vue-router": "^3.2.0"
+    "vue-router": "^3.2.0",
+    "weixin-js-sdk": "^1.6.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "~4.5.0",

+ 10 - 0
public/index.html

@@ -5,12 +5,22 @@
   <meta charset="utf-8">
   <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <meta http-equiv="X-Content-Type-Options" content="nosniff">
   <meta name="renderer" content="webkit">
   <meta name="viewport"
     content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, minimal-ui">
   <meta name="format-detection" content="telephone=no">
   <link rel="icon" href="<%= BASE_URL %>logo.ico">
   <title>2021年全国大众创业万众创新活动周云展览</title>
+  <script>
+    var _hmt = _hmt || [];
+    (function() {
+      var hm = document.createElement("script");
+      hm.src = "https://hm.baidu.com/hm.js?a1af463bc2692b6861ac40d2e024b07d";
+      var s = document.getElementsByTagName("script")[0]; 
+      s.parentNode.insertBefore(hm, s);
+    })();
+  </script>
 </head>
 
 <body>

+ 10 - 1
public/mobile.html

@@ -4,12 +4,21 @@
     <meta charset="utf-8">
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta http-equiv="X-Content-Type-Options" content="nosniff">
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, minimal-ui">
     <meta name="format-detection" content="telephone=no">
     <link rel="icon" href="<%= BASE_URL %>logo.ico">
     <title>2021年全国大众创业万众创新活动周云展览</title>
-   
+    <script>
+      var _hmt = _hmt || [];
+      (function() {
+        var hm = document.createElement("script");
+        hm.src = "https://hm.baidu.com/hm.js?a1af463bc2692b6861ac40d2e024b07d";
+        var s = document.getElementsByTagName("script")[0]; 
+        s.parentNode.insertBefore(hm, s);
+      })();
+    </script>
   </head>
   <body>
     <script src="<%= VUE_APP_STATIC_DIR %>/js/lib/jquery-2.1.1.min.js" class="build keep"></script>

+ 1 - 1
public/model/application.js

@@ -181,7 +181,7 @@ System.register([], function (_export, _context) {
     var launchScene = settings.launchScene; // load scene
 
     cc.director.loadScene(launchScene, null, function () {
-      cc.view.setDesignResolutionSize(414, 736, 2);
+      cc.view.setDesignResolutionSize(414, 736, 1);
       console.log("Success to load scene: ".concat(launchScene));
     });
   }

Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
public/model/assets/main/import/08/08be024f5.json


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
public/model/assets/main/index.js


+ 10 - 0
public/model/index.html

@@ -20,6 +20,7 @@
   <!-- force edge on IE -->
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
   <meta name="msapplication-tap-highlight" content="no">
+  <meta http-equiv="X-Content-Type-Options" content="nosniff">
 
   <!-- force full screen on some browser -->
   <meta name="full-screen" content="yes"/>
@@ -38,6 +39,15 @@
   <!--<link rel="apple-touch-icon-precomposed" href=".png" />-->
 
   <link rel="stylesheet" type="text/css" href="style.css"/>
+  <script>
+    var _hmt = _hmt || [];
+    (function() {
+      var hm = document.createElement("script");
+      hm.src = "https://hm.baidu.com/hm.js?a1af463bc2692b6861ac40d2e024b07d";
+      var s = document.getElementsByTagName("script")[0]; 
+      s.parentNode.insertBefore(hm, s);
+    })();
+  </script>
 
 </head>
 <body>

Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
public/model/src/settings.json


+ 10 - 0
public/scene.html

@@ -4,6 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta http-equiv="X-Content-Type-Options" content="nosniff">
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, minimal-ui">
     <meta name="format-detection" content="telephone=no">
@@ -26,6 +27,15 @@
       };
       
   </script>
+    <script>
+      var _hmt = _hmt || [];
+      (function() {
+        var hm = document.createElement("script");
+        hm.src = "https://hm.baidu.com/hm.js?a1af463bc2692b6861ac40d2e024b07d";
+        var s = document.getElementsByTagName("script")[0]; 
+        s.parentNode.insertBefore(hm, s);
+      })();
+    </script>
   </head>
   <body>
     <script src="<%= VUE_APP_STATIC_DIR %>/js/lib/jquery-2.1.1.min.js" class="build keep"></script>

+ 1 - 0
public/static/css/main.css

@@ -6614,6 +6614,7 @@ a.hasHover.tag-link:hover {
 #interaction-modal.desktop hr, #interaction-modal.desktop img {
     width: 100%;
     height: 100%;
+    pointer-events: none!important;
 }
 
 .nav-help-page {

+ 10 - 10
public/static/js/main_2020_show.js

@@ -8654,19 +8654,19 @@ window.Modernizr = function(n, e, t) {
         function s(e, t) {
             setTimeout(function() {
                 if (h.isHelpEnabled()) {
-                    // if (t(),
-                    // u.init(),
-                    // C.addClass("fadeIn landing " + u.deviceType),
-                    // h.isSmallHelpEnabled())
-                    //     return void C.addClass("small");
-                    // u.fill(I, d.LANDING[E]),
-                    // C.addClass(E)
+                    if (t(),
+                    u.init(),
+                    C.addClass("fadeIn landing " + u.deviceType),
+                    h.isSmallHelpEnabled())
+                        return void C.addClass("small");
+                    u.fill(I, d.LANDING[E]),
+                    C.addClass(E)
                 }
             }, e)
             //csz 用户引导界面
             var helpData = {
-                "pc":["static/images/pc_step1.png","static/images/pc_step2.png","static/images/pc_step3.png"],
-                "mobile":["static/images/phone_step1.png","static/images/phone_step2.png","static/images/phone_step3.png"]
+                "pc":["static/images/pc_step1.png","static/images/pc_step2.png"],
+                "mobile":["static/images/phone_step1.png","static/images/phone_step2.png"]
             }
             var navIcon = $(".nav-icon .icon");
             if(/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) navIcon.attr("src",helpData.mobile[0]);
@@ -15204,7 +15204,7 @@ window.Modernizr = function(n, e, t) {
                 
                 window.wx && manage.weixinShare();  
                 //初始画面
-                data.camera_start && data.camera_start.thumbImg && E(data.camera_start.thumbImg)
+                // data.camera_start && data.camera_start.thumbImg && E(data.camera_start.thumbImg)
                 function E(e) {
                     $("<img/>").attr("src", e).on("load", function() {
                         $("#gui-thumb").css("backgroundImage", "url(" + e + ")").fadeIn(500),

BIN
src/assets/images/mobile/bg.png


BIN
src/assets/images/mobile/bgdownload.png


BIN
src/assets/images/mobile/mobile_units.png


BIN
src/assets/images/mobile/qrcodetitle.png


BIN
src/assets/images/pc_step1.png


BIN
src/assets/images/pc_step2.png


BIN
src/assets/images/phone_step1.png


BIN
src/assets/images/phone_step2.png


BIN
src/assets/images/project/bg.png


BIN
src/assets/images/project/enter_bg.jpg


BIN
src/assets/images/project/list_a.jpg


BIN
src/assets/images/project/list_a.png


BIN
src/assets/images/project/list_b.jpg


BIN
src/assets/images/project/list_b.png


BIN
src/assets/images/project/list_c.jpg


BIN
src/assets/images/project/list_c.png


BIN
src/assets/images/project/list_d.jpg


BIN
src/assets/images/project/list_d.png


BIN
src/assets/images/project/list_e.jpg


BIN
src/assets/images/project/list_e.png


BIN
src/assets/images/project/list_xuting.jpg


BIN
src/assets/images/project/list_xuting.png


BIN
src/assets/images/project/mascot.gif


BIN
src/assets/images/project/pc_units.png


BIN
src/assets/images/project/qrcode/11.jpg


BIN
src/assets/images/project/qrcode/110.jpg


BIN
src/assets/images/project/qrcode/111.jpg


BIN
src/assets/images/project/qrcode/112.jpg


BIN
src/assets/images/project/qrcode/113.jpg


BIN
src/assets/images/project/qrcode/114.jpg


BIN
src/assets/images/project/qrcode/115.jpg


BIN
src/assets/images/project/qrcode/116.jpg


BIN
src/assets/images/project/qrcode/117.jpg


BIN
src/assets/images/project/qrcode/118.jpg


BIN
src/assets/images/project/qrcode/119.jpg


BIN
src/assets/images/project/qrcode/12.jpg


BIN
src/assets/images/project/qrcode/120.jpg


BIN
src/assets/images/project/qrcode/121.jpg


BIN
src/assets/images/project/qrcode/122.jpg


BIN
src/assets/images/project/qrcode/123.jpg


BIN
src/assets/images/project/qrcode/124.jpg


BIN
src/assets/images/project/qrcode/125.jpg


BIN
src/assets/images/project/qrcode/126.jpg


BIN
src/assets/images/project/qrcode/127.jpg


BIN
src/assets/images/project/qrcode/128.jpg


BIN
src/assets/images/project/qrcode/129.jpg


BIN
src/assets/images/project/qrcode/13.jpg


BIN
src/assets/images/project/qrcode/14.jpg


BIN
src/assets/images/project/qrcode/15.jpg


BIN
src/assets/images/project/qrcode/16.jpg


BIN
src/assets/images/project/qrcode/17.jpg


BIN
src/assets/images/project/qrcode/18.jpg


BIN
src/assets/images/project/qrcode/19.jpg


BIN
src/assets/images/project/qrcode/21.jpg


BIN
src/assets/images/project/qrcode/210.jpg


BIN
src/assets/images/project/qrcode/211.jpg


BIN
src/assets/images/project/qrcode/212.jpg


BIN
src/assets/images/project/qrcode/213.jpg


BIN
src/assets/images/project/qrcode/214.jpg


BIN
src/assets/images/project/qrcode/215.jpg


BIN
src/assets/images/project/qrcode/216.jpg


BIN
src/assets/images/project/qrcode/217.jpg


BIN
src/assets/images/project/qrcode/218.jpg


BIN
src/assets/images/project/qrcode/219.jpg


BIN
src/assets/images/project/qrcode/22.jpg


BIN
src/assets/images/project/qrcode/220.jpg


BIN
src/assets/images/project/qrcode/221.jpg


BIN
src/assets/images/project/qrcode/222.jpg


BIN
src/assets/images/project/qrcode/223.jpg


BIN
src/assets/images/project/qrcode/224.jpg


BIN
src/assets/images/project/qrcode/225.jpg


BIN
src/assets/images/project/qrcode/23.jpg


BIN
src/assets/images/project/qrcode/24.jpg


BIN
src/assets/images/project/qrcode/25.jpg


BIN
src/assets/images/project/qrcode/26.jpg


BIN
src/assets/images/project/qrcode/27.jpg


BIN
src/assets/images/project/qrcode/28.jpg


BIN
src/assets/images/project/qrcode/29.jpg


BIN
src/assets/images/project/qrcode/31.jpg


BIN
src/assets/images/project/qrcode/310.jpg


BIN
src/assets/images/project/qrcode/311.jpg


BIN
src/assets/images/project/qrcode/312.jpg


BIN
src/assets/images/project/qrcode/313.jpg


BIN
src/assets/images/project/qrcode/314.jpg


BIN
src/assets/images/project/qrcode/315.jpg


BIN
src/assets/images/project/qrcode/316.jpg


BIN
src/assets/images/project/qrcode/317.jpg


BIN
src/assets/images/project/qrcode/318.jpg


+ 0 - 0
src/assets/images/project/qrcode/319.jpg


Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff