|
@@ -2,7 +2,7 @@
|
|
|
<div class="app-container">
|
|
<div class="app-container">
|
|
|
<el-form :model="queryParams" ref="queryRef" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
|
<el-form :model="queryParams" ref="queryRef" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
|
|
<el-form-item label="活动类型" prop="activityType">
|
|
<el-form-item label="活动类型" prop="activityType">
|
|
|
- <DictSelect v-model="queryParams.activityType" :dictOptions="navigateMenuOption" placeholder="请选择"/>
|
|
|
|
|
|
|
+ <DictSelect v-model="queryParams.activityType" :dictOptions="activityTypeOption" placeholder="请选择"/>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
<el-form-item label="城市" prop="activityCity">
|
|
<el-form-item label="城市" prop="activityCity">
|
|
|
<DictSelect v-model="queryParams.activityCity" :dictOptions="navigateMenuOption" placeholder="请选择"/>
|
|
<DictSelect v-model="queryParams.activityCity" :dictOptions="navigateMenuOption" placeholder="请选择"/>
|
|
@@ -40,7 +40,12 @@
|
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
</el-row>
|
|
</el-row>
|
|
|
|
|
|
|
|
- <tableCompontent ref="tableRef" :loading="loading" :tableData="list" :columnData="columnData">
|
|
|
|
|
|
|
+ <tableCompontent ref="tableRef" height="" :loading="loading" :tableData="list" :columnData="columnData">
|
|
|
|
|
+ <template v-slot:activityStatus="row">
|
|
|
|
|
+ <span v-if="row.activityStatus === '1'" style="color: #85c91e">进行中</span>
|
|
|
|
|
+ <span v-else-if="row.activityStatus === '3'" style="color: red">已结束</span>
|
|
|
|
|
+ <span v-else>--</span>
|
|
|
|
|
+ </template>
|
|
|
<template v-slot:nickName="row">
|
|
<template v-slot:nickName="row">
|
|
|
<el-link type="primary" slot="reference" @click="viewStatistics(row)">查看统计</el-link>
|
|
<el-link type="primary" slot="reference" @click="viewStatistics(row)">查看统计</el-link>
|
|
|
</template>
|
|
</template>
|
|
@@ -62,7 +67,7 @@
|
|
|
</template>
|
|
</template>
|
|
|
|
|
|
|
|
<script>
|
|
<script>
|
|
|
-import { listUser } from "@/api/system/user";
|
|
|
|
|
|
|
+import { getActivityList } from "@/api/points/rules_api";
|
|
|
import tableCompontent from "@/components/tableCompontent/index.vue";
|
|
import tableCompontent from "@/components/tableCompontent/index.vue";
|
|
|
import listMixin from '@/utils/listMixin';
|
|
import listMixin from '@/utils/listMixin';
|
|
|
export default {
|
|
export default {
|
|
@@ -73,10 +78,17 @@ export default {
|
|
|
},
|
|
},
|
|
|
data() {
|
|
data() {
|
|
|
return {
|
|
return {
|
|
|
- // 显示搜索条件
|
|
|
|
|
- showSearch: true,
|
|
|
|
|
// 用户表格数据
|
|
// 用户表格数据
|
|
|
list: null,
|
|
list: null,
|
|
|
|
|
+ activityTypeOption:[
|
|
|
|
|
+ {label:'签到任务',value:'1'},
|
|
|
|
|
+ {label:'新手任务',value:'2'},
|
|
|
|
|
+ ],
|
|
|
|
|
+ navigateMenuOption:[
|
|
|
|
|
+ {label:'测试数据',value:'1'},
|
|
|
|
|
+ {label:'测试数据1',value:'2'},
|
|
|
|
|
+ {label:'测试数据2',value:'3'}
|
|
|
|
|
+ ],
|
|
|
columnData:[
|
|
columnData:[
|
|
|
{
|
|
{
|
|
|
prop: 'seq',
|
|
prop: 'seq',
|
|
@@ -87,7 +99,7 @@ export default {
|
|
|
fixed: 'left'
|
|
fixed: 'left'
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
- prop: 'email',
|
|
|
|
|
|
|
+ prop: 'activityName',
|
|
|
label: '活动名称',
|
|
label: '活动名称',
|
|
|
align:'center',
|
|
align:'center',
|
|
|
},
|
|
},
|
|
@@ -95,6 +107,8 @@ export default {
|
|
|
prop: 'activityType',
|
|
prop: 'activityType',
|
|
|
label: '活动类型',
|
|
label: '活动类型',
|
|
|
align:'center',
|
|
align:'center',
|
|
|
|
|
+ type:'find',
|
|
|
|
|
+ option:[]
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
prop: 'activityCity',
|
|
prop: 'activityCity',
|
|
@@ -104,8 +118,8 @@ export default {
|
|
|
{
|
|
{
|
|
|
prop: 'activityStatus',
|
|
prop: 'activityStatus',
|
|
|
label: '状态',
|
|
label: '状态',
|
|
|
- color:'red',
|
|
|
|
|
align:'center',
|
|
align:'center',
|
|
|
|
|
+ type: 'diy',
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
prop: 'activityTime',
|
|
prop: 'activityTime',
|
|
@@ -127,11 +141,6 @@ export default {
|
|
|
width: 120
|
|
width: 120
|
|
|
},
|
|
},
|
|
|
],
|
|
],
|
|
|
- navigateMenuOption:[
|
|
|
|
|
- {label:'测试数据',value:'1'},
|
|
|
|
|
- {label:'测试数据1',value:'2'},
|
|
|
|
|
- {label:'测试数据2',value:'3'}
|
|
|
|
|
- ]
|
|
|
|
|
};
|
|
};
|
|
|
},
|
|
},
|
|
|
created() {
|
|
created() {
|
|
@@ -142,13 +151,18 @@ export default {
|
|
|
activityStatus:'',
|
|
activityStatus:'',
|
|
|
dateRange:[],
|
|
dateRange:[],
|
|
|
}
|
|
}
|
|
|
- //this.getListUrl = listUser;
|
|
|
|
|
|
|
+ this.isImmediateLoad = false;
|
|
|
|
|
+ this.getListUrl = getActivityList;
|
|
|
// 或者设置自定义数据处理函数
|
|
// 或者设置自定义数据处理函数
|
|
|
this.customProcessDataFun = (val) => {
|
|
this.customProcessDataFun = (val) => {
|
|
|
// 自定义处理查询参数
|
|
// 自定义处理查询参数
|
|
|
this.queryParams = this.DateRange(this.queryParams,val.dateRange || [],['startTime','endTime'],'s')
|
|
this.queryParams = this.DateRange(this.queryParams,val.dateRange || [],['startTime','endTime'],'s')
|
|
|
};
|
|
};
|
|
|
},
|
|
},
|
|
|
|
|
+ mounted(){
|
|
|
|
|
+ this.columnData.find(item => item.prop === 'activityType').option = this.activityTypeOption;
|
|
|
|
|
+ this.handleQuery();
|
|
|
|
|
+ },
|
|
|
methods: {
|
|
methods: {
|
|
|
/** 新增操作 */
|
|
/** 新增操作 */
|
|
|
handleRuleAdd() {
|
|
handleRuleAdd() {
|