1

src/store/index.js

@@ -17,11 +17,11 @@ import expert from '@common/src/store/expert';
 // 产品
 import product from '@common/src/store/product';
 // 展会
-import dock from '@common/src/store/dock';
+import dock from '@common/src/store/dock/dock';
 // 培训问诊
 import trainLive from '@common/src/store/trainLive';
 // 交易备案
-import transaction from '@common/src/store/transaction';
+import dockTranscation from '@common/src/store/dock/dockTranscation';
 // 科技频道
 import channel from '@common/src/store/channel';
 // 技术新闻
@@ -67,7 +67,7 @@ export default new Vuex.Store({
     news,
     roadShow,
     interview,
-    transaction,
+    dockTranscation,
     notice,
     science,
     patent,

src/views/live/detail.vue

@@ -33,8 +33,8 @@
                   <el-option v-for="item in provinceList" :key="item.code" :label="item.name" :value="item.code"> </el-option>
                 </el-select>
               </template>
-              <template v-else-if="item.model == 'place'">
-                <el-select v-model="form.place" placeholder="请选择市区" filterable clearable>
+              <template v-else-if="item.model == 'city'">
+                <el-select v-model="form.city" placeholder="请选择市区" filterable clearable>
                   <el-option v-for="item in placeList" :key="item.code" :label="item.name" :value="item.code"> </el-option>
                 </el-select>
               </template>
@@ -68,8 +68,8 @@ export default {
         { label: '开始时间', model: 'start_time', custom: true },
         { label: '结束时间', model: 'end_time', custom: true },
         { label: '省份', model: 'province', custom: true },
-        { label: '市区', model: 'place', custom: true },
-        { label: '负责人', model: 'adminuser' },
+        { label: '市区', model: 'city', custom: true },
+        { label: '负责人', model: 'admin' },
         { label: '联系电话', model: 'phone' },
         { label: '主办方', model: 'sponsor' },
         { label: '承办方', model: 'organizer' },
@@ -80,8 +80,8 @@ export default {
         start_time: [{ required: true, message: '请选择开始时间' }],
         end_time: [{ required: true, message: '请选择结束时间' }],
         province: [{ required: true, message: '请选择省份' }],
-        place: [{ required: true, message: '请选择市区' }],
-        adminuser: [{ required: true, message: '请输入负责人' }],
+        city: [{ required: true, message: '请选择市区' }],
+        admin: [{ required: true, message: '请输入负责人' }],
         phone: [{ required: true, message: '请输入联系电话' }],
         sponsor: [{ required: true, message: '请输入主办方' }],
         organizer: [{ required: true, message: '请输入承办方' }],
@@ -119,6 +119,7 @@ export default {
           this.back();
         }
       } else {
+        data.user_id = this.user.id;
         let res = await this.create(data);
         if (this.$checkRes(res)) {
           this.$alert(`房间号：${res.data.room_id}；` + `手机号：${res.data.phone}；` + `密码：${res.data.password.secret}；`, '成功', {

src/views/live/index.vue

@@ -40,8 +40,8 @@ export default {
       ],
       fields: [
         { label: '房间号', prop: 'room_id', filter: 'input' },
-        { label: '展会标题', prop: 'title', filter: 'input' },
-        { label: '负责人', prop: 'adminuser' },
+        { label: '标题', prop: 'title', filter: 'input' },
+        { label: '负责人', prop: 'admin' },
         { label: '联系电话', prop: 'phone' },
         { label: '开始时间', prop: 'start_time' },
         { label: '结束时间', prop: 'end_time' },
@@ -64,6 +64,7 @@ export default {
     ...dock(['query', 'delete']),
     // 查询列表
     async search({ skip = 0, limit = 10, ...info } = {}) {
+      info.user_id = this.user.id;
       let res = await this.query({ skip, limit, ...info });
       if (this.$checkRes(res)) {
         this.$set(this, `list`, res.data);

src/views/news/index.vue

@@ -104,6 +104,8 @@ export default {
         { name: '工作动态', site: 'gzdt' },
         { name: '通知通告', site: 'tgtg' },
         { name: '技术前沿', site: 'jsqy' },
+        { name: '政策解读', site: 'zcjd' },
+        { name: '科技培训', site: 'kjpx' },
       ],
       // 信息列表
       newsopera: [

src/views/transaction/index.vue

@@ -29,7 +29,7 @@
 import dataTable from '@common/src/components/frame/filter-page-table.vue';
 import dataForm from '@common/src/components/frame/form.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: transaction } = createNamespacedHelpers('transaction');
+const { mapActions: dockTranscation } = createNamespacedHelpers('dockTranscation');
 export default {
   metaInfo() {
     return { title: this.$route.meta.title };
@@ -52,16 +52,21 @@ export default {
         },
       ],
       fields: [
-        { label: '产品名称', prop: 'product', filter: 'input', showTip: true },
-        { label: '供给者姓名', prop: 's_name', showTip: true },
+        { label: '产品名称', prop: 'product.name' },
+        { label: '供给者姓名', prop: 's_name', showTip: true, filter: 'input' },
         { label: '供给者电话', prop: 's_phone', showTip: true },
-        { label: '需求者姓名', prop: 'd_name', showTip: true },
+        { label: '需求者姓名', prop: 'd_name', showTip: true, filter: 'input' },
         { label: '需求者电话', prop: 'd_phone', showTip: true },
         {
           label: '交易状态',
           prop: 'status',
-          format: item => {
-            return item === '0' ? '正在洽谈' : item === '1' ? '达成意向' : item === '2' ? '交易备案' : item === '3' ? '交易完成' : '交易失败';
+          format: i => {
+            let word = '正在洽谈';
+            if (i == '1') word = '达成意向';
+            else if (i == '2') word = '交易备案';
+            else if (i == '3') word = '交易完成';
+            else if (i == '4') word = '交易失败';
+            return word;
           },
         },
       ],
@@ -83,7 +88,7 @@ export default {
     await this.search();
   },
   methods: {
-    ...transaction(['query', 'step']),
+    ...dockTranscation(['query', 'update']),
     // 查询列表
     async search({ skip = 0, limit = 10, ...info } = {}) {
       let res = await this.query({ skip, limit, ...info });
@@ -104,7 +109,7 @@ export default {
         status: data.status,
         id: this.form.id,
       };
-      let res = await this.step(newData);
+      let res = await this.update(newData);
       if (this.$checkRes(res)) {
         this.$message({
           message: '信息审核成功',