From 49302c26759de40e5f7cf759ba85a796ba4d5884 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Thu, 29 Aug 2024 12:57:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?bug=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../volunteer/activityArchive/Points.vue        | 10 +++++++---
 .../modules/volunteer/activityArchive/add.vue   | 17 ++++++++++++-----
 .../volunteer/activityArchive/enclosure.vue     |  8 ++++----
 .../volunteer/activityArchive/realselect.vue    |  8 ++++++--
 .../volunteer/activityArchive/select.vue        |  2 +-
 5 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/views/modules/volunteer/activityArchive/Points.vue b/src/views/modules/volunteer/activityArchive/Points.vue
index b70f96ab3..b5b32fc5a 100644
--- a/src/views/modules/volunteer/activityArchive/Points.vue
+++ b/src/views/modules/volunteer/activityArchive/Points.vue
@@ -67,12 +67,13 @@
       </el-table>
 
       <div>
-      
         <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNo"
           :page-sizes="[10, 20, 50]" :page-size="pageSize" layout="sizes, prev, pager, next, total" :total="total">
         </el-pagination>
         <!-- <el-dialog :visible.sync="info" :close-on-click-modal="false" :close-on-press-escape="false" title="附件详情"
-          width="1000px" top="10vh" class="dialog-h" @closed="AddClose" >
+          width="1000px" top="10vh" class="dialog-h" @closed="AddClose"  >
+
+
           <enclosure v-if="info" :list="fmData" @AddClose="AddClose" />
         </el-dialog> -->
       </div>
@@ -82,7 +83,7 @@
 </template>
 <script>
     import { requestPost,requestGet } from "@/js/dai/request";
-    // import { enclosure } from "./enclosure.vue";
+    // import enclosure  from "./enclosure.vue";
 export default {
     
    name: "see",
@@ -114,6 +115,9 @@ export default {
       default: () => {}
     }
   },
+  // components:{
+  //   enclosure
+  // },
   methods: {
     handleDetail(row){
           console.log(row,"row");
diff --git a/src/views/modules/volunteer/activityArchive/add.vue b/src/views/modules/volunteer/activityArchive/add.vue
index 2ded9e146..85cdaef28 100644
--- a/src/views/modules/volunteer/activityArchive/add.vue
+++ b/src/views/modules/volunteer/activityArchive/add.vue
@@ -97,12 +97,18 @@
                 @change="handleSwitchChange"></el-switch>
             </el-form-item>
           </div>
-          <div style="display: flex;">
+          <div v-if="formData.sponsors" style="display: flex;">
             <div style="">
             <div v-for="(item, index) in formData.sponsors" :label="index" :key="item.name" :prop=index>
+<<<<<<< Updated upstream
               <el-form-item label="赞助单位" prop="sponsors" style="margin-bottom:20px" label-width="110px">
                 <el-input v-model="item.name" placeholder="请输入" style="width: 300px;"></el-input>
                 <i class="el-icon-remove-outline" @click.prevent="removeDomain(item)" style="font-size: 20px; margin-left: 20px;"></i> 
+=======
+              <el-form-item label="赞助单位" prop="sponsors" style="margin-bottom:20px" >
+                <el-input v-model="item.name" placeholder="请输入" style="width: 280px;"></el-input>
+                <i class="el-icon-remove-outline" @click="removeDomain(item)" style="font-size: 20px; margin-left: 20px;"></i> 
+>>>>>>> Stashed changes
               </el-form-item>
               <el-form-item label="活动地点" prop="searchValue"   >
                         <div style="width: 300px">
@@ -266,6 +272,7 @@ export default {
         var index = this.formData.sponsors.indexOf(item)
         if (index !== -1) {
           this.formData.sponsors.splice(index, 1)
+          this.tableDate = {}
         }
       },
     //动态列表
@@ -313,10 +320,10 @@ export default {
         this.$message.error('请输入活动详情');
         return;
       }
-      // if (this.formData.imgs == '') {
-      //   this.$message.error('请上传图片');
-      //   return;
-      // }
+      if (this.formData.imgs == '') {
+        this.$message.error('请上传图片');
+        return;
+      }
       if (this.formData.strTime  == '') {
         this.$message.error('请填写活动开始时间');
         return;
diff --git a/src/views/modules/volunteer/activityArchive/enclosure.vue b/src/views/modules/volunteer/activityArchive/enclosure.vue
index 31fcf68fc..90e4a7934 100644
--- a/src/views/modules/volunteer/activityArchive/enclosure.vue
+++ b/src/views/modules/volunteer/activityArchive/enclosure.vue
@@ -59,17 +59,17 @@
           </el-table-column>
           <el-table-column prop="points" header-align="center" align="center" label="积分">
           </el-table-column>
-          <el-table-column label="附件" fixed="right" header-align="center" align="center" class="operate">
+          <!-- <el-table-column label="附件" fixed="right" header-align="center" align="center" class="operate">
             <template slot-scope="scope">
               <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleDetail(scope.row)">查看</el-button>
             </template>
-          </el-table-column>
+          </el-table-column> -->
         </el-table>
         <div>
-          <el-dialog :visible.sync="info" :close-on-click-modal="false" :close-on-press-escape="false" title="附件详情"
+          <!-- <el-dialog :visible.sync="info" :close-on-click-modal="false" :close-on-press-escape="false" title="附件详情"
             width="1000px" top="10vh" class="dialog-h" @closed="AddClose" v-if="add">
             <add :list="fmData" @AddClose="AddClose" />
-          </el-dialog>
+          </el-dialog> -->
           <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNo"
             :page-sizes="[10, 20, 50]" :page-size="pageSize" layout="sizes, prev, pager, next, total" :total="total">
           </el-pagination>
diff --git a/src/views/modules/volunteer/activityArchive/realselect.vue b/src/views/modules/volunteer/activityArchive/realselect.vue
index 0a4c15db5..265eb47a3 100644
--- a/src/views/modules/volunteer/activityArchive/realselect.vue
+++ b/src/views/modules/volunteer/activityArchive/realselect.vue
@@ -245,7 +245,7 @@
               this.formData=res.data;
               this.tableDate=res.data.sponsors[0],
               this.searchValue=res.data.address
-              this.formData.activityImgs=res.data.imgs
+              this.formData.activityImgs=[{url:res.data.imgs}]
   
           } else {
             this.$message.error(res.msg);
@@ -608,8 +608,12 @@
       }
   
   
-    }
+    },
+    destroyed () {
+    map = null
+  }
   }
