Merge branch 'master' of http://git.cc-lotus.info/count/webnew-count

src/views/achievement/parts/achievementsList.vue

@@ -5,7 +5,7 @@
         <el-col :span="24" class="list" @click.native="detailBtn(item)" v-for="(item, index) in list" :key="index">
           <span></span>
           <span class="textOver">{{ item.title }}</span>
-          <span>{{ item.date }}</span>
+          <span>{{ item.publish_time }}</span>
         </el-col>
         <el-col :span="24" class="page">
           <pagination :total="total" :limit="limit" v-on="$listeners"></pagination>

src/views/achievement/parts/countryList.vue

@@ -5,7 +5,7 @@
         <el-col :span="24" class="list" @click.native="detailBtn(item)" v-for="(item, index) in list" :key="index">
           <span></span>
           <span class="textOver">{{ item.title }}</span>
-          <span>{{ item.date }}</span>
+          <span>{{ item.publish_time }}</span>
         </el-col>
         <el-col :span="24" class="page">
           <pagination :total="total" :limit="limit" v-on="$listeners"></pagination>

src/views/achievement/parts/entrepreneurshipList.vue

@@ -5,7 +5,7 @@
         <el-col :span="24" class="list" @click.native="detailBtn(item)" v-for="(item, index) in list" :key="index">
           <span></span>
           <span class="textOver">{{ item.title }}</span>
-          <span>{{ item.date }}</span>
+          <span>{{ item.publish_time }}</span>
         </el-col>
         <el-col :span="24" class="page">
           <pagination :total="total" :limit="limit" v-on="$listeners"></pagination>

src/views/achievement/parts/knowledgeList.vue

@@ -5,7 +5,7 @@
         <el-col :span="24" class="list" @click.native="detailBtn(item)" v-for="(item, index) in list" :key="index">
           <span></span>
           <span class="textOver">{{ item.title }}</span>
-          <span>{{ item.date }}</span>
+          <span>{{ item.publish_time }}</span>
         </el-col>
         <el-col :span="24" class="page">
           <pagination :total="total" :limit="limit" v-on="$listeners"></pagination>

src/views/achievement/parts/projectList.vue

@@ -5,7 +5,7 @@
         <el-col :span="24" class="list" @click.native="detailBtn(item)" v-for="(item, index) in list" :key="index">
           <span></span>
           <span class="textOver">{{ item.title }}</span>
-          <span>{{ item.date }}</span>
+          <span>{{ item.publish_time }}</span>
         </el-col>
         <el-col :span="24" class="page">
           <pagination :total="total" :limit="limit" v-on="$listeners"></pagination>

src/views/achievement/parts/softwareList.vue

@@ -5,7 +5,7 @@
         <el-col :span="24" class="list" @click.native="detailBtn(item)" v-for="(item, index) in list" :key="index">
           <span></span>
           <span class="textOver">{{ item.title }}</span>
-          <span>{{ item.date }}</span>
+          <span>{{ item.publish_time }}</span>
         </el-col>
         <el-col :span="24" class="page">
           <pagination :total="total" :limit="limit" v-on="$listeners"></pagination>

src/views/achievement/parts/supercomputingList.vue

@@ -5,7 +5,7 @@
         <el-col :span="24" class="list" @click.native="detailBtn(item)" v-for="(item, index) in list" :key="index">
           <span></span>
           <span class="textOver">{{ item.title }}</span>
-          <span>{{ item.date }}</span>
+          <span>{{ item.publish_time }}</span>
         </el-col>
         <el-col :span="24" class="page">
           <pagination :total="total" :limit="limit" v-on="$listeners"></pagination>

src/views/achievement/parts/teachingList.vue

@@ -5,7 +5,7 @@
         <el-col :span="24" class="list" @click.native="detailBtn(item)" v-for="(item, index) in list" :key="index">
           <span></span>
           <span class="textOver">{{ item.title }}</span>
