首頁 探索 說明
註冊 登入
Official
/
Front_End_CN
2
0
複刻 0
Files 問題管理 0 合併請求 0 Wiki
瀏覽代碼

修改IPAD排版，修改案例识别PC还是手机端决定显示还是隐藏

zhibin 6 年之前
父節點
544213f3dd
當前提交
a5a9616493
共有 35 個文件被更改，包括 87 次插入 和 71 次删除
統一視圖 顯示文件統計
  1. 1 0
      .gitignore
  2. 1 1
      dist/index.html
  3. 2 0
      dist/static/css/app.7ef55023e1fa47369f77af15e8dc95e7.css
  4. 1 0
      dist/static/css/app.7ef55023e1fa47369f77af15e8dc95e7.css.map
  5. 0 2
      dist/static/css/app.aaefc71713f11c6f01d88eb4f0c5aab4.css
  6. 0 1
      dist/static/css/app.aaefc71713f11c6f01d88eb4f0c5aab4.css.map
  7. 2 0
      dist/static/js/1.2e58caa5f8e079607d50.js
  8. 1 0
      dist/static/js/1.2e58caa5f8e079607d50.js.map
  9. 0 2
      dist/static/js/1.9996715f492d7e129008.js
  10. 0 1
      dist/static/js/1.9996715f492d7e129008.js.map
  11. 0 2
      dist/static/js/3.b6cb1e21ac42778e9a79.js
  12. 0 1
      dist/static/js/3.b6cb1e21ac42778e9a79.js.map
  13. 2 2
      dist/static/js/4.0c22429acfd59cee038e.js
  14. 1 1
      dist/static/js/4.0c22429acfd59cee038e.js.map
  15. 2 0
      dist/static/js/4.40469a3ad37aade3f4f8.js
  16. 1 0
      dist/static/js/4.40469a3ad37aade3f4f8.js.map
  17. 2 0
      dist/static/js/5.15084ed2e72140c923ef.js
  18. 1 0
      dist/static/js/5.15084ed2e72140c923ef.js.map
  19. 0 2
      dist/static/js/5.8c702baf58904dfc184c.js
  20. 0 1
      dist/static/js/5.8c702baf58904dfc184c.js.map
  21. 2 0
      dist/static/js/app.5c86ef38074476d8735c.js
  22. 1 0
      dist/static/js/app.5c86ef38074476d8735c.js.map
  23. 0 2
      dist/static/js/app.c6c406bcbcef75f08b8e.js
  24. 0 1
      dist/static/js/app.c6c406bcbcef75f08b8e.js.map
  25. 2 0
      dist/static/js/manifest.0b567bbaa58d20f80309.js
  26. 1 1
      dist/static/js/manifest.6a8250ce4cda4f9071f4.js.map
  27. 0 2
      dist/static/js/manifest.6a8250ce4cda4f9071f4.js
  28. 2 1
      src/components/overlap/index.vue
  29. 1 3
      src/main.js
  30. 11 4
      src/pages/case/levelList/index.vue
  31. 4 4
      src/pages/home/index.vue
  32. 38 35
      src/pages/home/style.css
  33. 1 1
      src/pages/layout/footer.vue
  34. 3 1
      src/pages/product/index.vue
  35. 4 0
      src/pages/product/style.css

+ 1 - 0
.gitignore
查看文件 

@@ -28,3 +28,4 @@ build/Release
 
 # https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
 
 # https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
 
 node_modules
 
 node_modules
 
 
 
+

+ 1 - 1
dist/index.html
查看文件 

@@ -4,4 +4,4 @@
 
         hm.src = "https://hm.baidu.com/hm.js?ffaff915bbe343d0f8a2e1f3e7690551";
 
         hm.src = "https://hm.baidu.com/hm.js?ffaff915bbe343d0f8a2e1f3e7690551";
 
         var s = document.getElementsByTagName("script")[0];
 
         var s = document.getElementsByTagName("script")[0];
 
         s.parentNode.insertBefore(hm, s);
 
         s.parentNode.insertBefore(hm, s);
 
