update

src/api.js

@@ -255,9 +255,13 @@ export default {
 	getConferenceList: params => {
 		return axios.get(`${baseURL}/api/admin/conference/list`, { params: params });
 	},
+	addConference: params => {
+		return axios.post(`${baseURL}/api/admin/conference`, params);
+	},
 	putConference: params => {
 		return axios.put(`${baseURL}/api/admin/conference`, params);
 	},
+
 	getSignupList: params => {
 		return axios.get(`${baseURL}/api/admin/signup/list`, { params: params });
 	},

src/components/fuEditor/index.vue

@@ -41,8 +41,10 @@ export default {
       }
     },
     value: function(value) {
+      console.log(value)
       if (value !== this.editor.txt.html()) {
         this.editor.txt.html(this.value);
+        
       }
     }
     //value为编辑框输入的内容，这里我监听了一下值，当父组件调用得时候，如果给value赋值了，子组件将会显示父组件赋给的值

src/views/conference/AddConference.vue

@@ -111,7 +111,7 @@
                 <el-row>
                     <el-col :span="10">
                         <el-form-item label="主办方：">
-                            <el-select placeholder="请选择主办方" v-model="form.sponsor" filterable>
+                            <el-select placeholder="请选择主办方" v-model="form.organizer_id" filterable>
                                 <el-option
                                     v-for="(item, index) in organizerList"
                                     :key="index"
@@ -125,7 +125,7 @@
                         <el-form-item label="会议时间：">
                             <el-date-picker
                                 v-model="form.time"
-                                type="daterange"
+                                type="daterange" value-format="yyyy-MM-dd"
                                 range-separator="至"
                                 start-placeholder="开始日期"
                                 end-placeholder="结束日期"
@@ -138,7 +138,7 @@
                     <el-col :span="10">
                         <el-form-item label="城市：">
                             <el-cascader style="width:100%;"
-                                v-model="form.city"
+                                v-model="form.citys" :props='props'
                                 :options="cityList"
                                 @change="handleChangeCity">
                             </el-cascader>
@@ -152,7 +152,7 @@
                 </el-row>
                 
                 <el-form-item label='会议简介：'>
-                    <el-input type='textarea' v-model="form.introduce" :rows="3" placeholder="请输入会议介绍"></el-input>
+                    <el-input type='textarea' v-model="form.desc" :rows="3" placeholder="请输入会议介绍"></el-input>
                 </el-form-item>
                 <el-row>
                   <el-col :span="8">
@@ -380,9 +380,9 @@
                 </el-form-item>
                 <el-form-item style="position:fixed;bottom:20px;right:60px;">
                     <el-button type='primary'>预览</el-button>
-                    <el-button type='success'>发布</el-button>
-                    <el-button type='default'>保存并新增</el-button>
-                    <el-button type='default'>保存</el-button>
+                    <el-button @click="save" type='success'>发布</el-button>
+                    <!-- <el-button type='default'>保存并新增</el-button> -->
+                    <!-- <el-button type='default'>保存</el-button> -->
                     <el-button type="danger" plain>删除</el-button>
                 </el-form-item>
             </el-form>
@@ -401,14 +401,13 @@ export default {
                 is_signup:0,
                 is_popular:0,
                 is_recommend:0,
-                city:[],
+                citys:[],
                 signup_fields:[
                     { name: "姓名", id: "1" },
                     { name: "性别", id: "2" },
                     { name: "年龄", id: "3" },
                     { name: "职务", id: "4" },
-                    { name: "职称", id: "5" },
-                    { name: "职称", id: "5" },
+                    { name: "职称", id: "5" }
                 ],
                 speaker:[
                     {name:'',intruduce:''}
@@ -423,10 +422,35 @@ export default {
             organizerList:[],
             cityList:[],
             activeName:'first',
-            imageUrl:""
+            imageUrl:"",
+            props:{
+                value:'name'
+            }
         };
     },
     methods: {
+        save(){
+            var form=this.form;
+            form.city=form.citys.join('');
+            if(form.time.length>0){
+                form.begin_time=form.time[0]
+                form.end_time=form.time[1]
+            }
+            console.log(this.form)
+            this.$api.addConference().then(res=>{
+                if(res.data.code == 0){
+                    this.$message({
+                        message: '发布成功',
+                        type: 'success'
+                    })
+                }else{
+                    this.$message({
+                        message: res.data.message,
+                        type: 'error'
+                    })
+                }
+            })
+        },
         //封面
         handleAvatarSuccess(res, file) {
             this.form.img = file.response.data;

src/views/conference/Apply.vue

@@ -133,7 +133,7 @@
                     <template slot-scope="scope">
                         <el-button  @click="invoice=scope.row,dialogVisible2=true" class="edit"  type="text" >审核</el-button>
                         <el-button @click="invoice=scope.row,dialogVisible=true"  type="text">发票详情</el-button>
-                        <el-button    type="text" >入住凭证</el-button>
+                        <el-button @click="proof_img=scope.row.proof_img,dialogVisible3=true"    type="text" >入住凭证</el-button>
                         <el-button @click="dialogVisible1=true"   type="text" >驳回原因</el-button>
                     </template>
                     </el-table-column>
@@ -244,6 +244,11 @@
                     </el-form-item>
            </el-form>
         </el-dialog>
+         <el-dialog class="hotel"
+        title="入住凭证" :close-on-click-modal='false'
+        :visible.sync="dialogVisible3">
+           <img width="100%" :src="proof_img" alt="">
+        </el-dialog>
     </section>
 </template>
 <script>
@@ -263,7 +268,9 @@ export default {
             loading:false,
             dialogVisible:false,
             dialogVisible1:false,
-            dialogVisible2:false
+            dialogVisible2:false,
+            dialogVisible3:false,
+            proof_img:''
         }
     },
     methods:{

vue.config.js

@@ -3,8 +3,8 @@ module.exports={
         proxy:{
             '/api':{
                 // target:'http://39.107.246.59:81',
-                // target:'https://test.scxjc.club',
-                target:'http://caos.tederen.com',
+                target:'https://test.scxjc.club',
+                // target:'http://caos.tederen.com',
                 changeOrigin: true,
             }
         }