Merge branch 'featrue-social' into feature

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

@@ -165,6 +165,18 @@
                   this.formData = res.data
                   this.searchValue= res.data.address
                   this.fileList=[{fileUrl:res.data.attrs[0].url}]
+                let attrs=res.data.attrs.map(item=>{
+                   return item
+                })
+                this.fileList=attrs.map(item=>{
+                  return {
+                    fileUrl:item.url
+                  }
+                })
+      
+             
+
+                  
               } else {
                   this.$message.error(res.msg)
               }

src/views/modules/volunteer/Venuemanagement/info.vue

@@ -170,18 +170,26 @@
               console.log(id, "dskljfksdljf");
               let url = `/voluntary/positionVenues/history`;
               let params = {
-                positionId:"",
-                pageNo:"",
-                pageSize:"",
-                venueId:id,
+                  positionId: "",
+                  pageNo: "",
+                  pageSize: "",
+                  venueId: id,
               }
-              requestGet(url,params).then((res) => {
+              requestGet(url, params).then((res) => {
                   console.log(res);
                   if (res.code == 0) {
                       this.tableData1 = res.data.list
                       this.tableData1.forEach(item => {
-                      item.time = dayjs(item.time).format('YYYY-MM-DD')
+                        
+                        item.available=dayjs(item.available.split(",")).forEach(item=>{
+                        console.log(dayjs(item).format(hh-mm));
+                        
+                          item = dayjs(item).format(hh-mm)
+                        })
+                          item.time = dayjs(item.time).format('YYYY-MM-DD')
+                          
                       })
+                      console.log(this.tableData1, "this.tableData1");
                   } else {
                       this.$message.error(res.msg)
                   }

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

@@ -188,7 +188,8 @@
     methods: {
         // 获取志愿组织服务类型
         getServiceTypeList(){
-
+            console.log("获取志愿组织服务类型");
+            
         },
         //控制活动时间
         actcontrolTime() {
@@ -597,8 +598,7 @@
         },
         async addActivity() {
                 let url = '/voluntary/project/admin/create'
-                console.log(this.formData,"this.formData");
-                
+                this.formData.serviceClasses=[this.formData.serviceClasses]
                 const { data, code, msg } = await requestPost(url, this.formData)
                 if (code === 0) {
                     this.$message({

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

@@ -49,13 +49,11 @@
           </el-col>
                  <el-col :span="12">
              <el-form-item label="服务类型" label-width="150px" prop="serviceClasses">
-                <el-form-item label="服务类型" label-width="150px" prop="serviceClasses">
                 <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>
              </el-form-item>
-             </el-form-item>
           </el-col>
           <el-col :span="12">
                <el-form-item label="招募截止时间" label-width="150px" prop="recruitDeadline">