Merge branch 'third' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into third

src/views/manage/AddAudiences.vue

@@ -28,7 +28,7 @@
     <div class="publish">
       <el-button @click="saveBack" type="primary" size="large">取消</el-button>
       <el-button @click="saveBack(0)" type="primary" size="large">保存</el-button>
-      <el-button @click="saveBack(2)" type="primary" size="large">保存并发布</el-button>
+      <el-button @click="saveBack(1)" type="primary" size="large">保存并发布</el-button>
     </div>
     <el-dialog title="添加人员" :visible.sync="addUserShow" :close-on-click-modal="false" width="800px" custom-class="g-dialog">
         <el-row style="height: 400px;">
@@ -267,6 +267,7 @@
         // });
         //默认不查询
         //this.loadUserData(this.userDataPage);
+        this.queryUserData();
       },
       reset() {
         this.userQueryForm.keyword = '';
@@ -481,7 +482,7 @@
           }
           let isAdd = true;
           for(let j = 0; j < this.tableData.length; j++){
-            if(udata.id == this.tableData[j].aid){
+            if(udata.id == this.tableData[j].id){
               isAdd = false;
               break;
             }
@@ -504,7 +505,7 @@
 
       // 保存、保存并发布事件
       saveBack(status){
-        if(status === 2 || status === 0){
+        if(status === 1 || status === 0){
           this.form.status = status;
         }else{
           this.$router.push('/manage/ugroups');