guhongwei il y a 4 ans
Parent
commit
716b2b756a

+ 2 - 1
src/views/index.vue

@@ -166,7 +166,8 @@ export default {
   created() {},
   methods: {
     login() {
-      window.location.replace('/cysciweb/login');
+      // window.location.replace('/cysciweb/login');
+      window.location.replace('/login');
     },
   },
   computed: {

+ 128 - 45
src/views/market/detail-model/model-3.vue

@@ -6,22 +6,81 @@
           <slot></slot>
         </el-col>
         <el-col :span="24" class="info">
-          <el-col :span="24" class="title">
-            {{ data.title }}
-          </el-col>
-          <el-col :span="24" class="other">
-            <el-col :span="12" class="text">
-              信息来源:<span>{{ data.origin }}</span>
+          <el-col :span="24" class="top">
+            <el-col :span="24" class="name">
+              <p class="textOver">{{ data.name || '暂无' }}</p>
+              <p>{{ getDate(data.create_time) }}</p>
             </el-col>
-            <el-col :span="12" class="text">
-              发布时间:<span>{{ data.publish_time }}</span>
+            <el-col :span="12">
+              <el-col :span="8" class="otherInfo textOver"> 需求程度 </el-col>
+              <el-col :span="16" class="otherInfo textOver">
+                {{ data.demand || '暂无' }}
+              </el-col>
+            </el-col>
+            <el-col :span="12">
+              <el-col :span="8" class="otherInfo textOver"> 信息属性 </el-col>
+              <el-col :span="16" class="otherInfo textOver">
+                {{ data.messattribute || '暂无' }}
+              </el-col>
+            </el-col>
+            <el-col :span="12">
+              <el-col :span="8" class="otherInfo textOver"> 联系人 </el-col>
+              <el-col :span="16" class="otherInfo textOver">
+                {{ data.contacts || '暂无' }}
+              </el-col>
+            </el-col>
+            <el-col :span="12">
+              <el-col :span="8" class="otherInfo textOver"> QQ/微信 </el-col>
+              <el-col :span="16" class="otherInfo textOver">
+                {{ data.qqwx || '暂无' }}
+              </el-col>
+            </el-col>
+            <el-col :span="12">
+              <el-col :span="8" class="otherInfo textOver"> 联系电话 </el-col>
+              <el-col :span="16" class="otherInfo textOver">
+                {{ getphone(data.phone) || '暂无' }}
+              </el-col>
+            </el-col>
+            <el-col :span="12">
+              <el-col :span="8" class="otherInfo textOver"> 电子邮箱 </el-col>
+              <el-col :span="16" class="otherInfo textOver">
+                {{ data.email || '暂无' }}
+              </el-col>
             </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 :span="24" class="down">
+            <el-col :span="24" class="downInfo">
+              <el-col :span="4" class="tit">
+                <h2>信息描述</h2>
+              </el-col>
+              <el-col :span="20" class="info">
+                {{ data.informationdesc || '暂无' }}
+              </el-col>
+            </el-col>
+            <el-col :span="24" class="downInfo">
+              <el-col :span="4" class="tit">
+                <h2>核心要素</h2>
+              </el-col>
+              <el-col :span="20" class="info">
+                {{ data.coreelements || '暂无' }}
+              </el-col>
+            </el-col>
+            <el-col :span="24" class="downInfo">
+              <el-col :span="4" class="tit">
+                <h2>价格信息</h2>
+              </el-col>
+              <el-col :span="20" class="info">
+                {{ data.priceinfo || '暂无' }}
+              </el-col>
+            </el-col>
+            <el-col :span="24" class="downInfo">
+              <el-col :span="4" class="tit">
+                <h2>商务预期</h2>
+              </el-col>
+              <el-col :span="20" class="info">
+                {{ data.expect || '暂无' }}
+              </el-col>
+            </el-col>
           </el-col>
         </el-col>
       </el-col>
@@ -30,7 +89,9 @@
 </template>
 
 <script>
+import { parseGeoJSON } from 'echarts';
 const _ = require('lodash');
+const moment = require('moment');
 import { mapState, createNamespacedHelpers } from 'vuex';
 export default {
   name: 'model-0',
@@ -43,9 +104,24 @@ export default {
   },
   created() {},
   methods: {
-    getImage(data) {
-      if (_.map(data, 'url')[0]) {
-        return _.map(data, 'url')[0];
+    // 隐藏手机号
+    getphone(value) {
+      if (value == undefined) {
+        return '暂无';
+      } else {
+        if (value.length === 11) {
+          let start = value.slice(0, 4);
+          let end = value.slice(-3);
+          return `${start}****${end}`;
+        } else {
+          return value;
+        }
+      }
+    },
+    getDate(date) {
+      if (date) {
+        let newDate = moment(date).format('YYYY-MM-DD');
+        if (newDate) return newDate;
       }
     },
   },
@@ -72,43 +148,50 @@ export default {
     margin: 0 0 10px 0;
   }
   .info {
-    .title {
-      font-size: 18px;
-      text-align: center;
-      font-weight: bold;
-      margin: 0 0 15px 0;
-    }
-    .other {
+    .top {
+      height: 180px;
+      overflow: hidden;
       margin: 0 0 15px 0;
-      .text {
-        font-size: 14px;
-        color: #666;
-        text-align: right;
-        padding: 0 10px;
-        span {
-          color: #000;
+      .name {
+        padding: 5px 10px;
+        border: 1px solid #ccc;
+        text-align: center;
+        p:nth-child(1) {
+          font-size: 18px;
+          font-weight: bold;
+        }
+        p:nth-child(2) {
+          font-size: 12px;
+          padding: 5px 0 0 0;
         }
       }
-      .text:nth-child(2) {
-        text-align: left;
+      .otherInfo {
+        font-size: 16px;
+        padding: 5px 10px;
+        height: 40px;
+        border: 1px solid #ccc;
       }
     }
-    .video {
-      text-align: center;
-      height: 260px;
-      overflow: hidden;
+    .down {
       margin: 0 0 15px 0;
-      video {
-        width: 50%;
-        height: 260px;
-        overflow: hidden;
+      .downInfo {
+        border: 1px solid #ccc;
+        .tit {
+          height: 150px;
+          line-height: 150px;
+          text-align: center;
+          border-right: 1px solid #ccc;
+        }
+        .info {
+          font-size: 16px;
+          padding: 10px;
+          min-height: 150px;
+        }
+        h2 {
+          margin: 0;
+        }
       }
     }
-    .content {
-      font-size: 16px;
-      text-indent: 2rem;
-      margin: 0 0 15px 0;
-    }
   }
 }
 </style>

+ 0 - 242
src/views/market/detail-model/model-4.vue

@@ -1,242 +0,0 @@
-<template>
-  <div id="model-0">
-    <el-row>
-      <el-col :span="24" class="main">
-        <el-col :span="24" class="btn">
-          <slot></slot>
-        </el-col>
-        <el-col :span="24" class="info">
-          <el-col :span="24" class="top">
-            <el-col :span="7" class="left" v-if="data.image != ''">
-              <el-carousel trigger="click" height="305px" :autoplay="false">
-                <el-carousel-item v-for="(item, index) in data.image" :key="index">
-                  <el-image :src="item.url" style="width: 99%; height: 345px; border: 1px solid #ccc"></el-image>
-                </el-carousel-item>
-              </el-carousel>
-            </el-col>
-            <el-col :span="7" v-else class="achieveImage">
-              <!-- <el-image :src="achievezb" style="height:305px;"></el-image>
-            <el-col :span="24" class="company textOver">
-              {{ data.company }}
-            </el-col>
-            <el-col :span="24" class="aName">
-              {{ data.name }}
-            </el-col>
-            <el-col :span="24" class="a-brief">{{ data.requirementdesc }}</el-col>
-            <el-col :span="24" class="cont">
-              <el-col :span="24" class="a-field">领域:{{ data.field }}</el-col>
-              <el-col :span="24" class="a-contacts">联系人:{{ data.contacts }}</el-col>
-            </el-col> -->
-              <p>紧急程度</p>
-              <p><el-rate v-model="value" disabled :max="max" :texts="texts" :colors="colors"> </el-rate></p>
-              <!-- <p>{{ data.degreeurgency || '暂无' }}</p> -->
-            </el-col>
-            <el-col :span="17" class="right">
-              <el-col :span="24" class="name textOver">
-                {{ data.name || '暂无' }}
-              </el-col>
-              <el-col :span="24">
-                <el-col :span="4" class="otherInfo textOver"> 需求方 </el-col>
-                <el-col :span="20" class="otherInfo textOver">
-                  {{ data.company }}
-                  <el-link v-if="data.companyweb != null || ''" :href="data.companyweb" :underline="false" target="_blank">({{ data.companyweb }})</el-link>
-                </el-col>
-              </el-col>
-              <el-col :span="12">
-                <el-col :span="8" class="otherInfo textOver"> 所属领域 </el-col>
-                <el-col :span="16" class="otherInfo textOver">
-                  {{ data.field || '暂无' }}
-                </el-col>
-              </el-col>
-              <el-col :span="12">
-                <el-col :span="8" class="otherInfo textOver"> 合作方式 </el-col>
-                <el-col :span="16" class="otherInfo textOver">
-                  {{ data.cooperation ? data.cooperation : '暂无' }}
-                </el-col>
-              </el-col>
-              <el-col :span="12">
-                <el-col :span="8" class="otherInfo textOver"> 紧急程度 </el-col>
-                <el-col :span="16" class="otherInfo textOver"> {{ data.demand || '暂无' }} </el-col>
-              </el-col>
-              <el-col :span="12">
-                <el-col :span="8" class="otherInfo textOver"> 投资预算 </el-col>
-                <el-col :span="16" class="otherInfo textOver"> {{ data.budget || '暂无' }} </el-col>
-              </el-col>
-              <el-col :span="12">
-                <el-col :span="8" class="otherInfo textOver"> 联系人 </el-col>
-                <el-col :span="16" class="otherInfo textOver">
-                  {{ data.contacts || '暂无' }}
-                </el-col>
-              </el-col>
-              <el-col :span="12">
-                <el-col :span="8" class="otherInfo textOver"> QQ/微信 </el-col>
-                <el-col :span="16" class="otherInfo textOver">
-                  {{ data.qqwx || '暂无' }}
-                </el-col>
-              </el-col>
-              <el-col :span="24">
-                <el-col :span="4" class="otherInfo textOver"> 联系电话 </el-col>
-                <el-col :span="20" class="otherInfo textOver">
-                  {{ getphone(data.phone) || '暂无' }}
-                </el-col>
-              </el-col>
-              <el-col :span="24">
-                <el-col :span="4" class="otherInfo textOver"> 电子邮箱 </el-col>
-                <el-col :span="20" class="otherInfo textOver">
-                  {{ data.email || '暂无' }}
-                </el-col>
-              </el-col>
-            </el-col>
-          </el-col>
-          <el-col :span="24" class="down">
-            <el-col :span="24" class="downInfo">
-              <el-col :span="4" class="tit">
-                <h2>需求说明</h2>
-              </el-col>
-              <el-col :span="20" class="info">
-                {{ data.requirementdesc || '暂无' }}
-              </el-col>
-            </el-col>
-            <el-col :span="24" class="downInfo">
-              <el-col :span="4" class="tit">
-                <h2>预期目标</h2>
-              </el-col>
-              <el-col :span="20" class="info">
-                {{ data.expect || '暂无' }}
-              </el-col>
-            </el-col>
-            <el-col :span="24" class="downInfo">
-              <el-col :span="4" class="tit">
-                <h2>需求现状</h2>
-              </el-col>
-              <el-col :span="20" class="info">
-                {{ data.present || '暂无' }}
-              </el-col>
-            </el-col>
-            <el-col :span="24" class="downInfo">
-              <el-col :span="4" class="tit">
-                <h2>合作要求</h2>
-              </el-col>
-              <el-col :span="20" class="info">
-                {{ data.condition || '暂无' }}
-              </el-col>
-            </el-col>
-          </el-col>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-const _ = require('lodash');
-import { mapState, createNamespacedHelpers } from 'vuex';
-export default {
-  name: 'model-0',
-  props: {
-    data: { type: Object },
-  },
-  components: {},
-  data: function () {
-    return {
-      value: 1,
-      max: 3,
-      colors: ['#ff0000', '#ff0000', '#ff0000'],
-      texts: ['一般', '紧急', '长期'],
-    };
-  },
-  created() {},
-  methods: {
-    // 隐藏手机号
-    getphone(value) {
-      if (value == undefined) {
-        return '暂无';
-      } else {
-        if (value.length === 11) {
-          let start = value.slice(0, 4);
-          let end = value.slice(-3);
-          return `${start}****${end}`;
-        } else {
-          return value;
-        }
-      }
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-  watch: {
-    test: {
-      deep: true,
-      immediate: true,
-      handler(val) {},
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.main {
-  .btn {
-    text-align: right;
-    margin: 0 0 10px 0;
-  }
-  .info {
-    .top {
-      height: 315px;
-      overflow: hidden;
-      .right {
-        padding: 0 0 0 10px;
-        .name {
-          font-size: 18px;
-          font-weight: bold;
-          padding: 10px;
-          border: 1px solid #ccc;
-          text-align: center;
-        }
-        .otherInfo {
-          padding: 10px;
-          font-size: 16px;
-          border: 1px solid #ccc;
-        }
-      }
-    }
-    .down {
-      margin: 0 0 15px 0;
-      .downInfo {
-        border: 1px solid #ccc;
-        .tit {
-          height: 150px;
-          line-height: 150px;
-          text-align: center;
-          border-right: 1px solid #ccc;
-        }
-        .info {
-          font-size: 16px;
-          padding: 10px;
-          min-height: 150px;
-        }
-      }
-    }
-    .achieveImage {
-      height: 305px;
-      overflow: hidden;
-      p:nth-child(1) {
-        font-size: 25px;
-        text-align: left;
-        padding: 10px 0;
-      }
-      p:nth-child(2) {
-        margin: 60px 0 0 0;
-        text-align: center;
-      }
-    }
-  }
-}
-/deep/.el-rate__icon {
-  font-size: 60px;
-}
-</style>

+ 0 - 194
src/views/market/detail-model/model-5.vue

@@ -1,194 +0,0 @@
-<template>
-  <div id="model-0">
-    <el-row>
-      <el-col :span="24" class="main">
-        <el-col :span="24" class="btn">
-          <slot></slot>
-        </el-col>
-        <el-col :span="24" class="info">
-          <el-col :span="24" class="top">
-            <el-col :span="24" class="name">
-              <p class="textOver">{{ data.name || '暂无' }}</p>
-              <p>{{ getDate(data.meta.createdAt) }}</p>
-            </el-col>
-            <el-col :span="12">
-              <el-col :span="8" class="otherInfo textOver"> 需求程度 </el-col>
-              <el-col :span="16" class="otherInfo textOver">
-                {{ data.demand || '暂无' }}
-              </el-col>
-            </el-col>
-            <el-col :span="12">
-              <el-col :span="8" class="otherInfo textOver"> 信息属性 </el-col>
-              <el-col :span="16" class="otherInfo textOver">
-                {{ data.messattribute || '暂无' }}
-              </el-col>
-            </el-col>
-            <el-col :span="12">
-              <el-col :span="8" class="otherInfo textOver"> 联系人 </el-col>
-              <el-col :span="16" class="otherInfo textOver">
-                {{ data.contacts || '暂无' }}
-              </el-col>
-            </el-col>
-            <el-col :span="12">
-              <el-col :span="8" class="otherInfo textOver"> QQ/微信 </el-col>
-              <el-col :span="16" class="otherInfo textOver">
-                {{ data.qqwx || '暂无' }}
-              </el-col>
-            </el-col>
-            <el-col :span="12">
-              <el-col :span="8" class="otherInfo textOver"> 联系电话 </el-col>
-              <el-col :span="16" class="otherInfo textOver">
-                {{ getphone(data.phone) || '暂无' }}
-              </el-col>
-            </el-col>
-            <el-col :span="12">
-              <el-col :span="8" class="otherInfo textOver"> 电子邮箱 </el-col>
-              <el-col :span="16" class="otherInfo textOver">
-                {{ data.email || '暂无' }}
-              </el-col>
-            </el-col>
-          </el-col>
-          <el-col :span="24" class="down">
-            <el-col :span="24" class="downInfo">
-              <el-col :span="4" class="tit">
-                <h2>信息描述</h2>
-              </el-col>
-              <el-col :span="20" class="info">
-                {{ data.informationdesc || '暂无' }}
-              </el-col>
-            </el-col>
-            <el-col :span="24" class="downInfo">
-              <el-col :span="4" class="tit">
-                <h2>核心要素</h2>
-              </el-col>
-              <el-col :span="20" class="info">
-                {{ data.coreelements || '暂无' }}
-              </el-col>
-            </el-col>
-            <el-col :span="24" class="downInfo">
-              <el-col :span="4" class="tit">
-                <h2>价格信息</h2>
-              </el-col>
-              <el-col :span="20" class="info">
-                {{ data.priceinfo || '暂无' }}
-              </el-col>
-            </el-col>
-            <el-col :span="24" class="downInfo">
-              <el-col :span="4" class="tit">
-                <h2>商务预期</h2>
-              </el-col>
-              <el-col :span="20" class="info">
-                {{ data.expect || '暂无' }}
-              </el-col>
-            </el-col>
-          </el-col>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-const _ = require('lodash');
-const moment = require('moment');
-import { mapState, createNamespacedHelpers } from 'vuex';
-export default {
-  name: 'model-0',
-  props: {
-    data: { type: Object },
-  },
-  components: {},
-  data: function () {
-    return {};
-  },
-  created() {},
-  methods: {
-    // 隐藏手机号
-    getphone(value) {
-      if (value == undefined) {
-        return '暂无';
-      } else {
-        if (value.length === 11) {
-          let start = value.slice(0, 4);
-          let end = value.slice(-3);
-          return `${start}****${end}`;
-        } else {
-          return value;
-        }
-      }
-    },
-    getDate(date) {
-      let newDate = moment(date).format('YYYY-MM-DD');
-      if (newDate) return newDate;
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-  watch: {
-    test: {
-      deep: true,
-      immediate: true,
-      handler(val) {},
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.main {
-  .btn {
-    text-align: right;
-    margin: 0 0 10px 0;
-  }
-  .info {
-    .top {
-      height: 180px;
-      overflow: hidden;
-      margin: 0 0 15px 0;
-      .name {
-        padding: 5px 10px;
-        border: 1px solid #ccc;
-        text-align: center;
-        p:nth-child(1) {
-          font-size: 18px;
-          font-weight: bold;
-        }
-        p:nth-child(2) {
-          font-size: 12px;
-          padding: 5px 0 0 0;
-        }
-      }
-      .otherInfo {
-        font-size: 16px;
-        padding: 5px 10px;
-        height: 40px;
-        border: 1px solid #ccc;
-      }
-    }
-    .down {
-      margin: 0 0 15px 0;
-      .downInfo {
-        border: 1px solid #ccc;
-        .tit {
-          height: 150px;
-          line-height: 150px;
-          text-align: center;
-          border-right: 1px solid #ccc;
-        }
-        .info {
-          font-size: 16px;
-          padding: 10px;
-          min-height: 150px;
-        }
-        h2 {
-          margin: 0;
-        }
-      }
-    }
-  }
-}
-</style>

+ 3 - 22
src/views/market/index.vue

@@ -19,18 +19,8 @@
               <list type="3" :list="thrList" @detail="detail"></list>
             </el-col>
             <el-col :span="12" class="left">
-              <top topText="项目路演" @more="more('3')"></top>
-              <list type="4" :list="fourList" @detail="detail"></list>
-            </el-col>
-          </el-col>
-          <el-col :span="24" class="common thr">
-            <el-col :span="12" class="left">
-              <top topText="科技需求" @more="more('4')"></top>
-              <list type="5" :list="fiveList" @detail="detail"></list>
-            </el-col>
-            <el-col :span="12" class="left">
-              <top topText="商务服务" @more="more('5')"></top>
-              <list type="6" :list="sixList" @detail="detail"></list>
+              <top topText="商务服务" @more="more('3')"></top>
+              <list type="4" :list="sixList" @detail="detail"></list>
             </el-col>
           </el-col>
         </div>
@@ -58,8 +48,6 @@ export default {
       oneList: [],
       twoList: [],
       thrList: [],
-      fourList: [],
-      fiveList: [],
       sixList: [],
       productType: productType,
     };
@@ -74,11 +62,7 @@ export default {
     ...expert({ expertQuery: 'query' }),
     async search({ skip = 0, limit = 10, ...info } = {}) {
       for (const val of this.productType) {
-        if (val.value == '0') {
-          // 科技需求
-          let res = await this.productQuery({ skip, limit: 6, type: val.value, ...info });
-          if (this.$checkRes(res)) this.$set(this, `fiveList`, res.data);
-        } else if (val.value == '1') {
+        if (val.value == '1') {
           // 技术成果
           let res = await this.productQuery({ skip, limit: 6, type: val.value, ...info });
           if (this.$checkRes(res)) this.$set(this, `oneList`, res.data);
@@ -91,9 +75,6 @@ export default {
       // 专利信息
       let res = await this.patentQuery({ skip, limit: 6, ...info });
       if (this.$checkRes(res)) this.$set(this, `twoList`, res.data);
-      // 项目路演
-      res = await this.roadShowQuery({ skip, limit: 5, ...info });
-      if (this.$checkRes(res)) this.$set(this, `fourList`, res.data);
       // 专家智库
       res = await this.expertQuery({ skip, limit: 6, ...info });
       const { img_url } = res.data;

+ 10 - 5
src/views/market/list-model/model-3.vue

@@ -1,17 +1,17 @@
 <template>
-  <div id="model-3">
+  <div id="model-4">
     <el-row>
       <el-col :span="24" class="main">
         <el-col :span="24" class="list" v-for="(item, index) in list" :key="index" @click.native="detail(item.id)">
           <el-col :span="24" class="title textOver">
-            {{ item.title }}
+            {{ item.name }}
           </el-col>
           <el-col :span="24" class="other">
             <el-col :span="12" class="text textOver">
-              信息来源:<span>{{ item.origin }}</span>
+              信息属性:<span>{{ item.messattribute }}</span>
             </el-col>
             <el-col :span="12" class="text textOver">
-              发布时间:<span>{{ item.publish_time }}</span>
+              发布时间:<span>{{ getDate(item.meta.createdAt) }}</span>
             </el-col>
           </el-col>
         </el-col>
@@ -21,9 +21,10 @@
 </template>
 
 <script>
+const moment = require('moment');
 import { mapState, createNamespacedHelpers } from 'vuex';
 export default {
-  name: 'model-3',
+  name: 'model-4',
   props: {
     list: { type: Array, default: () => [] },
   },
@@ -36,6 +37,10 @@ export default {
     detail(id) {
       this.$router.push({ path: './list', query: { index: this.index, id } });
     },
+    getDate(date) {
+      let newDate = moment(date).format('YYYY-MM-DD');
+      if (newDate) return newDate;
+    },
   },
   computed: {
     ...mapState(['user']),

+ 0 - 91
src/views/market/list-model/model-4.vue

@@ -1,91 +0,0 @@
-<template>
-  <div id="model-4">
-    <el-row>
-      <el-col :span="24" class="main">
-        <el-col :span="24" class="list" v-for="(item, index) in list" :key="index" @click.native="detail(item.id)">
-          <el-col :span="24" class="title textOver">
-            {{ item.name }}
-          </el-col>
-          <el-col :span="24" class="other">
-            <el-col :span="12" class="text textOver">
-              所属领域:<span>{{ item.field }}</span>
-            </el-col>
-            <el-col :span="12" class="text textOver">
-              发布时间:<span>{{ getDate(item.meta.createdAt) }}</span>
-            </el-col>
-          </el-col>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-const moment = require('moment');
-import { mapState, createNamespacedHelpers } from 'vuex';
-export default {
-  name: 'model-4',
-  props: {
-    list: { type: Array, default: () => [] },
-  },
-  components: {},
-  data: function () {
-    return {};
-  },
-  created() {},
-  methods: {
-    detail(id) {
-      this.$router.push({ path: './list', query: { index: this.index, id } });
-    },
-    getDate(date) {
-      let newDate = moment(date).format('YYYY-MM-DD');
-      if (newDate) return newDate;
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-    index() {
-      return parseInt(this.$route.query.index) || 0;
-    },
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-  watch: {
-    test: {
-      deep: true,
-      immediate: true,
-      handler(val) {},
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.main {
-  .list {
-    padding: 12px 10px;
-    border-bottom: 1px solid #ccc;
-    .title {
-      font-size: 16px;
-      margin: 0 0 5px 0;
-    }
-    .other {
-      .text {
-        font-size: 14px;
-        color: #666;
-        span {
-          color: #000;
-        }
-      }
-    }
-  }
-  .list:hover {
-    cursor: pointer;
-    .title {
-      color: #409eff;
-      font-weight: bold;
-    }
-  }
-}
-</style>

+ 0 - 91
src/views/market/list-model/model-5.vue

@@ -1,91 +0,0 @@
-<template>
-  <div id="model-4">
-    <el-row>
-      <el-col :span="24" class="main">
-        <el-col :span="24" class="list" v-for="(item, index) in list" :key="index" @click.native="detail(item.id)">
-          <el-col :span="24" class="title textOver">
-            {{ item.name }}
-          </el-col>
-          <el-col :span="24" class="other">
-            <el-col :span="12" class="text textOver">
-              信息属性:<span>{{ item.messattribute }}</span>
-            </el-col>
-            <el-col :span="12" class="text textOver">
-              发布时间:<span>{{ getDate(item.meta.createdAt) }}</span>
-            </el-col>
-          </el-col>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-const moment = require('moment');
-import { mapState, createNamespacedHelpers } from 'vuex';
-export default {
-  name: 'model-4',
-  props: {
-    list: { type: Array, default: () => [] },
-  },
-  components: {},
-  data: function () {
-    return {};
-  },
-  created() {},
-  methods: {
-    detail(id) {
-      this.$router.push({ path: './list', query: { index: this.index, id } });
-    },
-    getDate(date) {
-      let newDate = moment(date).format('YYYY-MM-DD');
-      if (newDate) return newDate;
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-    index() {
-      return parseInt(this.$route.query.index) || 0;
-    },
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-  watch: {
-    test: {
-      deep: true,
-      immediate: true,
-      handler(val) {},
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.main {
-  .list {
-    padding: 12px 10px;
-    border-bottom: 1px solid #ccc;
-    .title {
-      font-size: 16px;
-      margin: 0 0 5px 0;
-    }
-    .other {
-      .text {
-        font-size: 14px;
-        color: #666;
-        span {
-          color: #000;
-        }
-      }
-    }
-  }
-  .list:hover {
-    cursor: pointer;
-    .title {
-      color: #409eff;
-      font-weight: bold;
-    }
-  }
-}
-</style>

+ 1 - 5
src/views/market/list.vue

@@ -30,8 +30,6 @@ export default {
     kjcg: () => import('./list/kjcg.vue'),
     zlxx: () => import('./list/zlxx.vue'),
     zjzk: () => import('./list/zjzk.vue'),
-    xmlu: () => import('./list/xmlu.vue'),
-    jxxq: () => import('./list/jxxq.vue'),
     swfw: () => import('./list/swfw.vue'),
   },
   data: function () {
@@ -40,9 +38,7 @@ export default {
         { name: '科技成果', component: 'kjcg', options: { useTab: false, listModel: 0 } },
         { name: '专利信息', component: 'zlxx', options: { useTab: false, listModel: 1 } },
         { name: '专家智库', component: 'zjzk', options: { useTab: false, listModel: 2 } },
-        { name: '项目路演', component: 'xmlu', options: { useTab: false, listModel: 3 } },
-        { name: '技术需求', component: 'jxxq', options: { useTab: false, listModel: 4 } },
-        { name: '商务服务', component: 'swfw', options: { useTab: false, listModel: 5 } },
+        { name: '商务服务', component: 'swfw', options: { useTab: false, listModel: 3 } },
       ],
       component: '',
       params: {},

+ 0 - 81
src/views/market/list/jxxq.vue

@@ -1,81 +0,0 @@
-<template>
-  <div id="jxxq">
-    <list-page v-bind="$attrs" :total="total" v-if="!id" @toSearch="search" :pageSize="pageSize">
-      <component :is="model" :list="list"></component>
-    </list-page>
-    <template v-else>
-      <dmodel :data="detail" v-if="detail">
-        <el-button size="mini" type="primary" @click="$router.push({ path: './list', query: { index: $route.query.index } })"> 返回</el-button>
-      </dmodel>
-    </template>
-  </div>
-</template>
-
-<script>
-const _ = require('lodash');
-import listPage from '@c/list/list-page.vue';
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: product } = createNamespacedHelpers('product');
-export default {
-  name: 'jxxq',
-  props: ['listModel'],
-  components: {
-    listPage,
-    model4: () => import('../list-model/model-4.vue'),
-    dmodel: () => import('../detail-model/model-4.vue'),
-  },
-  data: function () {
-    return {
-      // 列表
-      list: [],
-      total: 0,
-      pageSize: 7,
-      // 详情
-      detail: {},
-    };
-  },
-  created() {
-    this.search();
-  },
-  methods: {
-    ...product(['query', 'fetch']),
-    async search({ skip = 0, limit = this.pageSize, ...info } = {}) {
-      let res = await this.query({ skip, limit, type: 0, ...info });
-      if (this.$checkRes(res)) {
-        this.$set(this, `list`, res.data);
-        this.$set(this, `total`, res.total);
-      }
-    },
-    // 查询详情
-    async searchInfo() {
-      let res = await this.fetch(this.id);
-      if (this.$checkRes(res)) {
-        this.$set(this, `detail`, res.data);
-      }
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-    model() {
-      const moduleNumber = this.listModel || 0;
-      return `model${moduleNumber}`;
-    },
-    id() {
-      return this.$route.query.id;
-    },
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-  watch: {
-    id: {
-      handler(ne) {
-        if (ne) this.searchInfo();
-      },
-      immediate: true,
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped></style>

+ 2 - 2
src/views/market/list/swfw.vue

@@ -21,8 +21,8 @@ export default {
   props: ['listModel'],
   components: {
     listPage,
-    model5: () => import('../list-model/model-5.vue'),
-    dmodel: () => import('../detail-model/model-5.vue'),
+    model3: () => import('../list-model/model-3.vue'),
+    dmodel: () => import('../detail-model/model-3.vue'),
   },
   data: function () {
     return {

+ 0 - 81
src/views/market/list/xmlu.vue

@@ -1,81 +0,0 @@
-<template>
-  <div id="xmlu">
-    <list-page v-bind="$attrs" :total="total" v-if="!id" @toSearch="search" :pageSize="pageSize" searchModel="title">
-      <component :is="model" :list="list"></component>
-    </list-page>
-    <template v-else>
-      <dmodel :data="detail" v-if="detail">
-        <el-button size="mini" type="primary" @click="$router.push({ path: './list', query: { index: $route.query.index } })"> 返回</el-button>
-      </dmodel>
-    </template>
-  </div>
-</template>
-
-<script>
-const _ = require('lodash');
-import listPage from '@c/list/list-page.vue';
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: roadShow } = createNamespacedHelpers('roadShow');
-export default {
-  name: 'xmlu',
-  props: ['listModel'],
-  components: {
-    listPage,
-    model3: () => import('../list-model/model-3.vue'),
-    dmodel: () => import('../detail-model/model-3.vue'),
-  },
-  data: function () {
-    return {
-      // 列表
-      list: [],
-      total: 0,
-      pageSize: 7,
-      // 详情
-      detail: {},
-    };
-  },
-  created() {
-    this.search();
-  },
-  methods: {
-    ...roadShow(['query', 'fetch']),
-    async search({ skip = 0, limit = this.pageSize, ...info } = {}) {
-      let res = await this.query({ skip, limit, ...info });
-      if (this.$checkRes(res)) {
-        this.$set(this, `list`, res.data);
-        this.$set(this, `total`, res.total);
-      }
-    },
-    // 查询详情
-    async searchInfo() {
-      let res = await this.fetch(this.id);
-      if (this.$checkRes(res)) {
-        this.$set(this, `detail`, res.data);
-      }
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-    model() {
-      const moduleNumber = this.listModel || 0;
-      return `model${moduleNumber}`;
-    },
-    id() {
-      return this.$route.query.id;
-    },
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-  watch: {
-    id: {
-      handler(ne) {
-        if (ne) this.searchInfo();
-      },
-      immediate: true,
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped></style>

+ 1 - 30
src/views/market/parts/list.vue

@@ -44,36 +44,7 @@
             </el-col>
           </el-col>
         </el-col>
-        <el-col :span="24" class="one four" v-else-if="type == '4'">
-          <el-col :span="24" class="fourList" v-for="(item, index) in list" :key="index" @click.native="detailBtn(item.id, '3')">
-            <el-col :span="24" class="top">
-              <el-col :span="19" class="title textOver">
-                {{ item.title }}
-              </el-col>
-              <el-col :span="5" class="date">
-                <span>{{ item.publish_time || '暂无' }}</span>
-              </el-col>
-            </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'">
-          <el-col :span="24" class="fiveList" v-for="(item, index) in list" :key="index" @click.native="detailBtn(item.id, '4')">
-            <el-col :span="24" class="top">
-              <el-col :span="19" class="title textOver">
-                {{ item.name }}
-              </el-col>
-              <el-col :span="5" class="date">
-                <span>{{ getDate(item.create_time) || '暂无' }}</span>
-              </el-col>
-            </el-col>
-            <el-col :span="24" class="down">
-              <el-col :span="12" class="textOver"> 所属领域:{{ item.filed }} </el-col>
-              <el-col :span="12" class="textOver"> 合作方式:{{ item.cooperation }} </el-col>
-            </el-col>
-          </el-col>
-        </el-col>
-        <el-col :span="24" class="one six" v-else-if="type == '6'">
+        <el-col :span="24" class="one six" v-else-if="type == '4'">
           <el-col :span="24" class="sixList" v-for="(item, index) in list" :key="index" @click.native="detailBtn(item.id, '5')">
             <el-col :span="10" class="name textOver">
               {{ item.name }}