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

# Conflicts:
#	src/views/modules/volunteer/activityArchive/add.vue
#	src/views/modules/volunteer/activityArchive/index.vue

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

@@ -19,6 +19,7 @@
               <Tinymce class="tinymce_view " v-model.trim="formData.content" :height="250" placeholder="请输入活动内容" />
             </div>
           </el-form-item>
+<<<<<<< HEAD
           <el-form-item label="照片" prop="activityImgs">
             <div>
               <el-upload :headers="$getElUploadHeaders()" class="avatar-uploader" :action="uploadUrl"
@@ -32,12 +33,25 @@
           <el-form-item label="活动时间" prop="activeTime">
             <el-date-picker v-model="formData.strTime" type="datetime" placeholder="开始时间" format="yyyy-MM-dd HH:mm:ss"
               value-format="yyyy-MM-dd HH:mm:ss">
+=======
+          <el-form-item label="图片" prop="coverPic">
+            <template>
+              <upload-image :defaultFileList="formData.imgs" :limit="1" @change="onChangeFileList"
+                @file-removed="removedImg"></upload-image>
+            </template>
+
+          </el-form-item>
+          <el-form-item label="活动时间" prop="activeTime">
+            <el-date-picker v-model="formData.strTime" type="datetime" placeholder="开始时间"
+              format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss">
+>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
             </el-date-picker>至 <el-date-picker v-model="formData.endTime" type="datetime" placeholder="结束时间"
               format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="活动名额" prop="points">
             <div style="display: flex; flex-direction: column;">
+<<<<<<< HEAD
               <el-input-number :disabled="formData.notQuota === '0'" v-model.trim="formData.quota" :max="10"
                 label="描述文字"></el-input-number>
               <el-radio style="margin-top: 20px;" v-model="formData.notQuota" label="0">不限名额</el-radio>
@@ -46,6 +60,16 @@
           <el-form-item label="活动类型" prop="type" required>
             <el-select v-model.trim="formData.type" placeholder="请选择" clearable>
               <el-option v-for="item in  typeList" :key="item.id" :label="item.name" :value="item.id">
+=======
+              <el-input-number vdisabled="radio === '1'? true:false" v-model.trim="formData.quota"
+               :min="1" :max="10" label="描述文字"></el-input-number>
+              <el-radio style="margin-top: 20px;" v-model="formData.notQuota" label="1">不限名额</el-radio>
+            </div>
+          </el-form-item>
+          <el-form-item label="活动类型" prop="typeId" required>
+            <el-select v-model.trim="formData.typeId" placeholder="请选择" clearable>
+              <el-option v-for="item in  formData.typeList" :key="item.id" :label="item.name" :value="item.id">
+>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
               </el-option>
             </el-select>
           </el-form-item>
@@ -58,10 +82,18 @@
         </el-form>
       </div>
       <div style="width: 49%;">
+<<<<<<< HEAD
         <el-form ref="ref_form" :inline="true" :model="formData" class="form">
           <div>
             <el-form-item label="活动积分" prop="integral">
               <el-input-number v-model="formData.points" :min="1" :max="10" label="描述文字"></el-input-number>
+=======
+        <el-form ref="ref_form" :inline="true" :model="formData"  class="form">
+          <div>
+            <el-form-item label="活动积分" prop="integral">
+              <el-input-number v-model="formData.points"  :min="1" :max="10"
+                label="描述文字"></el-input-number>
+>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
             </el-form-item>
 
             <!-- <el-form-item label="所属项目" prop="typeId" required>
@@ -71,7 +103,11 @@
                                 </el-option>
                             </el-select>
                         </el-form-item> -->
+<<<<<<< HEAD
             <el-form-item label="报名条件" prop="conditions" style="display: block">
+=======
+            <el-form-item label="报名条件" prop="condition" style="display: block">
+>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
               <div class="item_width_1">
                 <Tinymce class="tinymce_view " v-model.trim="formData.conditions" :height="250" placeholder="请输入活动内容" />
               </div>
@@ -79,6 +115,7 @@
             <el-form-item label="签到时间" prop="Checktime">
               <el-date-picker v-model.trim="formData.signInTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
                 format="yyyy-MM-dd HH:mm:ss" placeholder="请选择签到时间" style="width:280px">
+<<<<<<< HEAD
               </el-date-picker>至
               <el-date-picker v-model.trim="formData.signOutTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
                 format="yyyy-MM-dd HH:mm:ss" placeholder="请选择签到时间" style="width:280px">
