1

src/store/market/exportuser.js

@@ -4,6 +4,7 @@ import _ from 'lodash';
 Vue.use(Vuex);
 const api = {
   expertsuserInfo: `/api/market/expertsuser`,
+  indexqueryinfo: `/api/market/expertsuser/indexquery`,
 };
 const state = () => ({});
 const mutations = {};
@@ -17,6 +18,14 @@ const actions = {
     });
     return res;
   },
+  async expertquery({ commit }, { skip = 0, limit, ...info } = {}) {
+    const res = await this.$axios.$get(`${api.indexqueryinfo}`, {
+      skip,
+      limit,
+      ...info,
+    });
+    return res;
+  },
   async create({ commit }, payload) {
     const res = await this.$axios.$post(`${api.expertsuserInfo}`, payload);
     return res;

src/store/market/marketproduct.js

@@ -4,6 +4,7 @@ import _ from 'lodash';
 Vue.use(Vuex);
 const api = {
   newsInfo: `/api/market/product`,
+  indexqueryinfo: `/api/market/product/indexquery`,
 };
 const state = () => ({});
 const mutations = {};
@@ -17,6 +18,14 @@ const actions = {
     });
     return res;
   },
+  async marketquery({ commit }, { skip = 0, limit, ...info } = {}) {
+    const res = await this.$axios.$get(`${api.indexqueryinfo}`, {
+      skip,
+      limit,
+      ...info,
+    });
+    return res;
+  },
   async newquery({ commit }, { skip = 0, limit, ...info } = {}) {
     const res = await this.$axios.$get(`${api.newsInfo}/newquery`, {
       skip,

src/views/market/index.vue

@@ -19,7 +19,7 @@
               <el-col :span="24" class="leftDown">
                 <el-row :gutter="7">
                   <el-col
-                    :span="6"
+                    :span="8"
                     class="achieveList"
                     v-for="(item, index) in achieveList"
                     :key="index"
@@ -28,7 +28,6 @@
                     <el-col :span="24" class="achieveImage">
                       <el-image v-if="item.image && item.image.length > 0" :src="item.image[0].url"></el-image>
                       <el-image v-else :src="achievezb"></el-image>
-                      <!-- <el-col :span="24" class="name">{{item.}}</el-col> -->
                       <el-col :span="24" class="name textOver aName">
                         {{ item.name }}
                       </el-col>
@@ -38,9 +37,6 @@
                         <el-col :span="24" class="a-contacts">联系人：{{ item.contacts }}</el-col>
                       </el-col>
                     </el-col>
-                    <!-- <el-col :span="24" class="name textOver aName">
-                      {{ item.name }}
-                    </el-col> -->
                   </el-col>
                 </el-row>
               </el-col>
@@ -154,7 +150,7 @@
         </el-col>
       </el-col>
     </el-row>
-    <el-col :span="24" class="createpro" style="display:none">
+    <el-col :span="24" class="createpro" style="display:none;">
       <el-button type="text" @click="dialog = true">我要<br />发布</el-button>
     </el-col>
     <el-dialog :visible.sync="dialog" class="releaseDialog" title="信息征集" @close="toClose" width="61%">
@@ -177,7 +173,7 @@
                   </el-col>
                   <el-col :span="12" class="txt">
                     <el-form-item label="统一社会信用代码：">
-                      <el-input v-model="technologyForm.companytype" placeholder="请输入统一社会信用代码"></el-input>
+                      <el-input v-model="technologyForm.zzjgdm" placeholder="请输入统一社会信用代码"></el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12" class="txt">
@@ -578,41 +574,7 @@ export default {
       achievezb: require('@/assets/3.png'),
       expertimage: require('@/assets/live/222.png'),
       // 成果
-      achieveList: [
-        // {
-        //   achievebrief: '1',
-        //   achieveown: '权属',
-        //   achievesource: '国家项目',
-        //   achievestatus: '原理样机',
-        //   company: '高新技术企业',
-        //   condition: '1',
-        //   contacts: '高新技术企业',
-        //   cooperation: '合作开发',
-        //   expectations: '1',
-        //   features: '1',
-        //   field: '电子信息技术',
-        //   id: '5f72a7f78ee21ce51c076da7',
-        //   image: [
-        //     {
-        //       url: '/files/image/20200929112017.jpg',
-        //       _id: '5f72a7f78ee21ce51c076dab',
-        //     },
-        //     {
-        //       url: '/files/image/20200929112021.jpg',
-        //       _id: '5f72a7f78ee21ce51c076daa',
-        //     },
-        //   ],
-        //   intentionprice: '123',
-        //   name: '测试专利信息',
-        //   phone: '18000000008',
-        //   qqwx: '12345678',
-        //   roadshow: '/files/roadshow/20200929112010.xlsx',
-        //   status: '1',
-        //   team: '1',
-        //   type: '1',
-        //   userid: '5f7043b5114497e1d0bb452a',
-        // },
-      ],
+      achieveList: [],
       // 技术
       technologyList: [],
       // 商务信息
@@ -645,16 +607,16 @@ export default {
   },
   methods: {
     ...markettype({ markettypeList: 'query' }),
-    ...product({ newquery: 'newquery', productCreate: 'create' }),
-    ...expertsuser({ expertQuery: 'query' }),
+    ...product({ newquery: 'newquery', productCreate: 'create', marketquery: 'marketquery' }),
+    ...expertsuser({ expertQuery: 'query', expertquery: 'expertquery' }),
     async search() {
-      let res = await this.newquery({ skip: 0, limit: 8, type: '1', status: '1' });
+      let res = await this.marketquery({ skip: 0, limit: 6, type: '1', status: '1' });
       if (this.$checkRes(res)) this.$set(this, `achieveList`, res.data);
-      res = await this.newquery({ skip: 0, limit: 6, type: '0', status: '1' });
+      res = await this.marketquery({ skip: 0, limit: 6, type: '0', status: '1' });
       if (this.$checkRes(res)) this.$set(this, `technologyList`, res.data);
-      res = await this.newquery({ skip: 0, limit: 5, type: '2', status: '1' });
+      res = await this.marketquery({ skip: 0, limit: 5, type: '2', status: '1' });
       if (this.$checkRes(res)) this.$set(this, `businessList`, res.data);
-      res = await this.expertQuery({ skip: 0, limit: 6 });
+      res = await this.expertquery({ skip: 0, limit: 6 });
       if (this.$checkRes(res)) this.$set(this, `expertList`, res.data);
     },
     // 未注册用户添加产品
@@ -832,17 +794,6 @@ export default {
             -webkit-box-orient: vertical;
             transform: scale(0.8);
           }
-          // .a-brief::after {
-          //   content: '...';
-          //   position: absolute;
-          //   bottom: 2px;
-          //   right: 15px;
-          //   padding-left: 20px;
-          //   background: -webkit-linear-gradient(left, transparent, #fff 55%);
-          //   background: -o-linear-gradient(left, transparent, #fff 55%);
-          //   background: -moz-linear-gradient(left, transparent, #fff 55%);
-          //   background: linear-gradient(left, transparent, #fff 55%);
-          // }
           .cont {
             position: absolute;
             left: 0px;
@@ -855,55 +806,13 @@ export default {
             }
           }
         }
-        // .name {
-        //   color: #fff;
-        //   width: 100%;
-        //   transform: translateY(-50%) scale(0);
-        //   position: absolute;
-        //   top: 50%;
-        //   left: 0;
-        //   height: 40px;
-        //   text-align: center;
-        //   line-height: 40px;
-        //   font-size: 16px;
-        //   z-index: 200;
-        //   transition: all 0.4s linear;
-        // }
       }
       .achieveList:hover {
         cursor: pointer;
-        // .name {
-        //   color: #0085d2;
-        //   font-weight: bold;
-        // }
       }
       .achieveList::before {
         content: '';
-        // background: linear-gradient(to left top, #e6e6fa, #b0c4de);
-        // background: #ccc;
-        // height: 100%;
-        // width: 100%;
-        // opacity: 0;
-        // position: absolute;
-        // z-index: 100;
-        // left: 0;
-        // top: 0;
-        // transition: all 0.4s linear;
       }
-      // .achieveList:hover::before {
-      //   opacity: 0.4;
-      // }
-      // .achieveList:hover {
-      //   // box-shadow: 3px 12px 15px rgba(0, 0, 0, 0.4);
-      //   box-shadow: 3px 5px 6px rgba(0, 0, 0, 0.5);
-      // }
-      // .achieveList:hover .achieveImage .el-image {
-      //   transform: scale(1.2);
-      // }
-      // .achieveList:hover .name {
-      //   transform: translateY(-50%) scale(1);
-      //   font-weight: bolder;
-      // }
     }
   }
   .right {

src/views/market/list/achieve.vue

@@ -2,6 +2,16 @@
   <div id="achieve">
     <el-row>
       <el-col :span="24" class="main">
+        <el-col :span="24" class="listTop">
+          <el-col :span="12" class="columnname">
+            <span>|</span> <span>{{ column_name }}</span>
+          </el-col>
+          <el-col :span="12" class="search">
+            <el-input placeholder="请输入名称" v-model="infoName" class="input-with-select">
+              <el-button slot="append" icon="el-icon-search"></el-button>
+            </el-input>
+          </el-col>
+        </el-col>
         <el-col :span="24" class="list" v-for="(item, index) in list" :key="index">
           <el-col :span="21" class="name" @click.native="clickDetail(item.id)">
             {{ item.name }}
@@ -33,6 +43,7 @@ export default {
   props: {
     achieveList: { type: Array },
     total: { type: Number },
+    column_name: null,
   },
   components: {},
   data: function() {
@@ -41,6 +52,7 @@ export default {
       pageSize: 5, //每页显示数据数量
       origin: [], //分割数据
       list: [], //显示数据列表
+      infoName: '',
     };
   },
   created() {},
@@ -126,6 +138,23 @@ export default {
       color: #0085d2;
     }
   }
+  .listTop {
+    height: 49px;
+    line-height: 49px;
+    border-bottom: 1px solid #ccc;
+    .columnname {
+      span:first-child {
+        color: #22529a;
+        font-weight: bold;
+        font-size: 25px;
+      }
+      span:last-child {
+        color: #22529a;
+        font-size: 20px;
+        font-weight: bold;
+      }
+    }
+  }
 }
 .page {
   text-align: center;

src/views/market/list/business.vue

@@ -2,6 +2,16 @@
   <div id="business">
     <el-row>
       <el-col :span="24" class="main">
+        <el-col :span="24" class="listTop">
+          <el-col :span="12" class="columnname">
+            <span>|</span> <span>{{ column_name }}</span>
+          </el-col>
+          <el-col :span="12" class="search">
+            <el-input placeholder="请输入名称" v-model="infoName" class="input-with-select">
+              <el-button slot="append" icon="el-icon-search"></el-button>
+            </el-input>
+          </el-col>
+        </el-col>
         <el-col :span="24" class="list" v-for="(item, index) in list" :key="index">
           <el-col :span="15" class="name textOver" @click.native="clickDetail(item.id)">
             {{ item.name }}
@@ -33,6 +43,7 @@ export default {
   props: {
     businessList: { type: Array },
     total: { type: Number },
+    column_name: null,
   },
   components: {},
   data: function() {
@@ -41,6 +52,7 @@ export default {
       pageSize: 10, //每页显示数据数量
       origin: [], //分割数据
       list: [], //显示数据列表
+      infoName: '',
     };
   },
   created() {},
@@ -121,6 +133,23 @@ export default {
       color: #0085d2;
     }
   }
+  .listTop {
+    height: 49px;
+    line-height: 49px;
+    border-bottom: 1px solid #ccc;
+    .columnname {
+      span:first-child {
+        color: #22529a;
+        font-weight: bold;
+        font-size: 25px;
+      }
+      span:last-child {
+        color: #22529a;
+        font-size: 20px;
+        font-weight: bold;
+      }
+    }
+  }
 }
 .page {
   text-align: center;

src/views/market/list/expert.vue

@@ -2,6 +2,16 @@
   <div id="expert">
     <el-row>
       <el-col :span="24" class="main">
+        <el-col :span="24" class="listTop">
+          <el-col :span="12" class="columnname">
+            <span>|</span> <span>{{ column_name }}</span>
+          </el-col>
+          <el-col :span="12" class="search">
+            <el-input placeholder="请输入名称" v-model="infoName" class="input-with-select">
+              <el-button slot="append" icon="el-icon-search"></el-button>
+            </el-input>
+          </el-col>
+        </el-col>
         <el-col :span="24" class="list" v-for="(item, index) in list" :key="index">
           <el-col :span="21" class="name" @click.native="clickDetail(item.id)">
             {{ item.name }}
@@ -36,6 +46,7 @@ export default {
   props: {
     expertList: { type: Array },
     total: { type: Number },
+    column_name: null,
   },
   components: {},
   data: function() {
@@ -44,6 +55,7 @@ export default {
       pageSize: 6, //每页显示数据数量
       origin: [], //分割数据
       list: [], //显示数据列表
+      infoName: '',
     };
   },
   created() {},
@@ -122,6 +134,23 @@ export default {
       color: #0085d2;
     }
   }
+  .listTop {
+    height: 49px;
+    line-height: 49px;
+    border-bottom: 1px solid #ccc;
+    .columnname {
+      span:first-child {
+        color: #22529a;
+        font-weight: bold;
+        font-size: 25px;
+      }
+      span:last-child {
+        color: #22529a;
+        font-size: 20px;
+        font-weight: bold;
+      }
+    }
+  }
 }
 .page {
   text-align: center;

src/views/market/list/technology.vue

@@ -2,6 +2,16 @@
   <div id="technology">
     <el-row>
       <el-col :span="24" class="main">
+        <el-col :span="24" class="listTop">
+          <el-col :span="12" class="columnname">
+            <span>|</span> <span>{{ column_name }}</span>
+          </el-col>
+          <el-col :span="12" class="search">
+            <el-input placeholder="请输入名称" v-model="infoName" class="input-with-select">
+              <el-button slot="append" icon="el-icon-search"></el-button>
+            </el-input>
+          </el-col>
+        </el-col>
         <el-col :span="24" class="list" v-for="(item, index) in list" :key="index">
           <el-col :span="15" class="name textOver" @click.native="clickDetail(item.id)">
             {{ item.name }}
@@ -33,6 +43,7 @@ export default {
   props: {
     technologyList: { type: Array },
     total: { type: Number },
+    column_name: null,
   },
   components: {},
   data: function() {
@@ -41,6 +52,7 @@ export default {
       pageSize: 10, //每页显示数据数量
       origin: [], //分割数据
       list: [], //显示数据列表
+      infoName: '',
     };
   },
   created() {},
@@ -121,6 +133,23 @@ export default {
       color: #0085d2;
     }
   }
+  .listTop {
+    height: 49px;
+    line-height: 49px;
+    border-bottom: 1px solid #ccc;
+    .columnname {
+      span:first-child {
+        color: #22529a;
+        font-weight: bold;
+        font-size: 25px;
+      }
+      span:last-child {
+        color: #22529a;
+        font-size: 20px;
+        font-weight: bold;
+      }
+    }
+  }
 }
 .page {
   text-align: center;

src/views/market/marketlists.vue

@@ -12,28 +12,18 @@
           </el-col>
           <el-col :span="18" class="listInfo">
             <span v-if="display == 'list'">
-              <el-col :span="24" class="listTop">
-                <el-col :span="12" class="columnname">
-                  <span>|</span> <span>{{ column_name }}</span>
-                </el-col>
-                <el-col :span="12" class="search">
-                  <el-input placeholder="请输入名称" v-model="infoName" class="input-with-select">
-                    <el-button slot="append" icon="el-icon-search"></el-button>
-                  </el-input>
-                </el-col>
-              </el-col>
               <el-col :span="24" class="listDown">
                 <span v-if="column_name == '科技需求'">
-                  <technology :technologyList="technologyList" :total="technologyTotal" @clickDetail="clickDetail"></technology>
+                  <technology :technologyList="technologyList" :column_name="column_name" :total="technologyTotal" @clickDetail="clickDetail"></technology>
                 </span>
                 <span v-else-if="column_name == '技术成果'">
-                  <achieve :achieveList="achieveList" :total="achieveTotal" @clickDetail="clickDetail"></achieve>
+                  <achieve :achieveList="achieveList" :column_name="column_name" :total="achieveTotal" @clickDetail="clickDetail"></achieve>
                 </span>
                 <span v-else-if="column_name == '商务信息'">
-                  <business :businessList="businessList" :total="businessTotal" @clickDetail="clickDetail"></business>
+                  <business :businessList="businessList" :column_name="column_name" :total="businessTotal" @clickDetail="clickDetail"></business>
                 </span>
                 <span v-else-if="column_name == '专家服务'">
-                  <expert :expertList="expertList" :total="expertTotal" @clickDetail="clickDetail"></expert>
+                  <expert :expertList="expertList" :column_name="column_name" :total="expertTotal" @clickDetail="clickDetail"></expert>
                 </span>
               </el-col>
             </span>
@@ -336,23 +326,6 @@ export default {
     overflow: hidden;
     box-shadow: 0 0 10px #2d64b3;
     padding: 10px;
-    .listTop {
-      height: 49px;
-      line-height: 49px;
-      border-bottom: 1px solid #ccc;
-      .columnname {
-        span:first-child {
-          color: #22529a;
-          font-weight: bold;
-          font-size: 25px;
-        }
-        span:last-child {
-          color: #22529a;
-          font-size: 20px;
-          font-weight: bold;
-        }
-      }
-    }
   }
 }
 </style>

src/views/notice/index.vue

@@ -41,7 +41,7 @@
                   </el-col>
                   <el-col :span="12" class="txt">
                     <el-form-item label="统一社会信用代码：">
-                      <el-input v-model="technologyForm.companytype" placeholder="请输入统一社会信用代码"></el-input>
+                      <el-input v-model="technologyForm.zzjgdm" placeholder="请输入统一社会信用代码"></el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12" class="txt">