-          <span>{{ item.date }}</span>
+          <span>{{ item.publish_time }}</span>
         </el-col>
         <el-col :span="24" class="page">
           <pagination :total="total" :limit="limit" v-on="$listeners"></pagination>

src/views/achievement/parts/technologyList.vue

@@ -5,7 +5,7 @@
         <el-col :span="24" class="list" @click.native="detailBtn(item)" v-for="(item, index) in list" :key="index">
           <span></span>
           <span class="textOver">{{ item.title }}</span>
-          <span>{{ item.date }}</span>
+          <span>{{ item.publish_time }}</span>
         </el-col>
         <el-col :span="24" class="page">
           <pagination :total="total" :limit="limit" v-on="$listeners"></pagination>

src/views/communication/parts/industryList.vue

@@ -5,7 +5,7 @@
         <el-col :span="24" class="list" @click.native="detailBtn(item)" v-for="(item, index) in list" :key="index">
           <span></span>
           <span class="textOver">{{ item.title }}</span>
-          <span>{{ item.date }}</span>
+          <span>{{ item.publish_time }}</span>
         </el-col>
         <el-col :span="24" class="page">
           <pagination :total="total" :limit="limit" v-on="$listeners"> </pagination>

src/views/communication/parts/right.vue

@@ -8,14 +8,9 @@
             <span slot="label" class="dian"></span>
             <el-col :span="24" class="list">
               <ul>
-                <li
-                  class="zhuantiList"
-                  v-for="(item, index) in ztytList"
-                  :key="index"
-                  @click="$router.push({ path: '/communication/list', query: { col_name: '专题研讨', id: 'id', display: '1' } })"
-                >
+                <li class="zhuantiList" v-for="(item, index) in ztytList" :key="index" @click="zhuanti(item)">
                   <el-col :span="20" class="title textOver">{{ item.title }}</el-col>
-                  <el-col :span="4" class="date textOver">{{ item.date }}</el-col>
+                  <el-col :span="4" class="date textOver">{{ item.publish_time }}</el-col>
                 </li>
               </ul>
               <el-col class="more" :span="24"><el-link :underline="false" @click="morezt()">查看更多</el-link></el-col>
@@ -26,14 +21,9 @@
             <span slot="label" class="dian"></span>
             <el-col :span="24" class="list">
               <ul>
-                <li
-                  class="zhuantiList"
-                  v-for="(item, index) in jswdList"
-                  :key="index"
-                  @click="$router.push({ path: '/communication/list', query: { col_name: '技术问答', id: 'id', display: '1' } })"
-                >
+                <li class="zhuantiList" v-for="(item, index) in jswdList" :key="index" @click="jishu(item)">
                   <el-col :span="20" class="title textOver">{{ item.title }}</el-col>
-                  <el-col :span="4" class="date textOver">{{ item.date }}</el-col>
+                  <el-col :span="4" class="date textOver">{{ item.publish_time }}</el-col>
                 </li>
               </ul>
               <el-col class="more" :span="24"><el-link :underline="false" @click="morejishu()">查看更多</el-link></el-col>
@@ -44,14 +34,9 @@
             <span slot="label" class="dian"></span>
             <el-col :span="24" class="list">
               <ul>
-                <li
-                  class="zhuantiList"
-                  v-for="(item, index) in hyyjList"
-                  :key="index"
-                  @click="$router.push({ path: '/communication/list', query: { col_name: '行业研究', id: 'id', display: '1' } })"
-                >
+                <li class="zhuantiList" v-for="(item, index) in hyyjList" :key="index" @click="hangye(item)">
                   <el-col :span="20" class="title textOver">{{ item.title }}</el-col>
-                  <el-col :span="4" class="date textOver">{{ item.date }}</el-col>
+                  <el-col :span="4" class="date textOver">{{ item.publish_time }}</el-col>
                 </li>
               </ul>
               <el-col class="more" :span="24"><el-link :underline="false" @click="morehangye()">查看更多</el-link></el-col>