-      })();</script><title>四维时代</title><link href=./static/css/app.aaefc71713f11c6f01d88eb4f0c5aab4.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.6a8250ce4cda4f9071f4.js></script><script type=text/javascript src=./static/js/vendor.2b1ab4a90cc9aae36b2c.js></script><script type=text/javascript src=./static/js/app.c6c406bcbcef75f08b8e.js></script></body></html>
 
+      })();</script><title>四维时代</title><link href=./static/css/app.7ef55023e1fa47369f77af15e8dc95e7.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.0b567bbaa58d20f80309.js></script><script type=text/javascript src=./static/js/vendor.2b1ab4a90cc9aae36b2c.js></script><script type=text/javascript src=./static/js/app.5c86ef38074476d8735c.js></script></body></html>

File diff suppressed because it is too large
+ 2 - 0
dist/static/css/app.7ef55023e1fa47369f77af15e8dc95e7.css


File diff suppressed because it is too large
+ 1 - 0
dist/static/css/app.7ef55023e1fa47369f77af15e8dc95e7.css.map


File diff suppressed because it is too large
+ 0 - 2
dist/static/css/app.aaefc71713f11c6f01d88eb4f0c5aab4.css


File diff suppressed because it is too large
+ 0 - 1
dist/static/css/app.aaefc71713f11c6f01d88eb4f0c5aab4.css.map


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


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


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


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


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


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


File diff suppressed because it is too large
+ 2 - 2
dist/static/js/4.0c22429acfd59cee038e.js


File diff suppressed because it is too large
+ 1 - 1
dist/static/js/4.0c22429acfd59cee038e.js.map


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


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


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


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


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


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


File diff suppressed because it is too large
+ 2 - 0
dist/static/js/app.5c86ef38074476d8735c.js


File diff suppressed because it is too large
+ 1 - 0
dist/static/js/app.5c86ef38074476d8735c.js.map


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


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


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


File diff suppressed because it is too large
+ 1 - 1
dist/static/js/manifest.6a8250ce4cda4f9071f4.js.map


File diff suppressed because it is too large
+ 0 - 2
dist/static/js/manifest.6a8250ce4cda4f9071f4.js


+ 2 - 1
src/components/overlap/index.vue
查看文件 

