Forráskód Böngészése

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

guhongwei 5 éve
szülő
commit
a1118547f6
1 módosított fájl, 2 hozzáadás és 5 törlés
  1. 2 5
      src/views/hall/dock/zhanjiaduijie.vue

+ 2 - 5
src/views/hall/dock/zhanjiaduijie.vue

@@ -71,10 +71,9 @@
               <el-col class="mainDown">
                 <!-- <el-button @click="btnInfo()" type="info">项目详情</el-button> -->
                 <!-- <el-button v-if="this.user.uid != detailInfo.userid" @click="btnPhone()" type="primary">对接聊天</el-button> -->
+                <el-button type="warning" style="float:left;" @click.native="back()">返回</el-button>
                 <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="btnTrade()" type="success">洽谈交易</el-button>
-
                 <el-dialog title="对接聊天" :visible.sync="dialogTableVisible">
                   <el-col :span="24" class="two">
                     <chat :room="room"></chat>
@@ -92,7 +91,6 @@
         <el-table-column prop="memo" label="参数内容" align="center"> </el-table-column>
       </el-table>
     </el-dialog>
-    <el-col :span="24" class="marketPublish" @click.native="back()"> <span>返回</span></el-col>
   </div>
 </template>
 
@@ -167,7 +165,6 @@ export default {
     },
     // 线下对接
     async btnPhone() {
-      this.dialogTableVisible = true;
       if (!this.room.id) {
         //TODO 请求房间号
         let obj = {};
@@ -191,7 +188,7 @@ export default {
           this.$set(this, `room`, res.data);
         }
       }
-      // this.display = '2';
+      this.dialogTableVisible = true;
     },
     async btnTrade() {
       let form = {};