修改

config/dev.env.js

@@ -1,9 +1,12 @@
 module.exports = {
 	NODE_ENV: '"development"',
 	ENV_CONFIG: '"dev"',
-  BASE_API: '"http://192.168.100.208:9083/admin"',
-  // OS_API: '"http://10.32.2.208:9081/storage"',
-  // BASE_API: '"http://192.168.100.208:9083/admin"',
   // 本地数据库：登录用户名 admin123，密码 admin123
-  OS_API: '"http://192.168.100.208:9083/admin"'
+  // OS_API: '"http://192.168.100.208:9083/admin"',
+  // BASE_API: '"http://192.168.100.208:9083/admin"',
+  OS_API: '"https://xiaoyou.dgtis.com/admin"',
+  BASE_API: '"https://xiaoyou.dgtis.com/admin"',
+  
+  
+  
 }

src/api/activityManage.js

@@ -0,0 +1,37 @@
+import request from '@/utils/request'
+
+export function createItem(data) {
+  return request({
+    url: '/mall-welfare/welfare/add',
+    method: 'post',
+    data
+  })
+}
+
+export function updateItem(query) {
+  return request({
+    url: '/mall-welfare/welfare/edit',
+    method: 'post',
+    data:query
+  })
+}
+
+export function activityList(query) {
+  return request({
+    url: '/mall-welfare/welfare/list',
+    method: 'post',
+    params:query
+  })
+}
+
+export function activityState(query) {
+  return request({
+    url: 'mall-welfare/modify/status',
+    method: 'post',
+    params:query
+  })
+}
+
+
+
+

src/api/rankingList.js

@@ -0,0 +1,25 @@
+import request from '@/utils/request'
+
+export function complete(query) {
+  return request({
+    url: '/mall-order/complete',
+    method: 'post',
+    params:query
+  })
+}
+
+export function list(query) {
+  return request({
+    url: '/mall-order/page',
+    method: 'post',
+    params:query
+  })
+}
+
+export function detail(query) {
+  return request({
+    url: '/mall-order/info',
+    method: 'post',
+    params:query
+  })
+}

src/permission.js

