From c7c91ce9ea90bb382f681ea5c3ffaee12fc8d518 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: Wed, 4 Sep 2024 15:47:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../volunteer/Dynamicmanagement/add.vue       | 640 ++++++++++++++++++
 .../volunteer/Dynamicmanagement/edit.vue      | 640 ++++++++++++++++++
 .../volunteer/Dynamicmanagement/index.vue     |   9 +-
 .../modules/volunteer/VolManage/enclosure.vue |  92 +++
 .../modules/volunteer/VolManage/integral.vue  |  28 +-
 .../volunteer/VoluntaryOrganization/index.vue |   2 +-
 .../volunteer/VolunteerProjects/index.vue     |   9 +-
 .../volunteer/VolunteerProjects/process.vue   | 381 ++++-------
 .../volunteer/VolunteerProjects/record.vue    | 286 ++++++++
 .../volunteer/VolunteerProjects/recruit.vue   | 293 +++-----
 .../modules/volunteer/activityArchive/add.vue | 236 ++++---
 .../volunteer/activityArchive/index.vue       | 102 ++-
 .../volunteer/activityArchive/process.vue     | 100 +++
 .../volunteer/activityArchive/select.vue      | 199 +++---
 .../volunteer/pointsRedemption/add.vue        | 416 +++++++-----
 .../volunteer/pointsRedemption/index.vue      | 184 ++---
 .../volunteer/pointsRedemption/update.vue     | 272 +++++---
 17 files changed, 2843 insertions(+), 1046 deletions(-)
 create mode 100644 src/views/modules/volunteer/Dynamicmanagement/add.vue
 create mode 100644 src/views/modules/volunteer/Dynamicmanagement/edit.vue
 create mode 100644 src/views/modules/volunteer/VolManage/enclosure.vue
 create mode 100644 src/views/modules/volunteer/VolunteerProjects/record.vue
 create mode 100644 src/views/modules/volunteer/activityArchive/process.vue

