il y a 6 ans · 6acfb3bb33
--- a/config/index.js
+++ b/config/index.js
@@ -13,7 +13,7 @@ module.exports = {
 
				     proxyTable: {},
			
 
				 
			
 
				     // Various Dev Server settings
			
 
				-    host: 'localhost', // can be overwritten by process.env.HOST
			
 
				+    host: '192.168.0.197', // can be overwritten by process.env.HOST
			
 
				     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
			
 
				     autoOpenBrowser: false,
			
 
				     errorOverlay: true,
			
--- a/index.html
+++ b/index.html
@@ -6,6 +6,8 @@
 
				     <title>四维看看</title>
			
 
				   </head>
			
 
				   <body>
			
 
				+    <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/gsap/2.1.2/TweenMax.min.js"> </script>
			
 
				+    <script src="https://cdn.bootcss.com/three.js/r81/three.min.js"></script> -->
			
 
				     <div id="app"></div>
			
 
				     <!-- built files will be auto injected -->
			
 
				   </body>
			
--- a/package.json
+++ b/package.json
@@ -15,6 +15,8 @@
 
				   },
			
 
				   "dependencies": {
			
 
				     "axios": "^0.18.0",
			
 
				+    "gsap": "^2.1.2",
			
 
				+    "luxy.js": "^0.1.0",
			
 
				     "three": "^0.102.1",
			
 
				     "vue": "^2.5.2",
			
 
				     "vue-router": "^3.0.1"
			
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,13 +8,14 @@
 
				     <div class="mask" :class="{active: showMask}" :style="{zIndex: maskZIndex}"></div>
			
 
				     <!-- <ichat /> -->
			
 
				     <router-view/>
			
 
				-    <ifooter />
			
 
				+    <ifooter v-if="$route.name!=='about'" />
			
 
				   </div>
			
 
				 </template>
			
 
				 
			
 
				 <script>
			
 
				 import '@/assets/style/reset.scss'
			
 
				 import '@/assets/style/public.scss'
			
 
				+import '@/assets/imgfont/iconfont.css'
			
 
				 import '@/assets/font/iconfont.css'
			
 
				 import header from '@/page/layout/header'
			
 
				 import footer from '@/page/layout/footer'
			
@@ -65,7 +66,7 @@ export default {
 
				   left: 0;
			
 
				   top: 0;
			
 
				   width: 100%;
			
 
				-  z-index: 4;
			
 
				+  z-index: 999;
			
 
				 }
			
 
				 
			
 
				 .mask {
			
--- a/src/assets/images/about1.jpg
+++ b/src/assets/images/about1.jpg
--- a/src/assets/images/about2.jpg
+++ b/src/assets/images/about2.jpg
--- a/src/assets/images/about3.jpg
+++ b/src/assets/images/about3.jpg
--- a/src/assets/images/about4.jpg
+++ b/src/assets/images/about4.jpg
--- a/src/assets/images/about5.jpg
+++ b/src/assets/images/about5.jpg
--- a/src/assets/images/about6.jpg
+++ b/src/assets/images/about6.jpg
--- a/src/assets/images/about7.jpg
+++ b/src/assets/images/about7.jpg
--- a/src/assets/images/about_bg.jpg
+++ b/src/assets/images/about_bg.jpg
--- a/src/assets/images/about_logo.png
+++ b/src/assets/images/about_logo.png
--- a/src/assets/images/android.png
+++ b/src/assets/images/android.png
--- a/src/assets/images/app_img1.png
+++ b/src/assets/images/app_img1.png
--- a/src/assets/images/app_img2.png
+++ b/src/assets/images/app_img2.png
--- a/src/assets/images/app_img3.png
+++ b/src/assets/images/app_img3.png
--- a/src/assets/images/apple.png
+++ b/src/assets/images/apple.png
--- a/src/assets/images/background.jpg
+++ b/src/assets/images/background.jpg
--- a/src/assets/images/battery-bg.png
+++ b/src/assets/images/battery-bg.png
--- a/src/assets/images/battery-border.png
+++ b/src/assets/images/battery-border.png
--- a/src/assets/images/battery-left.png
+++ b/src/assets/images/battery-left.png
--- a/src/assets/images/battery-right.png
+++ b/src/assets/images/battery-right.png
--- a/src/assets/images/boomImg.png
+++ b/src/assets/images/boomImg.png
--- a/src/assets/images/camera1.png
+++ b/src/assets/images/camera1.png
--- a/src/assets/images/camera2.png
+++ b/src/assets/images/camera2.png
--- a/src/assets/images/camera3.png
+++ b/src/assets/images/camera3.png
--- a/src/assets/images/camera4.png
+++ b/src/assets/images/camera4.png
--- a/src/assets/images/canvas-left.png
+++ b/src/assets/images/canvas-left.png
--- a/src/assets/images/canvas-right.png
+++ b/src/assets/images/canvas-right.png
--- a/src/assets/images/cicle.png
+++ b/src/assets/images/cicle.png
--- a/src/assets/images/circle_before.png
+++ b/src/assets/images/circle_before.png
--- a/src/assets/images/company.png
+++ b/src/assets/images/company.png
--- a/src/assets/images/eight-bg.png
+++ b/src/assets/images/eight-bg.png
--- a/src/assets/images/event.png
+++ b/src/assets/images/event.png
--- a/src/assets/images/fdage.png
+++ b/src/assets/images/fdage.png
--- a/src/assets/images/fjqxd.png
+++ b/src/assets/images/fjqxd.png
--- a/src/assets/images/fk_img.png
+++ b/src/assets/images/fk_img.png
--- a/src/assets/images/fk_jiantou.png
+++ b/src/assets/images/fk_jiantou.png
--- a/src/assets/images/fk_logo.png
+++ b/src/assets/images/fk_logo.png
--- a/src/assets/images/fk_mask.png
+++ b/src/assets/images/fk_mask.png
--- a/src/assets/images/fk_paishe.png
+++ b/src/assets/images/fk_paishe.png
--- a/src/assets/images/fk_shouji.png
+++ b/src/assets/images/fk_shouji.png
--- a/src/assets/images/fk_upload.png
+++ b/src/assets/images/fk_upload.png
--- a/src/assets/images/fk_wangge.png
+++ b/src/assets/images/fk_wangge.png
--- a/src/assets/images/frame/masterLayer_0000.png
+++ b/src/assets/images/frame/masterLayer_0000.png
--- a/src/assets/images/frame/masterLayer_0001.png
+++ b/src/assets/images/frame/masterLayer_0001.png
--- a/src/assets/images/frame/masterLayer_00010.png
+++ b/src/assets/images/frame/masterLayer_00010.png
--- a/src/assets/images/frame/masterLayer_00011.png
+++ b/src/assets/images/frame/masterLayer_00011.png
--- a/src/assets/images/frame/masterLayer_00012.png
+++ b/src/assets/images/frame/masterLayer_00012.png
--- a/src/assets/images/frame/masterLayer_00013.png
+++ b/src/assets/images/frame/masterLayer_00013.png
--- a/src/assets/images/frame/masterLayer_00014.png
+++ b/src/assets/images/frame/masterLayer_00014.png
--- a/src/assets/images/frame/masterLayer_00015.png
+++ b/src/assets/images/frame/masterLayer_00015.png
--- a/src/assets/images/frame/masterLayer_00016.png
+++ b/src/assets/images/frame/masterLayer_00016.png
--- a/src/assets/images/frame/masterLayer_00017.png
+++ b/src/assets/images/frame/masterLayer_00017.png
--- a/src/assets/images/frame/masterLayer_00018.png
+++ b/src/assets/images/frame/masterLayer_00018.png
--- a/src/assets/images/frame/masterLayer_00019.png
+++ b/src/assets/images/frame/masterLayer_00019.png
--- a/src/assets/images/frame/masterLayer_0002.png
+++ b/src/assets/images/frame/masterLayer_0002.png
--- a/src/assets/images/frame/masterLayer_00020.png
+++ b/src/assets/images/frame/masterLayer_00020.png
--- a/src/assets/images/frame/masterLayer_00021.png
+++ b/src/assets/images/frame/masterLayer_00021.png
--- a/src/assets/images/frame/masterLayer_00022.png
+++ b/src/assets/images/frame/masterLayer_00022.png
--- a/src/assets/images/frame/masterLayer_00023.png
+++ b/src/assets/images/frame/masterLayer_00023.png
--- a/src/assets/images/frame/masterLayer_00024.png
+++ b/src/assets/images/frame/masterLayer_00024.png
--- a/src/assets/images/frame/masterLayer_00025.png
+++ b/src/assets/images/frame/masterLayer_00025.png
--- a/src/assets/images/frame/masterLayer_00026.png
+++ b/src/assets/images/frame/masterLayer_00026.png
--- a/src/assets/images/frame/masterLayer_00027.png
+++ b/src/assets/images/frame/masterLayer_00027.png
--- a/src/assets/images/frame/masterLayer_00028.png
+++ b/src/assets/images/frame/masterLayer_00028.png
--- a/src/assets/images/frame/masterLayer_00029.png
+++ b/src/assets/images/frame/masterLayer_00029.png
--- a/src/assets/images/frame/masterLayer_0003.png
+++ b/src/assets/images/frame/masterLayer_0003.png
--- a/src/assets/images/frame/masterLayer_00030.png
+++ b/src/assets/images/frame/masterLayer_00030.png
--- a/src/assets/images/frame/masterLayer_00031.png
+++ b/src/assets/images/frame/masterLayer_00031.png
--- a/src/assets/images/frame/masterLayer_00032.png
+++ b/src/assets/images/frame/masterLayer_00032.png
--- a/src/assets/images/frame/masterLayer_00033.png
+++ b/src/assets/images/frame/masterLayer_00033.png
--- a/src/assets/images/frame/masterLayer_00034.png
+++ b/src/assets/images/frame/masterLayer_00034.png
--- a/src/assets/images/frame/masterLayer_00035.png
+++ b/src/assets/images/frame/masterLayer_00035.png
--- a/src/assets/images/frame/masterLayer_00036.png
+++ b/src/assets/images/frame/masterLayer_00036.png
--- a/src/assets/images/frame/masterLayer_00037.png
+++ b/src/assets/images/frame/masterLayer_00037.png
--- a/src/assets/images/frame/masterLayer_00038.png
+++ b/src/assets/images/frame/masterLayer_00038.png
--- a/src/assets/images/frame/masterLayer_00039.png
+++ b/src/assets/images/frame/masterLayer_00039.png
--- a/src/assets/images/frame/masterLayer_0004.png
+++ b/src/assets/images/frame/masterLayer_0004.png
--- a/src/assets/images/frame/masterLayer_00040.png
+++ b/src/assets/images/frame/masterLayer_00040.png
--- a/src/assets/images/frame/masterLayer_00041.png
+++ b/src/assets/images/frame/masterLayer_00041.png
--- a/src/assets/images/frame/masterLayer_00042.png
+++ b/src/assets/images/frame/masterLayer_00042.png
--- a/src/assets/images/frame/masterLayer_00043.png
+++ b/src/assets/images/frame/masterLayer_00043.png
--- a/src/assets/images/frame/masterLayer_00044.png
+++ b/src/assets/images/frame/masterLayer_00044.png
--- a/src/assets/images/frame/masterLayer_00045.png
+++ b/src/assets/images/frame/masterLayer_00045.png
--- a/src/assets/images/frame/masterLayer_00046.png
+++ b/src/assets/images/frame/masterLayer_00046.png
--- a/src/assets/images/frame/masterLayer_00047.png
+++ b/src/assets/images/frame/masterLayer_00047.png
--- a/src/assets/images/frame/masterLayer_00048.png
+++ b/src/assets/images/frame/masterLayer_00048.png
--- a/src/assets/images/frame/masterLayer_00049.png
+++ b/src/assets/images/frame/masterLayer_00049.png
--- a/src/assets/images/frame/masterLayer_0005.png
+++ b/src/assets/images/frame/masterLayer_0005.png
--- a/src/assets/images/frame/masterLayer_00050.png
+++ b/src/assets/images/frame/masterLayer_00050.png
--- a/src/assets/images/frame/masterLayer_00051.png
+++ b/src/assets/images/frame/masterLayer_00051.png
--- a/src/assets/images/frame/masterLayer_00052.png
+++ b/src/assets/images/frame/masterLayer_00052.png
--- a/src/assets/images/frame/masterLayer_00053.png
+++ b/src/assets/images/frame/masterLayer_00053.png
--- a/src/assets/images/frame/masterLayer_00054.png
+++ b/src/assets/images/frame/masterLayer_00054.png
--- a/src/assets/images/frame/masterLayer_00055.png
+++ b/src/assets/images/frame/masterLayer_00055.png
--- a/src/assets/images/frame/masterLayer_00056.png
+++ b/src/assets/images/frame/masterLayer_00056.png
--- a/src/assets/images/frame/masterLayer_00057.png
+++ b/src/assets/images/frame/masterLayer_00057.png
--- a/src/assets/images/frame/masterLayer_00058.png
+++ b/src/assets/images/frame/masterLayer_00058.png