合并

src/layout/master/index/news.vue

@@ -9,8 +9,8 @@
           <el-col :span="13" class="block">
             <el-carousel ref="shubiao">
               <el-carousel-item v-for="(item, index) in newsList" :key="index" :name="`${index}`">
-                <el-link :underline="false">
-                  <el-image style="width:620px;height:350px;" :src="item.picurl" class="newsList"></el-image>
+                <el-link :underline="false" @click="$router.push({ path: `/news/detail?id=${item.id}` })">
+                  <el-image style="width:620px;height:350px;" :src="item.pic" class="newsList"></el-image>
                 </el-link>
               </el-carousel-item>
             </el-carousel>
@@ -21,7 +21,15 @@
                 <span class="qiudata"></span>
                 <el-link :underline="false">今天（3月8日星期五）</el-link>
               </li>
-              <li class="list" v-for="(tag, index) in newsList" :key="index" :type="tag.type" @mouseover="shuYi(index)" :class="newListActive(tag)">
+              <li
+                class="list"
+                v-for="(tag, index) in newsList"
+                :key="index"
+                :type="tag.type"
+                @mouseover="shuYi(index)"
+                :class="newListActive(tag)"
+                @click="$router.push({ path: `/news/detail?id=${tag.id}` })"
+              >
                 <span class="qiu"></span>
                 <el-link :underline="false" class="newsListTit">{{ tag.title }}</el-link>
               </li>

src/layout/master/index/notice.vue

@@ -17,7 +17,7 @@
             </el-col>
             <el-col :span="24" class="noticelist">
               <el-col :span="8" class="content" v-for="(item, index) in noticelist" :key="index">
-                <el-link :underline="false">
+                <el-link :underline="false" @click.native="$router.push({ path: `/notice/detail?id=${item.id}` })">
                   <el-col :span="24" class="image">
                     <el-image style="width:100%;height:226px;" :src="item.url"></el-image>
                   </el-col>
@@ -25,10 +25,10 @@
                     <p>{{ item.title }}</p>
                   </el-col>
                   <el-col :span="24" class="text">
-                    <p>{{ item.text }}</p>
+                    <p v-html="item.content"></p>
                   </el-col>
                   <el-col :span="24" class="time">
-                    {{ item.time }}
+                    {{ item.publish_time }}
                   </el-col>
                 </el-link>
               </el-col>

src/views/master/login/company.vue

@@ -23,9 +23,9 @@ import foot from '../../../layout/master/index/foot.vue';
 export default {
   name: 'companys',
   props: {
-    topinfo: null,//头部内容
-    newsinfo: null,//中间登录
-    footinfo: null,//底部内容
+    topinfo: null, //头部内容
+    newsinfo: null, //中间登录
+    footinfo: null, //底部内容
   },
   components: {
     top,
@@ -33,10 +33,10 @@ export default {
     foot,
   },
   data: () => ({}),
-  created() { },
+  created() {},
   computed: {},
   methods: {},
-};  
+};
 </script>
 
 <style lang="less" scoped>