更新

src/layout/market/context.vue

@@ -176,11 +176,11 @@
           </el-col>
         </el-col>
         <el-col :span="24" class="anniu">
-          <el-button type="primary" @click="btnPhone()" v-if="this.user.uid != detailInfo.userid">对接聊天</el-button>
-          <el-button v-if="this.user.uid != detailInfo.userid" @click="onSubmit()" type="success">洽谈交易</el-button>
-          <!-- <el-button @click="onSubmit" type="success">对接聊天</el-button><el-button @click="onSubmit" type="primary">洽谈交易</el-button></el-col -->
+          <el-button type="primary" @click="btnPhone()" v-if="this.user.uid != detailInfo.userid">对接</el-button>
+          <el-button v-if="this.user.uid != detailInfo.userid" @click="onSubmit()" type="success">洽谈</el-button>
+          <!-- <el-button @click="onSubmit" type="success">对接</el-button><el-button @click="onSubmit" type="primary">洽谈</el-button></el-col -->
         </el-col>
-        <el-dialog title="对接聊天" :visible.sync="dialogTableVisible">
+        <el-dialog title="对接" :visible.sync="dialogTableVisible">
           <el-col :span="24" class="two">
             <chat :room="room"></chat>
           </el-col>

src/layout/market/zhuanjia.vue

@@ -47,11 +47,11 @@
           </el-button>
         </div>
         <el-col :span="24" class="anniu">
-          <el-button type="primary" @click="btnPhone()" v-if="this.user.uid != zhuanjiainfo.userid">对接聊天</el-button>
-          <el-button v-if="this.user.uid != zhuanjiainfo.userid" @click="zjsubmit()" type="success">洽谈交易</el-button>
+          <el-button type="primary" @click="btnPhone()" v-if="this.user.uid != zhuanjiainfo.userid">对接</el-button>
+          <el-button v-if="this.user.uid != zhuanjiainfo.userid" @click="zjsubmit()" type="success">洽谈</el-button>
         </el-col>
       </el-col>
-      <el-dialog title="对接聊天" :visible.sync="dialogTableVisible">
+      <el-dialog title="对接" :visible.sync="dialogTableVisible">
         <el-col :span="24" class="two">
           <chat :room="room"></chat>
         </el-col>

src/views/hall/dock/dockDetail.vue

@@ -162,15 +162,15 @@
                 <busiDetail :detailInfo="detailInfo" @onSubmit="onSubmit" :displayBtn="displayBtn"></busiDetail>
               </el-col>
               <!-- <el-col :span="24" class="anniu">
-                <el-button type="primary" size="mini" v-if="this.user.uid != detailInfo.userid" @click="btnPhone()">对接聊天</el-button>
-                <el-button type="success" size="mini" v-if="this.user.uid != detailInfo.userid" @click="onSubmit()">洽谈交易</el-button>
+                <el-button type="primary" size="mini" v-if="this.user.uid != detailInfo.userid" @click="btnPhone()">对接</el-button>
+                <el-button type="success" size="mini" v-if="this.user.uid != detailInfo.userid" @click="onSubmit()">洽谈</el-button>
               </el-col> -->
             </el-col>
           </div>
         </el-col>
       </el-col>
     </el-row>
-    <el-dialog title="对接聊天" :visible.sync="dialogTableVisible">
+    <el-dialog title="对接" :visible.sync="dialogTableVisible">
       <chat :room="room"></chat>
     </el-dialog>
   </div>
@@ -204,7 +204,7 @@ export default {
       dockInfo: {},
       //技术，产品，服务
       detailInfo: {},
-      // 对接聊天
+      // 对接
       dialogTableVisible: false,
       room: {},
       // 显示按钮
@@ -229,7 +229,7 @@ export default {
         this.$set(this, `detailInfo`, res.data);
       }
     },
