1

src/views/market/detail-model/model-3.vue

@@ -14,23 +14,15 @@
               信息来源：<span>{{ data.origin }}</span>
             </el-col>
             <el-col :span="12" class="text">
-              发布时间：<span>{{ data.release_time }}</span>
+              发布时间：<span>{{ data.publish_time }}</span>
             </el-col>
           </el-col>
+          <el-col :span="24" class="video" v-if="data.filepath">
+            <video :src="getImage(data.filepath)" controls="controls">your browser does not support the video tag</video>
+          </el-col>
           <el-col :span="24" class="content">
             <p v-html="data.content"></p>
           </el-col>
-          <el-col :span="24" class="image" v-if="data.image">
-            <el-carousel height="300px" :interval="2000">
-              <el-carousel-item v-for="(tag, index) in data.image" :key="index">
-                <el-image :src="tag.url"></el-image>
-              </el-carousel-item>
-            </el-carousel>
-          </el-col>
-          <el-col :span="24" class="fileUrl" v-if="data.fileUrl && data.fileUrl.length > 0">
-            <p>附件：</p>
-            <el-link :href="data.fileUrl[0].url">{{ data.fileUrl[0].name }}</el-link>
-          </el-col>
         </el-col>
       </el-col>
     </el-row>
@@ -38,6 +30,7 @@
 </template>
 
 <script>
+const _ = require('lodash');
 import { mapState, createNamespacedHelpers } from 'vuex';
 export default {
   name: 'model-0',
@@ -49,7 +42,13 @@ export default {
     return {};
   },
   created() {},
-  methods: {},
+  methods: {
+    getImage(data) {
+      if (_.map(data, 'url')[0]) {
+        return _.map(data, 'url')[0];
+      }
+    },
+  },
   computed: {
     ...mapState(['user']),
   },
@@ -94,19 +93,22 @@ export default {
         text-align: left;
       }
     }
+    .video {
+      text-align: center;
+      height: 260px;
+      overflow: hidden;
+      margin: 0 0 15px 0;
+      video {
+        width: 50%;
+        height: 260px;
+        overflow: hidden;
+      }
+    }
     .content {
       font-size: 16px;
       text-indent: 2rem;
       margin: 0 0 15px 0;
     }
-    .image {
-      text-align: center;
-      padding: 0 26%;
-      .el-image {
-        width: 100%;
-        height: 100%;
-      }
-    }
   }
 }
 </style>

src/views/market/list-model/model-3.vue

@@ -11,7 +11,7 @@
               信息来源：<span>{{ item.origin }}</span>
             </el-col>
             <el-col :span="12" class="text textOver">
-              发布时间：<span>{{ item.release_time }}</span>
+              发布时间：<span>{{ item.publish_time }}</span>
             </el-col>
           </el-col>
         </el-col>

src/views/market/list/xmlu.vue

@@ -14,25 +14,22 @@
 <script>
 const _ = require('lodash');
 import listPage from '@c/list/list-page.vue';
-const { newsColumn } = require('@common/dict/index');
 import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: news } = createNamespacedHelpers('news');
+const { mapActions: roadShow } = createNamespacedHelpers('roadShow');
 export default {
   name: 'xmlu',
   props: ['listModel'],
   components: {
     listPage,
-    model2: () => import('../list-model/model-2.vue'),
-    dmodel: () => import('../detail-model/model-2.vue'),
+    model3: () => import('../list-model/model-3.vue'),
+    dmodel: () => import('../detail-model/model-3.vue'),
   },
   data: function () {
     return {
-      // 栏目
-      column: newsColumn,
       // 列表
       list: [],
       total: 0,
-      pageSize: 4,
+      pageSize: 7,
       // 详情
       detail: {},
     };
@@ -41,9 +38,8 @@ export default {
     this.search();
   },
   methods: {
-    ...news(['query', 'fetch']),
+    ...roadShow(['query', 'fetch']),
     async search({ skip = 0, limit = this.pageSize, ...info } = {}) {
-      info.column_name = this.column[this.listModel];
       let res = await this.query({ skip, limit, ...info });
       if (this.$checkRes(res)) {
         this.$set(this, `list`, res.data);

src/views/market/parts/list.vue

@@ -54,7 +54,7 @@
                 <span>{{ item.publish_time || '暂无' }}</span>
               </el-col>
             </el-col>
-            <el-col :span="24" class="down"> 简介:{{ item.titlejj }} </el-col>
+            <el-col :span="24" class="down"> 简介:{{ item.titlejj || '暂无' }} </el-col>
           </el-col>
         </el-col>
         <el-col :span="24" class="one five" v-else-if="type == '5'">