@@ -16,7 +16,25 @@ function hasPermission(roles, permissionRoles) {
 
 const whiteList = ['/login', '/authredirect']// no redirect whitelist
 //自定义路由
-const myRoles = ['pointManage', 'pointInstructions', 'pointRulesList', 'pointList', 'goodsManage', 'goodsExchangeRules', 'goodsList', 'giftManage', 'giftExchangeRules', 'giftList', 'welfareManage', 'welfareList', 'exchangeManage', 'exchangeList',]
+const myRoles = [
+  // 'pointManage', 
+  // 'pointInstructions', 
+  // 'pointRulesList', 
+  // 'pointList', 
+  // 'goodsManage', 
+  // 'goodsExchangeRules', 
+  // 'goodsList', 
+  // 'giftManage', 
+  // 'giftExchangeRules', 
+  // 'giftList', 
+  // 'welfareManage', 
+  // 'welfareList', 
+  // 'exchangeManage', 
+  // 'exchangeList',
+  // 'activityManage', 
+  // 'activityList', 
+  'rankingList',
+]
 
 router.beforeEach((to, from, next) => {
   NProgress.start() // start progress bar

src/router/index.js

@@ -123,6 +123,28 @@ export const asyncRouterMap = [
       { path: 'exchangeList', component: _import('exchangeManage/exchangeList'), name: 'exchangeList', meta: { title: '兑换列表', noCache: false, hideTag: true, hidden: true}},
     ]
   },
+  {
+    path: '/activityManage',
+    component: Layout,
+    redirect: 'noredirect',
+    name: 'activityManage',
+    meta: {
+      title: '活动管理',
+      icon: 'huodong'
+    },
+    children: [
+      { path: 'activityList', component: _import('activityManage/activityList'), name: 'activityList', meta: { title: '活动列表', noCache: true }},
+      { path: 'activityList', component: _import('activityManage/activityList'), name: 'activityList', meta: { title: '活动列表', noCache: false, hideTag: true, hidden: true}},
+    ]
+  },
+  {
+    path: '/ranking',
+    component: Layout,
+    redirect: 'noredirect',
+    children: [
+      { path: 'rankingList', component: _import('ranking/rankingList'), name: 'rankingList', meta: { title: '积分排行', icon: 'paihang', noCache: true }},
+    ]
+  },
   {
     path: '/user',
     component: Layout,

src/views/activityManage/activityList.vue

@@ -0,0 +1,427 @@
+<template>
+    <div class="app-container calendar-list-container">
+
+        <!-- 查询和其他操作 -->
+        <div class="filter-container">
+            <el-input clearable class="filter-item" style="width: 200px;" placeholder="活动名称"
+                v-model="listQuery.title"></el-input>
+           
+            <!-- <el-date-picker class="filter-item" v-model="listQuery.createTime" type="datetime" placeholder="创建时间">
+            </el-date-picker> -->
+            <el-date-picker
+            class="filter-item"
+            value-format="yyyy-MM-dd"
+            v-model="listQuery.createTime"
+            type="date"
+            placeholder="创建日期">
+            </el-date-picker>
+            <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">查找</el-button>
+            <el-button class="filter-item" type="primary" @click="handleCreate" icon="el-icon-edit">添加</el-button>
+
+        </div>
+
+        <!-- 查询结果 -->
+        <el-table size="small" :data="list" v-loading="listLoading" element-loading-text="正在查询中。。。" border fit
+            highlight-current-row>
+            <el-table-column type="index" label="序号" header-align="center" align="center">
+            </el-table-column>
+
+            <el-table-column align="center" min-width="100px" label="活动名称" prop="title">
+            </el-table-column>
+            <el-table-column align="center" min-width="100px" label="活动开始结束时间">
+                <template slot-scope="props">
+                   {{ props.row.startTimeStr }}~{{ props.row.endTimeStr }}
+                </template>
+            </el-table-column>
+            <el-table-column align="center" min-width="80px" label="创建人" prop="creater">
+            </el-table-column>
+            <el-table-column align="center" min-width="150px" label="创建时间" prop="createTime">
+            </el-table-column>
+            <el-table-column align="center" min-width="80px" label="活动状态" prop="statusName">
+            </el-table-column>
+            <el-table-column align="center" label="操作" width="240px" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                    <el-button type="primary" size="small" @click="handleUpdate(scope.row)">编辑</el-button>
+                    <el-button v-if="scope.row.status == 0" type="success" size="small"
+                        @click="changeState(scope.row.welfareId, 1)">开启</el-button>
+                    <el-button v-if="scope.row.status == 1" type="warning" size="small"
+                        @click="changeState(scope.row.welfareId, 0)">关闭</el-button>
+                    <el-button type="danger" size="mini" @click="handleDelete(scope.row.welfareId, -1)">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!-- 分页 -->
+        <div class="pagination-container">
+            <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                :current-page="listQuery.page" :page-sizes="[10, 20, 30, 50]" :page-size="listQuery.limit"
+                layout="total, sizes, prev, pager, next, jumper" :total="total">
+            </el-pagination>
+        </div>
+        <!-- 添加或修改对话框 -->
+        <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="70%">
+            <el-form :rules="rules" ref="dataForm" :model="dataForm" status-icon label-position="left" label-width="100px" style='width:700px;margin-left:50px;'>
+                <el-form-item label="活动名称" prop="title">
+                    <el-input v-model="dataForm.title" style="width: 350px"></el-input>
+                </el-form-item>
+                <el-form-item label="活动连接">
+                    <el-input v-model="dataForm.activityUrl" style="width: 350px"></el-input>
+                </el-form-item>
+                <el-form-item style="width: 800px" label="活动图片" prop="imgUrl">
+                    <el-tooltip content="建议图片宽高比260*200" placement="top-start">
+                        <el-upload :action="fileImgUrl" list-type="picture-card" :file-list="dataForm.images" :limit="1"
+                            :on-success="handleGallerySucess" :on-exceed="handleExceed" :before-upload="uploadBannerImg"
+                            :on-remove="handleRemove">
+                            <i class="el-icon-plus"></i>
+                        </el-upload>
+                    </el-tooltip>
+                </el-form-item>
+                <el-form-item label="开始日期" prop="startTimeStr">
+                    <el-date-picker value-format="yyyy-MM-dd" format="yyyy-MM-dd" :picker-options="setDisabled" v-model="dataForm.startTimeStr" type="date" placeholder="请选择开始时间" style="width: 350px">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="结束日期" prop="endTimeStr">
+                    <el-date-picker value-format="yyyy-MM-dd" format="yyyy-MM-dd" :picker-options="setDisabled" v-model="dataForm.endTimeStr" type="date" placeholder="请选择结束时间" style="width: 350px">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="参与人">
+                    <el-select v-model="dataForm.participants" multiple filterable placeholder="请选择" style="width: 350px">
+                        <el-option :key="item.loginId" v-for="item in participantsList" :label="item.userName" :value="item.loginId">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item style="width: 800px" label="内容" prop="content">
+                    <tinymce v-model="dataForm.content" ref="tinymce"></tinymce>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="dialogFormVisible = false">取消</el-button>
+                <el-button v-if="dialogStatus == 'create'" type="primary" @click="createData">确定</el-button>
+                <el-button v-else type="primary" @click="updateData">确定</el-button>
+            </div>
+        </el-dialog>
+
+    </div>
+</template>
+  
+<style>
+.demo-table-expand {
+    font-size: 0;
+}
+
+.demo-table-expand label {
+    width: 200px;
+    color: #99a9bf;
+}
+
+.demo-table-expand .el-form-item {
+    margin-right: 0;
+    margin-bottom: 0;
+}
+</style>
+  
+<script>
+import { createItem, updateItem, activityList, activityState } from "@/api/activityManage";
+import { allUserList } from "@/api/public";
+import waves from "@/directive/waves"; // 水波纹指令
+import Tinymce from '@/components/Tinymce'
+
+export default {
+    components: { Tinymce },
+    directives: { waves },
+    data() {
+        return {
+            setDisabled: {
+                disabledDate(time) {
+                    // return time.getTime() > Date.now();  // 可选历史天、可选当前天、不可选未来天
+                    // return time.getTime() > Date.now() - 8.64e7;  // 可选历史天、不可选当前天、不可选未来天
+                    // return time.getTime() < Date.now() - 8.64e7;  // 不可选历史天、可选当前天、可选未来天
+                    return time.getTime() < Date.now(); // 不可选历史天、不可选当前天、可选未来天
+                },
+            },
+            participantsList: [],
+            list: [],
+            total: 0,
+            listLoading: false,
+            listQuery: {
+                page: 1,
+                limit: 10,
+                title: '',
+                createTime: '',
+            },
+            dataForm: {
+                title: '',
+                imgUrl: '',
+                activityUrl: '',
+                startTimeStr: '',
+                endTimeStr: '',
+                participants: [],
+                content: '',
+                images: [],
+            },
+            dialogFormVisible: false,
+            dialogStatus: '',
+            textMap: {
+                update: "编辑",
+                create: "创建",
+            },
+            rules: {
+                title: [{ required: true, message: "请填写活动名称", trigger: "blur" }],
+                imgUrl: [{ required: true, message: "图片不能为空", trigger: "blur" }],
+                startTimeStr: [
+                    { required: true, message: "请选择活动开始时间", trigger: "change" },
+                    { validator: this.checkStartTime, trigger: 'change' }
+                ],
+                endTimeStr: [
+                    { required: true, message: "请选择活动结束时间", trigger: "change" },
+                    { validator: this.checkEndTime, trigger: 'change' }
+                ],
+                content: [{ required: true, message: "内容不能为空", trigger: "blur" }],
+            },
+            fileImgUrl: "https://xiaoyou.dgtis.com/admin/storage/create",
+        }
+    },
+    created() {
+        this.getAllUserList(); 
+        this.getList();
+    },
+    methods: {
+        //校验开始时间
+        checkStartTime(rule, value, callback) {
+            if (!value) {
+                callback(new Error("请选择活动开始时间！"));
+            } else {
+                if (this.dataForm.endTimeStr && Date.parse(value)  > Date.parse(this.dataForm.endTimeStr)) {
+                    callback(new Error("活动开始时间必须小于等于活动结束时间！"))
+                    this.dataForm.startTimeStr = '';
+                } else {
+                    callback();
+                }
+            }
+        },
+        //校验结束时间
+        checkEndTime(rule, value, callback) {
+            if (!value) {
+                callback(new Error("请选择活动结束时间！"));
+            } else {
+                if (!this.dataForm.startTimeStr) {
+                    callback(new Error("请选择活动开始时间！"))
+                    this.dataForm.endTimeStr = '';
+                } else if (Date.parse(this.dataForm.startTimeStr) > Date.parse(value)) {
+                    callback(new Error("活动结束时间必须大于等于活动开始时间！"))
+                    this.dataForm.endTimeStr = '';
+                } else {
+                    callback();
+                }
+            }
+        },
+        handleRemove(file, fileList) {
+            console.log(file, fileList);
+            let images = [];
+            for (let i in fileList) {
+                let response = fileList[i].response;
+                let url = response.data.url;
+                images.push(url);
+                this.dataForm.imgUrl = images.join(",");
+            }
+        },
+        uploadBannerImg(file) {
+            const isJPGs = file.type === "image/jpeg";
+            console.log(isJPGs);
+        },
+        handleExceed(files, fileList) {
+            this.$message.warning(
+                `当前限制选择 1 个文件，本次选择了 ${files.length} 个文件！，共选择了 ${files.length + fileList.length
+                } 个文件`
+            );
+        },
+        handleGallerySucess(res, file, fileList) {
+            this.dataForm.imgUrl = ""; // 清空画廊图片数组
+
+            let images = [];
+            for (let i in fileList) {
+                let response = fileList[i].response;
+                if (response.errno && response.errno != "0") {
+                    this.$message.error("该图片上传失败,已被移除,请重新上传!");
+                    // 上传失败移除该 file 对象
+                    fileList.splice(i, 1);
+                } else {
+                    let url = response.data.url;
+                    images.push(url);
+                }
+            }
+
+            this.dataForm.imgUrl = images.join(",");
+        },
+        resetForm() {
+            this.dataForm = {
+                title: '',
+                imgUrl: '',
+                activityUrl: '',
+                startTimeStr: '',
+                endTimeStr: '',
+                participants: [],
+                content: '',
+                images: [],
+            };
+        },
+        handleCreate() {
+
+            this.resetForm();
+            this.dialogFormVisible = true;
+            this.dialogStatus = "create";
+            this.$nextTick(() => {
+                this.$refs.tinymce.setContent("");
+                this.$refs["dataForm"].clearValidate();
+            });
+        },
+        createData() {
+            this.$refs["dataForm"].validate((valid) => {
+                if (valid) {
+                    console.log(this.dataForm);
+                    createItem(this.dataForm)
+                            .then((response) => {
+                                this.getList();
+                                this.dialogFormVisible = false;
+                                this.$notify({
+                                    title: "成功",
+                                    message: "创建成功",
+                                    type: "success",
+                                    duration: 2000,
+                                });
+                                this.getList();
+                            })
+                            .catch(() => { });
+                }
+            });
+        },
+        handleUpdate(row) {
+            this.dataForm = Object.assign({}, row);
+            let content = this.dataForm.content;
+            if (this.dataForm.imgUrl) {
+                let images = this.dataForm.imgUrl.split(",");
+                this.dataForm.images = [];
+                for (let i in images) {
+                    let url = images[i];
+                    let name = "image_" + i;
+
+                    this.dataForm.images.push({
+                        name: name,
+                        url: url,
+                        response: { error: "0", data: { url: url } },
+                    });
+                }
+            }
+            this.dialogStatus = 'update'
+            this.dialogFormVisible = true
+            this.$nextTick(() => {
+                this.$refs.tinymce.setContent(content);
+                this.$refs['dataForm'].clearValidate()
+            })
+        },
+        updateData() {
+            this.$refs['dataForm'].validate((valid) => {
+                if (valid) {
+                    updateItem(this.dataForm).then(() => {
+                            this.dialogFormVisible = false
+                            this.$notify({
+                                title: '成功',
+                                message: '更新成功',
+                                type: 'success',
+                                duration: 2000
+                            })
+                            this.getList()
+                        })
+
+                }
+
+            })
+        },
+        changeState(welfareId, index) {
+            activityState({ welfareId: welfareId, status: index }).then(response => {
+                this.$notify({
+                    title: '成功',
+                    message: '活动状态修改成功',
+                    type: 'success',
+                    duration: 2000
+                })
+                this.getList()
+            })
+        },
+        handleDelete(welfareId, index) {
+            this.$confirm('确认删除吗?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                activityState({ welfareId: welfareId, status: index }).then(response => {
+                    this.$notify({
+                        title: '成功',
+                        message: '删除成功',
+                        type: 'success',
+                        duration: 2000
+                    })
+                    this.getList();
+                })
+            }).catch(() => {})
+
+        },
+        getAllUserList() {
+            allUserList().then(response => {
+                this.participantsList = response.data.data;
+            }).catch(() => {});
+        },
+        getList() {
+            this.listLoading = true
+            activityList(this.listQuery).then(response => {
+                this.list = response.data.data.items
+                this.total = response.data.data.total
+                this.listLoading = false
+            }).catch(() => {})
+        },
+       
+
+        handleFilter() {
+            this.listQuery.page = 1
+            this.getList()
+        },
+        handleSizeChange(val) {
+            this.listQuery.limit = val
+            this.getList()
+        },
+        handleCurrentChange(val) {
+            this.listQuery.page = val
+            this.getList()
+        },
+
+        
+    }
+}
+</script>
+<style>
+.ad-avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+}
+
+.ad-avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+}
+
+.ad-avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+}
+
+.ad-avatar {
+    display: block;
+}
+</style>
+  