diff --git a/src/views/modules/volunteer/Dynamicmanagement/add.vue b/src/views/modules/volunteer/Dynamicmanagement/add.vue
new file mode 100644
index 000000000..5bdcdaeca
--- /dev/null
+++ b/src/views/modules/volunteer/Dynamicmanagement/add.vue
@@ -0,0 +1,640 @@
+<template>
+    <div>
+ 
+       <div class="dialog-h-content scroll-h">
+         
+          <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" 
+             class="form">
+             <el-row>
+            <el-col :span="12">
+             <el-form-item label="所属栏目" label-width="150px" prop="Servicetype">
+                <el-select  multiple-limit='4' class="u-item-width-normal" v-model.trim="formData.Servicetype" placeholder="请选择" clearable multiple>
+                   <el-option v-for="item in ServicetypeList" :key="item.Servicetypeust" :label="item.typeName" :value="item.id" >
+                   </el-option>
+                </el-select>
+             </el-form-item>
+          </el-col>
+          <el-col :span="12">
+                 <el-form-item label="文章标题" prop="sumUp" label-width="150px">
+                <el-input v-model.trim="formData.sumUp" size="small" clearable placeholder="请输入活动名称"
+                   class="u-item-width-normal"></el-input>
+             </el-form-item>
+                 </el-col>
+            <el-col :span="24">
+             <el-form-item label="封面图片" label-width="150px" prop="fileList">
+                         <template>
+                             <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"
+                                 @file-removed="removedImg"></upload-image>
+                         </template>
+             </el-form-item>
+          </el-col>
+            <el-col :span="24">
+            <el-form-item label="活动详情" prop="zhaomu" style="display: block"  label-width="150px"> 
+              <div class="item_width_1">
+                <Tinymce class="tinymce_view " v-model.trim="formData.zhaomu" :height="150" placeholder="请输入活动内容" />
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+          <el-form-item  label="置顶
+          " style="display: block" prop="peopleCount" label-width="150px">
+              <el-switch v-model="formData.online" :active-value='1' :inactive-value='0'
+                @change="handleSwitchChange"></el-switch>
+            </el-form-item>
+        </el-col>
+          </el-row></el-form>
+       </div>
+       <div class="div_btn">
+          <el-button size="small" @click="handleCancle">取 消</el-button>
+          <el-button size="small" v-if="formType != 'detail'" type="primary" :disabled="btnDisable"
+             @click="handleComfirm">确 定</el-button>
+ 
+       </div>
+    </div>
+ </template>
+ 
+ <script>
+ import { mapGetters } from 'vuex'
+ import { Loading } from 'element-ui' // 引入Loading服务
+ import { requestPost } from '@/js/dai/request'
+ import Tinymce from '@c/tinymce2/index.vue'
+ import daiMap from "@/utils/dai-map";
+ import util from '@js/util.js';
+ // import UploadImage from './upload-image.vue'
+ import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
+ 
+ var map
+ var search
+ var markers
+ var infoWindowList
+ var geocoder // 新建一个正逆地址解析类
+ 
+ let loading // 加载动画
+ export default {
+    data() {
+ 
+        return {
+ 
+            activityImgs: [],//活动照片
+            fileList:[],
+            searchValue:"",
+            ServicetypeList:[
+                { label: "敬老爱老", value: 1 },
+                { label: "助残帮困", value: 2 },
+                { label: "扶贫帮困", value: 3 },
+                { label: "环保绿化", value: 4 },
+                { label: "文化教育", value: 5 },
+                { label: "扶贫帮困", value: 6 },
+                { label: "其他", value: 7 },
+            ],
+            Organizationaltype:[
+                { label: "社区", value: 1 },
+                { label: "企业", value: 2 },
+                { label: "学校", value: 3 },
+            ],
+            formData:    
+                { 
+                Servicelevel:"",//服务等级
+                VolunteerPic:"",//品牌图片
+                Volunteerbrand:"",//志愿品牌
+                Organizational:"",//组织介绍
+                fileList: [],//封面图片
+                AdministratorIDCard:"",//身份证信息
+                Administratorphone:"",//管理员电话
+                AdministratorName:"",//管理员姓名
+                Organizationaltype:"",//组织类型
+                Servicetype:"",//服务类型
+                OrganizationName:"",//组织名称
+                agencyName:"",//所属组织
+                id: "",
+                typeId: "",
+                activityName: "",//活动名称
+                status: 0,//状态
+                assistingParty: "",//协办方
+                startTime: "",//开始时间
+                endTime: "",//结束时间
+                coverPic: "",//封面图片地址
+                content: "",//活动内容
+                address: "",//地址
+                online: 0,//开关
+                cutOffTime: "",//截止时间
+                points: 0,//积分
+                participants: 0,//活动人数
+                sendMessage: 0,//推送数
+                sumUp: "",//活动总结
+                activityImgs: [],//图片列表
+                longitude: this.$store.state.user.longitude, //经度
+                latitude: this.$store.state.user.latitude,//纬度
+                },
+ 
+            corganizerList: [],
+            uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+            customerId: localStorage.getItem('customerId'),
+ 
+        }
+        
+    },
+ 
+    components: { Tinymce, UploadImage },
+    mounted() {
+        console.log(this.$store.state.user,"this.$store.state.user");
+        
+        this.formData.agencyName=this.$store.state.user.agencyName
+        if (this.$store.state.user.level=="district") {
+            this.formData.Servicelevel="区级"
+            
+        }
+        this.activityType()
+        this.listServerOrg()
+    },
+ 
+    methods: {
+        //控制活动时间
+        actcontrolTime() {
+            console.log("dislfj");
+            if (this.formData.startTime > this.formData.endTime) {
+                this.$message.error('活动结束时间不能在活动开始时间之前');
+                this.formData.endTime = ''
+                return
+            }
+        },
+        validateContent() {
+      // 使用正则表达式去除HTML标签后检查内容
+      const textContent = this.stripHtml(this.formData.sumUp);
+      if (textContent.trim() === '') {
+        this.formData.sumUp = null;
+      }
+    },
+    stripHtml(html) {
+      const div = document.createElement('div');
+      div.innerHTML = html;
+      return div.textContent || div.innerText || '';
+    },
+ 
+        // 上传成功
+        handleImgSuccess(res, file, fileList) {
+            if (res.code === 0 && res.msg === 'success') {
+                let format = file.name.split('.').pop();
+                let srcType = file.raw.type;
+                let type = 'file';
+                if (srcType.indexOf('image') != -1) {
+                    type = 'image';
+                } else if (srcType.indexOf('video') != -1) {
+                    type = 'video';
+                }
+                // this.formData.activityImgs.push({
+                //     format,
+                //     name: file.name,
+                //     size: file.size,
+                //     type,
+                //     url: res.data.url
+                // });
+                // console.log('this.formData.activityImgs',res.data.url)
+                this.formData.activityImgs.push(res.data.url);
+ 
+            } else {
+                this.$message.error(res.msg);
+            }
+        },
+        // 删除图片
+        handleImgRemove(file) {
+            console.log('handleImgRemove', file);
+            if (file.response) {
+                let index = this.formData.activityImgs.findIndex(item => item.url == file.response.data.url);
+                this.formData.activityImgs.splice(index, 1);
+            } else if (file.url) {
+                let index = this.formData.activityImgs.findIndex(item => item.url == file.url);
+                this.formData.activityImgs.splice(index, 1);
+            }
+        },
+        // 图片预览
+        handleImgPreview(file) {
+            console.log(file);
+            window.open(file.url || file.response.data.url);
+        },
+        // 文件数量超过限制
+        handleImgExceed() {
+            this.$message({
+                type: 'warning',
+                message: '文件数量最多不超过三个'
+            });
+        },
+        // 上传前的验证
+        beforeImgUpload(file) {
+            const isLt1M = file.size / 1024 / 1024 < 10;
+            const srcType = file.type;
+            const format = file.name.split('.').pop();
+            if (!isLt1M) {
+                this.$message.error('上传文件大小不能超过 10MB!');
+                return false;
+            }
+            if (srcType.indexOf('image') == -1) {
+                this.$message.error('仅限图片格式');
+                return false;
+            }
+            return true;
+        },
+ 
+        async activityType() {
+            const url = "/actual/base/activityType/page"
+            let params = {
+                // agencyId: this.agencyId
+                pageSize: 20,
+                pageNo: 1,
+                typeName: "",
+                enabled: 1
+            }
+            const { data, code, msg } = await requestPost(url, params)
+            if (code === 0) {
+                this.typeList = data.list
+            } else {
+                this.$message.error(msg)
+            }
+            this.$nextTick(() => {
+                if (!map) {
+                    this.initMap(this.formData.latitude, this.formData.longitude);
+                    console.log("map", map,this.formData.latitude, this.formData.longitude)
+                } else {
+                    map.setCenter(this.formData.latitude, this.formData.longitude);
+                    map.setMarker(this.formData.latitude, this.formData.longitude);
+                    console.log("mapmapmap", map)
+                }
+            })
+        },
+ 
+        handleOnlineRegistration(value) {
+            // 
+            if (value) {
+                this.online = true;
+                this.formData.online = 1;
+            } else {
+                this.online = false;
+                this.formData.cutOffTime = ''
+                this.formData.online = 0;
+            }
+        },
+ 
+        // onChangeFileList(e) {
+        //     if (e.length > 0) {
+        //         let item = e[0];
+        //         let ob = {
+        //             fileType: '0',
+        //             fileUrl: item.response.data.url
+        //         };
+        //         this.fileList = [ob];
+        //         this.formData.coverPic = ob.fileUrl;
+        //     }
+        // },
+        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.coverPic = e[0].response.data.url;
+            } else {
+                this.formData.coverPic = '';
+            }
+        },
+ 
+        onChangeImgs(e, rowIndex = 0) {
+            console.log('onChangeFileList', e)
+            if (e.length > 0) {
+                this.activityImgs = []
+                e.forEach(item => {
+                    let ob = {
+                        fileType: '0',
+                        fileUrl: item.response.data.url
+                    }
+                    this.activityImgs.push(ob)
+                })
+            }
+        },
+ 
+        // onChangeImgs(e) {
+        //     this.activityImgs = [];
+        //     if (e.length > 0) {
+        //         e.forEach(item => {
+        //             let ob = {
+        //                 fileType: '0',
+        //                 fileUrl: item.response.data.url
+        //             };
+        //             this.activityImgs.push(ob);
+        //         });
+        //         console.log('this.activityImgs',this.activityImgs)
+        //     }
+        // },
+ 
+        handleChange(value) {},
+        handleTimeChange(time) {
+            if (time) {
+                const startTimeArray = util.dateFormatter(time[0], 'time').split('-')
+                console.log(startTimeArray);
+                const endTimeArray = util.dateFormatter(time[1], 'time').split('-')
+                console.log(endTimeArray);
+                this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] 
+                this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] 
+                // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
+                // this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
+            } else {
+                this.formData.startTime = ''
+                this.formData.endTime = ''
+            }
+ 
+        },
+        async initForm(type, activityId) {
+            this.startLoading()
+            this.formType = type
+            if (type === 'edit') {
+                if (activityId.activityImgs || activityId.sumUp) {
+                    this.records = true
+                } else {
+                    this.records = false
+                }
+                this.formData = activityId
+                this.timeRange = [this.formData.startTime, this.formData.endTime]
+                console.log(activityId,"activityId");
+                
+                if (activityId.coverPic) {
+                    let ob = {
+                        fileType: '0',
+                        fileUrl: activityId.coverPic
+                    };
+                    this.fileList = [ob];
+                    this.formData.coverPic = ob.fileUrl;
+                    if (this.formData.online == 1) {
+                        this.online = true
+                    }
+                }
+            } else if (type === 'records') {
+                this.records = true
+            } else if (type === 'summary') {
+                this.formData = activityId
+                this.formData.activityImgs = []
+                console.log("this.formData", this.formData)
+                this.records = true
+                this.summary = false
+            } else {
+                this.records = false
+            }
+            this.endLoading()
+ 
+        },
+ 
+        async getDemandOptions() {
+            this.$http
+                .post("/actual/base/serviceitem/listAllCategory")
+                .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg);
+                    } else {
+                        console.log(res.data);
+                        this.demandOptions = this.getFlagData(
+                            this.getTreeData(res.data),
+                            "usableFlag"
+                        );
+                    }
+                })
+                .catch(() => {
+                    return this.$message.error("网络错误");
+                });
+        },
+        getFlagData(data, flag) {
+            if (!Array.isArray(data)) return [];
+            let arr1 = data.filter((item) => item[flag]);
+            let arr2 = arr1.map((item) => {
+                if (item.childCateList)
+                    return { ...item, childCateList: this.getFlagData(item.childCateList, flag) };
+                else return item;
+            });
+            return arr2;
+        },
+        getTreeData(data) {
+            if (!Array.isArray(data)) return [];
+            let arr = data.map((item) => {
+                let _item = {};
+                if (item.childCateList) {
+                    if (item.childCateList.length === 0)
+                        _item = { ...item, childCateList: undefined };
+                    else _item = { ...item, childCateList: this.getTreeData(item.childCateList) };
+                } else {
+                    _item = { ...item };
+                }
+                return _item;
+            });
+            return arr;
+        },
+        async loadGrid() {
+            const url = "/gov/org/customergrid/gridoption"
+ 
+            let params = {
+                agencyId: this.agencyId
+            }
+ 
+            const { data, code, msg } = await requestPost(url, params)
+ 
+            if (code === 0) {
+                this.gridList = data
+ 
+            } else {
+                this.$message.error(msg)
+            }
+ 
+        },
+ 
+ 
+        //加载组织
+        async loadFormData() {
+            const url = '/actual/base/icpartyactivity/detail'
+            // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/detail'
+            let params = {
+                id: this.activityId
+            }
+ 
+            const { data, code, msg } = await requestPost(url, params)
+ 
+            if (code === 0) {
+                this.formData = data
+                let style_img = "style='width:50px;height:40px;' "
+ 
+                if (this.formData.content) {
+                    // this.formData.content = this.formData.content.replace(/<img/g, "<img style='width:200px;height:240px;'")
+                    // let array=this.formData.content.split('<img')
+                }
+ 
+            } else {
+                this.$message.error(msg)
+            }
+        },
+ 
+        async handleComfirm() {
+
+
+
+ 
+           if (!this.formData.Administratorphone) {
+              this.$message.error('请输入活动详情');
+              return;
+           }
+ 
+           if (!this.formData.AdministratorName) {
+              this.$message.error('请上传封面图片');
+              return;
+           }
+ 
+           if (!this.formData.Organizationaltype) {
+              this.$message.error('请输入文章标题');
+              return;
+           }
+ 
+           if (!this.formData.Servicetype) {
+              this.$message.error('请输入所属项目');
+              return;
+           }
+ 
+
+           console.log(this.formData,"this.formData");
+           this.addActivity()
+        },
+        async addActivity() {
+            if (this.formType === 'edit' || this.formType === 'summary') {
+                let url = '/actual/base/communityActivity/update'
+                const { data, code, msg } = await requestPost(url, this.formData)
+                if (code === 0) {
+                    this.$message({
+                        type: 'success',
+                        message: '操作成功'
+                    })
+                    this.resetData()
+                    this.$emit('dialogOk')
+                    this.btnDisable = false
+                } else {
+                    this.btnDisable = false
+                    this.$message.error(msg)
+                }
+            } else {
+                let url = '/actual/base/communityActivity/save'
+                const { data, code, msg } = await requestPost(url, this.formData)
+                if (code === 0) {
+                    this.$message({
+                        type: 'success',
+                        message: '操作成功'
+                    })
+                    this.resetData()
+                    this.$emit('dialogOk')
+                    this.btnDisable = false
+                } else {
+                    this.btnDisable = false
+                    this.$message.error(msg)
+                }
+            }
+ 
+ 
+        },
+ 
+        handleCancle() {
+             console.log("sdlkfjklsdf ");
+            this.$emit('showAddClose')
+ 
+        },
+ 
+
+        // 开启加载动画
+        startLoading() {
+            loading = Loading.service({
+                lock: true, // 是否锁定
+                text: '正在加载……', // 加载中需要显示的文字
+                background: 'rgba(0,0,0,.7)' // 背景颜色
+            })
+        },
+        // 结束加载动画
+        endLoading() {
+            // clearTimeout(timer);
+            if (loading) {
+                loading.close()
+            }
+        }
+    },
+    computed: {
+        dataRule() {
+            return {
+                Servicetype: [
+                    { required: true, message: '请选择所属栏目', trigger: 'blur' }
+                ],
+                zhaomu: [
+                    { required: true, message: '活动详情不能为空', trigger: 'blur' }
+                ],
+                sumUp: [
+                    { required: true, message: '请填写文章标题', trigger: 'blur' }
+                ],
+                fileList: [
+                    { required: true, message: '请选择活动照片', trigger: 'blur' }
+                ]
+            }
+        },
+ 
+    },
+    props: {
+ 
+ 
+ 
+    },
+    destroyed () {
+     map = null
+   }
+ }
+ </script>
+ 
+ 
+ <style lang="scss" scoped>
+ @import "@/assets/scss/modules/visual/communityManageForm.scss";
+ </style>
+ <style lang="scss" scoped>
+ .item_width_1 {
+    width: 634px;
+ 
+    /deep/.tox .tox-dialog {
+        z-index: 20000;
+    }
+ }
+ .u-item-width-normal{
+    width: 222px;
+ }
+ 
+ .tinymce_view {
+    ::v-deep .tox .tox-dialog {
+        z-index: 2000000000;
+    }
+ }
+ 
+ .div_map {
+    position: relative;
+ }
+ 
+ .div_searchmap {
+    z-index: 5000;
+    position: absolute;
+    top: 5px;
+    left: 5px;
+ }
+ 
+ .tinymce_view {
+    height: 400px;
+    overflow: auto;
+ }
+ 
+ .text_p {
+    margin: 0;
+    padding: 0 10px;
+    border: 1px solid #d9d9d9;
+    border-radius: 5px;
+ 
+    >p {
+        margin: 0;
+    }
+ }
+ </style>
\ No newline at end of file
diff --git a/src/views/modules/volunteer/Dynamicmanagement/edit.vue b/src/views/modules/volunteer/Dynamicmanagement/edit.vue
new file mode 100644
index 000000000..e38d9f1a3
--- /dev/null
+++ b/src/views/modules/volunteer/Dynamicmanagement/edit.vue
@@ -0,0 +1,640 @@
+<template>
+    <div>
+ 
+       <div class="dialog-h-content scroll-h">
+         
+          <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" 
+             class="form">
+             <el-row>
+            <el-col :span="12">
+             <el-form-item label="所属栏目" label-width="150px" prop="Servicetype">
+                <el-select  multiple-limit='4' class="u-item-width-normal" v-model.trim="formData.Servicetype" placeholder="请选择" clearable multiple>
+                   <el-option v-for="item in ServicetypeList" :key="item.Servicetypeust" :label="item.typeName" :value="item.id" >
+                   </el-option>
+                </el-select>
+             </el-form-item>
+          </el-col>
+          <el-col :span="12">
+                 <el-form-item label="文章标题" prop="sumUp" label-width="150px">
+                <el-input v-model.trim="formData.sumUp" size="small" clearable placeholder="请输入活动名称"
+                   class="u-item-width-normal"></el-input>
+             </el-form-item>
+                 </el-col>
+            <el-col :span="24">
+             <el-form-item label="封面图片" label-width="150px" prop="fileList">
+                         <template>
+                             <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"
+                                 @file-removed="removedImg"></upload-image>
+                         </template>
+             </el-form-item>
+          </el-col>
+            <el-col :span="24">
+            <el-form-item label="活动详情" prop="zhaomu" style="display: block"  label-width="150px"> 
+              <div class="item_width_1">
+                <Tinymce class="tinymce_view " v-model.trim="formData.zhaomu" :height="150" placeholder="请输入活动内容" />
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+          <el-form-item  label="置顶
+          " style="display: block" prop="peopleCount" label-width="150px">
+              <el-switch v-model="formData.online" :active-value='1' :inactive-value='0'
+                @change="handleSwitchChange"></el-switch>
+            </el-form-item>
+        </el-col>
+          </el-row></el-form>
+       </div>
+       <div class="div_btn">
+          <el-button size="small" @click="handleCancle">取 消</el-button>
+          <el-button size="small" v-if="formType != 'detail'" type="primary" :disabled="btnDisable"
+             @click="handleComfirm">确 定</el-button>
+ 
+       </div>
+    </div>
+ </template>
+ 
+ <script>
+ import { mapGetters } from 'vuex'
+ import { Loading } from 'element-ui' // 引入Loading服务
+ import { requestPost } from '@/js/dai/request'
+ import Tinymce from '@c/tinymce2/index.vue'
+ import daiMap from "@/utils/dai-map";
+ import util from '@js/util.js';
+ // import UploadImage from './upload-image.vue'
+ import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
+ 
+ var map
+ var search
+ var markers
+ var infoWindowList
+ var geocoder // 新建一个正逆地址解析类
+ 
+ let loading // 加载动画
+ export default {
+    data() {
+ 
+        return {
+ 
+            activityImgs: [],//活动照片
+            fileList:[],
+            searchValue:"",
+            ServicetypeList:[
+                { label: "敬老爱老", value: 1 },
+                { label: "助残帮困", value: 2 },
+                { label: "扶贫帮困", value: 3 },
+                { label: "环保绿化", value: 4 },
+                { label: "文化教育", value: 5 },
+                { label: "扶贫帮困", value: 6 },
+                { label: "其他", value: 7 },
+            ],
+            Organizationaltype:[
+                { label: "社区", value: 1 },
+                { label: "企业", value: 2 },
+                { label: "学校", value: 3 },
+            ],
+            formData:    
+                { 
+                Servicelevel:"",//服务等级
+                VolunteerPic:"",//品牌图片
+                Volunteerbrand:"",//志愿品牌
+                Organizational:"",//组织介绍
+                fileList: [],//封面图片
+                AdministratorIDCard:"",//身份证信息
+                Administratorphone:"",//管理员电话
+                AdministratorName:"",//管理员姓名
+                Organizationaltype:"",//组织类型
+                Servicetype:"",//服务类型
+                OrganizationName:"",//组织名称
+                agencyName:"",//所属组织
+                id: "",
+                typeId: "",
+                activityName: "",//活动名称
+                status: 0,//状态
+                assistingParty: "",//协办方
+                startTime: "",//开始时间
+                endTime: "",//结束时间
+                coverPic: "",//封面图片地址
+                content: "",//活动内容
+                address: "",//地址
+                online: 0,//开关
+                cutOffTime: "",//截止时间
+                points: 0,//积分
+                participants: 0,//活动人数
+                sendMessage: 0,//推送数
+                sumUp: "",//活动总结
+                activityImgs: [],//图片列表
+                longitude: this.$store.state.user.longitude, //经度
+                latitude: this.$store.state.user.latitude,//纬度
+                },
+ 
+            corganizerList: [],
+            uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+            customerId: localStorage.getItem('customerId'),
+ 
+        }
+        
+    },
+ 
+    components: { Tinymce, UploadImage },
+    mounted() {
+        console.log(this.$store.state.user,"this.$store.state.user");
+        
+        this.formData.agencyName=this.$store.state.user.agencyName
+        if (this.$store.state.user.level=="district") {
+            this.formData.Servicelevel="区级"
+            
+        }
+        this.activityType()
+        this.listServerOrg()
+    },
+ 
+    methods: {
+        //控制活动时间
+        actcontrolTime() {
+            console.log("dislfj");
+            if (this.formData.startTime > this.formData.endTime) {
+                this.$message.error('活动结束时间不能在活动开始时间之前');
+                this.formData.endTime = ''
+                return
+            }
+        },
+        validateContent() {
+      // 使用正则表达式去除HTML标签后检查内容
+      const textContent = this.stripHtml(this.formData.sumUp);
+      if (textContent.trim() === '') {
+        this.formData.sumUp = null;
+      }
+    },
+    stripHtml(html) {
+      const div = document.createElement('div');
+      div.innerHTML = html;
+      return div.textContent || div.innerText || '';
+    },
+ 
+        // 上传成功
+        handleImgSuccess(res, file, fileList) {
+            if (res.code === 0 && res.msg === 'success') {
+                let format = file.name.split('.').pop();
+                let srcType = file.raw.type;
+                let type = 'file';
+                if (srcType.indexOf('image') != -1) {
+                    type = 'image';
+                } else if (srcType.indexOf('video') != -1) {
+                    type = 'video';
+                }
+                // this.formData.activityImgs.push({
+                //     format,
+                //     name: file.name,
+                //     size: file.size,
+                //     type,
+                //     url: res.data.url
+                // });
+                // console.log('this.formData.activityImgs',res.data.url)
+                this.formData.activityImgs.push(res.data.url);
+ 
+            } else {
+                this.$message.error(res.msg);
+            }
+        },
+        // 删除图片
+        handleImgRemove(file) {
+            console.log('handleImgRemove', file);
+            if (file.response) {
+                let index = this.formData.activityImgs.findIndex(item => item.url == file.response.data.url);
+                this.formData.activityImgs.splice(index, 1);
+            } else if (file.url) {
+                let index = this.formData.activityImgs.findIndex(item => item.url == file.url);
+                this.formData.activityImgs.splice(index, 1);
+            }
+        },
+        // 图片预览
+        handleImgPreview(file) {
+            console.log(file);
+            window.open(file.url || file.response.data.url);
+        },
+        // 文件数量超过限制
+        handleImgExceed() {
+            this.$message({
+                type: 'warning',
+                message: '文件数量最多不超过三个'
+            });
+        },
+        // 上传前的验证
+        beforeImgUpload(file) {
+            const isLt1M = file.size / 1024 / 1024 < 10;
+            const srcType = file.type;
+            const format = file.name.split('.').pop();
+            if (!isLt1M) {
+                this.$message.error('上传文件大小不能超过 10MB!');
+                return false;
+            }
+            if (srcType.indexOf('image') == -1) {
+                this.$message.error('仅限图片格式');
+                return false;
+            }
+            return true;
+        },
+ 
+        async activityType() {
+            const url = "/actual/base/activityType/page"
+            let params = {
+                // agencyId: this.agencyId
+                pageSize: 20,
+                pageNo: 1,
+                typeName: "",
+                enabled: 1
+            }
+            const { data, code, msg } = await requestPost(url, params)
+            if (code === 0) {
+                this.typeList = data.list
+            } else {
+                this.$message.error(msg)
+            }
+            this.$nextTick(() => {
+                if (!map) {
+                    this.initMap(this.formData.latitude, this.formData.longitude);
+                    console.log("map", map,this.formData.latitude, this.formData.longitude)
+                } else {
+                    map.setCenter(this.formData.latitude, this.formData.longitude);
+                    map.setMarker(this.formData.latitude, this.formData.longitude);
+                    console.log("mapmapmap", map)
+                }
+            })
+        },
+ 
+        handleOnlineRegistration(value) {
+            // 
+            if (value) {
+                this.online = true;
+                this.formData.online = 1;
+            } else {
+                this.online = false;
+                this.formData.cutOffTime = ''
+                this.formData.online = 0;
+            }
+        },
+ 
+        // onChangeFileList(e) {
+        //     if (e.length > 0) {
+        //         let item = e[0];
+        //         let ob = {
+        //             fileType: '0',
+        //             fileUrl: item.response.data.url
+        //         };
+        //         this.fileList = [ob];
+        //         this.formData.coverPic = ob.fileUrl;
+        //     }
+        // },
+        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.coverPic = e[0].response.data.url;
+            } else {
+                this.formData.coverPic = '';
+            }
+        },
+ 
+        onChangeImgs(e, rowIndex = 0) {
+            console.log('onChangeFileList', e)
+            if (e.length > 0) {
+                this.activityImgs = []
+                e.forEach(item => {
+                    let ob = {
+                        fileType: '0',
+                        fileUrl: item.response.data.url
+                    }
+                    this.activityImgs.push(ob)
+                })
+            }
+        },
+ 
+        // onChangeImgs(e) {
+        //     this.activityImgs = [];
+        //     if (e.length > 0) {
+        //         e.forEach(item => {
+        //             let ob = {
+        //                 fileType: '0',
+        //                 fileUrl: item.response.data.url
+        //             };
+        //             this.activityImgs.push(ob);
+        //         });
+        //         console.log('this.activityImgs',this.activityImgs)
+        //     }
+        // },
+ 
+        handleChange(value) {},
+        handleTimeChange(time) {
+            if (time) {
+                const startTimeArray = util.dateFormatter(time[0], 'time').split('-')
+                console.log(startTimeArray);
+                const endTimeArray = util.dateFormatter(time[1], 'time').split('-')
+                console.log(endTimeArray);
+                this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] 
+                this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] 
+                // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
+                // this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
+            } else {
+                this.formData.startTime = ''
+                this.formData.endTime = ''
+            }
+ 
+        },
+        async initForm(type, activityId) {
+            this.startLoading()
+            this.formType = type
+            if (type === 'edit') {
+                if (activityId.activityImgs || activityId.sumUp) {
+                    this.records = true
+                } else {
+                    this.records = false
+                }
+                this.formData = activityId
+                this.timeRange = [this.formData.startTime, this.formData.endTime]
+                console.log(activityId,"activityId");
+                
+                if (activityId.coverPic) {
+                    let ob = {
+                        fileType: '0',
+                        fileUrl: activityId.coverPic
+                    };
+                    this.fileList = [ob];
+                    this.formData.coverPic = ob.fileUrl;
+                    if (this.formData.online == 1) {
+                        this.online = true
+                    }
+                }
+            } else if (type === 'records') {
+                this.records = true
+            } else if (type === 'summary') {
+                this.formData = activityId
+                this.formData.activityImgs = []
+                console.log("this.formData", this.formData)
+                this.records = true
+                this.summary = false
+            } else {
+                this.records = false
+            }
+            this.endLoading()
+ 
+        },
+ 
+        async getDemandOptions() {
+            this.$http
+                .post("/actual/base/serviceitem/listAllCategory")
+                .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg);
+                    } else {
+                        console.log(res.data);
+                        this.demandOptions = this.getFlagData(
+                            this.getTreeData(res.data),
+                            "usableFlag"
+                        );
+                    }
+                })
+                .catch(() => {
+                    return this.$message.error("网络错误");
+                });
+        },
+        getFlagData(data, flag) {
+            if (!Array.isArray(data)) return [];
+            let arr1 = data.filter((item) => item[flag]);
+            let arr2 = arr1.map((item) => {
+                if (item.childCateList)
+                    return { ...item, childCateList: this.getFlagData(item.childCateList, flag) };
+                else return item;
+            });
+            return arr2;
+        },
+        getTreeData(data) {
+            if (!Array.isArray(data)) return [];
+            let arr = data.map((item) => {
+                let _item = {};
+                if (item.childCateList) {
+                    if (item.childCateList.length === 0)
+                        _item = { ...item, childCateList: undefined };
+                    else _item = { ...item, childCateList: this.getTreeData(item.childCateList) };
+                } else {
+                    _item = { ...item };
+                }
+                return _item;
+            });
+            return arr;
+        },
+        async loadGrid() {
+            const url = "/gov/org/customergrid/gridoption"
+ 
+            let params = {
+                agencyId: this.agencyId
+            }
+ 
+            const { data, code, msg } = await requestPost(url, params)
+ 
+            if (code === 0) {
+                this.gridList = data
+ 
+            } else {
+                this.$message.error(msg)
+            }
+ 
+        },
+ 
+ 
+        //加载组织
+        async loadFormData() {
+            const url = '/actual/base/icpartyactivity/detail'
+            // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/detail'
+            let params = {
+                id: this.activityId
+            }
+ 
+            const { data, code, msg } = await requestPost(url, params)
+ 
+            if (code === 0) {
+                this.formData = data
+                let style_img = "style='width:50px;height:40px;' "
+ 
+                if (this.formData.content) {
+                    // this.formData.content = this.formData.content.replace(/<img/g, "<img style='width:200px;height:240px;'")
+                    // let array=this.formData.content.split('<img')
+                }
+ 
+            } else {
+                this.$message.error(msg)
+            }
+        },
+ 
+        async handleComfirm() {
+
+
+
+ 
+           if (!this.formData.Administratorphone) {
+              this.$message.error('请输入活动详情');
+              return;
+           }
+ 
+           if (!this.formData.AdministratorName) {
+              this.$message.error('请上传封面图片');
+              return;
+           }
+ 
+           if (!this.formData.Organizationaltype) {
+              this.$message.error('请输入文章标题');
+              return;
+           }
+ 
+           if (!this.formData.Servicetype) {
+              this.$message.error('请输入所属项目');
+              return;
+           }
+ 
+
+           console.log(this.formData,"this.formData");
+           this.addActivity()
+        },
+        async addActivity() {
+            if (this.formType === 'edit' || this.formType === 'summary') {
+                let url = '/actual/base/communityActivity/update'
+                const { data, code, msg } = await requestPost(url, this.formData)
+                if (code === 0) {
+                    this.$message({
+                        type: 'success',
+                        message: '操作成功'
+                    })
+                    this.resetData()
+                    this.$emit('dialogOk')
+                    this.btnDisable = false
+                } else {
+                    this.btnDisable = false
+                    this.$message.error(msg)
+                }
+            } else {
+                let url = '/actual/base/communityActivity/save'
+                const { data, code, msg } = await requestPost(url, this.formData)
+                if (code === 0) {
+                    this.$message({
+                        type: 'success',
+                        message: '操作成功'
+                    })
+                    this.resetData()
+                    this.$emit('showEditClose')
+                    this.btnDisable = false
+                } else {
+                    this.btnDisable = false
+                    this.$message.error(msg)
+                }
+            }
+ 
+ 
+        },
+ 
+        handleCancle() {
+             console.log("sdlkfjklsdf ");
+            this.$emit('showEditClose')
+ 
+        },
+ 
+
+        // 开启加载动画
+        startLoading() {
+            loading = Loading.service({
+                lock: true, // 是否锁定
+                text: '正在加载……', // 加载中需要显示的文字
+                background: 'rgba(0,0,0,.7)' // 背景颜色
+            })
+        },
+        // 结束加载动画
+        endLoading() {
+            // clearTimeout(timer);
+            if (loading) {
+                loading.close()
+            }
+        }
+    },
+    computed: {
+        dataRule() {
+            return {
+                Servicetype: [
+                    { required: true, message: '请选择所属栏目', trigger: 'blur' }
+                ],
+                zhaomu: [
+                    { required: true, message: '活动详情不能为空', trigger: 'blur' }
+                ],
+                sumUp: [
+                    { required: true, message: '请填写文章标题', trigger: 'blur' }
+                ],
+                fileList: [
+                    { required: true, message: '请选择活动照片', trigger: 'blur' }
+                ]
+            }
+        },
+ 
+    },
+    props: {
+ 
+ 
+ 
+    },
+    destroyed () {
+     map = null
+   }
+ }
+ </script>
+ 
+ 
+ <style lang="scss" scoped>
+ @import "@/assets/scss/modules/visual/communityManageForm.scss";
+ </style>
+ <style lang="scss" scoped>
+ .item_width_1 {
+    width: 634px;
+ 
+    /deep/.tox .tox-dialog {
+        z-index: 20000;
+    }
+ }
+ .u-item-width-normal{
+    width: 222px;
+ }
+ 
+ .tinymce_view {
+    ::v-deep .tox .tox-dialog {
+        z-index: 2000000000;
+    }
+ }
+ 
+ .div_map {
+    position: relative;
+ }
+ 
+ .div_searchmap {
+    z-index: 5000;
+    position: absolute;
+    top: 5px;
+    left: 5px;
+ }
+ 
+ .tinymce_view {
+    height: 400px;
+    overflow: auto;
+ }
+ 
+ .text_p {
+    margin: 0;
+    padding: 0 10px;
+    border: 1px solid #d9d9d9;
+    border-radius: 5px;
+ 
+    >p {
+        margin: 0;
+    }
+ }
+ </style>
\ No newline at end of file
diff --git a/src/views/modules/volunteer/Dynamicmanagement/index.vue b/src/views/modules/volunteer/Dynamicmanagement/index.vue
index 9e14629e5..03af8f9e5 100644
--- a/src/views/modules/volunteer/Dynamicmanagement/index.vue
+++ b/src/views/modules/volunteer/Dynamicmanagement/index.vue
@@ -3,7 +3,7 @@
         <div class="m-search">
             <el-form :inline="true" ref="ref_searchform" :label-width="'100px'">
                 <div>
