合并

src/layout/index/chengguo.vue

@@ -7,7 +7,7 @@
             <span :style="`border-color:${borderColor}`">{{title}}</span>
           </el-col>
           <el-col :span="6" style="text-align:right;">
-            <el-link :underline="false" :style="`color:${Color}`">MORE<i class="el-icon-video-play"></i></el-link>
+            <el-link :underline="false" :style="`color:${Color}`" @click="$router.push({ path: `list/${chengguolist[0].id}` })">MORE<i class="el-icon-video-play"></i></el-link>
           </el-col>
         </el-col>
         <el-col :span="24" class="newsMain">

src/layout/index/mingshi.vue

@@ -6,8 +6,9 @@
           <el-col :span="18">
             <span :style="`border-color:${borderColor}`">{{title}}</span>
           </el-col>
-          <el-col :span="6" style="text-align:right;">
-            <el-link :underline="false" :style="`color:${Color}`">MORE<i class="el-icon-video-play"></i></el-link>
+          <el-col :span="6" style="text-align:right;"> 
+            <el-link :underline="false" :style="`color:${Color}`" @click="$router.push({ path: `list/${mingshilist[0].id}` })">MORE<i class="el-icon-video-play"></i></el-link>
+            
           </el-col>
         </el-col>
           <el-col :span="24" class="newsMain">

src/layout/index/news.vue

@@ -7,7 +7,7 @@
             <span :style="`border-color:${borderColor}`">{{title}}</span>
           </el-col>
           <el-col :span="6" style="text-align:right;">
-            <el-link :underline="false" :style="`color:${Color}`">MORE<i class="el-icon-video-play"></i></el-link>
+            <el-link :underline="false" :style="`color:${Color}`" @click="$router.push({ path: `list/${newslist.column.id}` })">MORE<i class="el-icon-video-play"></i></el-link>
           </el-col>
         </el-col>
         <el-col :span="24" class="newsMain">

src/layout/index/notice.vue

@@ -7,13 +7,15 @@
             <span :style="`border-color:${borderColor}`">{{title}}</span>
           </el-col>
           <el-col :span="6" style="text-align:right;">
-            <el-link :underline="false" :style="`color:${Color}`">MORE<i class="el-icon-video-play"></i></el-link>
+            <el-link :underline="false" :style="`color:${Color}`"  @click="$router.push({ path: `list/${noticelist.column.id}` })">MORE<i class="el-icon-video-play"></i></el-link>
           </el-col>
         </el-col>
         <el-col :span="24" class="newsMain">
           <el-col :span="24" v-for="(tag, index) in noticelist.children" :key="index" :type="tag.type">
             <el-col class="chengguolist" :span="24" v-for="(item, index) in tag.children" :key="index">
               <el-col :span="16" @click.native="$router.push({ name: 'detail', params:{id:item.id} })">
+              <!-- @click.native="$router.push({ path: `/info/detail?id=${item.id}` })" -->
+              <!-- @click.native="$router.push({ path: '/detail', params:{id:item.id} })" -->
                 <p class="textOver">{{ item.title }}</p>
               </el-col>
               <el-col :span="8" style="text-align:right;">

src/views/detail/detail.vue

@@ -1,9 +1,9 @@
 <template>
   <div id="detail">
-    <el-row>
+    <el-row style="overflow-y: hidden;">
       <el-col :span="24" class="top">
         <div class="w_1200">
-          <top :logolist="logolist"></top>
+          <top :topInfo="topInfo"></top>
         </div>
       </el-col>
       <el-col :span="24" class="menu">
@@ -17,7 +17,7 @@
         </div>
       </el-col>
       <el-col :span="24" class="down">
-          <footinfo :content="content"></footinfo>
+          <footinfo :topInfo="topInfo"></footinfo>
       </el-col>
     </el-row>
   </div>
@@ -31,9 +31,8 @@ import footinfo from '../../layout/index/foot.vue';
 export default {
   name: 'detail',
   props: {
-    logolist:null,
+    topInfo:null,
     contentList:null,
-    content:null,
   },
   components: {
     top,
@@ -65,7 +64,7 @@ export default {
   min-height:500px;
 }
 .down {
-  height: 100px;
+   min-height: 100px;
   border: 1px solid #ccc;
 }
 </style>

src/views/list/list.vue

@@ -1,9 +1,9 @@
 <template>
   <div id="list">
-    <el-row>
+    <el-row style="overflow-y: hidden;">
       <el-col :span="24" class="top">
         <div class="w_1200">
-          <top :logolist="logolist"></top>
+          <top :topInfo="topInfo"></top>
         </div>
       </el-col>
       <el-col :span="24" class="menu">
@@ -22,7 +22,7 @@
         </div>
       </el-col>
       <el-col :span="24" class="down">
-          <footinfo :content="content"></footinfo>
+          <footinfo :topInfo="topInfo"></footinfo>
       </el-col>
     </el-row>
   </div>
@@ -37,9 +37,8 @@ import footinfo from '../../layout/index/foot.vue';
 export default {
   name: 'list',
   props: {
-    logolist: null,
+    topInfo:null,
     mainRightList:null,
-    content: null,
   },
   components: {
     top,
@@ -70,7 +69,6 @@ export default {
 .main {
   min-height: 500px;
   margin-bottom: 20px;
-  border: 1px solid #ccc;
 }
 .main .mainLeft {
   min-height: 500px;
@@ -84,7 +82,7 @@ export default {
   border: 1px solid #ccc;
 }
 .down {
-  height: 100px;
+  min-height: 100px;
   border: 1px solid #ccc;
 }
 </style>