Merge branch 'xiaowang-social' into feature

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

@@ -66,7 +66,7 @@
              </el-form-item>
           </el-col>
           <el-col :span="12">
-             <el-form-item label="组织封面图" label-width="150px" prop="qualification">
+             <el-form-item label="组织封面图" label-width="150px" prop="orgImage">
                          <template>
                              <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"
                                  @file-removed="removedImg"></upload-image>
@@ -135,6 +135,7 @@
             ],
             formData:    
                 {
+                    orgImage: "",//组织图片
                  status:"pass",//审核状态
                 numberNum:"",//组织成员数量
                 userId:"",//志愿者id
@@ -306,9 +307,9 @@
                 fileUrl: item.response.data.url
             })) : []; // 当e为空时清空fileList
             if (e.length > 0) {
-                this.formData.coverPic = e[0].response.data.url;
+                this.formData.orgImage = e[0].response.data.url;
             } else {
-                this.formData.coverPic = '';
+                this.formData.orgImage = '';
             }
         },
  

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

@@ -65,7 +65,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="orgImage">
                          <template>
                              <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"  :file-list="fileList"
                                  @file-removed="removedImg"></upload-image>
@@ -498,9 +498,8 @@
       if (code === 0&&data) {
         this.formData = data[0];
         this.searchValue= this.formData.address
-       console.log(data[0].qualification,"sdlkfjlsdfj");
        this.fileList=[]
-        this.fileList.push({fileUrl:data[0].qualification})
+        this.fileList.push({fileUrl:data[0].orgImage})
         this.fileList1.push({fileUrl:data[0].brandImg})
         
         console.log(this.formData,"this.formData");

src/views/modules/volunteer/pointsRedemption/update.vue

@@ -71,8 +71,8 @@
     
         <el-col :span="12">
            <el-form-item label="星级专属" required label-width="150px">
-              <el-select class="item_width_1" v-model="formData.starLevel" placeholder="请选择">
-                 <el-option v-for="item in starList" :key="item.id" :label="item.name" :value="item.id">
+              <el-select class="item_width_1" v-model="formData.starLevel" placeholder="请选择" clearable>
+                 <el-option v-for="item in starList" :key="item.id" :label="item.name" :value="item.id" clearable>
                  </el-option>
               </el-select>
            </el-form-item>