bill-lai 3 anni fa
parent
commit
a750cd330e

+ 1 - 1
config/index.js

@@ -12,7 +12,7 @@ module.exports = {
     // assetsPublicPath: 'http://120.24.64.23:3000/',
     // assetsPublicPath: 'http://120.24.64.23:3000/',
     proxyTable: {
     proxyTable: {
       '/': {
       '/': {
-        target: 'http://120.24.64.23:3000/',
+        target: 'http://www.4dage.com/',
         changeOrigin: true,
         changeOrigin: true,
         pathRewrite: {
         pathRewrite: {
           ['^/']: ''
           ['^/']: ''

File diff suppressed because it is too large
+ 9 - 7
dist/index.html


File diff suppressed because it is too large
+ 0 - 2
dist/static/js/0.7b4d1afaa7a1d61afc43.js


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/0.7b4d1afaa7a1d61afc43.js.map


File diff suppressed because it is too large
+ 0 - 20
dist/static/js/vendor.2b1ab4a90cc9aae36b2c.js


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/vendor.2b1ab4a90cc9aae36b2c.js.map


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 - 1
src/pages/information/news/details.vue

@@ -20,7 +20,9 @@ export default {
   },
   },
   async mounted () {
   async mounted () {
     let result = (await this.$http.get('/news/' + this.$route.params.id)).data.content
     let result = (await this.$http.get('/news/' + this.$route.params.id)).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,

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

@@ -9,7 +9,7 @@
           {{new Date(Number(article.date)).format('yyyy-MM-dd')}} 发表
           {{new Date(Number(article.date)).format('yyyy-MM-dd')}} 发表
         </span>
         </span>
         <p ref="brief">{{article.brief}}</p>
         <p ref="brief">{{article.brief}}</p>
-        <a :href="'#/information/news/' + article.id">阅读全文>></a>
+        <a :href="!article.outer_link ? ('#/information/news/' + article.id) : article.outer_link">阅读全文>></a>
       </div>
       </div>
     </div>
     </div>
   </div>
   </div>
@@ -89,24 +89,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,
@@ -116,7 +123,7 @@ export default {
   }
   }
 
 
   .article p {
   .article p {
-    height: 88px;
+    /* height: 88px; */
     flex: 0 0 auto;
     flex: 0 0 auto;
     overflow: hidden;
     overflow: hidden;
   }
   }
@@ -133,5 +140,9 @@ export default {
     font-size: 14px;
     font-size: 14px;
   }
   }
 
 
+  .article a {
+    justify-self: end;
+  }
+
 }
 }
 </style>
 </style>

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

@@ -41,7 +41,19 @@
           <a href="http://www.cgaii.com" target="_blank">中德人工智能研究院</a>
           <a href="http://www.cgaii.com" target="_blank">中德人工智能研究院</a>
         </div>
         </div>
         <p>Copyright © 2019 4DAGE Co., Ltd. All rights reserved. </p>
         <p>Copyright © 2019 4DAGE Co., Ltd. All rights reserved. </p>
-        <p><a href="http://www.beian.miit.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>

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

@@ -6,12 +6,12 @@
             <a href="http://www.4dkankan.com/">四维看看</a>
             <a href="http://www.4dkankan.com/">四维看看</a>
           </h2>
           </h2>
           <p class="m-content">
           <p class="m-content">
-            世界上首款消费级3D相机, 5分钟即可复刻100平米空间,耗时仅为传统机器采集图像时间的二十分之一,价格仅为传统3D建模设备的十分之一
-            该产品由四维时代自主研发,运用人工智能三维数字化技术,具有易操作、自动化、高精度等特点,应用于文博、地产、电商、餐饮、家居等领域,为传统行业赋能
+            世界上首款消费级3D相机, 全新3D空间相机四维看看Pro,10分钟精准复刻100㎡空间,720度8K画质展示,为各行各业赋能。该产品由四维时代自主研发,运用人工智能三维数字化技术,具有易操作、自动化和高精度等特点
+            四维看看Pro已为文博、消防和刑侦等多个领域建立三维数字化空间档案,同时助力地产、酒店民宿、电商、餐饮等行业,打造全新消费体验
           </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>
 
 
@@ -49,7 +49,7 @@
         <div class="info">
         <div class="info">
           <h2 class="m-title">四维看展</h2>
           <h2 class="m-title">四维看展</h2>
           <p class="m-content">
           <p class="m-content">
-            四维看展是国内首家集文字、图片、语音、在线场景漫游于一体的线上艺术空间。打开小程序即可浏览全球最新最全的艺术资讯,实时了解热门的文博动态;
+            四维看展是国内集文字、图片、语音、在线场景漫游于一体的线上艺术空间。打开小程序即可浏览全球的艺术资讯,实时了解热门的文博动态;
             足不出户就能逛遍艺术展厅,720°轻松鉴赏艺术作品。它是一座永不落幕的美术馆,带你踏上数字艺术之旅。
             足不出户就能逛遍艺术展厅,720°轻松鉴赏艺术作品。它是一座永不落幕的美术馆,带你踏上数字艺术之旅。
           </p>
           </p>
         </div>
         </div>