Merge branch 'xiaowang-social' of http://120.46.222.128:10021/elink-star/epmet-work-pc into xiaowang-social

src/views/modules/volunteer/activityArchive/Points.vue

@@ -67,11 +67,10 @@
       </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="附件详情"
+        <!-- <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"  >
 
 
@@ -84,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",
@@ -117,9 +116,9 @@ export default {
       default: () => {}
     }
   },
-  components:{
+  // components:{
-    enclosure
+  //   enclosure
-  },
+  // },
   methods: {
     handleDetail(row){
           console.log(row,"row");

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

@@ -58,6 +58,7 @@
         </el-form>
       </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">
@@ -97,12 +98,12 @@
                 @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>
               <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.prevent="removeDomain(item)" style="font-size: 20px; margin-left: 20px;"></i> 
+                <i class="el-icon-remove-outline" @click="removeDomain(item)" style="font-size: 20px; margin-left: 20px;"></i> 
               </el-form-item>
   
               <el-form-item label="联系电话" prop="sponsors">
@@ -267,6 +268,7 @@ export default {
         var index = this.formData.sponsors.indexOf(item)
         if (index !== -1) {
           this.formData.sponsors.splice(index, 1)
+          this.tableDate = {}
         }
       },
     //动态列表
@@ -312,10 +314,10 @@ export default {
         this.$message.error('请输入活动详情');
         return;
       }
-      // if (this.formData.imgs == '') {
+      if (this.formData.imgs == '') {
-      //   this.$message.error('请上传图片');
+        this.$message.error('请上传图片');
-      //   return;
+        return;
-      // }
+      }
       if (this.formData.strTime  == '') {
         this.$message.error('请填写活动开始时间');
         return;

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>

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{

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">