Merge branch 'xiaowang-social' into test

# Conflicts:
#	src/views/modules/volunteer/VolunteerProjects/add.vue

src/views/modules/volunteer/VolunteerProjects/add.vue

@@ -49,7 +49,7 @@
           </el-col>
                  <el-col :span="12">
              <el-form-item label="服务类型" label-width="150px" prop="serviceClasses">
-                <el-select  class="u-item-width-normal" v-model.trim="formData.serviceClasses" placeholder="请选择" clearable >
+                <el-select  multiple-limit=1 class="u-item-width-normal" v-model.trim="formData.serviceClasses" placeholder="请选择" clearable multiple>
                    <el-option v-for="item in ServicetypeListName" :key="item.value" :label="item.label" :value="item.value" >
                    </el-option>
                 </el-select>
@@ -597,20 +597,11 @@
               return;
            }
  
-           if (!this.formData.Organizationaltype) {
-              this.$message.error('请输入组织类型');
-              return;
-           }
- 
+
            if (!this.formData.serviceTimeFrom&&!this.formData.serviceTimeTo) {
               this.$message.error('请选择服务期限');
               return;
            }
- 
-           if (!this.formData.OrganizationName) {
-              this.$message.error('请填写发布单位');
-              return;
-           }
            console.log(this.formData,"this.formData");
            this.addActivity()
         },
@@ -624,11 +615,8 @@
                         type: 'success',
                         message: '操作成功'
                     })
-                    this.resetData()
                     this.$emit('showAddClose')
-                    this.btnDisable = false
                 } else {
-                    this.btnDisable = false
                     this.$message.error(msg)
                 }
             

src/views/modules/volunteer/VolunteerProjects/edit.vue

@@ -40,7 +40,7 @@
              </el-form-item>
             </el-col>
             <el-col :span="12">
-             <el-form-item label="项目展示图" label-width="150px" prop="fileList">
+             <el-form-item label="项目展示图" label-width="150px" prop="activityImgs">
                          <template>
                              <upload-image  :defaultFileList="fileList1" :limit="1" @change="onChangeFileList"
                                  @file-removed="removedImg"></upload-image>
@@ -509,11 +509,8 @@
                         type: 'success',
                         message: '操作成功'
                     })
-                    this.resetData()
                     this.$emit('showEditClose')
-                    this.btnDisable = false
                 } else {
-                    this.btnDisable = false
                     this.$message.error(msg)
                 }
             
@@ -635,7 +632,6 @@
     computed: {
         dataRule() {
             return {
- 
                 projectTitle: [
                     { required: true, message: '名称不能为空', trigger: 'blur' }
                 ],