Merge branch 'master' of http://git.cc-lotus.info/service-platform/web-test

src/views/dynamic/list.vue

@@ -15,9 +15,9 @@
           </el-col>
           <el-table :data="resultTable" stripe style="width: 96%" border>
             <el-table-column prop="time" label="时间"> </el-table-column>
-            <el-table-column prop="name" label="项目名称" show-overflow-tooltip="true"> </el-table-column>
-            <el-table-column prop="sell_unit" label="营销单位" show-overflow-tooltip="true"> </el-table-column>
-            <el-table-column prop="buy_unit" label="采购单位" show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="name" label="项目名称" :show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="sell_unit" label="营销单位" :show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="buy_unit" label="采购单位" :show-overflow-tooltip="true"> </el-table-column>
           </el-table>
         </el-col>
         <el-col v-if="menuIndex == '1'" class="leftInfo">
@@ -26,9 +26,9 @@
           </el-col>
           <el-table :data="willTable" stripe style="width: 96%" border>
             <el-table-column prop="time" label="时间"> </el-table-column>
-            <el-table-column prop="name" label="项目名称" show-overflow-tooltip="true"> </el-table-column>
-            <el-table-column prop="sell_unit" label="营销单位" show-overflow-tooltip="true"> </el-table-column>
-            <el-table-column prop="buy_unit" label="采购单位" show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="name" label="项目名称" :show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="sell_unit" label="营销单位" :show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="buy_unit" label="采购单位" :show-overflow-tooltip="true"> </el-table-column>
           </el-table>
         </el-col>
         <el-col v-if="menuIndex == '2'" class="leftInfo">
@@ -37,9 +37,9 @@
           </el-col>
           <el-table :data="cooperationTable" stripe style="width: 96%" border>
             <el-table-column prop="time" label="时间"> </el-table-column>
-            <el-table-column prop="name" label="项目名称" show-overflow-tooltip="true"> </el-table-column>
-            <el-table-column prop="sell_unit" label="营销单位" show-overflow-tooltip="true"> </el-table-column>
-            <el-table-column prop="buy_unit" label="采购单位" show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="name" label="项目名称" :show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="sell_unit" label="营销单位" :show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="buy_unit" label="采购单位" :show-overflow-tooltip="true"> </el-table-column>
           </el-table>
         </el-col>
         <el-col v-if="menuIndex == '3'" class="leftInfo">
@@ -48,9 +48,9 @@
           </el-col>
           <el-table :data="demandTable" stripe style="width: 96%" border>
             <el-table-column prop="time" label="时间"> </el-table-column>
-            <el-table-column prop="name" label="项目名称" show-overflow-tooltip="true"> </el-table-column>
-            <el-table-column prop="sell_unit" label="营销单位" show-overflow-tooltip="true"> </el-table-column>
-            <el-table-column prop="buy_unit" label="采购单位" show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="name" label="项目名称" :show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="sell_unit" label="营销单位" :show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="buy_unit" label="采购单位" :show-overflow-tooltip="true"> </el-table-column>
           </el-table>
         </el-col>
         <el-col class="page">

src/views/market/index.vue

@@ -82,28 +82,27 @@
               </el-col>
             </el-col>
           </el-col>
-
-          <el-col :span="24">
-            <el-col :span="24" class="downLeftTop">
-              <el-image :src="downLeftTopImage"></el-image>
-              <span class="topTexts">
-                <span>最新发布</span>
-                <span
-                  ><p>B</p>
-                  <p>anking</p></span
-                >
-                <span @click="fabu()">我要发布</span>
-              </span>
-              <el-col :span="24" class="downLeftInfos">
-                <el-col :span="12" class="bankingLists" v-for="(item, index) in serviceList" :key="index" @click.native="serviceDetail(item.id)">
-                  <el-col :span="10">
-                    <el-image :src="item.image[0].url"></el-image>
-                  </el-col>
-                  <el-col :span="12">
-                    <span class="textOvers">{{ item.name }}</span>
-                    <span>{{ item.introduction }}</span>
-                  </el-col>
-                </el-col>
+        </el-col>
+      </el-col>
+      <el-col :span="24" class="marketNew">
+        <el-col :span="24" class="downLeftTop">
+          <el-image :src="downLeftTopImage"></el-image>
+          <span class="topTexts">
+            <span>最新发布</span>
+            <span
+              ><p>N</p>
+              <p>ewing</p></span
+            >
+            <span @click="fabu()">我要发布</span>
+          </span>
+          <el-col :span="24" class="downLeftInfos">
+            <el-col :span="12" class="bankingLists" v-for="(item, index) in newList" :key="index" @click.native="productDetail(item.id)">
+              <el-col :span="10">
+                <el-image :src="item.image[0].url"></el-image>
+              </el-col>
+              <el-col :span="12">
+                <span class="textOvers">{{ item.name }}</span>
+                <span>{{ item.introduction }}</span>
               </el-col>
             </el-col>
           </el-col>
@@ -159,6 +158,8 @@ export default {
       },
     ],
     serviceList: [],
+    newList: [
+    ],
   }),
   created() {
     this.search();
@@ -182,6 +183,7 @@ export default {
       if (this.$checkRes(res)) this.$set(this, `tecList`, res.data);
       res = await this.query({ skip: 0, limit: 4, totaltype: '1' });
       if (this.$checkRes(res)) this.$set(this, `productList`, res.data);
+      if (this.$checkRes(res)) this.$set(this, `newList`, res.data);
       res = await this.query({ skip: 0, limit: 4, totaltype: '2' });
       if (this.$checkRes(res)) this.$set(this, `serviceList`, res.data);
       // res = await this.expertQuery({ skip: 0, limit: 4 });
@@ -384,7 +386,7 @@ export default {
   color: #044b79;
 }
 .marketDown {
-  height: 780px;
+  height: 550px;
   overflow: hidden;
   margin: 20px 0 20px 0;
   background: #e9edf6;
@@ -575,4 +577,13 @@ export default {
   text-overflow: ellipsis;
   display: inline-block;
 }
+.marketNew {
+  float: none;
+  width: 80%;
+  margin: 30px auto;
+  height: 400px;
+}
+.downLeftInfos {
+  height: 330px;
+}
 </style>