liuqiao 4 年之前
父节点
当前提交
9cb24e3c2d

+ 12 - 1
src/layout/index.vue

@@ -119,7 +119,8 @@
       :class="[
         'footer',
         fixedHeader ? 'fixed-footer' : '',
-        /^\/indexLayout([\/][\D]+)?$/.test($route.path)|| /^\/matchLayout([\/][\D]+)?$/.test($route.path)
+        /^\/indexLayout([\/][\D]+)?$/.test($route.path)|| /^\/matchLayout([\/][\D]+)?$/.test($route.path)||/^\/topic([\/][\D]+)?$/.test($route.path)||
+        /^\/detailbzs1([\/][\D]+)?$/.test($route.path)|| /^\/detailbzs2([\/][\D]+)?$/.test($route.path)|| /^\/detailbzs3([\/][\D]+)?$/.test($route.path)|| /^\/detailbzs4([\/][\D]+)?$/.test($route.path)
           ? 'footer-index'
           : /^\/login\/index$/.test($route.path)
           ? 'footer-login'
@@ -430,6 +431,16 @@ export default {
     @include w_h();
   }
 }
+.fixed-footer{
+    position: fixed;
+    top: auto;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    z-index: 9;
+    width: 100%;
+    height: auto;
+}
 .show{
      background: $color_f;
 

+ 5 - 5
src/router/index.js

@@ -313,7 +313,7 @@ export const constantRoutes = [{
                 }
             },
             {
-                path: 'detailsxq',
+                path: 'topic/detailsxq',
                 name: 'Detailsxq',
                 component: () =>
                     import ('@/views/megagame/topic/details/detailsxq'),
@@ -323,7 +323,7 @@ export const constantRoutes = [{
                 }
             },
             {
-                path: 'detailafa',
+                path: 'topic/detailafa',
                 name: 'Detailafa',
                 component: () =>
                     import ('@/views/megagame/topic/details/detailafa'),
@@ -333,7 +333,7 @@ export const constantRoutes = [{
                 }
             },
             {
-                path: 'detailaw',
+                path: 'topic/detailaw',
                 name: 'detailaw',
                 component: () =>
                     import ('@/views/megagame/topic/details/detailaw'),
@@ -343,7 +343,7 @@ export const constantRoutes = [{
                 }
             },
             {
-                path: 'detailmw',
+                path: 'topic/detailmw',
                 name: 'detailmw',
                 component: () =>
                     import ('@/views/megagame/topic/details/detailmw'),
@@ -353,7 +353,7 @@ export const constantRoutes = [{
                 }
             },
             {
-                path: 'detailbyy',
+                path: 'topic/detailbyy',
                 name: 'detailbyy',
                 component: () =>
                     import ('@/views/megagame/topic/details/detailbyy'),

+ 20 - 2
src/views/index/indexLayout.vue

@@ -1,6 +1,6 @@
 /*indexLayout*/
 <template>
-  <div ref="getIndexHeight" class="index">
+  <div  ref="getIndexHeight" class="index">
     <div class="container">
       <transition name="fade-transform" mode="out-in">
         <router-view />
@@ -193,8 +193,25 @@ export default {
       this.$router.replace({ path: '/indexLayout/' + this.currentPage })
     }
   },
-  mounted() {},
+  mounted() {
+    //   let _this = this
+    // if (_this.$route.path.indexOf('/indexLayout') != -1) {
+    //   setTimeout(() => {
+    //     _this.getContainerHeright()
+    //   }, 100)
+
+    //   window.addEventListener('resize', function () {
+    //     _this.getContainerHeright()
+    //   })
+    // }
+  },
   methods: {
+    //  getContainerHeright() {
+    //   this.containerHeight =
+    //     this.$refs.getIndexHeight.clientHeight -
+    //     this.$refs.getFooterHeight.clientHeight +
+    //     'px'
+    // },
    xiaoxi(){
      console.log(111);
      var tempwindow=window.open('_blank');
@@ -276,6 +293,7 @@ export default {
     padding:8.5px 6px;
     background: #222020;
     overflow: hidden;
+    padding-bottom: 35px;
     .tab {
       @include w_h();
       @include flex(flex-start);

+ 1 - 1
src/views/index/workbench/index.vue

@@ -347,7 +347,7 @@ this.jiazai();
         // @include w_h(13.8%, 92%);
         min-width: 127px;
         min-height: 300px;
-        margin: 40px 5px;
+        margin: 26px 5px;
         @include w_h(13.8%);
         position: relative;
         img {

+ 5 - 5
src/views/megagame/topic/index.vue

@@ -157,10 +157,10 @@ export default {
       let path = ''
       switch (title) {
         case '前沿-HCFDLab-风洞模型流场分析':
-          path = 'detailsxq'
+          path = 'topic/detailsxq'
           break
         case '前沿-HCFDLab-Agard Wing升阻力曲线分析':
-          path = 'detailaw'
+          path = 'topic/detailaw'
           break
         case '前沿-Bladesign-X棱形截面悬臂梁的动态特性(模态、瞬态)分析':
           path = 'detailbzs1'
@@ -176,13 +176,13 @@ export default {
           break
 
         case '前沿-Bladesign-矩形截面梁受力分析':
-          path = 'detailbyy'
+          path = 'topic/detailbyy'
           break
         case '前沿-HCFDLab-Mavric Wing升阻力曲线分析':
-          path = 'detailmw'
+          path = 'topic/detailmw'
           break
         case '前沿-HCFDLab-AFA飞机模型流场分析':
-          path = 'detailafa'
+          path = 'topic/detailafa'
           break
       }
       this.$router.push(path)