-                    <el-form-item label="标题">
+                    <el-form-item label="标题"  :label-width="'50px'">
                         <el-input v-model.trim="formData.OrganizationName" size="small" class="item_width_1" clearable
                             placeholder="请输入">
                         </el-input>
@@ -144,9 +144,9 @@
 import { requestPost, requestGet } from "@/js/dai/request";
 import nextTick from "dai-js/tools/nextTick";
 import { mapGetters } from "vuex";
-// import add from "./add.vue"
+import add from "./add.vue"
 // import info from "./info.vue"
-// import edit from "./edit.vue"
+import edit from "./edit.vue"
 // import recruit from "./recruit"
 
 // import process from "./process.vue"
@@ -157,7 +157,8 @@ import axios from "axios";
 
 export default {
     components: {
-        // add,info,edit,recruit,process
+        add,edit
+        // info,recruit,process
     },
 
     data() {
diff --git a/src/views/modules/volunteer/VolManage/enclosure.vue b/src/views/modules/volunteer/VolManage/enclosure.vue
new file mode 100644
index 000000000..e87c34c91
--- /dev/null
+++ b/src/views/modules/volunteer/VolManage/enclosure.vue
@@ -0,0 +1,92 @@
+<template>
+  <div>
+  <div style="display: flex;white-space: nowrap;  padding: 30px 0 0 0 ;" >
+    <el-col :span="12">
+       <el-form-item label="调整类型" prop="type" required>
+              <el-select v-model.trim="formData.type" placeholder="请选择" clearable style="width: 280px">
+                <el-option v-for="item in  typeList" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+     </div>
+     <div class="div_btn">
+ 
+        <el-button size="small" @click="handleCancle">取 消</el-button>
+        <el-button size="small" v-if="formType != 'detail'" type="primary" :disabled="btnDisable"
+           @click="handleComfirm">确 定</el-button>
+
+  </div>
+</div>
+</template>
+<script>
+import { requestPost,requestGet } from "@/js/dai/request";
+export default {
+ name: "see",
+  data() {
+  return {
+      radio:'1',
+      stockQty:"",
+      labelPosition: 'right',
+      tableData: [],
+      awardId:""
+  };
+},
+props:{
+  VolunteerList:{
+    type: Object,
+    default: () => {}
+  }
+},
+created() {
+  console.log(this.VolunteerList,"list");
+  this.tableData=this.VolunteerList
+  // this.awardId=this.list.id
+  // this.getTableData()
+},
+methods: {
+  //取消审查
+  handleCancle(){
+    this.$emit('handleprocesslClose')
+  },
+  //确认审查
+  handleComfirm(){
+    this.$emit('handleprocesslClose')
+  },
+   getTableData() {
+      console.log(this.formData);
+      const url = "/voluntary/pointsAward/admin/detail";
+      let params = {
+        id:this.awardId
+    }
+    requestGet(url, params).then((res) =>{
+      console.log(res,"res");
+      if(res.code===0){
+        console.log("列表请求成功！！！！！！！！！！！！！！");
+        console.log(res.data, "data");
+        this.tableData = res.data
+        console.log(this.tableData, "this.tableData");
+      }
+    })
+      // const { data, code, msg } =  requestGet(url, params)
+      // console.log(data,"data");
+      // if (code === 0) {
+      //   console.log("列表请求成功！！！！！！！！！！！！！！");
+      //   console.log(data,"data");
+      //   this.tableData = data
+      //   console.log(this.tableData,"this.tableData");
+        
+  
+      // } else {
+      // }
+    },
+
+},
+
+
+}
+
+</script>
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>
\ No newline at end of file
diff --git a/src/views/modules/volunteer/VolManage/integral.vue b/src/views/modules/volunteer/VolManage/integral.vue
index 2ab17a35a..c3ea4c7ff 100644
--- a/src/views/modules/volunteer/VolManage/integral.vue
+++ b/src/views/modules/volunteer/VolManage/integral.vue
@@ -71,6 +71,9 @@
         </el-table-column>
 
         <el-table-column prop="pointsDelta" header-align="center" align="center" label="积分">
+          <template slot-scope="scope">
+            <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleAdjust(scope.row)">{{ scope.row.pointsDelta}}</el-button>
+          </template>
         </el-table-column>
         <!-- <el-table-column prop="ActivityCount" header-align="center" align="center" label="核销时间">
                 </el-table-column>
@@ -87,8 +90,12 @@
           :page-sizes="[10, 20, 50]" :page-size="pageSize" layout="sizes, prev, pager, next, total" :total="total">
         </el-pagination>
       </div>
-
+      <el-dialog   :modal="false" :visible.sync="adjustment" :close-on-click-modal="false" :close-on-press-escape="false" title="积分调整"
+            width="750px" top="15vh" class="dialog-h"   >
+            <enclosure v-if="adjustment" :list="fmData"  />
+          </el-dialog>
     </div>
+
     <div class="flex flex-center1 flex-center2">
       <el-button type="info" @click="handleremove">取消</el-button>
       <!-- <el-button type="danger" @click="getTableData">确定</el-button> -->
@@ -98,12 +105,15 @@
   </div>
 </template>
 <script>
+  import enclosure from "./enclosure.vue"
   import { requestPost,requestGet } from "@/js/dai/request";
+
 export default {
     
    name: "see",
     data() {
     return {
+      adjustment:false,
       formData:{
         createdTimeTo:"",
         createdTimeTo:"",
@@ -144,6 +154,9 @@ export default {
       default: () => {}
     }
   },
+  components:{
+    enclosure
+  },
   created() {
     console.log(this.list,"list");
     this.getlist()
@@ -154,6 +167,19 @@ export default {
   
   },
   methods: {
+    //调整积分
+    handleAdjust(row){
+   
+      this.adjustment=true
+      console.log(row, this.adjustment,"row");
+    },
+    //关闭调整积分
+        //调整积分
+        handleAdjustClose(row){
+      console.log(row,"row");
+      this.adjustmen=false
+      
+    },
           //控制活动时间
           actcontrolTime(){
       console.log("dislfj");
diff --git a/src/views/modules/volunteer/VoluntaryOrganization/index.vue b/src/views/modules/volunteer/VoluntaryOrganization/index.vue
index 5eb72611f..c950bc565 100644
--- a/src/views/modules/volunteer/VoluntaryOrganization/index.vue
+++ b/src/views/modules/volunteer/VoluntaryOrganization/index.vue
@@ -105,7 +105,7 @@
                 title="成员管理" width="1000px" top="10vh" class="dialog-h" @closed="MemberManagementClose">
                 <MemberManagement v-if="showMember" :list="fmData" @MemberManagementClose="MemberManagementClose" />
             </el-dialog>
-            <el-dialog :visible.sync="showprocess" :close-on-click-modal="false" :close-on-press-escape="false" title="审查"
+            <el-dialog :visible.sync="showprocess" :close-on-click-modal="false" :close-on-press-escape="false" title="审核"
                 width="850px" top="10vh" class="dialog-h" @closed="handleprocesslClose">
                 <process v-if="showprocess" @handleprocesslClose="handleprocesslClose"  :VolunteerList="EditList"/>
             </el-dialog>
diff --git a/src/views/modules/volunteer/VolunteerProjects/index.vue b/src/views/modules/volunteer/VolunteerProjects/index.vue
index 3b9b73cc8..b2dc94739 100644
--- a/src/views/modules/volunteer/VolunteerProjects/index.vue
+++ b/src/views/modules/volunteer/VolunteerProjects/index.vue
@@ -125,8 +125,8 @@
                 <process v-if="showprocess" @handleprocesslClose="handleprocesslClose" :VolunteerList="EditList" />
             </el-dialog>
             <el-dialog :visible.sync="showrecord" :close-on-click-modal="false" :close-on-press-escape="false"
-                title="查看记录" width="850px" top="10vh" class="dialog-h" @closed="handleprocesslClose">
-                <process v-if="showrecord" @handleprocesslClose="handleprocesslClose" :VolunteerList="EditList" />
+                title="查看记录" width="850px" top="10vh" class="dialog-h" @closed="handlerecordClose">
+                <Record v-if="showrecord" @handlerecordClose="handlerecordClose" :VolunteerList="EditList" />
             </el-dialog>
         </div>
     </div>
@@ -142,14 +142,14 @@ import edit from "./edit.vue"
 import recruit from "./recruit"
 
 import process from "./process.vue"
-// import Record from "./activeRecord"
+import Record from "./record"
 // import integral from "./integral"
 // //   import projectInfo from "./cpts/project-info";
 import axios from "axios";
 
 export default {
     components: {
-        add,info,edit,recruit,process
+        add,info,edit,recruit,process,Record
     },
 
     data() {
@@ -431,6 +431,7 @@ export default {
         this.EditList=row
         console.log(row,this.fmData,"row");  
         },
+        //关闭记录
         handlerecordClose(){
         this.showrecord=false 
         },
diff --git a/src/views/modules/volunteer/VolunteerProjects/process.vue b/src/views/modules/volunteer/VolunteerProjects/process.vue
index bab5994ef..63426cba0 100644
--- a/src/views/modules/volunteer/VolunteerProjects/process.vue
+++ b/src/views/modules/volunteer/VolunteerProjects/process.vue
@@ -1,286 +1,131 @@
 <template>
-  <div class="g-main" style="padding: 30px;">
-    <el-form :inline="true" :model="formData" class="demo-form-inline">
-      <el-form-item>
-        <el-select v-model="value" placeholder="请选择" class="item_width_1">
-          <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="加入时间" label-width="100px">
-        <el-date-picker v-model="formData.createdTimeFrom" type="datetime" placeholder="开始时间"
-          format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" style="width: 200px;">
-        </el-date-picker>
-        <span style="margin: 0 10px;">至</span>
-        <el-date-picker v-model="formData.createdTimeTo" type="datetime" placeholder="结束时间" format="yyyy-MM-dd HH:mm:ss"
-          value-format="yyyy-MM-dd HH:mm:ss" @change="actcontrolTime" style="width: 200px;">
-        </el-date-picker>
-      </el-form-item>
-    </el-form>
-    <div style="display: flex; justify-content: flex-end; margin-bottom: 10px;">
-      <el-button type="primary" @click="handleSearch">查询</el-button>
-    </div>
-    <div>
-      <div> <el-table :data="tableData" border height="250">
-          <el-table-column label="序号" width="80" header-align="center" align="center" type="index"></el-table-column>
-          <el-table-column prop="pointsClassName" header-align="center" align="center" label="活动时间">
-          </el-table-column>
-          <el-table-column prop="createdTime" header-align="center" align="center" label="活动标题">
-          </el-table-column>
-          . <el-table-column prop="operationName" header-align="center" align="center" label="活动地点">
-          </el-table-column>
-          <el-table-column prop="pointsDelta" header-align="center" align="center" label="活动详情">
-          </el-table-column>
-          <el-table-column prop="pointsDelta" header-align="center" align="center" label="状态">
-          </el-table-column>
-        </el-table></div>
-        <div v-if="true"> <el-table :data="tableData" border height="250">
-          <el-table-column label="序号" width="80" header-align="center" align="center" type="index"></el-table-column>
-          <el-table-column prop="pointsClassName" header-align="center" align="center" label="服务时间">
-          </el-table-column>
-          <el-table-column prop="createdTime" header-align="center" align="center" label="服务区域">
-          </el-table-column>
-          <el-table-column prop="operationName" header-align="center" align="center" label="服务地点">
-          </el-table-column>
-          <el-table-column prop="pointsDelta" header-align="center" align="center" label="服务详情">
-          </el-table-column>
-          <el-table-column prop="pointsDelta" header-align="center" align="center" label="附件">
-            <template slot-scope="scope">
-              <el-button type="text" @click="handleDetail(scope.row)">查看</el-button>
-            </template>
-          </el-table-column>
-        </el-table> </div>
+  <div>
+  <div style="display: flex;white-space: nowrap;  padding: 30px;" >
+      <el-form  style="padding-left: 50px;" :label-position="labelPosition" :model="tableData">
+          <el-form-item label="申请单位">
+            <div> {{ tableData.OrganizationName }}</div>
+          </el-form-item> 
+          <el-form-item label="申请名称">
+              {{ tableData.Servicetype }}
+          </el-form-item>
+          <el-form-item label="项目级别">
+             {{ tableData.Organizationaltype}}
+          </el-form-item>
+          <el-form-item label="项目介绍">
+             {{ tableData.AdministratorName}}
+          </el-form-item>
+          <el-form-item label="项目展示图">
+             {{ tableData.AdministratorName}}
+          </el-form-item>
+          <el-form-item label="服务区域">
+             {{ tableData.AdministratorIDCard }}
+            
+          </el-form-item>
+          <el-form-item label="服务类型">
+             {{ tableData.Administratorphone }}
+            
+          </el-form-item>
+          <el-form-item label="服务期限">
+             {{ tableData.agencyName }}
+            
+          </el-form-item>
+          <el-form-item label="附件">
+        <template slot-scope="scope">
+      <span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span>
+    </template>
+          </el-form-item>
+          <el-form-item label="审核">
+  
+          <div style="display: flex; justify-items:center; align-items: center;">
+              <el-radio v-model="radio" label="1" style="margin-right:20px">通过</el-radio>
+             <div class="flex flex-x  flex-center2">
+                <el-radio v-model="radio" label="2" style="margin-right: 10px;">不通过</el-radio>
+                <el-input v-if="radio == '2'" type="number" v-model="stockQty" style="width: 200px;"
+                   placeholder="请说明原因"></el-input>
      
-      <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>
+            </div>
       </div>
+          </el-form-item>
+      </el-form>
+     
+     </div>
+     <div class="div_btn">
+ 
+        <el-button size="small" @click="handleCancle">取 消</el-button>
+        <el-button size="small" v-if="formType != 'detail'" type="primary" :disabled="btnDisable"
+           @click="handleComfirm">确 定</el-button>
 
-    </div>
-    <el-dialog  :modal="false" :visible.sync="info" :close-on-click-modal="false" :close-on-press-escape="false" title="附件详情"
-          width="750px" top="15vh" class="dialog-h"   >
-          <enclosure v-if="info" :list="fmData"  />
-        </el-dialog>
-    <!-- <div class="flex flex-center1 flex-center2">
-      <el-button type="info" @click="handleremove">取消</el-button>
-      <el-button type="danger" @click="handleSubmit">确定</el-button>
-    </div> -->
-    </div>
-
+  </div>
+</div>
 </template>
 <script>
-import enclosure from "./enclosure.vue"
-  import { requestPost,requestGet } from "@/js/dai/request";
+import { requestPost,requestGet } from "@/js/dai/request";
 export default {
-    
-   name: "see",
-    data() {
-    return {
-      options: [{
-          value: '1',
-          label: '活动记录'
-        }, {
-          value: '2',
-          label: '服务记录'
-        }],
-        value: '',
-      formData:{
-        createdTimeTo:"",
-        createdTimeTo:"",
-        pointsClass:"",
-        optionsStatus: [
-          {
-            code:1,
-            name:"活动积分"
-          },
-          {
-            code:2,
-            name:"平台积分"
-          },
-          {
-            code:3,
-            name:"操作积分"
-          },
-        ],
-        },
-        labelPosition: 'right',
-        tableData: [
-          {1: '活动记录', 2: '服务记录'}
-        ],
-        integralnum: 1,
-        radio:3,
-        textarea: '',
-        behaviorName: '',
-        description:"",
-        pointsDelta:"",
-        Positive:'',
-        pageSize: 10,
-        pageNo: 1,
-        total: 0,
-        info:false
-    };
-  },
-  props:{
-    list:{
-      type: Object,
-      default: () => {}
-    }
-  },
-  created() {
-    console.log(this.list,"list");
-    this.getlist()
-    this.getpoint1s()
-
-  },
-  components:{
-    enclosure
+ name: "see",
+  data() {
+  return {
+      radio:'1',
+      stockQty:"",
+      labelPosition: 'right',
+      tableData: [],
+      awardId:""
+  };
+},
+props:{
+  VolunteerList:{
+    type: Object,
+    default: () => {}
+  }
+},
+created() {
+  console.log(this.VolunteerList,"list");
+  this.tableData=this.VolunteerList
+  // this.awardId=this.list.id
+  // this.getTableData()
+},
+methods: {
+  //取消审查
+  handleCancle(){
+    this.$emit('handleprocesslClose')
   },
-  computed:{
-  
+  //确认审查
+  handleComfirm(){
+    this.$emit('handleprocesslClose')
   },
-  methods: {
-    //打开附件
-    handleDetail(row){
-      console.log(row,"row");
-          this.info=true
-          console.log(this.info,"info");
-          
-          this.fmData=row
-  
-        },
-          //控制活动时间
-          actcontrolTime(){
-      console.log("dislfj");
-        if(this.formData.createdTimeFrom>this.formData.createdTimeTo){
-          this.$message.error('活动结束时间不能在活动开始时间之前');
-          this.formData.createdTimeTo=''
-          return
-        }
-    },
-    //查询
-    handleSearch(val) {
-            this.pageNo = 1;
-            this.getlist();
-          },
-          handleSizeChange(val) {
-        console.log(`每页 ${val} 条`);
-        this.pageSize = val;
-        window.localStorage.setItem("pageSize", val);
-        this.getlist();
-      },
-      handleCurrentChange(val) {
-        console.log(`当前页: ${val}`);
-        this.pageNo = val;
-        this.getlist();
-      },
-    //选+-
-    handleRadioChange(val){
-     console.log(val);
-     this.Positive = val === 3 ? '+' : val === 6 ? '-' : '';
-     console.log(this.Positive);
-     
-    },
-    
-    //获取积分行为
-    async getpoint1s() {
- const url = "/voluntary/points/adjustVolunteerPoints/reasonsList";
- let params={
- }
-await requestGet(url,params).then((res)=>{
-  if (res.code === 0) {
-   console.log("列表请求成功！！！！！！！！！！！！！！");
-   this.optionsStatus = res.data
-   console.log(this.optionsStatus);
-   
- } else {
- }
-})
-},
-    //调整积分
-      //   async getTableData() {
-      //   const url = "/voluntary/points/adjustVolunteerPoints/commit";
-      //   let params={
-      //     volunteerId:this.list.id,
-      //     reason:this.behaviorName,
-      //     description:this.description,
-      //     pointsDelta:this.Positive+this.integralnum,
-      //     primaryPoints:this.tableData.points
-      //     // volunteerId:this.list.id,
-      //     // mobile:this.formData.phone,
-      //     // name:this.formData.name
-      //   }
-      //   console.log(params,"params");
+   getTableData() {
+      console.log(this.formData);
+      const url = "/voluntary/pointsAward/admin/detail";
+      let params = {
+        id:this.awardId
+    }
+    requestGet(url, params).then((res) =>{
+      console.log(res,"res");
+      if(res.code===0){
+        console.log("列表请求成功！！！！！！！！！！！！！！");
+        console.log(res.data, "data");
+        this.tableData = res.data
+        console.log(this.tableData, "this.tableData");
+      }
+    })
+      // const { data, code, msg } =  requestGet(url, params)
+      // console.log(data,"data");
+      // if (code === 0) {
+      //   console.log("列表请求成功！！！！！！！！！！！！！！");
+      //   console.log(data,"data");
+      //   this.tableData = data
+      //   console.log(this.tableData,"this.tableData");
         
-      //   const { data, code, msg } = await requestPost(url,params);
-      //   if (code === 0) {
-      //     console.log("列表请求成功！！！！！！！！！！！！！！");
-      //     this.$message({
-      //       message: "调整成功",
-      //       type: "success",
-      //     });
-      //     this.$emit('summDetailClose')
-      //   } else {
-      //   }
-      // },
   
-      async getlist() {
-        const url = "/voluntary/points/listPointsChangeRecord";
-        let params={
-          volunteerId:this.list.id,
-          createdTimeFrom:this.formData.createdTimeFrom,
-          createdTimeTo:this.formData.createdTimeTo,
-          // description:this.description,
-          pointsClass:this.formData.pointsClass,
-          pageNo:this.pageNo,
-          pageSize:this.pageSize,
-          // pointsDelta:this.Positive+this.integralnum,
-          // primaryPoints:this.tableData.points
-          // volunteerId:this.list.id,
-          // mobile:this.formData.phone,
-          // name:this.formData.name
-        }
-        console.log(params,"params");
-        
-        const { data, code, msg } = await requestGet(url,params);
-        if (code === 0) {
-          this.tableData=data.list
-          this.total=data.total
-          console.log("列表请求成功！！！！！！！！！！！！！！");
-   
-          // console.log("列表请求成功！！！！！！！！！！！！！！");
-          // this.$message({
-          //   message: "调整成功",
-          //   type: "success",
-          // });
-          // this.$emit('summDetailClose')
-        } else {
-        }
-      },
-    handleSubmit(){
-      this.$emit('MemberManagementClose')
-    },
-    handleremove(){
-      this.$emit('MemberManagementClose')
+      // } else {
+      // }
     },
-    handleadjustment(value) {
-      console.log(value,"num");
-  },
-}
+
+},
+
 
 }
 
 </script>
 <style lang="scss" scoped>
-  @import "@/assets/scss/modules/management/volunteet.scss";
-  .item_width_1 {
-    width: 200px;
- 
-    /deep/.tox .tox-dialog {
-        z-index: 20000;
-    }
- }
- .u-item-width-normal{
-    width: 222px;
- }
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
 </style>
\ No newline at end of file
diff --git a/src/views/modules/volunteer/VolunteerProjects/record.vue b/src/views/modules/volunteer/VolunteerProjects/record.vue
new file mode 100644
index 000000000..fb262cba5
--- /dev/null
+++ b/src/views/modules/volunteer/VolunteerProjects/record.vue
@@ -0,0 +1,286 @@
+<template>
+    <div class="g-main" style="padding: 30px;">
+      <el-form :inline="true" :model="formData" class="demo-form-inline">
+        <el-form-item>
+          <el-select v-model="value" placeholder="请选择" class="item_width_1">
+            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="加入时间" label-width="100px">
+          <el-date-picker v-model="formData.createdTimeFrom" type="datetime" placeholder="开始时间"
+            format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" style="width: 200px;">
+          </el-date-picker>
+          <span style="margin: 0 10px;">至</span>
+          <el-date-picker v-model="formData.createdTimeTo" type="datetime" placeholder="结束时间" format="yyyy-MM-dd HH:mm:ss"
+            value-format="yyyy-MM-dd HH:mm:ss" @change="actcontrolTime" style="width: 200px;">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div style="display: flex; justify-content: flex-end; margin-bottom: 10px;">
+        <el-button type="primary" @click="handleSearch">查询</el-button>
+      </div>
+      <div>
+        <div> <el-table :data="tableData" border height="250">
+            <el-table-column label="序号" width="80" header-align="center" align="center" type="index"></el-table-column>
+            <el-table-column prop="pointsClassName" header-align="center" align="center" label="活动时间">
+            </el-table-column>
+            <el-table-column prop="createdTime" header-align="center" align="center" label="活动标题">
+            </el-table-column>
+            . <el-table-column prop="operationName" header-align="center" align="center" label="活动地点">
+            </el-table-column>
+            <el-table-column prop="pointsDelta" header-align="center" align="center" label="活动详情">
+            </el-table-column>
+            <el-table-column prop="pointsDelta" header-align="center" align="center" label="状态">
+            </el-table-column>
+          </el-table></div>
+          <div v-if="true"> <el-table :data="tableData" border height="250">
+            <el-table-column label="序号" width="80" header-align="center" align="center" type="index"></el-table-column>
+            <el-table-column prop="pointsClassName" header-align="center" align="center" label="服务时间">
+            </el-table-column>
+            <el-table-column prop="createdTime" header-align="center" align="center" label="服务区域">
+            </el-table-column>
+            <el-table-column prop="operationName" header-align="center" align="center" label="服务地点">
+            </el-table-column>
+            <el-table-column prop="pointsDelta" header-align="center" align="center" label="服务详情">
+            </el-table-column>
+            <el-table-column prop="pointsDelta" header-align="center" align="center" label="附件">
+              <template slot-scope="scope">
+                <el-button type="text" @click="handleDetail(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
+          </el-table> </div>
+       
+        <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>
+        </div>
+  
+      </div>
+      <el-dialog  :modal="false" :visible.sync="info" :close-on-click-modal="false" :close-on-press-escape="false" title="附件详情"
+            width="750px" top="15vh" class="dialog-h"   >
+            <enclosure v-if="info" :list="fmData"  />
+          </el-dialog>
+      <!-- <div class="flex flex-center1 flex-center2">
+        <el-button type="info" @click="handleremove">取消</el-button>
+        <el-button type="danger" @click="handleSubmit">确定</el-button>
+      </div> -->
+      </div>
+  
+  </template>
+  <script>
+  import enclosure from "./enclosure.vue"
+    import { requestPost,requestGet } from "@/js/dai/request";
+  export default {
+      
+     name: "see",
+      data() {
+      return {
+        options: [{
+            value: '1',
+            label: '活动记录'
+          }, {
+            value: '2',
+            label: '服务记录'
+          }],
+          value: '',
+        formData:{
+          createdTimeTo:"",
+          createdTimeTo:"",
+          pointsClass:"",
+          optionsStatus: [
+            {
+              code:1,
+              name:"活动积分"
+            },
+            {
+              code:2,
+              name:"平台积分"
+            },
+            {
+              code:3,
+              name:"操作积分"
+            },
+          ],
+          },
+          labelPosition: 'right',
+          tableData: [
+            {1: '活动记录', 2: '服务记录'}
+          ],
+          integralnum: 1,
+          radio:3,
+          textarea: '',
+          behaviorName: '',
+          description:"",
+          pointsDelta:"",
+          Positive:'',
+          pageSize: 10,
+          pageNo: 1,
+          total: 0,
+          info:false
+      };
+    },
+    props:{
+      list:{
+        type: Object,
+        default: () => {}
+      }
+    },
+    created() {
+      console.log(this.list,"list");
+      this.getlist()
+      this.getpoint1s()
+  
+    },
+    components:{
+      enclosure
+    },
+    computed:{
+    
+    },
+    methods: {
+      //打开附件
+      handleDetail(row){
+        console.log(row,"row");
+            this.info=true
+            console.log(this.info,"info");
+            
+            this.fmData=row
+    
+          },
+            //控制活动时间
+            actcontrolTime(){
+        console.log("dislfj");
+          if(this.formData.createdTimeFrom>this.formData.createdTimeTo){
+            this.$message.error('活动结束时间不能在活动开始时间之前');
+            this.formData.createdTimeTo=''
+            return
+          }
+      },
+      //查询
+      handleSearch(val) {
+              this.pageNo = 1;
+              this.getlist();
+            },
+            handleSizeChange(val) {
+          console.log(`每页 ${val} 条`);
+          this.pageSize = val;
+          window.localStorage.setItem("pageSize", val);
+          this.getlist();
+        },
+        handleCurrentChange(val) {
+          console.log(`当前页: ${val}`);
+          this.pageNo = val;
+          this.getlist();
+        },
+      //选+-
+      handleRadioChange(val){
+       console.log(val);
+       this.Positive = val === 3 ? '+' : val === 6 ? '-' : '';
+       console.log(this.Positive);
+       
+      },
+      
+      //获取积分行为
+      async getpoint1s() {
+   const url = "/voluntary/points/adjustVolunteerPoints/reasonsList";
+   let params={
+   }
+  await requestGet(url,params).then((res)=>{
+    if (res.code === 0) {
+     console.log("列表请求成功！！！！！！！！！！！！！！");
+     this.optionsStatus = res.data
+     console.log(this.optionsStatus);
+     
+   } else {
+   }
+  })
+  },
+      //调整积分
+        //   async getTableData() {
+        //   const url = "/voluntary/points/adjustVolunteerPoints/commit";
+        //   let params={
+        //     volunteerId:this.list.id,
+        //     reason:this.behaviorName,
+        //     description:this.description,
+        //     pointsDelta:this.Positive+this.integralnum,
+        //     primaryPoints:this.tableData.points
+        //     // volunteerId:this.list.id,
+        //     // mobile:this.formData.phone,
+        //     // name:this.formData.name
+        //   }
+        //   console.log(params,"params");
+          
+        //   const { data, code, msg } = await requestPost(url,params);
+        //   if (code === 0) {
+        //     console.log("列表请求成功！！！！！！！！！！！！！！");
+        //     this.$message({
+        //       message: "调整成功",
+        //       type: "success",
+        //     });
+        //     this.$emit('summDetailClose')
+        //   } else {
+        //   }
+        // },
+    
+        async getlist() {
+          const url = "/voluntary/points/listPointsChangeRecord";
+          let params={
+            volunteerId:this.list.id,
+            createdTimeFrom:this.formData.createdTimeFrom,
+            createdTimeTo:this.formData.createdTimeTo,
+            // description:this.description,
+            pointsClass:this.formData.pointsClass,
+            pageNo:this.pageNo,
+            pageSize:this.pageSize,
+            // pointsDelta:this.Positive+this.integralnum,
+            // primaryPoints:this.tableData.points
+            // volunteerId:this.list.id,
+            // mobile:this.formData.phone,
+            // name:this.formData.name
+          }
+          console.log(params,"params");
+          
+          const { data, code, msg } = await requestGet(url,params);
+          if (code === 0) {
+            this.tableData=data.list
+            this.total=data.total
+            console.log("列表请求成功！！！！！！！！！！！！！！");
+     
+            // console.log("列表请求成功！！！！！！！！！！！！！！");
+            // this.$message({
+            //   message: "调整成功",
+            //   type: "success",
+            // });
+            // this.$emit('summDetailClose')
+          } else {
+          }
+        },
+      handleSubmit(){
+        this.$emit('MemberManagementClose')
+      },
+      handleremove(){
+        this.$emit('MemberManagementClose')
+      },
+      handleadjustment(value) {
+        console.log(value,"num");
+    },
+  }
+  
+  }
+  
+  </script>
+  <style lang="scss" scoped>
+    @import "@/assets/scss/modules/management/volunteet.scss";
+    .item_width_1 {
+      width: 200px;
+   
+      /deep/.tox .tox-dialog {
+          z-index: 20000;
+      }
+   }
+   .u-item-width-normal{
+      width: 222px;
+   }
+  </style>
\ No newline at end of file
diff --git a/src/views/modules/volunteer/VolunteerProjects/recruit.vue b/src/views/modules/volunteer/VolunteerProjects/recruit.vue
index aa1b87c64..e59564d8c 100644
--- a/src/views/modules/volunteer/VolunteerProjects/recruit.vue
+++ b/src/views/modules/volunteer/VolunteerProjects/recruit.vue
@@ -1,97 +1,63 @@
 <template>
-  <div class="g-main" style="padding: 30px;">
-    <el-form :inline="true" :model="formData" class="demo-form-inline" style="">
-        <el-form-item label="姓名">
-              <el-input v-model.trim="formData.name" size="small" class="item_width_1" clearable
-                          placeholder="请输入">
-                      </el-input>
-        </el-form-item>
-        <el-form-item label="加入时间" label-width="100px">
-            <el-date-picker v-model="formData.createdTimeFrom" type="datetime" placeholder="开始时间"
-            format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss">
-          </el-date-picker>
-          <span style="margin: 0 10px;">至</span> 
-          <el-date-picker v-model="formData.createdTimeTo" type="datetime" placeholder="结束时间"
-            format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" @change="actcontrolTime">
-          </el-date-picker>
-        </el-form-item>
-        </el-form>
-        <div  style="display: flex; justify-content: flex-end; margin-bottom: 10px;">
-          <el-button type="primary" @click="handleSearch">查询</el-button>
-        </div>
-      
-    <div >
-      <el-table :data="tableData" border     height="250"      >
-        <el-table-column label="序号" width="80" header-align="center" align="center" type="index"></el-table-column>
-        <el-table-column prop="pointsClassName" header-align="center" align="center" label="加入时间">
-        </el-table-column>
-        <el-table-column prop="createdTime" header-align="center" align="center" label="所属社区">
-        </el-table-column>
-        . <el-table-column prop="operationName" header-align="center" align="center" label="姓名">
-        </el-table-column>
-        <el-table-column prop="pointsDelta" header-align="center" align="center" label="身份证号">
-        </el-table-column>
-        <el-table-column prop="pointsDelta" header-align="center" align="center" label="手机号">
+    <div class="g-main" style="padding: 30px;">
+        <el-table :data="tableData" border  @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55"></el-table-column>
+            <el-table-column label="序号" width="80" header-align="center" align="center" type="index"></el-table-column>
+            <el-table-column prop="realName" header-align="center" align="center" label="申请时间">
+            </el-table-column>
+            <el-table-column prop="nickName" header-align="center" align="center" label="申请单位">
+            </el-table-column>
+            <el-table-column prop="mobile" header-align="center" align="center" label="附件">
+                <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 prop="nickName" header-align="center" align="center" label="审核解构">
+            </el-table-column>
+            <el-table-column prop="nickName" header-align="center" align="center" label="审核时间">
+            </el-table-column>
+            <!-- . <el-table-column prop="idCard" header-align="center" align="center" label="证件号" >
         </el-table-column>
-        <el-table-column prop="pointsDelta" header-align="center" align="center" label="活动次数">
-      </el-table-column>
-      <el-table-column prop="pointsDelta" header-align="center" align="center" label="服务时常">
-      </el-table-column>
-      </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>
-      </div>
-
-    </div>
-    <!-- <div class="flex flex-center1 flex-center2">
-      <el-button type="info" @click="handleremove">取消</el-button>
-      <el-button type="danger" @click="handleSubmit">确定</el-button>
-    </div> -->
-    <div>
+        <el-table-column prop="applyTime" header-align="center" align="center" label="报名时间" >
+        </el-table-column> -->
+            <!-- <el-table-column label="操作" fixed="right" width="250" 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>
+            <el-button type="text" style="color:#1C6AFD;" size="small"
+              @click="handleEdit(scope.row)">活动记录</el-button>
+            <el-button  type="text" style="color:#1C6AFD;" size="small"
+              @click="handleDelete(scope.row)">积分调整</el-button>
+          </template>
+        </el-table-column> -->
+        </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>
+        </div>
+        <div class="flex flex-center1 flex-center2">
+            <el-button type="info" @click="handleremove">通 过</el-button>
+            <!-- <el-button type="danger" @click="getTableData">确定</el-button> -->
+        </div>
     </div>
-  </div>
 </template>
 <script>
-  import { requestPost,requestGet } from "@/js/dai/request";
+import { requestPost,requestGet } from "@/js/dai/request";
 export default {
     
    name: "see",
     data() {
     return {
-      formData:{
-        createdTimeTo:"",
-        createdTimeTo:"",
-        pointsClass:"",
-        optionsStatus: [
-          {
-            code:1,
-            name:"活动积分"
-          },
-          {
-            code:2,
-            name:"平台积分"
-          },
-          {
-            code:3,
-            name:"操作积分"
-          },
-        ],
-        },
+        name:"",
+        mobile:"",
+        total:0,
         labelPosition: 'right',
         tableData: [],
-        integralnum: 1,
-        radio:3,
-        textarea: '',
-        options: [],
-        behaviorName: '',
-        description:"",
-        pointsDelta:"",
-        Positive:'',
-        pageSize: 10,
+        formData:[],
         pageNo: 1,
-        total: 0,
+        pageSize:20,
     };
   },
   props:{
@@ -99,136 +65,59 @@ export default {
       type: Object,
       default: () => {}
     }
-  },
-  created() {
-    console.log(this.list,"list");
-    this.getlist()
-    this.getpoint1s()
-
-  },
-  computed:{
-  
   },
   methods: {
-          //控制活动时间
-          actcontrolTime(){
-      console.log("dislfj");
-        if(this.formData.createdTimeFrom>this.formData.createdTimeTo){
-          this.$message.error('活动结束时间不能在活动开始时间之前');
-          this.formData.createdTimeTo=''
-          return
-        }
-    },
-    //查询
-    handleSearch(val) {
-            this.pageNo = 1;
-            this.getlist();
-          },
-          handleSizeChange(val) {
-        console.log(`每页 ${val} 条`);
-        this.pageSize = val;
-        window.localStorage.setItem("pageSize", val);
-        this.getlist();
+    //选中
+    handleSelectionChange(val) {
+        this.multipleSelection = val;
       },
-      handleCurrentChange(val) {
-        console.log(`当前页: ${val}`);
-        this.pageNo = val;
-        this.getlist();
-      },
-    //选+-
-    handleRadioChange(val){
-     console.log(val);
-     this.Positive = val === 3 ? '+' : val === 6 ? '-' : '';
-     console.log(this.Positive);
-     
-    },
-    
-    //获取积分行为
-    async getpoint1s() {
- const url = "/voluntary/points/adjustVolunteerPoints/reasonsList";
- let params={
- }
-await requestGet(url,params).then((res)=>{
-  if (res.code === 0) {
-   console.log("列表请求成功！！！！！！！！！！！！！！");
-   this.optionsStatus = res.data
-   console.log(this.optionsStatus);
-   
- } else {
- }
-})
-},
-    //调整积分
-      //   async getTableData() {
-      //   const url = "/voluntary/points/adjustVolunteerPoints/commit";
-      //   let params={
-      //     volunteerId:this.list.id,
-      //     reason:this.behaviorName,
-      //     description:this.description,
-      //     pointsDelta:this.Positive+this.integralnum,
-      //     primaryPoints:this.tableData.points
-      //     // volunteerId:this.list.id,
-      //     // mobile:this.formData.phone,
-      //     // name:this.formData.name
-      //   }
-      //   console.log(params,"params");
-        
-      //   const { data, code, msg } = await requestPost(url,params);
-      //   if (code === 0) {
-      //     console.log("列表请求成功！！！！！！！！！！！！！！");
-      //     this.$message({
-      //       message: "调整成功",
-      //       type: "success",
-      //     });
-      //     this.$emit('summDetailClose')
-      //   } else {
-      //   }
-      // },
+           //查询
+           handleSearch(){
+          console.log("this.long");
   
-      async getlist() {
-        const url = "/voluntary/points/listPointsChangeRecord";
-        let params={
-          volunteerId:this.list.id,
-          createdTimeFrom:this.formData.createdTimeFrom,
-          createdTimeTo:this.formData.createdTimeTo,
-          // description:this.description,
-          pointsClass:this.formData.pointsClass,
-          pageNo:this.pageNo,
+          this.getTableData()
+           },
+    handleCurrentChange(val) {
+          console.log(`当前页: ${val}`);
+          this.pageNo = val;
+          this.getTableData();
+        },
+    handleSizeChange(val) {
+          console.log(`每页 ${val} 条`);
+          this.pageSize = val;
+          window.localStorage.setItem("pageSize", val);
+          this.getTableData();
+        },
+         //活动列表
+         async getTableData() {
+        // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
+        const url = "/voluntary/activityApply/list";
+        let params = {
+          name:this.name,
+          mobile:this.mobile,
+          pageNo: this.pageNo,
+          activityId:this.list.id,
+          // activityId:"1826111922849996802",
           pageSize:this.pageSize,
-          // pointsDelta:this.Positive+this.integralnum,
-          // primaryPoints:this.tableData.points
-          // volunteerId:this.list.id,
-          // mobile:this.formData.phone,
-          // name:this.formData.name
-        }
-        console.log(params,"params");
-        
-        const { data, code, msg } = await requestGet(url,params);
-        if (code === 0) {
-          this.tableData=data.list
-          this.total=data.total
-          console.log("列表请求成功！！！！！！！！！！！！！！");
-   
-          // console.log("列表请求成功！！！！！！！！！！！！！！");
-          // this.$message({
-          //   message: "调整成功",
-          //   type: "success",
-          // });
-          // this.$emit('summDetailClose')
+     
+      }
+      requestGet(url, params).then((res) => {
+        if (res.code == 0) {
+          this.total = res.data.total || 0;
+          this.tableData = res.data.list;
+          console.log(this.tableData, "this.tableData");
         } else {
+          this.$message.error(res.msg);
         }
+      });
+
       },
-    handleSubmit(){
-      this.$emit('MemberManagementClose')
-    },
-    handleremove(){
-      this.$emit('MemberManagementClose')
-    },
-    handleadjustment(value) {
-      console.log(value,"num");
   },
-}
-
+  created() {
+    console.log(this.list,"list");
+    this.getTableData()
+   
+  },
 }
 
 </script>
diff --git a/src/views/modules/volunteer/activityArchive/add.vue b/src/views/modules/volunteer/activityArchive/add.vue
index fcf21b146..0aeb88408 100644
--- a/src/views/modules/volunteer/activityArchive/add.vue
+++ b/src/views/modules/volunteer/activityArchive/add.vue
@@ -10,6 +10,16 @@
                 @change="handleChangeAgency"></el-cascader>
             </el-form-item>
           </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="所属项目" prop="typeId" >
+                            <el-select class="item_width_1" v-model.trim="formData.typeId" placeholder="请选择" clearable style="width: 280px">
+                                <el-option v-for="item in typeList" :key="item.nametypeName" :label="item.typeName"
+                                    :value="item.id">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+          </el-col>
           <el-col :span="12"> <el-form-item label="活动类型" prop="type" required>
               <el-select v-model.trim="formData.type" placeholder="请选择" clearable style="width: 280px">
                 <el-option v-for="item in  typeList" :key="item.id" :label="item.name" :value="item.id">
@@ -17,7 +27,26 @@
               </el-select>
             </el-form-item>
           </el-col>
-              <el-col :span="12">
+          <el-col :span="12">
+            <el-form-item label="活动标题" prop="title" required>
+              <el-input placeholder="请输入活动标题" v-model="formData.title" style="width: 280px; ">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12"> <el-form-item label="活动级别" prop="serviceLevel" >
+              <el-select v-model.trim="formData.serviceLevel" placeholder="请选择" clearable style="width: 280px">
+                <el-option v-for="item in  serviceLevelList" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12"> <el-form-item label="活动区域" prop="district" required>
+            <el-cascader class="list_item_width_1" ref="myCascader" clearable style="width: 280px;"
+                v-model.trim="formData.district" :options="orgOptions" :props="orgOptionProps"
+                @change="handleChangeAgency"></el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="活动名额" prop="points" required>
               <div style="display: flex; justify-items:center; align-items: center;">
                 <el-input-number :disabled="formData.notQuota == '0'" v-model.trim="formData.quota" :min="0"
@@ -27,15 +56,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="活动标题" prop="title" required>
-              <el-input  placeholder="请输入活动标题"  v-model="formData.title" style="width: 280px; "
-             >
-              </el-input>
+            <el-form-item label="服务时长" prop="serviceTime" required>
+              <div style="display: flex; justify-items:center; align-items: center;" >
+                <el-input-number  v-model.trim="formData.serviceTime" :min="1"
+                  label="描述文字" type="number"></el-input-number>
+              </div>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="活动积分" prop="integral" >
-              <el-input-number v-model="formData.points" :min="1" label="描述文字"></el-input-number>
+            <el-form-item label="活动积分" prop="integral">
+              <el-input-number v-model="formData.points" :min="0" label="描述文字" :step="0.1" :precision="1" ></el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -43,26 +73,26 @@
               <el-date-picker v-model="formData.deadline" type="datetime" placeholder="选择日期时间" style="width: 280px;"
                 value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss">
               </el-date-picker>
-          
-            </el-form-item> 
-           
+
+            </el-form-item>
+
           </el-col>
           <el-col :span="12">
-            <el-form-item label=" 联系人" prop="linkman" required >
-            <el-input v-model="formData.linkman" placeholder="请输入" style="width: 280px;"></el-input>
-          </el-form-item>
+            <el-form-item label=" 联系人" prop="linkman" required>
+              <el-input v-model="formData.linkman" placeholder="请输入" style="width: 280px;"></el-input>
+            </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label=" 联系电话" prop="linkMobile"  required>
-            <el-input v-model="formData.linkMobile" placeholder="请输入"style="width: 280px;"></el-input>
-          </el-form-item>
+            <el-form-item label=" 联系电话" prop="linkMobile" required>
+              <el-input v-model="formData.linkMobile" placeholder="请输入" style="width: 280px;"></el-input>
+            </el-form-item>
           </el-col>
-      
-      
-      
+
+
+
           <el-col :span="24">
             <el-form-item label="活动时间" prop="strTime" required>
-               <!-- <el-date-picker
+              <!-- <el-date-picker
       v-model="value1"
       type="datetimerange"
       range-separator="至"
@@ -76,7 +106,7 @@
                 type="datetime" placeholder="结束时间" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
                 style="width:195px" @change="actcontrolTime">
               </el-date-picker>
-              
+
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -103,9 +133,6 @@
               <el-input-number v-model="formData.points" :min="1" :max="10" label="描述文字"></el-input-number>
             </el-form-item>
           </el-col> -->
-
-       
-          
           <el-col :span="24">
             <el-form-item label="活动详情" prop="content" style="display: block" required>
               <div style="width: 756px;">
@@ -115,31 +142,31 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="报名条件" prop="conditions">
-              <el-input type="textarea" placeholder="请输入活动标题，不超过50子" :height="150"  v-model="formData.conditions" maxlength="200"
-                show-word-limit style="width: 756px;">
+              <el-input type="textarea" placeholder="请输入活动标题，不超过50子" :height="150" v-model="formData.conditions"
+                maxlength="200" show-word-limit style="width: 756px;">
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-        <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" :loading="loading">
-              <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
-                style="width: 400px;" :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-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" :loading="loading">
+                  <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
+                    style="width: 400px;" :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-col>
           <el-col :span="12">
             <!-- <el-col :span="12"> -->
-          <el-form-item v-if="formType !== 'records'" label="上线" style="display: block" prop="peopleCount">
+            <el-form-item v-if="formType !== 'records'" label="上线" style="display: block" prop="peopleCount">
               <el-switch v-model="formData.online" :active-value='1' :inactive-value='0'
                 @change="handleSwitchChange"></el-switch>
             </el-form-item>
-          <!-- </el-col> -->
+            <!-- </el-col> -->
             <!-- <el-form-item label="活动积分" prop="integral" >
               <el-input-number v-model="formData.points" :min="1" :max="10" label="描述文字"></el-input-number>
             </el-form-item> -->
@@ -154,35 +181,35 @@
               </div>
 
             </el-form-item>
-          <!-- </el-col> -->
-          <!-- <el-col :span="24"> -->
-      
-          <!-- </el-col> -->
+            <!-- </el-col> -->
+            <!-- <el-col :span="24"> -->
+
+            <!-- </el-col> -->
           </el-col>
 
- 
 
-    
-     
-         
-      
+
+
+
+
+
           <el-col :span="12">
             <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="removeDomain(item)"
-                  style="font-size: 20px; margin-left: 20px;"></i>
-              </el-form-item>
-
-              <el-form-item label="联系电话" prop="sponsors">
-                <el-input v-model="item.phone" placeholder="请输入" style="width: 280px;"></el-input>
-              </el-form-item>
+              <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="removeDomain(item)"
+                      style="font-size: 20px; margin-left: 20px;"></i>
+                  </el-form-item>
+
+                  <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>
-          </div>
-          <i class="el-icon-circle-plus" @click="addDomain" style="font-size: 20px; margin-top:7px;"></i>
-        </div>
           </el-col>
         </el-row>
 
@@ -192,20 +219,13 @@
 
 
 
-        <!-- <el-form-item label="所属项目" prop="typeId" required>
-                            <el-select class="item_width_1" v-model.trim="formData.typeId" placeholder="请选择" clearable>
-                                <el-option v-for="item in typeList" :key="item.nametypeName" :label="item.typeName"
-                                    :value="item.id">
-                                </el-option>
-                            </el-select>
-                        </el-form-item> -->
 
 
 
 
 
 
-        
+
       </el-form>
       <!-- <i class="el-icon-circle-plus"  @click="addDomain" style="font-size: 20px;"></i> -->
 
@@ -247,6 +267,7 @@ export default {
         multiple: false,
         checkStrictly: true
     },
+    orgTypeFilter:[],
     customerId: localStorage.getItem('customerId'),
     uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
       orgOptions:[],
@@ -254,32 +275,35 @@ export default {
       btnDisable: false,    
       searchValue:"",
       formData: {
-        title:"",
-    agencyId:"",
-    projectId:"",
-    content:"",
-    points:'',
-    imgs:"",
-    deadline:"",
-    strTime:"",
-    endTime:"",
-    signInTime:"",
-    signOutTime:"",
-    quota:'',
-    conditions:"",
-    notQuota:1,
-    linkman:"",
-    linkMobile:"",
-    address:"",
-    longitude: this.$store.state.user.longitude, //经度
-    latitude: this.$store.state.user.latitude,//纬度
-    type:"",
-    online:0,
-    sponsors:[{
-      name:"",
-      phone:""
-    }
-    ]
+        district:"",
+        serviceLevel:'',
+        serviceTime: "",
+        title: "",
+        agencyId: "",
+        projectId: "",
+        content: "",
+        points: '',
+        imgs: "",
+        deadline: "",
+        strTime: "",
+        endTime: "",
+        signInTime: "",
+        signOutTime: "",
+        quota: '',
+        conditions: "",
+        notQuota: 1,
+        linkman: "",
+        linkMobile: "",
+        address: "",
+        longitude: this.$store.state.user.longitude, //经度
+        latitude: this.$store.state.user.latitude,//纬度
+        type: "",
+        online: 0,
+        sponsors: [{
+          name: "",
+          phone: ""
+        }
+        ]
 
       },
 
@@ -294,6 +318,21 @@ export default {
             name:"线下活动"
           }
         ],
+      serviceLevelList:[
+      {
+            id:0,
+            name:"市区级"
+          },
+          {
+            id:1,
+            name:"街道级"
+          },
+          {
+            id:2,
+            name:"社区级"
+          }
+    
+      ],
       fileList: [],
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
         tableDate:{},
@@ -321,10 +360,15 @@ export default {
         deadline: [
           { required: true, message: '活动报名时间不能为空', trigger: 'blur' },
         ],
+        serviceTime: [
+          { required: true, message: '服务时长不能为空', trigger: 'blur' },
+        ],
+        
       }
     }
   },
   watch: {
+
     'checked'(newValue) {
       console.log(newValue,'newvalue');
       // 当 notQuota 变为 '0' 时，清空 quota
diff --git a/src/views/modules/volunteer/activityArchive/index.vue b/src/views/modules/volunteer/activityArchive/index.vue
index e0e6e1fb5..cc7ecd90e 100644
--- a/src/views/modules/volunteer/activityArchive/index.vue
+++ b/src/views/modules/volunteer/activityArchive/index.vue
@@ -4,20 +4,20 @@
       <el-form :inline="true" ref="ref_searchform" :label-width="'100px'">
         <div>
           <el-form-item label="活动标题">
-            <el-input v-model.trim="formData.content"  class="item_width_1" clearable placeholder="请输入">
+            <el-input v-model.trim="formData.content" class="item_width_1" clearable placeholder="请输入">
             </el-input>
           </el-form-item>
           <el-form-item label="活动时间">
             <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-date-picker>       
-             <span style="margin: 0 10px">至</span>
-            <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">
+              value-format="yyyy-MM-dd HH:mm:ss">
+            </el-date-picker>
+            <span style="margin: 0 10px">至</span>
+            <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="发布状态">
-            <el-select v-model="formData.online" placeholder="请选择" clearable >
+            <el-select v-model="formData.online" placeholder="请选择" clearable>
               <el-option v-for="item in formData.optionsStatus" :key="item.value" :label="item.label"
                 :value="item.value">
               </el-option>
@@ -37,39 +37,52 @@
     <div class="m-table">
       <el-button style="" class="diy-button--add" size="small" @click="handleAdd">新增</el-button>
       <el-table class="table" :data="tableData" border v-loading="tableLoading" style="width: 100%">
-        <el-table-column label="序号" header-align="center" align="center" type="index"  width="80"></el-table-column>
-        <el-table-column prop="title" header-align="center" align="center" label="活动标题"  :show-overflow-tooltip="true">
+        <el-table-column label="序号" header-align="center" align="center" type="index" width="80"></el-table-column>
+        <el-table-column prop="title" header-align="center" align="center" label="活动标题" :show-overflow-tooltip="true">
         </el-table-column>
-        <el-table-column prop="address" header-align="center" align="center" label="活动地点"  :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="strTime" header-align="center" align="center" label="活动时间"  :show-overflow-tooltip="true">
-                    <template slot-scope="scope">
-        <span>{{ scope.row.strTime  }}至{{ scope.row.endTime }}</span>
-      </template>
-      
+        <el-table-column prop="address" header-align="center" align="center" label="活动地点"
+          :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column prop="strTime" header-align="center" align="center" label="活动时间" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{ scope.row.strTime }}至{{ scope.row.endTime }}</span>
+          </template>
+
         </el-table-column>
-        <el-table-column prop="deadline" header-align="center" align="center" label="报名截止时间"  :show-overflow-tooltip="true">
-  
+        <el-table-column prop="deadline" header-align="center" align="center" label="报名截止时间"
+          :show-overflow-tooltip="true">
+
         </el-table-column>
-        <el-table-column prop="agencyName" header-align="center" align="center" label="主办方"  :show-overflow-tooltip="true">
+        <el-table-column prop="agencyName" header-align="center" align="center" label="主办方"
+          :show-overflow-tooltip="true">
         </el-table-column>
-        <el-table-column prop="updatedTime" header-align="center" align="center" label="发布时间"  :show-overflow-tooltip="true">
+        <el-table-column prop="updatedTime" header-align="center" align="center" label="发布时间"
+          :show-overflow-tooltip="true">
         </el-table-column>
-        <el-table-column prop="statusType" header-align="center" align="center" label="状态"  :show-overflow-tooltip="true">
+        <el-table-column prop="statusType" header-align="center" align="center" label="状态"
+          :show-overflow-tooltip="true">
           <!-- <template slot-scope="scope">
             <span>{{ scope.row.online === 0 ? '下线' : '上线' }}</span>
           </template> -->
         </el-table-column>
-        <el-table-column prop="Points" header-align="center" align="center" label="来源"  :show-overflow-tooltip="true">
+        <el-table-column prop="Points" header-align="center" align="center" label="来源" :show-overflow-tooltip="true">
+          管理端
+        </el-table-column>
+        <el-table-column prop="Points" header-align="center" align="center" label="审核状态" :show-overflow-tooltip="true">
           管理端
         </el-table-column>
         <!-- <el-table-column prop="ActivityCount" header-align="center" align="center" label="所属项目">
         </el-table-column> -->
-        <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate"  :show-overflow-tooltip="true">
+        <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate"
+          :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            <el-button type="text" v-if="scope.row.statusType=='未发布'" style="color:#1C6AFD;" size="small" @click="handleDetail(scope.row)">修改</el-button>
+            <el-button type="text" v-if="scope.row.statusType=='未发布'" style="color:#1C6AFD;" size="small"
+              @click="handleDetail(scope.row)">修改</el-button>
             <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleselect(scope.row)">查看</el-button>
-            <el-button  v-if="scope.row.online === 1 &&scope.row.statusType!='进行中'&&scope.row.statusType!='进行中'" type="text" style="color:#1C6AFD;" size="small" @click="handleupOnline(scope.row)">下线</el-button>
-            <el-button v-if="scope.row.online === 0 &&scope.row.statusType!='进行中'" type="text" style="color:#1C6AFD;" size="small" @click="handleupOnline(scope.row)">上线</el-button>
+            <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleprocessl(scope.row)">审核</el-button>
+            <el-button v-if="scope.row.online === 1 &&scope.row.statusType!='进行中'&&scope.row.statusType!='进行中'"
+              type="text" style="color:#1C6AFD;" size="small" @click="handleupOnline(scope.row)">下线</el-button>
+            <el-button v-if="scope.row.online === 0 &&scope.row.statusType!='进行中'" type="text" style="color:#1C6AFD;"
+              size="small" @click="handleupOnline(scope.row)">上线</el-button>
             <!-- <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleintegral(scope.row)">更多</el-button> -->
             <el-dropdown trigger="click" style="margin-left: 10px"
               @command="(command) => handelRegister(command, scope.row)">
@@ -91,25 +104,29 @@
         </el-pagination>
       </div>
       <el-dialog :visible.sync="add" :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" />
+        width="1000px" top="10vh" class="dialog-h" @closed="AddClose" v-if="add">
+        <add :list="fmData" @AddClose="AddClose" />
       </el-dialog>
       <el-dialog :visible.sync="showselect" :close-on-click-modal="false" :close-on-press-escape="false" title="修改"
-        width="1000px" top="10vh" class="dialog-h" @closed="updateClose" v-if="showselect" >
-        <selecthande  :list="fmData" @updateClose="updateClose" />
+        width="1000px" top="10vh" class="dialog-h" @closed="updateClose" v-if="showselect">
+        <selecthande :list="fmData" @updateClose="updateClose" />
       </el-dialog>
       <el-dialog :visible.sync="showdeltail" :close-on-click-modal="false" :close-on-press-escape="false" title="查看"
         width="1000px" top="10vh" class="dialog-h" @closed="selectClose">
-        <realselect  v-if="showdeltail" :list="fmData" @selectClose="selectClose" />
+        <realselect v-if="showdeltail" :list="fmData" @selectClose="selectClose" />
       </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">
-        <Points  v-if="HandlePointsshow" :list="fmData" />
+        <Points v-if="HandlePointsshow" :list="fmData" />
       </el-dialog>
-      <el-dialog  :visible.sync="ActivityCountshow" :close-on-click-modal="false" :close-on-press-escape="false"
+      <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"   />
+        <ActivityCountshow v-if="ActivityCountshow" :list="fmData" />
       </el-dialog>
+      <el-dialog :visible.sync="showprocess" :close-on-click-modal="false" :close-on-press-escape="false" title="审核"
+                width="500px" top="10vh" class="dialog-h" @closed="handleprocesslClose">
+                <process v-if="showprocess" @handleprocesslClose="handleprocesslClose"  :VolunteerList="EditList"/>
+            </el-dialog>
     </div>
 
   </div>
@@ -127,9 +144,10 @@
     import Points from "./Points.vue"
     import selecthande from "./select.vue"
     import realselect from "./realselect.vue"
-
+    import process from "./process.vue"
+    
     export default {
-      components: {add,ActivityCountshow,Points,realselect,selecthande },
+      components: {add,ActivityCountshow,Points,realselect,selecthande,process},
     
       data() {
         return {
@@ -164,6 +182,7 @@
           ],
           Record: false,
           fmData: [],
+          showprocess:false,
 
         };
       },
@@ -183,6 +202,17 @@
        
       },
       methods: {
+                //审核
+                handleprocessl(row){
+            this.showprocess=true
+            this.EditList=row
+            console.log(row,this.fmData,"row");
+        },
+                //关闭审核
+        
+                handleprocesslClose(){
+            this.showprocess=false
+        },
         //新增关闭
       //   AddClose(){
       //   this.Record=false
@@ -232,7 +262,7 @@
           endTime:this.formData.endTime,
           online:this.formData.online
       }
-      requestGet(url, params).then((res) => {
+      requestPost(url, params).then((res) => {
         if (res.code == 0) {
           this.total = res.data.total || 0;
           this.tableData = res.data.list;
diff --git a/src/views/modules/volunteer/activityArchive/process.vue b/src/views/modules/volunteer/activityArchive/process.vue
new file mode 100644
index 000000000..69f6e322f
--- /dev/null
+++ b/src/views/modules/volunteer/activityArchive/process.vue
@@ -0,0 +1,100 @@
+<template>
+  <div>
+  <div style="display: flex;white-space: nowrap;  padding: 30px 0 0 0 ;" >
+      <el-form  style="padding-left: 50px;" :label-position="labelPosition" :model="tableData">
+      
+          <el-form-item label="审核">
+  
+          <div style="display: flex; justify-items:center; align-items: center;">
+              <el-radio v-model="radio" label="1" style="margin-right:20px">通过</el-radio>
+             <div class="flex flex-x  flex-center2">
+                <el-radio v-model="radio" label="2" style="margin-right: 10px;">不通过</el-radio>
+                <el-input v-if="radio == '2'" type="number" v-model="stockQty" style="width: 200px;"
+                   placeholder="请说明原因"></el-input>
+     
+            </div>
+      </div>
+          </el-form-item>
+      </el-form>
+     
+     </div>
+     <div class="div_btn">
+ 
+        <el-button size="small" @click="handleCancle">取 消</el-button>
+        <el-button size="small" v-if="formType != 'detail'" type="primary" :disabled="btnDisable"
+           @click="handleComfirm">确 定</el-button>
+
+  </div>
+</div>
+</template>
+<script>
+import { requestPost,requestGet } from "@/js/dai/request";
+export default {
+ name: "see",
+  data() {
+  return {
+      radio:'1',
+      stockQty:"",
+      labelPosition: 'right',
+      tableData: [],
+      awardId:""
+  };
+},
+props:{
+  VolunteerList:{
+    type: Object,
+    default: () => {}
+  }
+},
+created() {
+  console.log(this.VolunteerList,"list");
+  this.tableData=this.VolunteerList
+  // this.awardId=this.list.id
+  // this.getTableData()
+},
+methods: {
+  //取消审查
+  handleCancle(){
+    this.$emit('handleprocesslClose')
+  },
+  //确认审查
+  handleComfirm(){
+    this.$emit('handleprocesslClose')
+  },
+   getTableData() {
+      console.log(this.formData);
+      const url = "/voluntary/pointsAward/admin/detail";
+      let params = {
+        id:this.awardId
+    }
+    requestGet(url, params).then((res) =>{
+      console.log(res,"res");
+      if(res.code===0){
+        console.log("列表请求成功！！！！！！！！！！！！！！");
+        console.log(res.data, "data");
+        this.tableData = res.data
+        console.log(this.tableData, "this.tableData");
+      }
+    })
+      // const { data, code, msg } =  requestGet(url, params)
+      // console.log(data,"data");
+      // if (code === 0) {
+      //   console.log("列表请求成功！！！！！！！！！！！！！！");
+      //   console.log(data,"data");
+      //   this.tableData = data
+      //   console.log(this.tableData,"this.tableData");
+        
+  
+      // } else {
+      // }
+    },
+
+},
+
+
+}
+
+</script>
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>
\ No newline at end of file
diff --git a/src/views/modules/volunteer/activityArchive/select.vue b/src/views/modules/volunteer/activityArchive/select.vue
index 5c1fa7a52..ac91dcf66 100644
--- a/src/views/modules/volunteer/activityArchive/select.vue
+++ b/src/views/modules/volunteer/activityArchive/select.vue
@@ -10,6 +10,16 @@
                 @change="handleChangeAgency"></el-cascader>
             </el-form-item>
           </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="所属项目" prop="typeId" >
+                            <el-select class="item_width_1" v-model.trim="formData.typeId" placeholder="请选择" clearable style="width: 280px">
+                                <el-option v-for="item in typeList" :key="item.nametypeName" :label="item.typeName"
+                                    :value="item.id">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+          </el-col>
           <el-col :span="12"> <el-form-item label="活动类型" prop="type" required>
               <el-select v-model.trim="formData.type" placeholder="请选择" clearable style="width: 280px">
                 <el-option v-for="item in  typeList" :key="item.id" :label="item.name" :value="item.id">
@@ -17,7 +27,26 @@
               </el-select>
             </el-form-item>
           </el-col>
-              <el-col :span="12">
+          <el-col :span="12">
+            <el-form-item label="活动标题" prop="title" required>
+              <el-input placeholder="请输入活动标题" v-model="formData.title" style="width: 280px; ">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12"> <el-form-item label="活动级别" prop="serviceLevel" >
+              <el-select v-model.trim="formData.serviceLevel" placeholder="请选择" clearable style="width: 280px">
+                <el-option v-for="item in  serviceLevelList" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12"> <el-form-item label="活动区域" prop="district" required>
+            <el-cascader class="list_item_width_1" ref="myCascader" clearable style="width: 280px;"
+                v-model.trim="formData.district" :options="orgOptions" :props="orgOptionProps"
+                @change="handleChangeAgency"></el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="活动名额" prop="points" required>
               <div style="display: flex; justify-items:center; align-items: center;">
                 <el-input-number :disabled="formData.notQuota == '0'" v-model.trim="formData.quota" :min="0"
@@ -27,15 +56,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="活动标题" prop="title" required>
-              <el-input  placeholder="请输入活动标题"  v-model="formData.title" style="width: 280px; "
-             >
-              </el-input>
+            <el-form-item label="服务时长" prop="serviceTime" required>
+              <div style="display: flex; justify-items:center; align-items: center;" >
+                <el-input-number  v-model.trim="formData.serviceTime" :min="1"
+                  label="描述文字" type="number"></el-input-number>
+              </div>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="活动积分" prop="integral" >
-              <el-input-number v-model="formData.points" :min="1"  label="描述文字"></el-input-number>
+            <el-form-item label="活动积分" prop="integral">
+              <el-input-number v-model="formData.points" :min="0" label="描述文字" :step="0.1" :precision="1" ></el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -43,19 +73,40 @@
               <el-date-picker v-model="formData.deadline" type="datetime" placeholder="选择日期时间" style="width: 280px;"
                 value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss">
               </el-date-picker>
-          
-            </el-form-item> 
-           
+
+            </el-form-item>
+
           </el-col>
-      
+          <el-col :span="12">
+            <el-form-item label=" 联系人" prop="linkman" required>
+              <el-input v-model="formData.linkman" placeholder="请输入" style="width: 280px;"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label=" 联系电话" prop="linkMobile" required>
+              <el-input v-model="formData.linkMobile" placeholder="请输入" style="width: 280px;"></el-input>
+            </el-form-item>
+          </el-col>
+
+
+
           <el-col :span="24">
             <el-form-item label="活动时间" prop="strTime" required>
+              <!-- <el-date-picker
+      v-model="value1"
+      type="datetimerange"
+      range-separator="至"
+      start-placeholder="开始日期"
+      end-placeholder="结束日期">
+    </el-date-picker>
+  </div> -->
               <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" style="width:195px">
               </el-date-picker> <span style="margin: 0 10px">至</span> <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"
                 style="width:195px" @change="actcontrolTime">
               </el-date-picker>
+
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -82,9 +133,6 @@
               <el-input-number v-model="formData.points" :min="1" :max="10" label="描述文字"></el-input-number>
             </el-form-item>
           </el-col> -->
-
-       
-          
           <el-col :span="24">
             <el-form-item label="活动详情" prop="content" style="display: block" required>
               <div style="width: 756px;">
@@ -93,32 +141,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="报名条件" prop="conditions" >
-              <el-input type="textarea" placeholder="请输入活动标题，不超过50子"  v-model="formData.conditions" maxlength="200"
-                show-word-limit style="width: 756px;">
+            <el-form-item label="报名条件" prop="conditions">
+              <el-input type="textarea" placeholder="请输入活动标题，不超过50子" :height="150" v-model="formData.conditions"
+                maxlength="200" show-word-limit style="width: 756px;">
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-        <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" :loading="loading">
-              <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
-                style="width: 400px;" :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-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" :loading="loading">
+                  <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
+                    style="width: 400px;" :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-col>
           <el-col :span="12">
             <!-- <el-col :span="12"> -->
-          <el-form-item v-if="formType !== 'records'" label="上线" style="display: block" prop="peopleCount">
+            <el-form-item v-if="formType !== 'records'" label="上线" style="display: block" prop="peopleCount">
               <el-switch v-model="formData.online" :active-value='1' :inactive-value='0'
                 @change="handleSwitchChange"></el-switch>
             </el-form-item>
-          <!-- </el-col> -->
+            <!-- </el-col> -->
             <!-- <el-form-item label="活动积分" prop="integral" >
               <el-input-number v-model="formData.points" :min="1" :max="10" label="描述文字"></el-input-number>
             </el-form-item> -->
@@ -133,59 +181,30 @@
               </div>
 
             </el-form-item>
-          <!-- </el-col> -->
-          <!-- <el-col :span="24"> -->
-      
-          <!-- </el-col> -->
-              
-          <!-- <el-col :span="12"> -->
+            <!-- </el-col> -->
+            <!-- <el-col :span="24"> -->
+
+            <!-- </el-col> -->
+          </el-col>
+          <el-col :span="12">
             <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="removeDomain(item)"
-                  style="font-size: 20px; margin-left: 20px;"></i>
-              </el-form-item>
-
-              <el-form-item label="联系电话" prop="sponsors">
-                <el-input v-model="item.phone" placeholder="请输入" style="width: 280px;"></el-input>
-              </el-form-item>
+              <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="removeDomain(item)"
+                      style="font-size: 20px; margin-left: 20px;"></i>
+                  </el-form-item>
+
+                  <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>
-          </div>
-          <i class="el-icon-circle-plus" @click="addDomain" style="font-size: 20px; margin-top:7px;"></i>
-        </div>
-          <!-- </el-col> -->
           </el-col>
-
- 
-
-    
-     
-         
-   
         </el-row>
-
-
-
-
-
-
-
-        <!-- <el-form-item label="所属项目" prop="typeId" required>
-                            <el-select class="item_width_1" v-model.trim="formData.typeId" placeholder="请选择" clearable>
-                                <el-option v-for="item in typeList" :key="item.nametypeName" :label="item.typeName"
-                                    :value="item.id">
-                                </el-option>
-                            </el-select>
-                        </el-form-item> -->
-
-
-
-
-
-
-        
       </el-form>
       <!-- <i class="el-icon-circle-plus"  @click="addDomain" style="font-size: 20px;"></i> -->
 
@@ -258,15 +277,30 @@ export default {
     ]
 
       },
-
+    //活动级别
+    serviceLevelList:[
+      {
+            id:0,
+            name:"市区级"
+          },
+          {
+            id:1,
+            name:"街道级"
+          },
+          {
+            id:2,
+            name:"社区级"
+          }
+    
+      ],
       activityImgs:[],//图片
       typeList:[
           {
-            id:"1",
+            id:1,
             name:"线上活动"
           },
           {
-            id:"2",
+            id:2,
             name:"线下活动"
           }
         ],
@@ -327,6 +361,7 @@ export default {
   },
 
   methods: {
+
     //删除动态
     removeDomain(item) {
         if (item.id) {
diff --git a/src/views/modules/volunteer/pointsRedemption/add.vue b/src/views/modules/volunteer/pointsRedemption/add.vue
index f5aa02ff9..ad36fe9e4 100644
--- a/src/views/modules/volunteer/pointsRedemption/add.vue
+++ b/src/views/modules/volunteer/pointsRedemption/add.vue
@@ -4,10 +4,10 @@
          style="overflow: scroll;">
          <el-row>
             <el-col :span="12">
-            <el-form-item label="标题" label-width="150px" required>
-            <el-input class="item_width_1" v-model="formData.awardName" placeholder="请输入内容"></el-input>
-         </el-form-item>
-      </el-col>
+               <el-form-item label="标题" label-width="150px" required>
+                  <el-input class="item_width_1" v-model="formData.awardName" placeholder="请输入内容"></el-input>
+               </el-form-item>
+            </el-col>
             <el-col :span="12">
                <el-form-item label="分类" required label-width="150px">
                   <el-select class="item_width_1" v-model="formData.classKey" placeholder="请选择">
@@ -17,6 +17,7 @@
                   </el-select>
                </el-form-item>
             </el-col>
+    
             <el-col :span="12">
                <el-form-item label="发布范围" label-width="150px" required>
                   <el-cascader class="list_item_width_1" ref="myCascader" clearable size="small" style="width:300px ;"
@@ -24,76 +25,96 @@
                      @change="handleChangeAgency"></el-cascader>
                </el-form-item>
             </el-col>
-           <el-col :span="12">
+            <el-col :span="12">
                <el-form-item required label="兑换积分" label-width="150px">
                   <el-input style="width:300px ;" v-model="formData.points" placeholder="请输入"></el-input>
                </el-form-item>
             </el-col>
             <el-col :span="12">
                <el-form-item label="赞助单位" label-width="150px">
-            <el-input v-model="formData.sponsorName" placeholder="请输入"  style="width:300px ;"></el-input>
-         </el-form-item>
+                  <el-input v-model="formData.sponsorName" placeholder="请输入" style="width:300px ;"></el-input>
+               </el-form-item>
             </el-col>
             <el-col :span="12">
                <el-form-item label="联系电话" label-width="150px" prop="sponsorMobile">
-            <el-input style="width:300px ;" v-model="formData.sponsorMobile" placeholder="请输入" ></el-input>
-         </el-form-item>
+                  <el-input style="width:300px ;" v-model="formData.sponsorMobile" placeholder="请输入"></el-input>
+               </el-form-item>
             </el-col>
             <el-col :span="12">
                <el-form-item label="库存" label-width="150px">
-            <div style="width:195px;height: 40px;" class="flex flex-x  flex-center2">
-               <el-radio v-model="radio" label="1" style="margin-right:20px">不限数目</el-radio>
-               <div class="flex flex-x  flex-center2">
-                  <el-radio v-model="radio" label="2" style="margin-right: 10px;">自定义</el-radio>
-                  <el-input v-if="radio == '2'" type="number" v-model="formData.stockQty" style="width: 125px;"
-                     placeholder="请输入数量"></el-input>
-               </div>
-            </div>
-         </el-form-item>
+                  <div style="width:195px;height: 40px;" class="flex flex-x  flex-center2">
+                     <el-radio v-model="radio" label="1" style="margin-right:20px">不限数目</el-radio>
+                     <div class="flex flex-x  flex-center2">
+                        <el-radio v-model="radio" label="2" style="margin-right: 10px;">自定义</el-radio>
+                        <el-input v-if="radio == '2'" type="number" v-model="formData.stockQty" style="width: 125px;"
+                           placeholder="请输入数量"></el-input>
+                     </div>
+                  </div>
+               </el-form-item>
+            </el-col>
+            <el-col :span="12">
+               <el-form-item label="可兑换次数" label-width="150px">
+                  <div style="width:195px;height: 40px;" class="flex flex-x  flex-center2">
+                     <el-radio v-model="radio" label="1" style="margin-right:20px">不限数目</el-radio>
+                     <div class="flex flex-x  flex-center2">
+                        <el-radio v-model="radio" label="2" style="margin-right: 10px;">自定义</el-radio>
+                        <el-input v-if="radio == '2'" type="number" v-model="formData.stockQty" style="width: 125px;"
+                           placeholder="请输入数量"></el-input>
+                     </div>
+                  </div>
+               </el-form-item>
             </el-col>
             <el-col :span="12">
                <el-form-item label="有效期至" label-width="150px">
-            <el-date-picker style="width:300px ;" v-model="formData.expireTime" 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-date-picker style="width:300px ;" v-model="formData.expireTime" 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-col>
-   
-  
-         </el-row>
+     
+         <el-col :span="12">
+            <el-form-item label="星级专属" required label-width="150px">
+               <el-select class="item_width_1" v-model="formData.rating" placeholder="请选择">
+                  <el-option v-for="item in starList" :key="item.id" :label="item.name" :value="item.id">
+                  </el-option>
+               </el-select>
+            </el-form-item>
+         </el-col>
+         <el-col :span="12">
+            <el-form-item label="级别" required label-width="150px">
+               <el-select class="item_width_1" v-model="formData.level" placeholder="请选择">
+                  <el-option v-for="item in serviceLevelList" :key="item.id" :label="item.name" :value="item.id">
+                  </el-option>
+               </el-select>
+            </el-form-item>
+         </el-col>
 
-         <el-form-item v-if="formData.classKey=='mjq' ||formData.classKey=='cxdjq'" required label="金额"
-            label-width="150px">
-            <div class="item_width_2" style="display: flex;">
-               <div>￥</div>
-               <el-input v-model="formData.worthAmount" placeholder="请输入金额"></el-input>
-            </div>
-         </el-form-item>
-         <el-form-item :inline="true" required v-if="formData.classKey=='zkq'" label="折扣" label-width="150px">
+         <el-form-item :inline="true" required v-if="formData.classKey == 'zkq'" label="折扣" label-width="150px">
             <div class="item_width_2" style="display: flex;">
                <el-input v-model="formData.worthAmount" placeholder="请输入折扣"></el-input>
                <div> 折</div>
             </div>
          </el-form-item>
-         <el-form-item required v-if="formData.classKey=='hwjh'" label="原价" label-width="150px">
+         <el-form-item required v-if="formData.classKey == 'hwjh'" label="原价" label-width="150px">
             <div style="display: flex;">
                <div>￥</div>
                <el-input v-model="formData.worthAmount" placeholder="请输入内容"></el-input>
             </div>
          </el-form-item>
 
-    
+
          <el-form-item label="规则说明" label-width="150px">
             <Tinymce style="width: 763px;" class="tinymce_view" v-model="formData.description" :height="250"
                placeholder="请输入活动内容" />
          </el-form-item>
          <el-col :span="24">
-               <el-form-item label="上架" label-width="150px" inline="false">
-            <el-switch v-model="formData.shelveStatus" active-color="#13ce66" inactive-color=""
-               active-value="1" inactive-value="0">
-            </el-switch>
-         </el-form-item>
-            </el-col>
+            <el-form-item label="上架" label-width="150px" inline="false">
+               <el-switch v-model="formData.shelveStatus" active-color="#13ce66" inactive-color="" active-value="1"
+                  inactive-value="0">
+               </el-switch>
+            </el-form-item>
+         </el-col>
+      </el-row>
       </el-form>
       <div class="flex  flex-center1 flex-center2">
          <el-button type="primary" @click="submitForm()">提交</el-button>
@@ -102,157 +123,206 @@
    </div>
 </template>
 <script>
-import { requestPost,requestGet } from "@/js/dai/request";
+import { requestPost, requestGet } from "@/js/dai/request";
 import Tinymce from '@c/tinymce2/index.vue'
 export default {
    components: {
-    Tinymce
-  },
+      Tinymce
+   },
    name: "see",
-   
-    data() {
-    return {
-      formData:{
-          classKey: "",
-          awardName: "",
-          worthAmount: "",
-          points: "",
-          redeemerOrgId: "",
-          expireTime: "",
-          description: "",
-          stockQty: '',
-          sponsorName: "",
-          sponsorMobile: "",
-          shelveStatus: ''
-      },
-      orgOptionProps: {
-        value: 'agencyId',
-        label: 'agencyName',
-        children: 'subAgencyList',
-        emitPath: false,
-        multiple: false,
-        checkStrictly: true
-    },
-      labelPosition: 'right',
-      TypeList:[
-            
+
+   data() {
+      return {
+         serviceLevelList: [
+            {
+               id: 0,
+               name: "市区级"
+            },
+            {
+               id: 1,
+               name: "街道级"
+            },
+            {
+               id: 2,
+               name: "社区级"
+            },
+            {
+               id: 3,
+               name: "市场运营"
+            }
+
          ],
-      radio:'1',
-      orgOptions:[],
-          rules: {
-        sponsorMobile: [
-          { required: false, message: '联系电话不能为空', trigger: 'blur' },
-          { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' }
-        ]
-      }
-    };
 
-  },
+         starList: [
+            {
+               id: 0,
+               name: "一星"
+            },
+            {
+               id: 1,
+               name: "二星"
+            },
+            {
+               id: 2,
+               name: "三星"
+            },
+            {
+               id: 3,
+               name: "四星"
+            },
+            {
+               id: 3,
+               name: "五星"
+            }
 
+         ],
+         formData: {
+            level:'',
+            rating:'',
+            serviceLevel: "",
+            classKey: "",
+            awardName: "",
+            worthAmount: "",
+            points: "",
+            redeemerOrgId: "",
+            expireTime: "",
+            description: "",
+            stockQty: '',
+            sponsorName: "",
+            sponsorMobile: "",
+            shelveStatus: ''
+         },
+         orgOptionProps: {
+            value: 'agencyId',
+            label: 'agencyName',
+            children: 'subAgencyList',
+            emitPath: false,
+            multiple: false,
+            checkStrictly: true
+         },
+         labelPosition: 'right',
+         TypeList: [
+
+         ],
+         radio: '1',
+         orgOptions: [],
+         rules: {
+            sponsorMobile: [
+               { required: false, message: '联系电话不能为空', trigger: 'blur' },
+               { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' }
+            ]
+         }
+      };
 
-  created() {
-    this.getclasses()
-    this.getOrgTreeList()
-  },
-  methods: {
-   //获取当前组织
-   getOrgTreeList() {
-      this.$http
-        .post("/gov/org/customeragency/agencygridtree", {})
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.orgOptions = [];
-            this.orgOptions.push(res.data);
-            console.log(this.orgOptions,"this.orgOptions");
-            
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
-    },
-    handleChangeAgency(val){
-      console.log(val);
-      this.redeemerOrgId=val
-      
-    },
-   //获取物品分类信息
-   async getclasses() {
-        // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
-        const url = "/voluntary/pointsAward/classes/list";
-        let params = {
-      }
-        const { data, code, msg } = await requestGet(url, params)
-        if (code === 0) {
-          console.log("列表请求成功！！！！！！！！！！！！！！");
-          this.TypeList=data
-        } else {
-          this.$message.error(msg || "列表请求失败");
-        }
-      },
-   handlecancel(){
-      this.formData={}
-      console.log(this.formData,"formData");
-      
-      this.$emit('closeDialog')
    },
-   //提交
-  async submitForm(){
-      if (this.formData.classKey == '') {
-        this.$message.error('请选择分类');
-        return;
-      }
-      if (this.formData.awardName == '') {
-        this.$message.error('请输入标题');
-        return;
-      }
-      if (this.formData.points == '') {
-        this.$message.error('请输入积分');
-        return;
-      }
-      if (this.formData.redeemerOrgId == '') {
-        this.$message.error('请选择发布乏味');
-        return;
-      }
-      const url = "/voluntary/pointsAward/admin/add";
-        let params = {
-         ...this.formData
-      }
-        const { data, code, msg } = await requestPost(url, params)
-        if (code === 0) {
-        
-          this.$emit('closeDialog')
-          
-        } else {
-          this.$message.error(msg || "提交失败");
-        }
 
-   }
 
-  },
+   created() {
+      this.getclasses()
+      this.getOrgTreeList()
+   },
+   methods: {
+      //获取当前组织
+      getOrgTreeList() {
+         this.$http
+            .post("/gov/org/customeragency/agencygridtree", {})
+            .then(({ data: res }) => {
+               if (res.code !== 0) {
+                  return this.$message.error(res.msg);
+               } else {
+                  this.orgOptions = [];
+                  this.orgOptions.push(res.data);
+                  console.log(this.orgOptions, "this.orgOptions");
+
+               }
+            })
+            .catch(() => {
+               return this.$message.error("网络错误");
+            });
+      },
+      handleChangeAgency(val) {
+         console.log(val);
+         this.redeemerOrgId = val
+
+      },
+      //获取物品分类信息
+      async getclasses() {
+         // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
+         const url = "/voluntary/pointsAward/classes/list";
+         let params = {
+         }
+         const { data, code, msg } = await requestGet(url, params)
+         if (code === 0) {
+            console.log("列表请求成功！！！！！！！！！！！！！！");
+            this.TypeList = data
+         } else {
+            this.$message.error(msg || "列表请求失败");
+         }
+      },
+      handlecancel() {
+         this.formData = {}
+         console.log(this.formData, "formData");
+
+         this.$emit('closeDialog')
+      },
+      //提交
+      async submitForm() {
+         if (this.formData.classKey == '') {
+            this.$message.error('请选择分类');
+            return;
+         }
+         if (this.formData.awardName == '') {
+            this.$message.error('请输入标题');
+            return;
+         }
+         if (this.formData.points == '') {
+            this.$message.error('请输入积分');
+            return;
+         }
+         if (this.formData.redeemerOrgId == '') {
+            this.$message.error('请选择发布乏味');
+            return;
+         }
+         const url = "/voluntary/pointsAward/admin/add";
+         let params = {
+            ...this.formData
+         }
+         const { data, code, msg } = await requestPost(url, params)
+         if (code === 0) {
+
+            this.$emit('closeDialog')
+
+         } else {
+            this.$message.error(msg || "提交失败");
+         }
+
+      }
+
+   },
 
 }
 
 </script>
 <style lang="scss" scoped>
-  @import "@/assets/scss/modules/management/volunteet.scss";
-  .g-main{
-    padding: 30px;
-  }
-  .item_width_1 {
-    width: 300px;
+@import "@/assets/scss/modules/management/volunteet.scss";
 
-    /deep/.tox .tox-dialog {
-        z-index: 20000;
-    }
+.g-main {
+   padding: 30px;
 }
+
+.item_width_1 {
+   width: 300px;
+
+   /deep/.tox .tox-dialog {
+      z-index: 20000;
+   }
+}
+
 .item_width_2 {
-    width: 150px;
+   width: 150px;
 
-    /deep/.tox .tox-dialog {
-        z-index: 20000;
-    }
+   /deep/.tox .tox-dialog {
+      z-index: 20000;
+   }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/modules/volunteer/pointsRedemption/index.vue b/src/views/modules/volunteer/pointsRedemption/index.vue
index 4aa550ffb..f49fe1410 100644
--- a/src/views/modules/volunteer/pointsRedemption/index.vue
+++ b/src/views/modules/volunteer/pointsRedemption/index.vue
@@ -1,70 +1,71 @@
 <template>
-    <div class="g-main">
-      <div class="m-search">
-        <el-form :inline="true" ref="ref_searchform" :label-width="'100px'">
-          <div>
-            <el-form-item label="发布区域">
-              <el-cascader class="list_item_width_1" ref="myCascader" clearable size="small"
-               v-model.trim="formData.redeemOrgId" :options="orgOptions" :props="orgOptionProps"
-               @change="handleChangeAgency"></el-cascader>
-            </el-form-item>
-            <el-form-item label="分类">
+  <div class="g-main">
+    <div class="m-search">
+      <el-form :inline="true" ref="ref_searchform" :label-width="'100px'">
+        <div>
+          <el-form-item label="发布区域">
+            <el-cascader class="list_item_width_1" ref="myCascader" clearable size="small"
+              v-model.trim="formData.redeemOrgId" :options="orgOptions" :props="orgOptionProps"
+              @change="handleChangeAgency"></el-cascader>
+          </el-form-item>
+          <el-form-item label="分类">
+            <el-select v-model="formData.classKey" placeholder="请选择" clearable>
+              <el-option v-for="item in formData.optionsStatus" :key="item.classKey" :label="item.className"
+                :value="item.classKey">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="上架时间">
+            <el-date-picker v-model="formData.shelveOnTimeFrom" type="datetime" placeholder="开始时间"
+              format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss">
+            </el-date-picker><span style="margin: 0 10px">至</span><el-date-picker v-model="formData.shelveOnTimeTo"
+              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="星级专属">
               <el-select v-model="formData.classKey" placeholder="请选择" clearable>
                 <el-option v-for="item in formData.optionsStatus" :key="item.classKey" :label="item.className"
                   :value="item.classKey">
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="上架时间" >
-              <el-date-picker
-      v-model="formData.shelveOnTimeFrom"
-      type="datetime"
-      placeholder="开始时间" format="yyyy-MM-dd HH:mm:ss"
-      value-format="yyyy-MM-dd HH:mm:ss">
-    </el-date-picker><span style="margin: 0 10px">至</span><el-date-picker
-      v-model="formData.shelveOnTimeTo"
-      type="datetime"
-      placeholder="结束时间" format="yyyy-MM-dd HH:mm:ss"
-      value-format="yyyy-MM-dd HH:mm:ss">
-    </el-date-picker>
-            </el-form-item>
-
-          </div>
-          <div class="block">
-            <div style="display: flex; justify-content: flex-end;">
-              <el-button style="margin-left:10px" class="diy-button--blue" size="small"
-                @click="handleSearch">查询</el-button>
-              <el-button style="margin-left:10px" class="diy-button--white" size="small"
-                @click="resetSearch">重置</el-button>
-            </div>
+        </div>
+        <div class="block">
+          <div style="display: flex; justify-content: flex-end;">
+            <el-button style="margin-left:10px" class="diy-button--blue" size="small"
+              @click="handleSearch">查询</el-button>
+            <el-button style="margin-left:10px" class="diy-button--white" size="small"
+              @click="resetSearch">重置</el-button>
           </div>
-        </el-form>
-      </div>
-      <div class="m-table">
-        <el-button style="" class="diy-button--add" size="small" @click="handleAdd">新增</el-button>
-        <el-table class="table" :data="tableData" border v-loading="tableLoading" style="width: 100%">
-          <el-table-column label="序号" header-align="center" align="center" type="index" width="80"> </el-table-column>
-          <el-table-column prop="redeemerOrgName" header-align="center" align="center" label="发布区域">
-          </el-table-column>
-          <el-table-column prop="className" header-align="center" align="center" label="分类">
-            <!-- <template slot-scope="scope">
+        </div>
+      </el-form>
+    </div>
+    <div class="m-table">
+      <el-button style="" class="diy-button--add" size="small" @click="handleAdd">新增</el-button>
+      <el-table class="table" :data="tableData" border v-loading="tableLoading" style="width: 100%">
+        <el-table-column label="序号" header-align="center" align="center" type="index" width="80"> </el-table-column>
+        <el-table-column prop="redeemerOrgName" header-align="center" align="center" label="发布区域">
+        </el-table-column>
+        <el-table-column prop="className" header-align="center" align="center" label="分类">
+          <!-- <template slot-scope="scope">
           <span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span>
         </template> -->
-          </el-table-column>
-          <el-table-column prop="awardName" header-align="center" align="center" label="标题">
-            <template slot-scope="scope">
-                    <el-button style="width: 100%" type="text" @click="handleSelect(scope.row)">{{scope.row.awardName}}</el-button>
-            </template>
-          </el-table-column>
-          <el-table-column prop="shelveStatus" header-align="center" align="center" label="状态">
-            <template slot-scope="scope">
-              <span>{{ scope.row.shelveStatus === 0 ? '下架' : '上架' }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="shelveOnTime" header-align="center" align="center" label="上架时间"  format="yyyy-MM-dd HH:mm:ss"
-          value-format="yyyy-MM-dd HH:mm:ss">
-          </el-table-column>
-          <!-- <el-table-column prop="IDNumber" header-align="center" align="center" label="发布时间">
+        </el-table-column>
+        <el-table-column prop="awardName" header-align="center" align="center" label="标题">
+          <template slot-scope="scope">
+            <el-button style="width: 100%" type="text"
+              @click="handleSelect(scope.row)">{{scope.row.awardName}}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column prop="shelveStatus" header-align="center" align="center" label="状态">
+          <template slot-scope="scope">
+            <span>{{ scope.row.shelveStatus === 0 ? '下架' : '上架' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="shelveOnTime" header-align="center" align="center" label="上架时间"
+          format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss">
+        </el-table-column>
+        <!-- <el-table-column prop="IDNumber" header-align="center" align="center" label="发布时间">
           </el-table-column>
           <el-table-column prop="RegistrationTime" header-align="center" align="center" label="状态">
           </el-table-column>
@@ -72,41 +73,44 @@
           </el-table-column>
           <el-table-column prop="ActivityCount" header-align="center" align="center" label="所属项目">
           </el-table-column> -->
-          <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate">
-            <template slot-scope="scope">
-              <el-button v-if="scope.row.shelveStatus === 0" type="text" style="color:#1C6AFD;" size="small" @click="handleDetail(scope.row)">修改</el-button>
-              <el-button v-if="scope.row.shelveStatus === 0" type="text" style="color:#1C6AFD;" size="small" @click="handleonline(scope.row)">上架</el-button>
-              <el-button v-if="scope.row.shelveStatus === 1" type="text" style="color:#1C6AFD;" size="small" @click="handleuponline(scope.row)">下架</el-button>
-              <el-button  type="text" style="color:#1C6AFD;" size="small" @click="handleDel(scope.row)">删除</el-button>
-              <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleEdit(scope.row)">兑换记录</el-button>
-            </template>
-          </el-table-column>
-        </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>
-        </div>
-        <el-dialog :visible.sync="add" :close-on-click-modal="false" :close-on-press-escape="false" title="新增"
-          width="1000px" top="10vh" class="dialog-h" @closed="closeDialog">
-          <add v-if="add" :list="fmData" @closeDialog="closeDialog"/>
-        </el-dialog>
-        <el-dialog :visible.sync="updateshow" :close-on-click-modal="false" :close-on-press-escape="false" title="修改"
-          width="1000px" top="10vh" class="dialog-h" @closed="closeupdate">
-          <update v-if="updateshow" :list="fmData" @closeupdate="closeupdate"/>
-        </el-dialog>
-        <el-dialog :visible.sync="recordshow" :close-on-click-modal="false" :close-on-press-escape="false" title="兑换记录"
-          width="1000px" top="10vh" class="dialog-h" @closed="diaClose">
-          <record v-if="recordshow" :list="fmData" />
-        </el-dialog>
-        <el-dialog :visible.sync="showSelect" :close-on-click-modal="false" :close-on-press-escape="false" title="查看"
-          width="750px" top="10vh" class="dialog-h" @closed="diaClose">
-          <Select v-if="showSelect" :list="fmData" />
-        </el-dialog>
+        <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate">
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.shelveStatus === 0" type="text" style="color:#1C6AFD;" size="small"
+              @click="handleDetail(scope.row)">修改</el-button>
+            <el-button v-if="scope.row.shelveStatus === 0" type="text" style="color:#1C6AFD;" size="small"
+              @click="handleonline(scope.row)">上架</el-button>
+            <el-button v-if="scope.row.shelveStatus === 1" type="text" style="color:#1C6AFD;" size="small"
+              @click="handleuponline(scope.row)">下架</el-button>
+            <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleDel(scope.row)">删除</el-button>
+            <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleEdit(scope.row)">兑换记录</el-button>
+          </template>
+        </el-table-column>
+      </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>
       </div>
-  
+      <el-dialog :visible.sync="add" :close-on-click-modal="false" :close-on-press-escape="false" title="新增"
+        width="1000px" top="10vh" class="dialog-h" @closed="closeDialog">
+        <add v-if="add" :list="fmData" @closeDialog="closeDialog" />
+      </el-dialog>
+      <el-dialog :visible.sync="updateshow" :close-on-click-modal="false" :close-on-press-escape="false" title="修改"
+        width="1000px" top="10vh" class="dialog-h" @closed="closeupdate">
+        <update v-if="updateshow" :list="fmData" @closeupdate="closeupdate" />
+      </el-dialog>
+      <el-dialog :visible.sync="recordshow" :close-on-click-modal="false" :close-on-press-escape="false" title="兑换记录"
+        width="1000px" top="10vh" class="dialog-h" @closed="diaClose">
+        <record v-if="recordshow" :list="fmData" />
+      </el-dialog>
+      <el-dialog :visible.sync="showSelect" :close-on-click-modal="false" :close-on-press-escape="false" title="查看"
+        width="750px" top="10vh" class="dialog-h" @closed="diaClose">
+        <Select v-if="showSelect" :list="fmData" />
+      </el-dialog>
     </div>
-  </template>
+
+  </div>
+</template>
   
       <script>
       import record from "./record"
diff --git a/src/views/modules/volunteer/pointsRedemption/update.vue b/src/views/modules/volunteer/pointsRedemption/update.vue
index e15ba1e5f..8a0e8a40f 100644
--- a/src/views/modules/volunteer/pointsRedemption/update.vue
+++ b/src/views/modules/volunteer/pointsRedemption/update.vue
@@ -1,81 +1,126 @@
 <template>
-   <div class="g-main">
-      <el-form :inline="true" :label-position="labelPosition" :model="formData" :rules="rules"
-         style="height: 500px; overflow: scroll;">
-         <el-form-item label="分类" required label-width="150px">
-            <el-select class="item_width_1" v-model="formData.classKey" placeholder="请选择">
-               <el-option v-for="item in TypeList" :key="item.classKey" :label="item.className" :value="item.classKey">
-               </el-option>
-            </el-select>
-         </el-form-item>
-         <el-form-item label="标题" label-width="150px" required>
-            <el-input class="item_width_1" v-model="formData.awardName" placeholder="请输入内容"></el-input>
-         </el-form-item>
-         <el-form-item v-if="formData.classKey=='mjq' ||formData.classKey=='cxdjq'" required label="金额"
-            label-width="150px">
-            <div class="item_width_2" style="display: flex;">
-               <div>￥</div>
-               <el-input v-model="formData.worthAmount" placeholder="请输入金额"></el-input>
-            </div>
-         </el-form-item>
-         <el-form-item :inline="true" required v-if="formData.classKey=='zkq'" label="折扣" label-width="150px">
-            <div class="item_width_2" style="display: flex;">
-               <el-input v-model="formData.worthAmount" placeholder="请输入折扣"></el-input>
-               <div> 折</div>
-            </div>
-         </el-form-item>
-         <el-form-item required v-if="formData.classKey=='hwjh'" label="原价" label-width="150px">
-            <div style="display: flex;">
-               <div>￥</div>
-               <el-input v-model="formData.worthAmount" placeholder="请输入内容"></el-input>
-            </div>
-         </el-form-item>
-         <el-form-item required label="兑换积分" label-width="150px">
-            <el-input class="item_width_2" v-model="formData.points" placeholder="请输入"></el-input>
-         </el-form-item>
-         <el-form-item label="有效期至" label-width="150px">
-            <el-date-picker style="width: 250px;" v-model="formData.expireTime" 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="规则说明" label-width="150px">
-            <Tinymce style="width: 560px;" class="tinymce_view" v-model="formData.description" :height="250"
-               placeholder="请输入活动内容" />
-         </el-form-item>
-         <el-form-item label="库存" label-width="150px">
-            <div style="width:195px;;">
-               <el-radio v-model="radio" label="1" style="margin-right:20px">不限数目</el-radio>
-               <div class="flex flex-x  flex-center2" >
-                  <el-radio v-model="radio" label="2" style="margin-right: 10px;">自定义</el-radio>
-                  <el-input v-if="radio == '2'" type="number" v-model="formData.stockQty" placeholder="请输入数量"></el-input>
-               </div>
-            </div>
+  <div class="g-main">
+     <el-form :inline="true" :label-position="labelPosition" :model="formData" :rules="rules"
+        style="overflow: scroll;">
+        <el-row>
+           <el-col :span="12">
+              <el-form-item label="标题" label-width="150px" required>
+                 <el-input class="item_width_1" v-model="formData.awardName" placeholder="请输入内容"></el-input>
+              </el-form-item>
+           </el-col>
+           <el-col :span="12">
+              <el-form-item label="分类" required label-width="150px">
+                 <el-select class="item_width_1" v-model="formData.classKey" placeholder="请选择">
+                    <el-option v-for="item in TypeList" :key="item.classKey" :label="item.className"
+                       :value="item.classKey">
+                    </el-option>
+                 </el-select>
+              </el-form-item>
+           </el-col>
+   
+           <el-col :span="12">
+              <el-form-item label="发布范围" label-width="150px" required>
+                 <el-cascader class="list_item_width_1" ref="myCascader" clearable size="small" style="width:300px ;"
+                    v-model.trim="formData.redeemerOrgId" :options="orgOptions" :props="orgOptionProps"
+                    @change="handleChangeAgency"></el-cascader>
+              </el-form-item>
+           </el-col>
+           <el-col :span="12">
+              <el-form-item required label="兑换积分" label-width="150px">
+                 <el-input style="width:300px ;" v-model="formData.points" placeholder="请输入"></el-input>
+              </el-form-item>
+           </el-col>
+           <el-col :span="12">
+              <el-form-item label="赞助单位" label-width="150px">
+                 <el-input v-model="formData.sponsorName" placeholder="请输入" style="width:300px ;"></el-input>
+              </el-form-item>
+           </el-col>
+           <el-col :span="12">
+              <el-form-item label="联系电话" label-width="150px" prop="sponsorMobile">
+                 <el-input style="width:300px ;" v-model="formData.sponsorMobile" placeholder="请输入"></el-input>
+              </el-form-item>
+           </el-col>
+           <el-col :span="12">
+              <el-form-item label="库存" label-width="150px">
+                 <div style="width:195px;height: 40px;" class="flex flex-x  flex-center2">
+                    <el-radio v-model="radio" label="1" style="margin-right:20px">不限数目</el-radio>
+                    <div class="flex flex-x  flex-center2">
+                       <el-radio v-model="radio" label="2" style="margin-right: 10px;">自定义</el-radio>
+                       <el-input v-if="radio == '2'" type="number" v-model="formData.stockQty" style="width: 125px;"
+                          placeholder="请输入数量"></el-input>
+                    </div>
+                 </div>
+              </el-form-item>
+           </el-col>
+           <el-col :span="12">
+              <el-form-item label="可兑换次数" label-width="150px">
+                 <div style="width:195px;height: 40px;" class="flex flex-x  flex-center2">
+                    <el-radio v-model="radio" label="1" style="margin-right:20px">不限数目</el-radio>
+                    <div class="flex flex-x  flex-center2">
+                       <el-radio v-model="radio" label="2" style="margin-right: 10px;">自定义</el-radio>
+                       <el-input v-if="radio == '2'" type="number" v-model="formData.stockQty" style="width: 125px;"
+                          placeholder="请输入数量"></el-input>
+                    </div>
+                 </div>
+              </el-form-item>
+           </el-col>
+           <el-col :span="12">
+              <el-form-item label="有效期至" label-width="150px">
+                 <el-date-picker style="width:300px ;" v-model="formData.expireTime" 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-col>
+    
+        <el-col :span="12">
+           <el-form-item label="星级专属" required label-width="150px">
+              <el-select class="item_width_1" v-model="formData.rating" placeholder="请选择">
+                 <el-option v-for="item in starList" :key="item.id" :label="item.name" :value="item.id">
+                 </el-option>
+              </el-select>
+           </el-form-item>
+        </el-col>
+        <el-col :span="12">
+           <el-form-item label="级别" required label-width="150px">
+              <el-select class="item_width_1" v-model="formData.level" placeholder="请选择">
+                 <el-option v-for="item in serviceLevelList" :key="item.id" :label="item.name" :value="item.id">
+                 </el-option>
+              </el-select>
+           </el-form-item>
+        </el-col>
 
+        <el-form-item :inline="true" required v-if="formData.classKey == 'zkq'" label="折扣" label-width="150px">
+           <div class="item_width_2" style="display: flex;">
+              <el-input v-model="formData.worthAmount" placeholder="请输入折扣"></el-input>
+              <div> 折</div>
+           </div>
+        </el-form-item>
+        <el-form-item required v-if="formData.classKey == 'hwjh'" label="原价" label-width="150px">
+           <div style="display: flex;">
+              <div>￥</div>
+              <el-input v-model="formData.worthAmount" placeholder="请输入内容"></el-input>
+           </div>
+        </el-form-item>
 
-         </el-form-item>
-         <el-form-item label="发布范围" label-width="150px" required>
-            <el-cascader class="list_item_width_1" ref="myCascader" clearable size="small" style="width:210px ;"
-               v-model.trim="formData.redeemerOrgId" :options="orgOptions" :props="orgOptionProps"
-               @change="handleChangeAgency"></el-cascader>
-         </el-form-item>
 
-         <el-form-item label="赞助单位" label-width="150px" >
-            <el-input v-model="formData.sponsorName" placeholder="请输入"></el-input>
-         </el-form-item>
-         <el-form-item label="联系电话" label-width="150px"prop="sponsorMobile" >
-            <el-input style="width: 210px;" v-model="formData.sponsorMobile" placeholder="请输入"></el-input>
-         </el-form-item>
-         <el-form-item label="上架" label-width="150px" inline="false">
-            <el-switch style="width: 500px;" v-model="formData.shelveStatus" active-color="#13ce66" inactive-color=""
-               active-value="1" inactive-value="0">
-            </el-switch>
-         </el-form-item>
-      </el-form>
-      <div class="flex  flex-center1 flex-center2">
-         <el-button type="primary" @click="submitForm()">提交</el-button>
-         <el-button @click="handlecancel">取消</el-button>
-      </div>
-   </div>
+        <el-form-item label="规则说明" label-width="150px">
+           <Tinymce style="width: 763px;" class="tinymce_view" v-model="formData.description" :height="250"
+              placeholder="请输入活动内容" />
+        </el-form-item>
+        <el-col :span="24">
+           <el-form-item label="上架" label-width="150px" inline="false">
+              <el-switch v-model="formData.shelveStatus" active-color="#13ce66" inactive-color="" active-value="1"
+                 inactive-value="0">
+              </el-switch>
+           </el-form-item>
+        </el-col>
+     </el-row>
+     </el-form>
+     <div class="flex  flex-center1 flex-center2">
+        <el-button type="primary" @click="submitForm()">提交</el-button>
+        <el-button @click="handlecancel">取消</el-button>
+     </div>
+  </div>
 </template>
  <script>
  import { requestPost,requestGet } from "@/js/dai/request";
@@ -88,6 +133,49 @@
     
      data() {
      return {
+      serviceLevelList: [
+            {
+               id: 0,
+               name: "市区级"
+            },
+            {
+               id: 1,
+               name: "街道级"
+            },
+            {
+               id: 2,
+               name: "社区级"
+            },
+            {
+               id: 3,
+               name: "市场运营"
+            }
+
+         ],
+
+         starList: [
+            {
+               id: 0,
+               name: "一星"
+            },
+            {
+               id: 1,
+               name: "二星"
+            },
+            {
+               id: 2,
+               name: "三星"
+            },
+            {
+               id: 3,
+               name: "四星"
+            },
+            {
+               id: 3,
+               name: "五星"
+            }
+
+         ],
        formData:{
            classKey: "",
            awardName: "",
@@ -288,19 +376,25 @@
  
  </script>
  <style lang="scss" scoped>
-   @import "@/assets/scss/modules/management/volunteet.scss";
-   .item_width_1 {
-     width: 560px;
- 
-     /deep/.tox .tox-dialog {
-         z-index: 20000;
-     }
- }
- .item_width_2 {
-     width: 150px;
- 
-     /deep/.tox .tox-dialog {
-         z-index: 20000;
-     }
- }
+@import "@/assets/scss/modules/management/volunteet.scss";
+
+.g-main {
+   padding: 30px;
+}
+
+.item_width_1 {
+   width: 300px;
+
+   /deep/.tox .tox-dialog {
+      z-index: 20000;
+   }
+}
+
+.item_width_2 {
+   width: 150px;
+
+   /deep/.tox .tox-dialog {
+      z-index: 20000;
+   }
+}
  </style>
\ No newline at end of file