bug

src/components/hotel.vue

@@ -65,7 +65,15 @@
             <el-row v-if='h_status!=="view"'>
                 <el-col :span="12">
                     <el-form-item label="会议名称" >
-                        <el-input disabled v-model="huiyi_name"></el-input>
+                        <el-input disabled v-model="form.conference_id"></el-input>
+                        <!-- <el-select placeholder="请选择"  v-model="form.conference_id" clearable filterable>
+                            <el-option
+                                v-for="(item, index) in conferenceList"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.id">
+                            </el-option>
+                        </el-select> -->
                     </el-form-item>
                 </el-col>                
                 <el-col :span="10">
@@ -307,6 +315,7 @@ export default {
             ],
             local:null,
             keyword:'',
+            conferenceList:[]
         }
     },
     methods:{
@@ -321,7 +330,9 @@ export default {
         getData() {
             this.$api.getHotel({id:this.id}).then((res) => {
                 if(res.data.data){
+                    let id=this.form.conference_id
                     this.form = res.data.data;
+                    this.form.conference_id=id;
                     this.type=res.data.data.rooms
                 }
                 
@@ -587,6 +598,9 @@ export default {
         this.$api.getHotelList().then(res=>{
                 this.organizerList=res.data.data.list;
         })
+        this.$api.getConferenceList().then(res=>{
+                this.conferenceList=res.data.data.list;
+            })
         this.h_status=this.status;
         this.id=this.cur_id;
         if(this.h_status!='add'&&this.h_status!='bind'){

src/views/conference/AddConference.vue

@@ -155,7 +155,7 @@
                     <el-input type='textarea' v-model="form.desc" :rows="3" placeholder="请输入会议介绍"></el-input>
                 </el-form-item>
                 <el-form-item label='报名须知：'>
-                    <el-input type='textarea' v-model="form.sign_note" :rows="3" placeholder="请输入报名须知"></el-input>
+                    <el-input type='textarea' v-model="form.sign_note" :rows="8" placeholder="请输入报名须知"></el-input>
                 </el-form-item>
                 <el-row>
                   <el-col :span="8">

src/views/conference/Hotel.vue

@@ -30,7 +30,7 @@
 <template>
     <section class="signup_mannage">
         <p><span>会议管理></span>酒店管理</p>
-        <div class="content">
+        <div class="content" v-loading='loading'>
             <div class="filter">
                 <el-form size="small" label-width="70px" :inline="true"  label-position="left">
                     <el-form-item label="">
@@ -140,7 +140,7 @@ export default {
         return{
             form:{},
             order_status:'-3',
-            list:[{}],
+            list:[],
             reason:[],
             invoice:{},
             total:0,
@@ -217,7 +217,7 @@ export default {
                 }
                 this.list=res.data.data.list;
                 this.total=res.data.data.total
-            })
+            })          
         },
     },
     created(){

src/views/journalQun/AddJournal.vue

@@ -442,6 +442,7 @@ export default {
                   type: "success",
                   message: "保存成功!",
                 });
+                this.$router.push({path:this.$route.matched[0].path})
               } else {
                 this.$message.error("保存失败!");
               }
@@ -453,6 +454,7 @@ export default {
                   type: "success",
                   message: "保存成功!",
                 });
+                this.$router.push({path:this.$route.matched[0].path})
               } else {
                 this.$message.error("保存失败!");
               }

src/views/system/Banners.vue

@@ -75,7 +75,7 @@
           </el-form-item>
           <el-form-item style="float: right">
             <el-button
-              @click="(dialogVisible = true), (dialogTitle = '新增Banner图')"
+              @click="form1={},(dialogVisible = true), (dialogTitle = '新增Banner图')"
               type="primary"
               >新增Banner图</el-button
             >
@@ -85,31 +85,33 @@
       <el-table
         class="table"
         :data="list"
-        height="50vh"
+        height="57vh"
         border
         v-loading="loading"
         default-expand-all
         row-key="id"
         style="width: 100%"
       >
-        <el-table-column prop="name" label="Banner标题"> </el-table-column>
-        <el-table-column label="Banner图">
+        <el-table-column prop="name" label="Banner标题" align="center"> </el-table-column>
+        <el-table-column label="Banner图" align="center">
           <template slot-scope="scope">
             <img :src="scope.row.img" alt="" width="220" height="80" />
           </template>
         </el-table-column>
-        <el-table-column prop="is_active" label="是否开启">
+        <el-table-column prop="is_active" align="center" label="是否开启">
           <template slot-scope="scope">
-            <el-switch v-model="scope.row.is_active"> </el-switch>
+            <el-tag v-if="scope.row.is_active">开启</el-tag>
+            <el-tag v-else type="info">关闭</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="is_active" label="是否跳转">
+        <el-table-column prop="is_active" align="center" label="是否跳转">
           <template slot-scope="scope">
-            <el-switch v-model="scope.row.is_jump"> </el-switch>
+            <el-tag v-if="scope.row.is_jump">跳转</el-tag>
+            <el-tag v-else type="info">不跳转</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="url" label="跳转链接"> </el-table-column>
-        <el-table-column prop="zip" width="150" label="操作">
+        <el-table-column prop="url" align="center" label="跳转链接"> </el-table-column>
+        <el-table-column prop="zip" align="center" width="150" label="操作">
           <template slot-scope="scope">
             <el-button class="edit" type="text" @click="edit(scope.row.id)"
               >编辑</el-button
@@ -145,7 +147,7 @@
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
           >
-            <img v-if="form1.img" :src="form1.img" class="avatar" />
+            <img v-if="form1.img" height="100%" :src="form1.img" class="avatar" />
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
           <span style="font-size: 12px; color: #999999"
@@ -193,7 +195,7 @@ export default {
   },
   methods: {
     handleAvatarSuccess(res, file) {
-      this.form1.img = file.response.data;
+      // this.form1.img = file.response.data;
       this.$set(this.form1,"img",file.response.data)
     },
     search() {