tanyanfei преди 4 години
родител
ревизия
aa4a6fa997
променени са 2 файла, в които са добавени 9 реда и са изтрити 6 реда
  1. 8 5
      src/views/activity/AddActivity.vue
  2. 1 1
      src/views/conference/Apply.vue

+ 8 - 5
src/views/activity/AddActivity.vue

@@ -268,11 +268,12 @@
                                     </el-col>
                                     
                                     <el-col :span="4">
-                                        <el-button v-if='index==0' size="mini" type="primary" plain @click='addSpeaker' icon="el-icon-plus">添加主讲人</el-button>
-                                        <el-button v-else type="danger" size="mini" plain @click='clearSpeaker(index)'>删除</el-button>
+                                        
+                                        <el-button type="danger" size="mini" plain @click='clearSpeaker(index)'>删除</el-button>
                                     </el-col>
                                 </el-row>
                                 </div>
+                                <el-button style="margin-left:60px;"  size="mini" type="primary" plain @click='addSpeaker' icon="el-icon-plus">添加主讲人</el-button>
                             </section>
                         </el-tab-pane>
                     </el-tabs>
@@ -332,6 +333,7 @@ export default {
                     { name: "备注2", id: "remark2" },
                     { name: "备注3", id: "remark3" }
             ],
+            
             form: {
                 is_signup:0,
                 is_popular:0,
@@ -515,9 +517,10 @@ export default {
                 this.form.is_recommend=Boolean(this.form.is_recommend)
                 this.form.is_signup=Boolean(this.form.is_signup)
                 this.form.citys=this.form.city.split(' ')
-                this.form.time=[this.form.begin_time,this.form.end_time]
-                if(!this.form.speaker){
-                    this.form.speaker=[{}]
+                // this.form.time=[this.form.begin_time,this.form.end_time]
+                this.$set(this.form,'time',[res.data.data.begin_time,res.data.data.end_time])
+                if(!this.form.speaker || this.form.speaker.length<=0){
+                    this.form.speaker=[{name:'',intruduce:'',img:''}]
                 }
                 console.log(this.form,11111111111111)
             })

+ 1 - 1
src/views/conference/Apply.vue

@@ -278,7 +278,7 @@ export default {
     },
     data(){
         return{
-            form:{order_status:'-2',},
+            form:{order_status:'-2',type:'conference'},
             conferenceList:[],
             hotelList:[],
             list:[{}],