-    // 对接聊天
+    // 对接
     async btnPhone() {
       if (!this.room.id) {
         //TODO 请求房间号
@@ -261,7 +261,7 @@ export default {
       }
       this.dialogTableVisible = true;
     },
-    // 洽谈交易
+    // 洽谈
     async onSubmit() {
       let data = this.detailInfo;
       let form = {

src/views/hall/dock/zhanjiaduijie.vue

@@ -68,15 +68,15 @@
                 </el-col>
               </el-col>
               <el-col :span="24" class="anniu">
-                <el-button type="primary" size="mini" v-if="this.user.uid != detailInfo.userid" @click="btnPhone()">对接聊天</el-button>
-                <el-button type="success" size="mini" v-if="this.user.uid != detailInfo.userid" @click="onSubmit()">洽谈交易</el-button>
+                <el-button type="primary" size="mini" v-if="this.user.uid != detailInfo.userid" @click="btnPhone()">对接</el-button>
+                <el-button type="success" size="mini" v-if="this.user.uid != detailInfo.userid" @click="onSubmit()">洽谈</el-button>
               </el-col> -->
             </el-col>
           </div>
         </el-col>
       </el-col>
     </el-row>
-    <el-dialog title="对接聊天" :visible.sync="dialogTableVisible">
+    <el-dialog title="对接" :visible.sync="dialogTableVisible">
       <chat :room="room"></chat>
     </el-dialog>
   </div>
@@ -106,7 +106,7 @@ export default {
       dockInfo: {},
       // 专家详情
       detailInfo: {},
-      // 对接聊天
+      // 对接
       dialogTableVisible: false,
       room: {},
       // 显示按钮
@@ -130,7 +130,7 @@ export default {
         this.$set(this, `detailInfo`, res.data);
       }
     },
-    // 对接聊天
+    // 对接
     async btnPhone() {
       if (!this.room.id) {
         //TODO 请求房间号
@@ -161,7 +161,7 @@ export default {
       }
       this.dialogTableVisible = true;
     },
-    // 洽谈交易
+    // 洽谈
     async onSubmit() {
       let data = this.detailInfo;
       let form = {

src/views/market/detail/achiDetail.vue

@@ -12,7 +12,7 @@
           </el-col>
           <el-col :span="17" class="right">
             <el-col :span="24" class="name textOver">
-              {{ detailInfo.name }}
+              {{ detailInfo.name || '暂无' }}
             </el-col>
             <el-col :span="12" class="otherInfo textOver"> 成果单位：{{ detailInfo.company }} </el-col>
             <el-col :span="12" class="otherInfo textOver"> 单位网址：{{ detailInfo.cooperation }} </el-col>
@@ -109,12 +109,12 @@
           </el-col>
         </el-col>
         <el-col :span="24" class="anniu" v-if="displayBtn">
-          <el-button type="primary" size="mini" v-if="this.user.uid != detailInfo.userid" @click="btnPhone()">对接聊天</el-button>
-          <el-button type="success" size="mini" v-if="this.user.uid != detailInfo.userid" @click="onSubmit()">洽谈交易</el-button>
+          <el-button type="primary" size="mini" v-if="this.user.uid != detailInfo.userid" @click="btnPhone()">对接</el-button>
+          <el-button type="success" size="mini" v-if="this.user.uid != detailInfo.userid" @click="onSubmit()">洽谈</el-button>
         </el-col>
       </el-col>
     </el-row>
-    <el-dialog title="对接聊天" :visible.sync="dialogTableVisible">
+    <el-dialog title="对接" :visible.sync="dialogTableVisible">
       <chat :room="room"></chat>
     </el-dialog>
   </div>
@@ -140,7 +140,7 @@ export default {
   methods: {
     ...personalRoom(['create', 'countDelete']),
     ...transaction({ buyProduct: 'create' }),
-    // 对接聊天
+    // 对接
     async btnPhone() {
       if (!this.room.id) {
         //TODO 请求房间号
@@ -171,7 +171,7 @@ export default {
       }
       this.dialogTableVisible = true;
     },
-    // 洽谈交易
+    // 洽谈
     onSubmit() {
       this.$emit('onSubmit', { data: this.detailInfo });
     },

src/views/market/detail/busiDetail.vue

@@ -4,7 +4,7 @@
       <el-col :span="24" class="main">
         <el-col :span="24" class="top">
           <el-col :span="24" class="name">
-            {{ detailInfo.name }}
+            {{ detailInfo.name || '暂无' }}
           </el-col>
           <el-col :span="12" class="otherInfo">信息属性：{{ detailInfo.messattribute }} </el-col>
           <el-col :span="12" class="otherInfo">需求程度：{{ detailInfo.demand }} </el-col>
@@ -48,12 +48,12 @@
           </el-col>
         </el-col>
         <el-col :span="24" class="anniu" v-if="displayBtn">
-          <el-button type="primary" size="mini" v-if="this.user.uid != detailInfo.userid" @click="btnPhone()">对接聊天</el-button>
-          <el-button type="success" size="mini" v-if="this.user.uid != detailInfo.userid" @click="onSubmit()">洽谈交易</el-button>
+          <el-button type="primary" size="mini" v-if="this.user.uid != detailInfo.userid" @click="btnPhone()">对接</el-button>
+          <el-button type="success" size="mini" v-if="this.user.uid != detailInfo.userid" @click="onSubmit()">洽谈</el-button>
         </el-col>
       </el-col>
     </el-row>
-    <el-dialog title="对接聊天" :visible.sync="dialogTableVisible">
+    <el-dialog title="对接" :visible.sync="dialogTableVisible">
       <chat :room="room"></chat>
     </el-dialog>
   </div>
@@ -79,7 +79,7 @@ export default {
   methods: {
     ...personalRoom(['create', 'countDelete']),
     ...transaction({ buyProduct: 'create' }),
-    // 对接聊天
+    // 对接
     async btnPhone() {
       if (!this.room.id) {
         //TODO 请求房间号
@@ -110,7 +110,7 @@ export default {
       }
       this.dialogTableVisible = true;
     },
-    // 洽谈交易
+    // 洽谈
     onSubmit() {
       this.$emit('onSubmit', { data: this.detailInfo });
     },

src/views/market/detail/expeDetail.vue

@@ -9,7 +9,7 @@
           </el-col>
           <el-col :span="16" class="right">
             <el-col :span="24" class="name textOver">
-              {{ detailInfo.name }}
+              {{ detailInfo.name || '暂无' }}
             </el-col>
             <el-col :span="12" class="otherInfo textOver"> 毕业院校：{{ detailInfo.school }} </el-col>
             <el-col :span="12" class="otherInfo textOver"> 最高学历：{{ detailInfo.education }} </el-col>
@@ -64,12 +64,12 @@
           </el-col>
         </el-col>
         <el-col :span="24" class="anniu" v-if="displayBtn">
-          <el-button type="primary" size="mini" v-if="this.user.uid != detailInfo.userid" @click="btnPhone()">对接聊天</el-button>
-          <el-button type="success" size="mini" v-if="this.user.uid != detailInfo.userid" @click="onSubmit()">洽谈交易</el-button>
+          <el-button type="primary" size="mini" v-if="this.user.uid != detailInfo.userid" @click="btnPhone()">对接</el-button>
+          <el-button type="success" size="mini" v-if="this.user.uid != detailInfo.userid" @click="onSubmit()">洽谈</el-button>
         </el-col>
       </el-col>
     </el-row>
-    <el-dialog title="对接聊天" :visible.sync="dialogTableVisible">
+    <el-dialog title="对接" :visible.sync="dialogTableVisible">
       <chat :room="room"></chat>
     </el-dialog>
   </div>
@@ -99,7 +99,7 @@ export default {
   methods: {
     ...personalRoom(['create', 'countDelete']),
     ...transaction({ buyProduct: 'create' }),
-    // 对接聊天
+    // 对接
     async btnPhone() {
       if (!this.room.id) {
         //TODO 请求房间号
@@ -130,7 +130,7 @@ export default {
       }
       this.dialogTableVisible = true;
     },
-    // 洽谈交易
+    // 洽谈
     onSubmit() {
       this.$emit('onSubmit', { data: this.detailInfo });
     },

src/views/market/detail/techDetail.vue

@@ -12,7 +12,7 @@
           </el-col>
           <el-col :span="17" class="right">
             <el-col :span="24" class="name textOver">
-              {{ detailInfo.name }}
+              {{ detailInfo.name || '暂无' }}
             </el-col>
             <el-col :span="12" class="otherInfo textOver"> 所属企业：{{ detailInfo.company }} </el-col>
             <el-col :span="12" class="otherInfo textOver"> 所属领域：{{ detailInfo.field }} </el-col>
@@ -59,12 +59,12 @@
           </el-col>
         </el-col>
         <el-col :span="24" class="anniu" v-if="displayBtn">
-          <el-button type="primary" size="mini" v-if="this.user.uid != detailInfo.userid" @click="btnPhone()">对接聊天</el-button>
-          <el-button type="success" size="mini" v-if="this.user.uid != detailInfo.userid" @click="onSubmit()">洽谈交易</el-button>
+          <el-button type="primary" size="mini" v-if="this.user.uid != detailInfo.userid" @click="btnPhone()">对接</el-button>
+          <el-button type="success" size="mini" v-if="this.user.uid != detailInfo.userid" @click="onSubmit()">洽谈</el-button>
         </el-col>
       </el-col>
     </el-row>
-    <el-dialog title="对接聊天" :visible.sync="dialogTableVisible">
+    <el-dialog title="对接" :visible.sync="dialogTableVisible">
       <chat :room="room"></chat>
     </el-dialog>
   </div>
@@ -95,7 +95,7 @@ export default {
   methods: {
     ...personalRoom(['create', 'countDelete']),
     ...transaction({ buyProduct: 'create' }),
-    // 对接聊天
+    // 对接
     async btnPhone() {
       if (!this.room.id) {
         //TODO 请求房间号
@@ -127,7 +127,7 @@ export default {
       }
       this.dialogTableVisible = true;
     },
-    // 洽谈交易
+    // 洽谈
     onSubmit() {
       this.$emit('onSubmit', { data: this.detailInfo });
     },

src/views/market/marketlists copy.vue

@@ -368,7 +368,7 @@ export default {
       // form.status = '0';
       // console.log(form);
       // let res = await this.transactioncreate(form);
-      // this.$checkRes(res, '发起洽谈交易成功', '交易失败');
+      // this.$checkRes(res, '发起洽谈成功', '交易失败');
       // let shenhe = {};
       // shenhe.result = '0';
       // console.log(res.data.id);

src/views/market/marketlists.vue

@@ -221,7 +221,7 @@ export default {
       this.display = 'detail';
       this.searchDetail(column_name, id);
     },
-    // 科技需求，技术成果，商务信息洽谈交易
+    // 科技需求，技术成果，商务信息洽谈
     async techSubmit({ data }) {
       let form = {
         userid: this.user.uid,

src/views/userCenter/productInfo/part/infoRelease.vue

@@ -695,16 +695,31 @@
             </el-tab-pane>
           </el-tabs>
           <el-col :span="24" class="btn">
+            <el-button type="primary" @click="previewBtn()">信息预览</el-button>
             <el-button @click="draftBtn('form')">保存草稿</el-button>
-            <el-button type="primary" @click="submitBtn('form')">信息发布</el-button>
+            <el-button type="success" @click="submitBtn('form')">信息发布</el-button>
           </el-col>
         </el-col>
       </el-col>
     </el-row>
+    <el-dialog title="信息预览" :visible.sync="dialogVisible" width="50%" :before-close="handleClose">
+      <span v-if="type == '0'">
+        <techDetail :detailInfo="detailInfo" :displayBtn="displayBtn"></techDetail>
+      </span>
+      <span v-else-if="type == '1'">
+        <achiDetail :detailInfo="detailInfo" :displayBtn="displayBtn"></achiDetail>
+      </span>
+      <span v-else>
+        <busiDetail :detailInfo="detailInfo" :displayBtn="displayBtn"></busiDetail>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
+import techDetail from '@/views/market/detail/techDetail.vue';
+import achiDetail from '@/views/market/detail/achiDetail.vue';
+import busiDetail from '@/views/market/detail/busiDetail.vue';
 import _ from 'lodash';
 import upload from '@/components/upload.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
@@ -716,6 +731,9 @@ export default {
   },
   components: {
     upload,
+    techDetail,
+    achiDetail,
+    busiDetail,
   },
   data: function() {
     return {
@@ -732,6 +750,12 @@ export default {
       // 合作方式
       cooperationList: [],
       type: '0',
+      // 信息预览
+      dialogVisible: false,
+      // 显示按钮
+      displayBtn: false,
+      // 信息显示
+      detailInfo: {},
     };
   },
   created() {
@@ -760,6 +784,15 @@ export default {
     handleClick(tab) {
       this.$set(this, `type`, tab.index);
     },
+    // 信息预览
+    previewBtn() {
+      this.form.type = this.type;
+      this.dialogVisible = true;
+      this.$set(this, `detailInfo`, this.form);
+    },
+    handleClose() {
+      this.dialogVisible = false;
+    },
     // 草稿
     draftBtn() {
       this.form.type = this.type;