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

src/views/live/hall/liveApply.vue

@@ -17,7 +17,7 @@
           </el-col>
           <el-col :span="24" class="liveApplyInfo">
             <el-form ref="form" :model="form" label-width="120px">
-              <el-form-item label="技术名称">
+              <!-- <el-form-item label="技术名称">
                 <el-input v-model="form.name"></el-input>
               </el-form-item>
               <el-form-item label="行业类别">
@@ -50,7 +50,21 @@
               </el-form-item>
               <el-form-item label="技术图片">
                 <upload :limit="1" :data="form.image.url" type="url" :url="'/files/image/upload'" @upload="uploadSuccess"></upload>
+              </el-form-item> -->
+              <el-form-item label="申请人身份">
+                <el-radio-group v-model="form.resource" @change="changeuser">
+                  <el-radio label="0">买家</el-radio>
+                  <el-radio label="1">卖家</el-radio>
+                </el-radio-group>
               </el-form-item>
+              <span v-if="this.resource == '1' || this.resource == ''">
+                <el-form-item label="选择产品">
+                  <el-select v-model="form.region" placeholder="请选择产品">
+                    <el-option label="产品1" value="0"></el-option>
+                    <el-option label="产品2" value="1"></el-option>
+                  </el-select>
+                </el-form-item>
+              </span>
               <el-form-item label="联系人">
                 <el-input v-model="form.name"></el-input>
               </el-form-item>
@@ -82,19 +96,26 @@ export default {
   name: 'liveApply',
   props: {},
   components: {
-    upload,
+    // upload,
   },
   data: () => ({
     form: {
       image: {},
     },
     logo: require('@/assets/live/d10_fbb1.png'),
+    resource: '',
   }),
-  created() {},
+  created() {
+    console.log(this.form);
+  },
   methods: {
     onSubmit() {
       console.log(this.form);
     },
+    changeuser(label) {
+      // console.log(label);
+      this.$set(this, 'resource', label);
+    },
     uploadSuccess({ type, data }) {
       this.$set(this.form, `${type}`, data.uri);
     },

src/views/live/hall/parts/chat.vue

@@ -62,7 +62,7 @@ export default {
     },
     channel() {
       this.$stomp({
-        [`/exchange/group_chat/1`]: this.onMessage,
+        [`/exchange/public_chat`]: this.onMessage,
       });
     },
     onMessage(message) {