Merge branch 'master' of http://118.190.145.217:3000/xiaojincai/zky-admin

src/components/fuEditor/index.vue

@@ -41,7 +41,6 @@ export default {
       }
     },
     value: function(value) {
-      console.log(value)
       if (value !== this.editor.txt.html()) {
         this.editor.txt.html(this.value);
         
@@ -117,7 +116,6 @@ export default {
           // for (let i = 0; i < 1; i++) {
           // console.log(result)
           let url = result.data;
-          console.log(result)
           insertImg(url);
           // }
         }

src/style/home.scss

@@ -246,4 +246,7 @@ tbody{
 }
 .close {
 	color: red;
+}
+.el-table__fixed-right::before, .el-table__fixed::before{
+	background: none;
 }

src/views/conference/AddConference.vue

@@ -125,10 +125,10 @@
                         <el-form-item label="会议时间：">
                             <el-date-picker
                                 v-model="form.time"
-                                type="daterange" value-format="yyyy-MM-dd"
+                                type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss"
                                 range-separator="至"
-                                start-placeholder="开始日期"
-                                end-placeholder="结束日期"
+                                start-placeholder="开始时间"
+                                end-placeholder="结束时间"
                             >
                             </el-date-picker>
                         </el-form-item>
@@ -442,6 +442,7 @@ export default {
                 form.begin_time=form.time[0]
                 form.end_time=form.time[1]
             }
+            console.log(form)
             if(!form.name){
                 this.$message({
                     message: '请输入会议名称',
@@ -507,7 +508,7 @@ export default {
                 }
             }
             // form.organizer_name=this.organizerList.filter(item=>item.id==form.organizer_id)[0].name
-            console.log(form)
+            
             if(this.id){
                 this.$api.putConference(form).then(res=>{
                     if(res.data.code == 0){

src/views/conference/Manage.vue

@@ -54,6 +54,7 @@
                     label="会议海报">
                     <template slot-scope="scope"><img width="100" :src="scope.row.img" alt=""></template>
                     </el-table-column>
+                    
                     <el-table-column
                     prop="username"  
                     label="主办方">
@@ -63,10 +64,19 @@
                     label="主讲人">
                     </el-table-column>
                     <el-table-column
-                    width="350"
+                    prop=""  width="120"
+                    label="状态">
+                    <template slot-scope="scope">
+                        <el-tag v-if='scope.row.is_signup'>可报名</el-tag>
+                        <el-tag v-else type="info">不可报名</el-tag>
+                    </template>
+                    </el-table-column>
+                    <el-table-column
+                    width="220"
                     label="会议时间">
                     <template slot-scope="scope">
-                        {{scope.row.begin_time}}-{{scope.row.end_time}}
+                        开始：{{scope.row.begin_time}} <br>
+                       结束：{{scope.row.end_time}}
                     </template>
                     </el-table-column>
                     <el-table-column
@@ -80,10 +90,7 @@
                     prop=""  
                     label="酒店信息">
                     </el-table-column>
-                    <el-table-column
-                    prop=""  
-                    label="状态">
-                    </el-table-column>
+                    
                     <el-table-column  
                     prop="zip"  width="220" fixed="right"
                     label="操作">