Merge branch 'master' of http://git.cc-lotus.info/live-platform/live-cms

src/layout/room/detailInfo.vue

@@ -47,20 +47,19 @@
               ></el-input>
             </el-form-item>
             <el-form-item label="是否开启广告" prop="isadvert">
-              <el-switch style="display: block" v-model="form.isadvert" active-color="#13ce66" inactive-color="#ff4949" active-text="开启" inactive-text="关闭">
-              </el-switch>
+              <el-switch v-model="form.isadvert" active-text="开启" inactive-text="关闭"> </el-switch>
             </el-form-item>
-            <el-form-item label="广告位">
+            <el-form-item label="广告位" v-if="form.isadvert == true">
               <el-col :span="20">
-                <el-table :data="form.adverts" style="width: 100%">
-                  <el-table-column prop="title" label="标题" width="180"> </el-table-column>
-                  <el-table-column label="图片地址" width="180">
+                <el-table :data="form.adverts" style="width: 100%" border>
+                  <el-table-column prop="title" label="标题" align="center"> </el-table-column>
+                  <el-table-column label="图片地址" align="center">
                     <template slot-scope="scope">
-                      <el-image style="width: 100px; height: 100px" :src="scope.row.imgdir" :fit="fit"></el-image>
+                      <el-image style="width: 30px; height: 30px" :src="scope.row.imgdir"></el-image>
                     </template>
                   </el-table-column>
-                  <el-table-column prop="imgurl" label="链接地址"> </el-table-column>
-                  <el-table-column label="操作">
+                  <el-table-column prop="imgurl" label="链接地址" align="center"> </el-table-column>
+                  <el-table-column label="操作" align="center">
                     <template slot-scope="scope">
                       <el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
                     </template>
@@ -71,7 +70,7 @@
                 <el-button @click="drawer = true" type="primary" style="margin-left: 16px;">
                   上传广告图片
                 </el-button>
-                <el-drawer title="广告位" :visible.sync="drawer" :direction="direction" :before-close="handleClose">
+                <el-drawer title="广告位" class="drawer" :visible.sync="drawer" :direction="direction" :before-close="handleClose">
                   <el-form-item label="标题">
                     <el-input v-model="title" placeholder="请输入标题"></el-input>
                   </el-form-item>
@@ -168,4 +167,13 @@ export default {
   text-align: right;
   padding: 0 5px;
 }
+/deep/.el-table td {
+  padding: 5px 0;
+}
+/deep/ .el-table th {
+  padding: 5px 0;
+}
+/deep/.el-form-item .el-form-item {
+  margin-bottom: 20px;
+}
 </style>

src/views/room/detail.vue

@@ -44,6 +44,8 @@ export default {
     },
     async onSubmit({ data }) {
       if (this.id) {
+        console.log(data);
+
         let res = this.roomupdate(data);
         this.$checkRes(res, '修改房间成功', '创建房间失败');
       } else {