src/views/ranking/rankingList.vue

@@ -0,0 +1,183 @@
+<template>
+    <div class="app-container calendar-list-container exchangeView">
+        <!-- 查询和其他操作 -->
+        <div class="filter-container">
+            <el-input clearable class="filter-item" style="width: 200px;" placeholder="员工名称"
+                v-model="listQuery.purchaser"></el-input>
+            <!-- <el-input clearable class="filter-item" style="width: 200px;" placeholder="公司主体"
+                v-model="listQuery.orderSeq"></el-input>
+                <el-input clearable class="filter-item" style="width: 200px;" placeholder="部门"
+                v-model="listQuery.orderSeq"></el-input> -->
+            <el-select v-model="listQuery.type" clearable placeholder="排行类型" style="top: -4px;width: 200px;">
+                <el-option :key="item.type" v-for="item in orderTypeList" :label="item.name" :value="item.type">
+                </el-option>
+            </el-select>
+            <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">查找</el-button>
+            <el-button class="filter-item" type="primary" v-waves icon="el-icon-download" @click="handleDownLoad">导出</el-button>
+
+        </div>
+
+        <!-- 查询结果 -->
+        <el-table size="small" :data="list" v-loading="listLoading" element-loading-text="正在查询中。。。" border fit
+            highlight-current-row>
+            <el-table-column type="index" label="排行" header-align="center" align="center">
+            </el-table-column>
+            <el-table-column align="center" min-width="60px" label="头像">
+                <template slot-scope="props">
+                    <img style="width: 50px; height: 50px" :src="props.row.avatarUrl"></img>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" min-width="80px" label="员工名称" prop="purchaser">
+            </el-table-column>
+            <el-table-column align="center" min-width="150px" label="公司主体" prop="company">
+            </el-table-column>
+            <el-table-column align="center" min-width="150px" label="部门名称" prop="deptName">
+            </el-table-column>
+            <el-table-column align="center" min-width="120px" label="积分" prop="integral">
+            </el-table-column>
+        </el-table>
+
+        <!-- 分页 -->
+        <div class="pagination-container">
+            <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                :current-page="listQuery.page" :page-sizes="[10, 20, 30, 50]" :page-size="listQuery.limit"
+                layout="total, sizes, prev, pager, next, jumper" :total="total">
+            </el-pagination>
+        </div>
+    </div>
+</template>
+  
+<style>
+.demo-table-expand {
+    font-size: 0;
+}
+
+.demo-table-expand label {
+    width: 200px;
+    color: #99a9bf;
+}
+
+.demo-table-expand .el-form-item {
+    margin-right: 0;
+    margin-bottom: 0;
+}
+</style>
+  
+<script>
+import { list } from "@/api/rankingList";
+import waves from "@/directive/waves"; // 水波纹指令
+import Tinymce from '@/components/Tinymce'
+
+export default {
+    components: { Tinymce },
+    directives: { waves },
+    data() {
+        return {
+            orderTypeList: [
+                {
+                    type: 0,
+                    name: '当前积分'
+                },
+                {
+                    type: 1,
+                    name: '获取总积分'
+                },
+            ],
+            list: [
+                {
+                    id:'1',
+                    avatarUrl:'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png',
+                    purchaser:'张三',
+                    company:'神州通誉（洛阳）科技有限公司',
+                    deptName:'软件工程院',
+                    integral:'12000'
+                },
+                {
+                    id:'2',
+                    avatarUrl:'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png',
+                    purchaser:'张三',
+                    company:'神州通誉（洛阳）科技有限公司',
+                    deptName:'软件工程院',
+                    integral:'12000'
+                },
+                {
+                    id:'3',
+                    avatarUrl:'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png',
+                    purchaser:'张三',
+                    company:'神州通誉（洛阳）科技有限公司',
+                    deptName:'软件工程院',
+                    integral:'12000'
+                },
+            ],
+            total: 0,
+            listLoading: false,
+            listQuery: {
+                page: 1,
+                limit: 10,
+                // purchaser: '',
+                // orderSeq: '',
+                type: 0,
+                title: '',
+            },
+        }
+    },
+    created() {
+        // this.getList();
+    },
+    methods: {
+        handleDownLoad(){
+            window.location.href = process.env.BASE_API + '/mall-order/exportOrderLog?purchaser=' + this.listQuery.purchaser + '&orderSeq=' + this.listQuery.orderSeq + '&orderType=' + this.listQuery.orderType + '&title=' + this.listQuery.title;
+        },
+        getList() {
+            this.listLoading = true
+            list(this.listQuery).then(response => {
+                this.list = response.data.data.items
+                this.total = response.data.data.total
+                this.listLoading = false
+            }).catch(() => {})
+        },
+        handleFilter() {
+            this.listQuery.page = 1
+            this.getList()
+        },
+        handleSizeChange(val) {
+            this.listQuery.limit = val
+            this.getList()
+        },
+        handleCurrentChange(val) {
+            this.listQuery.page = val
+            this.getList()
+        },
+    }
+}
+</script>
+<style>
+.ad-avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+}
+
+.ad-avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+}
+
+.ad-avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+}
+
+.ad-avatar {
+    display: block;
+}
+.exchangeView .el-dialog__body {
+    padding-top: 0px;
+}
+</style>
+  

src/views/welfareManage/welfareList.vue

@@ -37,11 +37,7 @@
             </el-table-column>
             <el-table-column align="center" min-width="150px" label="创建时间" prop="createTime">
             </el-table-column>
-            <el-table-column align="center" min-width="80px" label="福利状态">
-                <template slot-scope="props">
-                    <span v-if="props.row.status == 1">开启</span>
-                    <span v-if="props.row.status == 0">关闭</span>
-                </template>
+            <el-table-column align="center" min-width="80px" label="福利状态" prop="statusName">
             </el-table-column>
             <el-table-column align="center" label="操作" width="240px" class-name="small-padding fixed-width">
                 <template slot-scope="scope">