bill-lai 3 years ago
parent
commit
d7eb25d10e

File diff suppressed because it is too large
+ 10 - 8
index.html


BIN
src/assets/images/baicon.png


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

@@ -3,7 +3,7 @@
     <div class="home_1" ref="video">
     <div class="home_1" ref="video">
       <img src="http://video.cgaii.com/new4dage/images/images/home_ban.jpg" v-if="isMobile" alt="">
       <img src="http://video.cgaii.com/new4dage/images/images/home_ban.jpg" v-if="isMobile" alt="">
       <video
       <video
-        src="http://model3d.4dage.com/video/H5/homeVideo.mp4"
+        src="https://model3d.4dage.com/video/H5/homeVideo.mp4"
         loop="loop" preload="" autoplay="autoplay" muted="muted" v-else ></video>
         loop="loop" preload="" autoplay="autoplay" muted="muted" v-else ></video>
       <div>
       <div>
         <div>
         <div>

+ 3 - 0
src/pages/information/news/details.vue

@@ -20,6 +20,9 @@ export default {
   },
   },
   async mounted () {
   async mounted () {
     let result = (await this.$http.get('/news/' + this.$route.params.id, {params: {language: 1}})).data.content
     let result = (await this.$http.get('/news/' + this.$route.params.id, {params: {language: 1}})).data.content
+    if (result.outer_link) {
+      location.href = result.outer_link
+    }
     share({
     share({
       title: result.title,
       title: result.title,
       imgUrl: result.cover,
       imgUrl: result.cover,

+ 17 - 5
src/pages/information/news/index.vue

@@ -9,7 +9,8 @@
           Posted on: {{new Date(Number(article.date)).format('yyyy-MM-dd')}}
           Posted on: {{new Date(Number(article.date)).format('yyyy-MM-dd')}}
         </span>
         </span>
         <p>{{article.brief}}</p>
         <p>{{article.brief}}</p>
-        <a :href="'#/information/news/' + article.id">Full text>></a>
+        
+        <a :href="!article.outer_link ? ('#/information/news/' + article.id) : article.outer_link">Full text>></a>
       </div>
       </div>
     </div>
     </div>
   </div>
   </div>
@@ -90,24 +91,31 @@ export default {
 
 
 @media screen and (min-width: 700px) {
 @media screen and (min-width: 700px) {
   .article {
   .article {
-    padding-right: calc(100% - 330px);
+    display: flex;
+    /* padding-right: calc(100% - 330px); */
     position: relative;
     position: relative;
     padding-bottom: 40px;
     padding-bottom: 40px;
     margin-bottom: 40px;
     margin-bottom: 40px;
+    align-items: flex-start;
   }
   }
 
 
   .article img {
   .article img {
+    margin-right: 30px;
     width: 300px;
     width: 300px;
+    height: auto;
+    align-self: flex-start;
   }
   }
 
 
   .article div {
   .article div {
-    position: absolute;
+    flex: 1;
+    /* position: absolute;
     left: 330px;
     left: 330px;
     right: 0;
     right: 0;
     top: 0;
     top: 0;
-    bottom: 40px;
+    bottom: 40px; */
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
+    align-self: stretch
   }
   }
 
 
   .article h2,
   .article h2,
@@ -117,7 +125,7 @@ export default {
   }
   }
 
 
   .article p {
   .article p {
-    height: 88px;
+    /* height: 88px; */
     flex: 0 0 auto;
     flex: 0 0 auto;
     overflow: hidden;
     overflow: hidden;
   }
   }
@@ -134,5 +142,9 @@ export default {
     font-size: 14px;
     font-size: 14px;
   }
   }
 
 
+  .article a {
+    justify-self: end;
+  }
+
 }
 }
 </style>
 </style>

+ 13 - 2
src/pages/layout/footer.vue

@@ -39,8 +39,19 @@
           <a href="https://www.4dmodel.com/" target="_blank">4DModel</a>
           <a href="https://www.4dmodel.com/" target="_blank">4DModel</a>
           <a href="https://cgaii.com/#/index?lang=en" target="_blank">CGAII</a>
           <a href="https://cgaii.com/#/index?lang=en" target="_blank">CGAII</a>
         </div>
         </div>
-        <p>Copyright © 2019 4DAGE Co., Ltd. All rights reserved. </p>
-        <p><a href="http://www.miitbeian.gov.cn">粤ICP备14078495号-2</a></p>
+        <p>
+          <a href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=44049102496646">
+            <img src="@/assets/images/baicon.png" style="float:left;"/>
+            粤公网安备 44049102496646号
+          </a>
+        </p>
+        <p>
+          <a href="http://beian.miit.gov.cn">
+            <img src="@/assets/images/baicon.png" style="float:left;"/>
+            粤ICP备14078495号
+          </a>
+        </p>
+        <p>珠海市四维时代网络科技有限公司</p>
       </div>
       </div>
     </div>
     </div>
   </div>
   </div>

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

@@ -12,7 +12,7 @@
           </p>
           </p>
       </div>
       </div>
       <computer
       <computer
-        src="http://www.4dmodel.com/SuperPanoramic/index.html?m=55"
+        src="https://www.4dkankan.com/showPC.html?m=JPoqsQXL"
         imgSrc="http://video.cgaii.com/new4dage/images/images/macbook_product.png"/>
         imgSrc="http://video.cgaii.com/new4dage/images/images/macbook_product.png"/>
     </div>
     </div>