zhibin il y a 6 ans
Parent
commit
c89f632384

+ 15 - 4
src/components/Slide/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="slide-layout">
+  <div class="slide-layout" ref="continure">
     <a class="ctrl up" @click="up">
       <slot name="up" />
     </a>
@@ -29,18 +29,19 @@ export default {
   },
   data () {
     return {
+      continure: 0,
       index: this.current
     }
   },
   computed: {
     left () {
-      return this.index / this.screens.length * 100 + '%'
+      return this.index * this.continure + 'px'
     },
     layoutStyle () {
-      return {width: this.screens.length + '00%', transform: `translateX(-${this.left})`}
+      return {width: this.continure * this.screens.length + '00%', transform: `translateX(-${this.left})`}
     },
     itemStyle () {
-      return {width: 1 / this.screens.length * 100 + '%'}
+      return {width: this.continure + 'px'}
     }
   },
   watch: {
@@ -61,6 +62,16 @@ export default {
         this.index = this.screens.length - 1
       }
     }
+  },
+  mounted () {
+    this.sizeHandle = () => {
+      this.continure = this.$refs.continure.offsetWidth
+    }
+    window.addEventListener('resize', this.sizeHandle)
+    setTimeout(this.sizeHandle, 100)
+  },
+  beforeDestroy () {
+    window.removeEventListener('resize', this.sizeHandle)
   }
 }
 </script>

+ 10 - 2
src/components/computer/index.vue

@@ -9,7 +9,9 @@
     <img src="http://video.cgaii.com/new4dage/images/images/macbook_3.png">
     <img src="http://video.cgaii.com/new4dage/images/images/macbook_4.png">
     <img src="http://video.cgaii.com/new4dage/images/images/macbook_5.png">
-    <iframe :src="this.src" />
+    <div class="iframe">
+      <iframe :src="this.src" />
+    </div>
   </div>
 </template>
 
@@ -112,12 +114,18 @@ export default {
   left: -7.55%;
 }
 
-.computer iframe {
+.computer .iframe {
   position: absolute;
   z-index: 1;
   left: 17.3%;
   top: 5.9%;
   width: 65.4%;
   height: 74.6%;
+  overflow: hidden;
+}
+
+.computer .iframe iframe {
+  width: 100%;
+  height: 100%;
 }
 </style>

+ 1 - 1
src/pages/about/index.vue

@@ -26,7 +26,7 @@
           <p><span>2017.07</span>4D Model, a large platform for 3D model sharing and communication, was launched in China.</p>
           <p><span>2017.09</span>the second session of China-Germany Artificial Intelligence Conference was held.</p>
           <p><span>2018.02</span>4DAGE teamed up with CCTV and Guangdong Spring Festival Gala to present "China's Miracle" to the Chinese audience using 3D AI digital technology on CCTV 1 and CCTV 3.</p>
-          <p><span>2018.05</span>4DKanKan, the world's first consumer-grade 3D camera was launched, capable of reconstructing 100m2 of space in five minutes – one twentieth of the time required for image acquisition by existing machines – and costing one-tenth the price of traditional 3D modeling equipment.</p>
+          <p><span>2018.05</span>4DKanKan, the world's first consumer-grade 3D camera was launched, capable of reconstructing 100 of space in five minutes – one twentieth of the time required for image acquisition by existing machines – and costing one-tenth the price of traditional 3D modeling equipment.</p>
           <p><span>2018.08</span>4DMuseum, the online exhibition platform, was launched. The first online art space created by 3D AI digital technology in China, the platform integrates online exhibitions, exhibition information, exhibition hall details and user comments.</p>
           <p><span>2018.11</span>The third China-Germany Artificial Intelligence Conference was held successfully. 4DAGE has shown the world its leading 3D digitization technology and its open platform for AI developers. It also released its 3D reconstruction technology at mobile end, and the updated version of its 3D camera, 4DKanKan.</p>
         </div>

+ 1 - 0
src/pages/home/style.css

@@ -505,6 +505,7 @@
 }
 
 .course-item {
+  margin-top: 20px;
   width: 100%;
   float: left;
 }

+ 5 - 5
src/pages/layout/footer.vue

@@ -28,10 +28,10 @@
             :code="require('@/assets/images/code_dy.jpg')"
           />
         </div>
-        <p><span>Cooperation</span>sales@4dage.com</p>
-        <p><span>Interview</span>pr@4dage.com</p>
+        <p><span>Business Collaboration</span>sales@4dage.com</p>
+        <p><span>Public Relations</span>pr@4dage.com</p>
         <p><span>Telephone</span>+86 400-6698-025</p>
-        <a href="http://show.4dage.com/brochure_en" target="_blank">Download 4DAGE Brochure</a>
+        <a href="http://show.4dage.com/brochure_en" target="_blank">4DAGE Broschüre herunterladen</a>
       </div>
       <div class="relevant">
         <div>
@@ -39,7 +39,7 @@
           <a href="https://www.4dmodel.com/" target="_blank">4DModel</a>
           <a href="https://cgaii.com/#/index?lang=en" target="_blank">CGAII</a>
         </div>
-        <p>Copyright © 2018 4DAGE Co., Ltd. All rights reserved. </p>
+        <p>Copyright © 2019 4DAGE Co., Ltd. All rights reserved. </p>
         <p><a href="http://www.miitbeian.gov.cn">粤ICP备14078495号-2</a></p>
       </div>
     </div>
@@ -95,7 +95,7 @@ export default {
 
   .infos > p > span {
     display: inline-block;
-    width: 124px;
+    width: 200px;
     text-align: right;
   }
 

+ 3 - 3
src/pages/planlife/style.css

@@ -167,13 +167,13 @@
 
 @media screen and (min-width: 1040px) {
   .lplan_4 {
-    text-align: center;
+    /* text-align: center; */
   }
   .lplan_4 .info {
     position: absolute;
-    left: 19%;
+    left: 26%;
     top: 12%;
-    width: 58.6%;
+    width: 54.6%;
     padding: 0;
   }
   .banner {