@@ -87,10 +124,18 @@
             <el-form-item label="报名截止时间" prop="deadline">
               <el-date-picker v-model="formData.deadline" type="datetime" placeholder="选择日期时间"
                 value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss">
+=======
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="报名截止时间" prop="deadline">
+              <el-date-picker v-model="formData.signOutTime" type="datetime" placeholder="选择日期时间"value-format="yyyy-MM-dd HH:mm:ss"
+              format="yyyy-MM-dd HH:mm:ss" >
+>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
               </el-date-picker>
             </el-form-item>
 
             <el-form-item v-if="formType!=='records'" label="上线" style="display: block" prop="peopleCount">
+<<<<<<< HEAD
               <el-switch v-model="formData.online" :active-value='1' :inactive-value='0'
                 @change="handleSwitchChange"></el-switch>
             </el-form-item>
@@ -117,25 +162,58 @@
                         </div>
                     </el-form-item>
         </el-form>
+=======
+              <el-switch v-model="formData.online"  active-value=1 inactive-value=0></el-switch>
+            </el-form-item>
+          </div>
+          <el-form-item label="赞助单位" prop="sponsor">
+            <el-input v-model="formData.sponsor" placeholder="请输入"></el-input>
+          </el-form-item>
+          <el-form-item label=" 联系电话" prop="number">
+            <el-input v-model="formData.number" placeholder="请输入"></el-input>
+          </el-form-item>
+          <el-form-item label="活动地点" prop="address" style="display: block">
+            <div>
+              <el-select v-model.trim="formData.address" filterable remote :reserve-keyword="true" placeholder="请输入关键词"
+               >
+                <!-- <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
+                  :key="item.value || index" :label="item.label" :value="item.value">
+                </el-option> -->
+              </el-select>
+              <div id="app_activity" class="div_map"></div>
+            </div>
+          </el-form-item>
+        </el-form>
+
+>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
       </div>
     </div>
     <div class="div_btn1">
       <el-button size="small" @click="handleCancle">取 消</el-button>
+<<<<<<< HEAD
       <el-button size="small" v-if="formType != 'detail'" type="primary" :disabled="btnDisable"
         @click="handleComfirm">确定</el-button>
 
+=======
+      <el-button size="small" v-if="formType != 'detail'" type="primary" :disabled="btnDisable" @click="handleComfirm">确定</el-button>
+        
+>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
 
     </div>
   </div>
 </template>
 <script>
+<<<<<<< HEAD
 import { Loading } from 'element-ui' // 引入Loading服务
+=======
+>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
 import { mapGetters } from 'vuex'
 import { requestPost, requestGet } from '@/js/dai/request'
 import fileList from '@/views/components/fileList'
 import Tinymce from '@c/tinymce2/index.vue'
 import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
 import daiMap from "@/utils/dai-map";
+<<<<<<< HEAD
 var map
 var search
 var markers
