bug

src/components/hotel.vue

@@ -65,7 +65,7 @@
             <el-row v-if='h_status!=="view"'>
                 <el-col :span="12">
                     <el-form-item label="会议名称" >
-                        <el-input disabled v-model="form.conference_id"></el-input>
+                        <el-input disabled v-model="huiyi_name"></el-input>
                         <!-- <el-select placeholder="请选择"  v-model="form.conference_id" clearable filterable>
                             <el-option
                                 v-for="(item, index) in conferenceList"

src/views/conference/Manage.vue

@@ -107,7 +107,7 @@
 
         <el-dialog width="80%" class="hotel"
         title="酒店列表" :close-on-click-modal='false'
-        :visible.sync="dialogVisible1">
+        :visible.sync="dialogVisible1"> 
             会议名称：{{name}}
             <el-button size="small" @click="dialogVisible=true,status='bind'" type="primary">添加酒店</el-button>
             <el-table

src/views/journalQun/Journal.vue

@@ -19,7 +19,7 @@
   overflow: hidden;
   .avatar {
     width: 100%;
-    height: auto;
+    height: 100%;
   }
 }
 .avatar-uploader .el-upload:hover {
@@ -124,7 +124,7 @@
             <el-button class="edit" type="text" @click="edit(scope.row)"
               >编辑</el-button
             >
-            <el-button class="del" @click="del" type="text">删除</el-button>
+            <el-button class="del" @click="del(scope.row.id)" type="text">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -151,19 +151,19 @@
           ref="form1"
         >
           <el-form-item label="上传二维码：" prop="img">
+          
             <el-upload
-              class="avatar-uploader"
-              action="/api/admin/uploadfile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess"
-            >
-              <img v-if="form1.qrcode" :src="form1.qrcode" class="avatar" />
-              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                        class="avatar-uploader"
+                        action="/api/admin/uploadfile"
+                        :show-file-list="false"
+                        :on-success="handleAvatarSuccess">
+                        <img v-if="form1.qrcode" :src="form1.qrcode" class="avatar">
+                        <i v-else class="el-icon-plus avatar-uploader-icon"></i>
             </el-upload>
             <span class="del" style="position:absolute;top:-8px;left:150px;" @click="delImg">删除</span>
-            <span style="font-size: 12px; color: #999999"
+            <!-- <span style="font-size: 12px; color: #999999"
               >建议图片尺寸为：210*160</span
-            >
+            > -->
           </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">
@@ -211,7 +211,7 @@ export default {
       dialogVisible: false,
       dialogTitle: "",
       dialogVisible1:false,
-      form1: {},
+      form1: {qrcode:''},
       file:''
     };
   },
@@ -270,8 +270,8 @@ export default {
       })
     },
     showQrcode(row){
-      this.form1.journal_id = row.journal_id;
-      this.form1.id = row.id;
+      this.form1.journal_id = row.id;
+      // this.form1.id = row.id;
       this.form1.qrcode = row.qrcode;
       this.dialogVisible = true;
     },
@@ -283,6 +283,7 @@ export default {
     },
     //封面
     handleAvatarSuccess(res, file) {
+      // this.form1.qrcode=file.response.data
       this.$set(this.form1,'qrcode',file.response.data)
     },
     handleAvatarSuccess1(res, file) {
@@ -326,7 +327,7 @@ export default {
       this.$confirm("确定删除吗", "提示", {
         type: "warning",
       }).then(() => {
-        this.$api.deleteEnterprise({ id: id }).then((res) => {
+        this.$api.delJournal({ id: id }).then((res) => {
           this.$message({
             message: "删除成功",
             type: "success",