@@ -21,7 +21,7 @@ export default {
 
       slide,
 
       slide,
 
       paused: false,
 
       paused: false,
 
       transition: 'none',
 
       transition: 'none',
 
-      isMobile: browser.mobile
 
+      isMobile: browser.mobile || browser.iPad
 
     }
 
     }
 
   },
 
   },
 
   methods: {
 
   methods: {
 
@@ -51,6 +51,7 @@ export default {
 
     let move = this.isMobile ? 'touchmove' : 'mousemove'
 
     let move = this.isMobile ? 'touchmove' : 'mousemove'
 
     let up = this.isMobile ? 'touchend' : 'mouseup'
 
     let up = this.isMobile ? 'touchend' : 'mouseup'
 
 
 
+    console.log(down)
 
     this.downHandle = ev => {
 
     this.downHandle = ev => {
 
       ev.preventDefault()
 
       ev.preventDefault()
 
       let width = this.bwidth
 
       let width = this.bwidth

+ 1 - 3
src/main.js
查看文件 

@@ -10,11 +10,9 @@ Vue.config.productionTip = false
 
 Vue.prototype.$bus = new Vue()
 
 Vue.prototype.$bus = new Vue()
 
 
 
 axios.defaults.baseURL = '/newOfficialapi/'
 
 axios.defaults.baseURL = '/newOfficialapi/'
 
+// axios.defaults.baseURL = 'http://www.4dage.com/newOfficialapi/'
 
 
 
 let language = ({ 'en': 2, 'cn': 1 })['cn']
 
 let language = ({ 'en': 2, 'cn': 1 })['cn']
 
-// [location.pathname.split('/').join('')]
 
-// axios.defaults.baseURL = 'http://localhost:7000/'
 
-// axios.defaults.baseURL = '/newOfficialapi/'
 
 axios.interceptors.request.use(function (config) {
 
 axios.interceptors.request.use(function (config) {
 
   if (!config.params) {
 
   if (!config.params) {
 
     config.params = { language }
 
     config.params = { language }

+ 11 - 4
src/pages/case/levelList/index.vue
查看文件 

@@ -5,10 +5,17 @@
 
       <div class="del-info">
 
       <div class="del-info">
 
         <h2>{{article.title}}</h2>
 
         <h2>{{article.title}}</h2>
 
         <div class="del-content" v-html="article.content"></div>
 
         <div class="del-content" v-html="article.content"></div>
 
-        <a v-if="article.link && article.type === 1" :href="article.link" class="button">点击体验</a>
 
-        <a v-if="article.link && article.type === 2" class="button">
 
-          <playvideo :src="article.link">点击体验</playvideo>
 
-        </a>
 
+
 
+        <template v-if="
 
+          article.pro_type === 0 ||
 
+          (article.pro_type === 1 && !isMobile) ||
 
+          (article.pro_type === 0 && isMobile)
 
+        ">
 
+          <a v-if="article.link && article.type === 1" :href="article.link" class="button">点击体验</a>
 
+          <a v-if="article.link && article.type === 2" class="button">
 
+            <playvideo :src="article.link">点击体验</playvideo>
 
+          </a>
 
+        </template>
 
         <!-- <a" @click="play(article.link)" class="button">点击体验</a> -->
 
         <!-- <a" @click="play(article.link)" class="button">点击体验</a> -->
 
       </div>
 
       </div>
 
     </div>
 
     </div>

+ 4 - 4
src/pages/home/index.vue
查看文件 

@@ -13,9 +13,8 @@
 
       </div>
 
       </div>
 
     </div>
 
     </div>
 
     <div class="home-layout">
 
     <div class="home-layout">
 
-
 
       <div class="home_2 clear">
 
       <div class="home_2 clear">
 
-        <h2 class="m-title">产品中心<a href="#/product" v-if="!isMobile">更多产品   →</a></h2>
 
+        <h2 class="m-title">产品中心<a href="#/product" v-if="!isMobile && width <= 500">更多产品   →</a></h2>
 
         <div class="h_2_layout">
 
         <div class="h_2_layout">
 
           <a class="h-m-1" href="#/product?id=swkk">
 
           <a class="h-m-1" href="#/product?id=swkk">
 
             <div class="img"></div>
 
             <div class="img"></div>
 
@@ -185,7 +184,7 @@
 
         <p>让数字化飞入寻常百姓家</p>
 
         <p>让数字化飞入寻常百姓家</p>
 
         <div class="h_8_catg clear">
 
         <div class="h_8_catg clear">
 
           <Slide :screens="courses.data" v-if="isMobile" :current="courses.index">
 
           <Slide :screens="courses.data" v-if="isMobile" :current="courses.index">
 
-            <div slot="item" slot-scope="{data: course, index}" class="course-item corse-item-slide">
 
+            <div slot="item" slot-scope="{data: course}" class="course-item corse-item-slide">
 
               <!-- <h3><span>{{course.title}}</span></h3> -->
 
               <!-- <h3><span>{{course.title}}</span></h3> -->
 
               <div>
 
               <div>
 
                 <p v-for="(c, i) in course.content" :key="i">{{c}}</p>
 
                 <p v-for="(c, i) in course.content" :key="i">{{c}}</p>
 
@@ -383,7 +382,8 @@ export default {
 
         index: 0
 
         index: 0
 
       },
 
       },
 
       isMobile: browser.mobile,
 
       isMobile: browser.mobile,
 
-      hzbh
 
+      hzbh,
 
+      width: window.outerWidth
 
     }
 
     }
 
   },
 
   },
 
   methods: {
 
   methods: {

+ 38 - 35
src/pages/home/style.css
查看文件 

@@ -227,7 +227,8 @@
 
 .catg > a > div {
 
 .catg > a > div {
 
   height: 210px;
 
   height: 210px;
 
   background: no-repeat center center;
 
   background: no-repeat center center;
 
-  background-size: cover;
 
+  background-size: auto 100%;
 
+
 
 }
 
 }
 
 
 
 .catg > a:nth-child(1) > div {
 
 .catg > a:nth-child(1) > div {
 
@@ -585,27 +586,21 @@
 
   margin-top: 25px;
 
   margin-top: 25px;
 
 }
 
 }
 
 
 
-@media screen and (min-width: 1040px) {
 
-  .item-content > a {
 
-    display: inline;
 
-  }
 
-  .home_8 {
 
-    padding-top: 72px;
 
-    padding-bottom: 60px;
 
-  }
 
-  .h_8_catg {
 
-    margin-top: 85px;
 
-  }
 
-  .h_2_layout > a {
 
-    margin-bottom: 0;
 
+@media screen and (min-width: 700px) {
 
+  .catg > a {
 
+    float: left;
 
+    width: 30%;
 
+    padding-bottom: 120px
 
   }
 
   }
 
 
 
-  .home_1 > div > div h1 {
 
-    font-size: 50px;
 
+  .catg > a:nth-child(2) {
 
+    margin-left: 5%;
 
+    margin-right: 5%;
 
   }
 
   }
 
 
 
-  .home_1 > div > div p {
 
-    font-size: 20px;
 
+  .catg > a > div {
 
+    height: 226px;
 
+    background-size: 100% auto;
 
   }
 
   }
 
 
 
   .h-m-1 {
 
   .h-m-1 {
 
@@ -613,6 +608,14 @@
 
     float: left;
 
     float: left;
 
   }
 
   }
 
 
 
+  .home_1>div>div h1 {
 
+    font-size: 50px;
 
+  }
 
+
 
+  .home_1>div>div p {
 
+    font-size: 20px;
 
+  }
 
+
 
   .h_2_layout .h-m-2 {
 
   .h_2_layout .h-m-2 {
 
     float: right;
 
     float: right;
 
     width: 49%;
 
     width: 49%;
 
@@ -624,9 +627,9 @@
 
     width: 49%;
 
     width: 49%;
 
   }
 
   }
 
 
 
-  .h-m-2 > .img,
 
-  .h-m-3 > .img,
 
-  .h-m-1 > .img {
 
+  .h-m-2>.img,
 
+  .h-m-3>.img,
 
+  .h-m-1>.img {
 
     width: 100%;
 
     width: 100%;
 
     /* position: static; */
 
     /* position: static; */
 
     left: inherit;
 
     left: inherit;
 
@@ -636,24 +639,28 @@
 
     overflow: hidden;
 
     overflow: hidden;
 
   }
 
   }
 
 
 
-  .h-m-1 > .img {
 
+  .h-m-1>.img {
 
     height: 562px;
 
     height: 562px;
 
   }
 
   }
 
+}
 
 
 
-  .catg > a {
 
-    float: left;
 
-    width: 30%;
 
+@media screen and (min-width: 1040px) {
 
+  .item-content > a {
 
+    display: inline;
 
   }
 
   }
 
-
 
-  .catg > a:nth-child(2) {
 
-    margin-left: 5%;
 
-    margin-right: 5%;
 
+  .home_8 {
 
+    padding-top: 72px;
 
+    padding-bottom: 60px;
 
+  }
 
+  .h_8_catg {
 
+    margin-top: 85px;
 
   }
 
   }
 
 
 
-  .catg > a > div {
 
-    height: 226px;
 
+  .h_2_layout > a {
 
+    margin-bottom: 0;
 
   }
 
   }
 
 
 
+
 
   .home_4 > div > a {
 
   .home_4 > div > a {
 
     width: 23%;
 
     width: 23%;
 
     float: left;
 
     float: left;
 
@@ -699,10 +706,6 @@
 
     padding-top: 108px;
 
     padding-top: 108px;
 
   }
 
   }
 
 
 
-  .catg > a {
 
-    padding-bottom: 120px
 
-  }
 
-
 
   .home_4 {
 
   .home_4 {
 
     padding-top: 100px;
 
     padding-top: 100px;
 
   }
 
   }

+ 1 - 1
src/pages/layout/footer.vue
查看文件 

@@ -36,7 +36,7 @@
 
       </div>
 
       </div>
 
       <div class="relevant">
 
       <div class="relevant">
 
         <div>
 
         <div>
 
-          <a href="http://www.4dkankan.com" target="_blank">四维看看</a>
 
+          <a href="http://www.4dkankan.com/index.html?lang=zh" target="_blank">四维看看</a>
 
           <a href="http://www.4dmodel.com/" target="_blank">四维模库</a>
 
           <a href="http://www.4dmodel.com/" target="_blank">四维模库</a>
 
           <a href="http://www.cgaii.com" target="_blank">中德人工智能研究院</a>
 
           <a href="http://www.cgaii.com" target="_blank">中德人工智能研究院</a>
 
         </div>
 
         </div>

+ 3 - 1
src/pages/product/index.vue
查看文件 

@@ -62,7 +62,7 @@
 
         <h2 class="m-title">万物墙</h2>
 
         <h2 class="m-title">万物墙</h2>
 
         <p class="m-content">震撼高清大屏展示，实现百人同时触控操作，多元化的交互展示系统，支持图像、视频、声音、三维模型等多媒体格式，广泛应用于文博、地产和商业等内容丰富，展示性强的行业。</p>
 
         <p class="m-content">震撼高清大屏展示，实现百人同时触控操作，多元化的交互展示系统，支持图像、视频、声音、三维模型等多媒体格式，广泛应用于文博、地产和商业等内容丰富，展示性强的行业。</p>
 
       </div>
 
       </div>
 
-      <div class="iframe-layout full">
 
+      <div class="iframe-layout full" :class="{mobile: isMobile}">
 
         <iframe frameborder="0" :src="src"></iframe>
 
         <iframe frameborder="0" :src="src"></iframe>
 
       </div>
 
       </div>
 
     </div>
 
     </div>
 
@@ -99,6 +99,7 @@
 
 import Scroll from '@/components/Scroll'
 
 import Scroll from '@/components/Scroll'
 
 import overlap from '@/components/overlap'
 
 import overlap from '@/components/overlap'
 
 import computer from '@/components/computer'
 
 import computer from '@/components/computer'
 
+import browser from '@/util/browser'
 
 
 
 export default {
 
 export default {
 
   data () {
 
   data () {
 
@@ -110,6 +111,7 @@ export default {
 
       },
 
       },
 
       pllslide: 0,
 
       pllslide: 0,
 
       lslide: 400,
 
       lslide: 400,
 
+      isMobile: browser.mobile,
 
       src: null
 
       src: null
 
     }
 
     }
 
   },
 
   },

+ 4 - 0
src/pages/product/style.css
查看文件 

@@ -99,6 +99,10 @@
 
 .case_2 > .iframe-layout {
 
 .case_2 > .iframe-layout {
 
   padding: 0 0 37.56%;
 
   padding: 0 0 37.56%;
 
   position: relative;
 
   position: relative;
 
+  min-height: 500px;
 
+}
 
+
 
+.case_2 > .iframe-layout.mobile {
 
   min-height: 258px;
 
   min-height: 258px;
 
 }
 
 }