@@ -146,6 +224,11 @@ export default {
     return {
       loading: false,
       searchOptions: [],
+=======
+export default {
+  data () {
+    return {
+>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
       orgOptionProps: {
         value: 'agencyId',
         label: 'agencyName',
@@ -154,6 +237,7 @@ export default {
         multiple: false,
         checkStrictly: true
     },
+<<<<<<< HEAD
     customerId: localStorage.getItem('customerId'),
     uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
       orgOptions:[],
@@ -193,6 +277,30 @@ export default {
         }
     ]
 
+=======
+      orgOptions:[],
+      btnDisable: false,
+      formData: {
+        online:0,
+        content:"",
+        points:"",
+        contacts:"",
+        integral:"",
+        condition:"",
+        imgs:[],
+        notQuota:0,
+        typeList:[
+          {
+            id:1,
+            name:"线上活动"
+          },
+          {
+            id:2,
+            name:"线下活动"
+          }
+        ]
+        
+>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
       },
 
       activityImgs:[],//图片
@@ -231,6 +339,7 @@ export default {
   },
 
   methods: {
+<<<<<<< HEAD
     
     handleClickKey(index) {
             let selPosition = this.resultList[index]
@@ -422,6 +531,42 @@ export default {
                 this.formData.imgs = '';
             }
         },
+=======
+    handleChangeAgency(val) {
+            console.log(val);
+            this.formData.agencyId = val
+       },
+    //提交
+    handleComfirm() {
+      console.log(this.formData,"this,formD");
+      let url="/voluntary/activityInfo/saveInfo";
+      let parms={
+        ...this.formData
+      }
+      console.log(parms,"parms");
+      
+      requestPost(url,parms).then((res)=>{
+        console.log(res,"res");
+        
+      })
+    },
+    //图片
+    removedImg() {
+            this.formData.imgs = ''
+     },
+    onChangeFileList(e) {
+            console.log(e, 'sssssb');
+            this.formData.$slotsimgs = e.length > 0 ? e.map(item => ({
+                fileType: '0',
+                fileUrl: item.response.data.url
+            })) : []; // 当e为空时清空fileList
+            if (e.length > 0) {
+                this.formData.imgs = e[0].response.data.url;
+            } else {
+                this.formData.imgs = '';
+            }
+        },
+>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
     //获取当前组织
    getOrgTreeList() {
       this.$http
@@ -440,7 +585,10 @@ export default {
           return this.$message.error("网络错误");
         });
         this.$nextTick(() => {
+<<<<<<< HEAD
           console.log(map,"mao");
+=======
+>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
                 if (!map) {
                     this.initMap(this.formData.latitude, this.formData.longitude);
                     console.log("map", map,this.formData.latitude, this.formData.longitude)
@@ -450,13 +598,17 @@ export default {
                     console.log("mapmapmap", map)
                 }
             })
+<<<<<<< HEAD
 
+=======
+>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
     },
     handleCancle () {
 
       this.$emit('diaDetailClose')
 
     },
+<<<<<<< HEAD
          // 开启加载动画
          startLoading() {
             loading = Loading.service({
@@ -472,6 +624,8 @@ export default {
                 loading.close()
             }
         }
+=======
+>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
   },
   computed: {
   },
@@ -494,7 +648,11 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+<<<<<<< HEAD
 .div_map{
   width: 400px;
 }
+=======
+
+>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
 </style>

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

@@ -14,8 +14,13 @@
             value-format="yyyy-MM-dd HH:mm:ss">
             </el-date-picker>
           </el-form-item>
+<<<<<<< HEAD
           <el-form-item label="发布状态">
             <el-select v-model="formData.online" placeholder="请选择" clearable >
+=======
+          <el-form-item label="状态">
+            <el-select v-model="formData.statusType" placeholder="请选择" clearable >
+>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
               <el-option v-for="item in formData.optionsStatus" :key="item.value" :label="item.label"
                 :value="item.value">
               </el-option>
@@ -93,11 +98,19 @@
       </el-dialog>
       <el-dialog :visible.sync="HandlePointsshow" :close-on-click-modal="false" :close-on-press-escape="false"
         title="打卡积分" width="1000px" top="10vh" class="dialog-h" @closed="diaClose">
+<<<<<<< HEAD
         <Points  v-if="HandlePointsshow" :list="fmData" />
       </el-dialog>
       <el-dialog :visible.sync="ActivityCountshow" :close-on-click-modal="false" :close-on-press-escape="false"
         title="报名管理" width="750" top="10vh" class="dialog-h" @closed="diaClose">
         <ActivityCountshow v-if="ActivityCountshow" :list="fmData" />
+=======
+        <Points :list="fmData" />
+      </el-dialog>
+      <el-dialog :visible.sync="ActivityCountshow" :close-on-click-modal="false" :close-on-press-escape="false"
+        title="报名管理" width="1000px" top="10vh" class="dialog-h" @closed="diaClose">
+        <ActivityCountshow :list="fmData" />
+>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
       </el-dialog>
     </div>
 
@@ -128,11 +141,19 @@
             strTime: "",
             endTime: "",
             optionsStatus: [{
+<<<<<<< HEAD
               value: '0',
               label: '下线'
             }, {
               value: '1',
               label: '上线 '
+=======
+              value: '已发布',
+              label: '已发布'
+            }, {
+              value: '未发布',
+              label: '未发布'
+>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
             },],
             online:'',
             title:""
@@ -167,6 +188,7 @@
         this.getTableData();
       },
       methods: {
+<<<<<<< HEAD
         
         //活动上下线
         handleupOnline(row){
@@ -190,6 +212,8 @@
           })
           
         },
+=======
+>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
         //查询
         handleSearch(){
           console.log("this.long");
@@ -208,7 +232,10 @@
           pageSize:this.pageSize,
           statusType:this.formData.statusType,
           endTime:this.formData.endTime,
+<<<<<<< HEAD
           online:this.formData.online
+=======
+>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
       }
       requestGet(url, params).then((res) => {
         if (res.code == 0) {