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

src/components/parts/chat.vue

@@ -10,7 +10,7 @@
         <ul>
           <li v-for="(i, index) in list" :key="index">
             <p>
-              <span>[{{ i.send_time | getTime }}]</span><span style="font-weight: bold;">{{ i.sender_name }}：</span>
+              <span>[{{ i.send_time | getTime }}]</span><span style="font-weight: bold;" :class="i.role == '8' ? 'nameColor' : ''">{{ i.sender_name }}：</span>
               <span> {{ i.content }}</span>
             </p>
           </li>
@@ -66,7 +66,10 @@ export default {
       }
       if (this.text != '') {
         let object = { sender_name: this.user.name, content: this.text };
-        if (this.user.uid) object.sender_id = this.user.uid;
+        if (this.user.uid) {
+          object.sender_id = this.user.uid;
+          object.role = this.user.role;
+        }
         //TODO接口
         let res = await this.create(object);
         this.$checkRes(res, null, res.errmsg || '发言失败');
@@ -227,4 +230,7 @@ export default {
   margin: 20px 0 0 0;
   border-radius: 5px;
 }
+.nameColor {
+  color: red;
+}
 </style>

src/layout/login/loginMain.vue

@@ -20,6 +20,7 @@
                       <el-radio label="2">个人</el-radio>
                       <el-radio label="3">机构管理员</el-radio>
                       <el-radio label="6">专家</el-radio>
+                      <el-radio label="8">VIP用户</el-radio>
                     </el-radio-group>
                   </el-form-item>
                   <el-col :span="24" class="loginSubmit"><el-button type="primary" @click="loginSubmit">登录</el-button></el-col>

src/router/index.js

@@ -240,12 +240,6 @@ const live = [
     name: 'enterprisefabu',
     component: () => import('../views/enterprise/enterprisefabu.vue'),
   },
-  {
-    path: '/direct',
-    name: 'live_direct',
-    meta: { title: '直播大厅', subSite: true },
-    component: () => import('../views/direct.vue'),
-  },
   {
     path: '/hall/direct',
     name: 'live_direct',

src/views/hall/dock/dockDetail.vue

@@ -225,7 +225,6 @@ export default {
       form.market_userid = this.detailInfo.userid;
       form.market_username = this.detailInfo.contact_user;
       form.dockid = this.$route.query.dockid;
-
       form.status = '0';
       if (!this.user.uid) {
         // this.$message.error('游客身份无法与卖家对话,请先注册');

src/views/hall/liveApply.vue

@@ -25,7 +25,7 @@
               </el-form-item>
               <span v-if="this.resource == '1' || this.resource == ''">
                 <el-form-item label="选择产品">
-                  <el-select v-model="form.goodsList" placeholder="请选择选择产品">
+                  <el-select v-model="form.goodsList" multiple placeholder="请选择选择产品">
                     <el-option v-for="(item, index) in goodsLists" :key="index" :label="item.name" :value="item.id"> </el-option>
                   </el-select>
                 </el-form-item>
@@ -84,8 +84,10 @@ export default {
       if (data.user_id) {
         data.user_name = this.user.name;
         data.role = this.user.role;
+
         let dock_id = this.$route.query.id;
-        data.goodsList = [this.productInfo(this.form.goodsList)];
+        data.goodsList = this.form.goodsList;
+        // data.goodsList = [this.productInfo(this.form.goodsList)];
         const res = await this.applyCreate({ id: dock_id, ...data });
         if (res.errcode === 0) {
           this.$message({
@@ -106,7 +108,7 @@ export default {
     },
     // 取消
     restBtn() {
-      $router.go(-1);
+      history.go(-1);
     },
     productInfo(id) {
       let index = this.goodsLists.find(item => item.id == id);
@@ -164,4 +166,8 @@ export default {
 .liveApplyInfo {
   padding: 0 100px;
 }
+
+/deep/.el-input__inner {
+  width: 1300px;
+}
 </style>

src/views/market/index.vue

@@ -215,7 +215,7 @@ export default {
     ...product(['newquery']),
     ...expertsuser({ expertQuery: 'query' }),
     async search() {
-      let res = await this.newquery({ skip: 0, limit: 6, totaltype: '0', status: '1' });
+      let res = await this.newquery({ skip: 0, limit: 5, totaltype: '0', status: '1' });
       if (this.$checkRes(res)) this.$set(this, `tecList`, res.data);
       res = await this.newquery({ skip: 0, limit: 4, totaltype: '1', status: '1' });
       if (this.$checkRes(res)) this.$set(this, `productList`, res.data);
@@ -392,7 +392,7 @@ export default {
 }
 .tecList {
   padding: 0 15px;
-  margin: 10px 0 10px 0;
+  margin: 15px 0;
 }
 .tecList p span:first-child {
   display: inline-block;