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

src/layout/enterprise/contextfabu.vue

@@ -395,13 +395,13 @@ export default {
     },
   }),
   created() {},
-
   computed: {},
   methods: {
     handleClick(tab, event) {
       console.log(tab, event);
     },
     demandBtn() {
+      this.demandForm.product_args = this.product_args;
       this.$emit('demandSubmit', { data: this.demandForm, id: this.demandForm.id });
     },
     demandBtns() {
@@ -428,6 +428,7 @@ export default {
 
     // 获取表格选中时的数据
     selectRow(val) {
+      console.log(val);
       this.selectlistRow = val;
     },
     addRow() {

src/layout/market/context.vue

@@ -135,7 +135,12 @@ export default {
         //TODO 请求房间号
         let obj = {};
         if (!this.user.uid) {
-          this.$message.error('游客身份无法与卖家对话,请先注册');
+          // this.$message.error('游客身份无法与卖家对话,请先注册');
+          this.$message({
+            dangerouslyUseHTMLString: true,
+            message: '<strong><a href="http://free.liaoningdoupo.com/platlive/newlogin" style="color:red;">游客身份无法与卖家对话,请先注册</a></strong>',
+            type: 'error',
+          });
           return;
         } else {
           obj.buyer_id = this.user.uid;
@@ -348,17 +353,10 @@ p {
   text-align: center;
 }
 
-/deep/.el-dialog__body {
-  padding: 15px 20px;
-  color: #606266;
-  font-size: 14px;
+/deep/.argsDialog .el-dialog__body {
   min-height: 120px;
-  word-break: break-all;
+  height: 0;
 }
-// /deep/.argsDialog .el-dialog__body {
-//   min-height: 120px;
-//   height: 0;
-// }
 
 /deep/.el-dialog__body {
   padding: 15px 20px;

src/layout/market/zhuanjia.vue

@@ -104,17 +104,20 @@ export default {
       this.resume = '123';
     },
     zjsubmit() {
-      console.log(this.policyInfo);
       this.$emit('zjsubmit', this.zhuanjiainfo);
     },
 
     async btnPhone() {
-      console.log(this.room.id);
       if (!this.room.id) {
         //TODO 请求房间号
         let obj = {};
         if (!this.user.uid) {
-          this.$message.error('游客身份无法与卖家对话,请先注册');
+          // this.$message.error('游客身份无法与卖家对话,请先注册');
+          this.$message({
+            dangerouslyUseHTMLString: true,
+            message: '<strong><a href="http://free.liaoningdoupo.com/platlive/newlogin" style="color:red;">游客身份无法与卖家对话,请先注册</a></strong>',
+            type: 'error',
+          });
           return;
         } else {
           obj.buyer_id = this.user.uid;

src/views/direct.vue

@@ -759,7 +759,7 @@ export default {
 
 /deep/.livemain .livevideo .right .el-tabs__nav-scroll {
   color: #fff;
-  width: 100%;
+  width: 97%;
   float: left;
   height: 40px;
   line-height: 40px;
@@ -769,6 +769,8 @@ export default {
 
 /deep/.livemain .livevideo .right .el-tabs__item {
   color: #fff;
+  font-weight: bold;
+  font-size: 16px;
 }
 
 /deep/.livemain .livevideo .right .el-tabs__item.is-active {
@@ -784,7 +786,7 @@ export default {
   bottom: 0;
   left: 0;
   height: 2px;
-  background-color: #fff;
+  background-color: transparent;
   z-index: 1;
   transition: transform 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
   list-style: none;
@@ -792,7 +794,7 @@ export default {
 }
 
 /deep/.el-tabs__nav-wrap::after {
-  background-color: none;
+  background-color: transparent;
 }
 .right ul {
   padding: 0;

src/views/enterprise/enterprisexuqiu.vue

@@ -75,8 +75,7 @@ export default {
       }
     },
     // 草稿
-    async demandSubmit(demandForm) {
-      let data = this.demandForm;
+    async demandSubmit({ data }) {
       data.userid = this.user.uid;
       let res;
       let msg;

src/views/hall/liveApply.vue

@@ -127,8 +127,13 @@ export default {
           });
         }
       } else {
-        let res = 0;
-        this.$checkRes(res, '请登录', '请登录');
+        // let res = 0;
+        // this.$checkRes(res, '请登录', '请登录');
+        this.$message({
+          dangerouslyUseHTMLString: true,
+          message: '<strong><a href="http://free.liaoningdoupo.com/platlive/newlogin" style="color:red;">游客身份无法与卖家对话,请先注册</a></strong>',
+          type: 'error',
+        });
       }
     },
     productInfo(id) {

src/views/market/marketfabu.vue

@@ -38,11 +38,7 @@ export default {
     ...mapMarketproduct({ productFetch: 'fetch', productCreate: 'create', productUpdate: 'update' }),
     async sumbit(demandForm) {
       this.demandForm.status = '0';
-
       let data = this.demandForm;
-      console.log(data);
-
-      console.log(data);
       data.userid = this.user.uid;
       let res;
       let msg;
@@ -58,8 +54,6 @@ export default {
     // 查询类型
     async maarkettype({ category = 54, ...info } = {}) {
       const res = await this.markettypeList({ category, ...info });
-      console.log(res.data);
-
       if (this.$checkRes(res)) {
         this.$set(this, `columnList`, res.data);
       }

src/views/market/marketlists.vue

@@ -253,7 +253,12 @@ export default {
       form.status = '0';
       form.type = '1';
       if (!this.user.uid) {
-        this.$message.error('游客身份无法与卖家对话,请先注册');
+        // this.$message.error('游客身份无法与卖家对话,请先注册');
+        this.$message({
+          dangerouslyUseHTMLString: true,
+          message: '<strong><a href="http://free.liaoningdoupo.com/platlive/newlogin" style="color:red;">游客身份无法与卖家对话,请先注册</a></strong>',
+          type: 'error',
+        });
         return;
       } else {
         let res = await this.transactioncreate(form);
@@ -272,7 +277,12 @@ export default {
       form.status = '0';
 
       if (!this.user.uid) {
-        this.$message.error('游客身份无法与卖家对话,请先注册');
+        // this.$message.error('游客身份无法与卖家对话,请先注册');
+        this.$message({
+          dangerouslyUseHTMLString: true,
+          message: '<strong><a href="http://free.liaoningdoupo.com/platlive/newlogin" style="color:red;">游客身份无法与卖家对话,请先注册</a></strong>',
+          type: 'error',
+        });
         return;
       } else {
         let res = await this.transactioncreate(form);