Merge branch 'xiaowang-social' into feature

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

@@ -451,12 +451,11 @@
           let url = `/voluntary/sphereLife/detail/${id}`;
           console.log(url,"url");
             requestGet(url).then((res) => {
-              console.log(res);
               if (res.code == 0) {
                   this.formData = res.data
                   this.fileList=[{fileUrl:res.data.attrs[0].url}]
                   this.searchValue=res.data.address
-                  console.log(this.formData,"this.formData");
+                  this.formData.tags1=res.data.tags.split(',').map(item => ({ tab: item.trim() }));
               } else {
                   this.$message.error(res.msg)
               }
@@ -466,8 +465,10 @@
       },
       //添加标签
       addDomain() {
+
+        
         if (this.formData.tags1.length < 4) {
-            this.formData.tags1.push({ name: '', tab: '' });
+            this.formData.tags1.push({tab: '' });
         
         }else{
           this.$message.error("最多添加4个标签");
@@ -546,18 +547,7 @@
         removedImg() {
             this.formData.coverPic = ''
         },
-        // onChangeFileList(e) {
-        //     console.log(e, 'sssssb');
-        //     this.fileList = e.length > 0 ? e.map(item => ({
-        //         fileType: '0',
-        //         fileUrl: item.response.data.url
-        //     })) : []; // 当e为空时清空fileList
-        //     if (e.length > 0) {
-        //         this.formData.qualification = e[0].response.data.url;
-        //     } else {
-        //         this.formData.qualification = '';
-        //     }
-        // },
+
 
         onChangeImgs(e, rowIndex = 0) {
             console.log('onChangeFileList', e)
@@ -594,9 +584,12 @@
      
    
         async handleComfirm() {
-           let one=this.formData.tags1.map(item => item.tab).join(', ')
-           this.formData.tags=one;
-           console.log(this.formData,"this.formData");
+            if (this.formData.tags1) {
+                let one=this.formData.tags1.map(item => item.tab).join(', ')
+                this.formData.tags=one;
+                console.log(this.formData,"this.formData");   
+            }
+
            
         //  console.log(this.formData.tags.map(item => item.tab).join(', '),"     this.formData");
           //  if (!this.formData.type) {

src/views/modules/volunteer/LifeCircleManagement/index.vue

@@ -359,7 +359,6 @@ export default {
        const { data, code, msg } = await requestPost(url, params)
        if (code === 0) {
          this.OrganizationaltypeList = data;
-         console.log(this.OrganizationaltypeList,"his.Organizationaltype");
          
        } else {
          this.$message.error(msg)
@@ -369,7 +368,7 @@ export default {
         handleprocessl(row){
             this.showprocess=true
             this.EditList=row
-            console.log(row,this.fmData,"row");
+ 
         },
         //关闭审查
         
@@ -379,7 +378,7 @@ export default {
         },
         //成员管理
         handleshowMember(row){
-          console.log    (row,this.fmData,"row");
+
             this.showMember=true
             this.fmData=row
    
@@ -392,8 +391,8 @@ export default {
         //修改
         handleEdit(row){
              this.showAdd=true
-            this.formTitle="新增"
-             console.log(row,"row");
+            this.formTitle="修改"
+
              this.$nextTick(() => {
              this.$refs.ref_form.initForm("edit", row.id);
       });
@@ -452,8 +451,8 @@ if (code === 0) {
   
   this.tableData.forEach(item => {
     this.options.forEach(item1 => {
-      console.log(item1, "item1");
-      console.log(item1.children, "item1.children");
+
+
       if (Array.isArray(item1.children)) {
         item1.children.forEach(item2 => {
           if (item2.value.toString() == item.type) {
@@ -465,7 +464,6 @@ if (code === 0) {
     });
   });
 
-  console.log(this.tableData, "this.tableData");
 } else {
   // 错误处理逻辑
 }

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

@@ -460,7 +460,6 @@
           async remoteMethod(query) {
               console.log(query, "sfsvsdv");
               if (query !== '') {
-  
                   const { msg, data } = await map.searchNearby(query);
                   this.resultList = []
    
@@ -495,7 +494,10 @@
               map.setMarker(lonlat[1], lonlat[0]);
               this.formData.latitude = lonlat[1];
               this.formData.longitude = lonlat[0];
+              this.formData.address=selPosition.address + selPosition.nam
               this.searchValue = selPosition.address + selPosition.name
+              console.log(this.formData.address," this.formData.address ");
+              
           },
    
   

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

@@ -53,7 +53,7 @@
                     <el-table-column prop="time" header-align="center" align="center" label="日期"
                         :show-overflow-tooltip="true">
                     </el-table-column>
-                    <el-table-column prop="name" header-align="center" align="center" label="预约人"
+                    <el-table-column prop="userName" header-align="center" align="center" label="预约人"
                         :show-overflow-tooltip="true">
                     </el-table-column>
                     <el-table-column prop="available" header-align="center" align="center" label="预约时间"
@@ -100,7 +100,7 @@
           return {
               formData:
               {
-                agencyName:"",
+                  agencyName: "",
                   agencyId: "",
                   linkman: "",
                   linkPhone: "",
@@ -118,9 +118,9 @@
                   address: "",//地址
                   longitude: this.$store.state.user.longitude, //经度
                   latitude: this.$store.state.user.latitude,//纬度
-                  },
-                  tableData1:[],
-                  showdisabled:false,
+              },
+              tableData1: [],
+              showdisabled: false,
               uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
               customerId: localStorage.getItem('customerId'),
    
@@ -184,8 +184,8 @@
               requestGet(url,params).then((res) => {
                   console.log(res);
                   if (res.code == 0) {
-                      this.tableData1 = res.data
-              
+                      this.tableData1 = res.data.list
+                    l
 
                   } else {
                       this.$message.error(res.msg)