From 50f9844589826b13c9cba24b00f4c2d3de5111eb 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:21:23 +0800
Subject: [PATCH] Merge branch 'xiaowang-social' into test

# Conflicts:
#	src/views/modules/volunteer/activityArchive/Points.vue
#	src/views/modules/volunteer/activityArchive/add.vue
---
 .../modules/volunteer/activityArchive/Points.vue     | 12 +++++-------
 src/views/modules/volunteer/activityArchive/add.vue  |  2 +-
 .../modules/volunteer/activityArchive/select.vue     |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/volunteer/activityArchive/Points.vue b/src/views/modules/volunteer/activityArchive/Points.vue
index 17675decf..b5b32fc5a 100644
--- a/src/views/modules/volunteer/activityArchive/Points.vue
+++ b/src/views/modules/volunteer/activityArchive/Points.vue
@@ -22,7 +22,7 @@
             <div>
                 <el-button type="primary"  @click="handleSearch">查询</el-button>
             </div> -->
-      <el-form :inline="true" :model="formData" class="demo-form-inline" style="" >
+      <el-form :inline="true" :model="formData" class="demo-form-inline" style="">
         <el-form-item label="是否发放积分">
           <el-select v-model="formData.whether" placeholder="请选择" clearable>
             <el-option v-for="item in formData.options" :key="item.value" :label="item.label" :value="item.value">
@@ -59,11 +59,11 @@
         </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>
@@ -75,7 +75,7 @@
 
 
           <enclosure v-if="info" :list="fmData" @AddClose="AddClose" />
-        </el-dialog>
+        </el-dialog> -->
       </div>
 
     </div>
@@ -89,7 +89,6 @@ export default {
    name: "see",
     data() {
     return {
-      info:false,
       showadd:false,
       searchData:[],
         labelPosition: 'right',
@@ -124,8 +123,7 @@ export default {
           console.log(row,"row");
           this.info=true
           console.log(this.info,"info");
-          this.$emit('handleclose')
-     
+          
           this.fmData=row
   
         },
diff --git a/src/views/modules/volunteer/activityArchive/add.vue b/src/views/modules/volunteer/activityArchive/add.vue
index 0eb619018..84deec308 100644
--- a/src/views/modules/volunteer/activityArchive/add.vue
+++ b/src/views/modules/volunteer/activityArchive/add.vue
@@ -59,7 +59,7 @@
       </div>
       <div style="width: 50%;">
         <el-form ref="ref_form" :inline="true" :model="formData"  class="form"  label-width="120px">
-        <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"
diff --git a/src/views/modules/volunteer/activityArchive/select.vue b/src/views/modules/volunteer/activityArchive/select.vue
index 4f8fd9c28..5e6529a61 100644
--- a/src/views/modules/volunteer/activityArchive/select.vue
+++ b/src/views/modules/volunteer/activityArchive/select.vue
@@ -382,7 +382,7 @@ export default {
       await requestPost(url,parms).then((res)=>{
         console.log(res,"res");
         if (res.code==0) {
-          this.$message.success('添加成功');
+          this.$message.success('修改成功');
           this.$emit('updateClose')
           // this.$router.push({path:'/volunteer/activityArchive'})
         }else{