@@ -61,14 +46,9 @@
             <span slot="label">科技培训</span>
             <el-col :span="24" class="list">
               <ul>
-                <li
-                  class="zhuantiList"
-                  v-for="(item, index) in kjpxList"
-                  :key="index"
-                  @click="$router.push({ path: '/communication/list', query: { col_name: '科技培训', id: 'id', display: '1' } })"
-                >
+                <li class="zhuantiList" v-for="(item, index) in kjpxList" :key="index" @click="keji(item)">
                   <el-col :span="20" class="title textOver">{{ item.title }}</el-col>
-                  <el-col :span="4" class="date textOver">{{ item.date }}</el-col>
+                  <el-col :span="4" class="date textOver">{{ item.publish_time }}</el-col>
                 </li>
               </ul>
               <el-col class="more" :span="24"><el-link :underline="false" @click="morekeji()">查看更多</el-link></el-col>
@@ -107,6 +87,37 @@ export default {
     morekeji() {
       this.$router.push({ path: '/communication/list', query: { col_name: '科技培训', display: '0' } });
     },
+    //专题
+    zhuanti(item) {
+      if (item.url) {
+        window.open(item.url);
+      } else {
+        this.$router.push({ path: '/communication/list', query: { col_name: '专题研讨', id: item.id, display: '1' } });
+      }
+    },
+    //技术
+    jishu(item) {
+      if (item.url) {
+        window.open(item.url);
+      } else {
+        this.$router.push({ path: '/communication/list', query: { col_name: '技术问答', id: item.id, display: '1' } });
+      }
+    },
+    hangye(item) {
+      if (item.url) {
+        window.open(item.url);
+      } else {
+        this.$router.push({ path: '/communication/list', query: { col_name: '行业研究', id: item.id, display: '1' } });
+      }
+    },
+
+    keji(item) {
+      if (item.url) {
+        window.open(item.url);
+      } else {
+        this.$router.push({ path: '/communication/list', query: { col_name: '科技培训', id: item.id, display: '1' } });
+      }
+    },
   },
 };
 </script>

src/views/communication/parts/scienceList.vue

@@ -5,7 +5,7 @@
         <el-col :span="24" class="list" @click.native="detailBtn(item)" v-for="(item, index) in list" :key="index">
           <span></span>
           <span class="textOver">{{ item.title }}</span>
-          <span>{{ item.date }}</span>
+          <span>{{ item.publish_time }}</span>
         </el-col>
         <el-col :span="24" class="page">
           <pagination :total="total" :limit="limit" v-on="$listeners"></pagination>

src/views/communication/parts/technologyList.vue

@@ -5,7 +5,7 @@
         <el-col :span="24" class="list" @click.native="detailBtn(item)" v-for="(item, index) in list" :key="index">
           <span></span>
           <span class="textOver">{{ item.title }}</span>
-          <span>{{ item.date }}</span>
+          <span>{{ item.publish_time }}</span>
         </el-col>
         <el-col :span="24" class="page">
           <pagination :total="total" :limit="limit" v-on="$listeners"></pagination>

src/views/communication/parts/topicDetail.vue

@@ -129,6 +129,8 @@ export default {
     ...comment({ commentquery: 'query', commentCreate: 'create', commentUpdate: 'update' }),
     async searchinfo() {
       if (this.id) {
+        const res = await this.fetch(this.id);
+        this.$set(this, `detail`, res.data);
       } else {
         let id = this.newsid;
         const res = await this.fetch(id);

src/views/communication/parts/topicList.vue

@@ -5,7 +5,7 @@
         <el-col :span="24" class="list" @click.native="detailBtn(item)" v-for="(item, index) in list" :key="index">
           <span></span>
           <span class="textOver">{{ item.title }}</span>
-          <span>{{ item.date }}</span>
+          <span>{{ item.publish_time }}</span>
         </el-col>
         <el-col :span="24" class="page">
           <pagination :total="total" :limit="limit" v-on="$listeners"></pagination>