+  
   </script>
   <style lang="scss" scoped>
   .div_map{
diff --git a/src/views/modules/volunteer/activityArchive/select.vue b/src/views/modules/volunteer/activityArchive/select.vue
index b5952a3ea..4f8fd9c28 100644
--- a/src/views/modules/volunteer/activityArchive/select.vue
+++ b/src/views/modules/volunteer/activityArchive/select.vue
@@ -108,7 +108,7 @@
             </div>
             <div  id="app_activity" class="div_map"></div>
           </el-form-item>
-          <div style="display: flex;">
+          <div v-if="formData.sponsors"  style="display: flex;">
             <div style="">
             <div v-for="(item, index) in formData.sponsors" :label="index" :key="item.name" :prop=index>
               <el-form-item label="赞助单位" prop="sponsors" style="margin-bottom:20px" label-width="110px">

From 9f4c5fe252896bcfc1a6817266172d731c472f33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Thu, 29 Aug 2024 13:05:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/volunteer/activityArchive/add.vue | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/views/modules/volunteer/activityArchive/add.vue b/src/views/modules/volunteer/activityArchive/add.vue
index 85cdaef28..313730e7e 100644
--- a/src/views/modules/volunteer/activityArchive/add.vue
+++ b/src/views/modules/volunteer/activityArchive/add.vue
@@ -58,7 +58,7 @@
         </el-form>
       </div>
       <div style="width: 50%;">
-        <el-form ref="ref_form" :inline="true" :model="formData"  class="form"  label-width="115px">
+        <el-form ref="ref_form" :inline="true" :model="formData"  class="form"  label-width="120px">
           <div>
             <el-form-item label="活动积分" prop="integral">
               <el-input-number v-model="formData.points"  :min="1" :max="10"
@@ -100,17 +100,19 @@
           <div v-if="formData.sponsors" style="display: flex;">
             <div style="">
             <div v-for="(item, index) in formData.sponsors" :label="index" :key="item.name" :prop=index>
-<<<<<<< Updated upstream
-              <el-form-item label="赞助单位" prop="sponsors" style="margin-bottom:20px" label-width="110px">
-                <el-input v-model="item.name" placeholder="请输入" style="width: 300px;"></el-input>
-                <i class="el-icon-remove-outline" @click.prevent="removeDomain(item)" style="font-size: 20px; margin-left: 20px;"></i> 
-=======
               <el-form-item label="赞助单位" prop="sponsors" style="margin-bottom:20px" >
                 <el-input v-model="item.name" placeholder="请输入" style="width: 280px;"></el-input>
                 <i class="el-icon-remove-outline" @click="removeDomain(item)" style="font-size: 20px; margin-left: 20px;"></i> 
->>>>>>> Stashed changes
               </el-form-item>
-              <el-form-item label="活动地点" prop="searchValue"   >
+  
+              <el-form-item label="联系电话" prop="sponsors">
+                <el-input v-model="item.phone" placeholder="请输入" style="width: 280px;"></el-input>
+              </el-form-item>
+            </div>
+          </div>
+     
+            <i class="el-icon-circle-plus" @click="addDomain" style="font-size: 20px; margin-top:7px;" ></i>   </div>
+            <el-form-item label="活动地点" prop="searchValue"   >
                         <div style="width: 300px">
                             <el-select v-model.trim="searchValue" filterable style="width: 300px" remote
                                 :reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
@@ -122,13 +124,6 @@
                             <div  id="app_activity" class="div_map"></div>
                         </div>
                     </el-form-item>
-              <el-form-item label="联系电话" prop="sponsors">
-                <el-input v-model="item.phone" placeholder="请输入" style="width: 300px;"></el-input>
-              </el-form-item>
-            </div>
-          </div>
-     
-            <i class="el-icon-circle-plus" @click="addDomain" style="font-size: 20px; margin-top:7px;" ></i>   </div>
 <!-- <i class="el-icon-circle-plus"  @click="addDomain" style="font-size: 20px;"></i> -->
      
 
@@ -301,8 +296,6 @@ export default {
     },
        //提交
       async  handleComfirm() {
-        console.log(this.tableDate);
-      this.formData.sponsors.push(this.tableDate);
       console.log(this.formData,"this,formD");
       if (this.formData.address == '') {
         this.$message.error('请输入活动地点');