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

src/components/pages.vue

@@ -7,7 +7,14 @@
             跟帖<span class="gentie">{{ total }}</span></span
           >
           <span
-            ><el-pagination background layout=" total, prev, pager, next" :page-size="limit" :current-page.sync="currentPage" @current-change="changePage">
+            ><el-pagination
+              background
+              layout="prev, pager, next"
+              :total="total"
+              :page-size="limit"
+              :current-page.sync="currentPage"
+              @current-change="changePage"
+            >
             </el-pagination
           ></span>
         </p>
@@ -25,7 +32,6 @@ import _ from 'lodash';
 export default {
   name: 'pagination',
   props: {
- 
     position: { type: String, default: 'right' },
     total: { type: Number, default: 0 },
     limit: { type: Number, default: 10 },
@@ -51,7 +57,7 @@ export default {
 
 <style lang="less" scoped>
 .newpage {
-  width: 92%;
+  width: 86%;
   float: left;
 }
 .gentie {

src/views/dynamic/dealDetail.vue

@@ -39,9 +39,7 @@
                       </el-col>
                     </el-col>
                     <el-col :span="24" class="btn">
-                      <el-button @click.native="$router.push({ path: '/live/hall/dock/dockDetail', query: { id: dealDetails.product_id } })"
-                        >我要对接</el-button
-                      >
+                      <el-button @click.native="onclick()">我要对接</el-button>
                     </el-col>
                   </el-col>
                 </el-col>
@@ -64,6 +62,7 @@
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: transaction } = createNamespacedHelpers('transaction');
+const { mapActions: product } = createNamespacedHelpers('enterpriseproject');
 export default {
   name: 'dealDetail',
   props: {},
@@ -83,12 +82,27 @@ export default {
   },
   methods: {
     ...transaction(['fetch']),
+    ...product({ list: 'newquery', newfetch: 'newfetch' }),
     async search() {
       let res = await this.fetch(this.id);
       res.data.status = parseInt(res.data.status);
       res.data.status = res.data.status + 1;
       this.$set(this, `dealDetails`, res.data);
     },
+
+    async onclick() {
+      console.log(this.dealDetails.product_id);
+      const res = await this.newfetch(this.dealDetails.product_id);
+      let id = this.dealDetails.product_id;
+      console.log(res.data.totaltype);
+      if (res.data.totaltype == '0') {
+        this.$router.push({ path: '/market/marketlists', query: { totaltype: 0, id: id, column_name: '技术供求', display: 2 } });
+      } else if (res.data.totaltype == '1') {
+        this.$router.push({ path: '/market/marketlists', query: { totaltype: 1, id: id, column_name: '科技产品', display: 2 } });
+      } else if (res.data.totaltype == '2') {
+        this.$router.push({ path: '/market/marketlists', query: { totaltype: 2, id: id, display: 2, column_name: '科技产品' } });
+      }
+    },
   },
   filters: {
     getDate(meta) {

src/views/market/index.vue

@@ -223,7 +223,7 @@ export default {
       this.$router.push({ path: '/market/marketlists', query: { totaltype: 1, column_name: '科技产品', display: 1 } });
     },
     productDetail(id) {
-      this.$router.push({ path: '/market/marketlists', query: { totaltype: 2, id: id, display: 2, column_name: '科技产品' } });
+      this.$router.push({ path: '/market/marketlists', query: { totaltype: 1, id: id, display: 2, column_name: '科技产品' } });
     },
     toTecList() {
       this.$router.push({ path: '/market/marketlists', query: { totaltype: 0, column_name: '技术供求', display: 1 } });

src/views/market/marketlists.vue

@@ -17,7 +17,7 @@
             <el-col class="infoLeftList" :span="24" v-for="(item, index) in zhuantiList" :key="index">
               <p>{{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}</p>
               <p>
-                <span class="textOver" @click="clickshanpin(item.id)">{{ item.name }} </span>
+                <span class="textOver" @click="clickshanpin(item.id)">{{ item.name }} </span><span></span>
                 <span>{{ item.introduction }}</span>
               </p>
             </el-col>
@@ -286,6 +286,7 @@ export default {
       shenhe.product_id = this.detailInfo.userid;
       console.log(shenhe);
       let ress = await this.tranauditcreate(shenhe);
+      this.$router.push({ path: '/live/hall/dock/dockDetail', query: { id: this.detailInfo.id } });
     },
   },
 };
@@ -394,6 +395,7 @@ export default {
   float: left;
   width: 90%;
   font-size: 18px;
+  padding: 0 0 20px 0;
 }
 .infoLeftList p:last-child span:last-child {
   float: left;
@@ -460,8 +462,8 @@ export default {
   width: 100px;
   height: 100px;
   z-index: 999;
-  left: 30%;
-  top: 70%;
+  left: 2%;
+  top: 80%;
   border-radius: 20px;
   box-shadow: 2px 2px 2px #055c9f;
   text-align: center;