dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
齐天大圣 2024-03-06 15:56:13 +08:00
commit 5f623957c4
1 changed files with 13 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
View File

@ -22,77 +22,34 @@
<div class="title_"> <div class="title_">
电子储值卡活动列表 电子储值卡活动列表
</div> </div>
<el-table <el-table :data="tableData" align="center" style="width: 100%">
:data="tableData" <el-table-column label="序号" type="index" align="center"> </el-table-column>
align="center" <el-table-column prop="groupOriented" label="电子储值卡活动适配对象" align="center" width="165">
style="width: 100%">
<el-table-column
label="序号"
type="index"
>
</el-table-column>
<el-table-column
prop="groupOriented"
label="电子储值卡活动适配对象"
align="center"
width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.groupOriented == 1">普通群体</span> <span v-if="scope.row.groupOriented == 1">普通群体</span>
<span v-if="scope.row.groupOriented == 2">等级会员</span> <span v-if="scope.row.groupOriented == 2">等级会员</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="活动信息" align="center"> <el-table-column label="活动信息" align="center">
<el-table-column <el-table-column prop="rechargeBalance" label="充值金额" align="center" > </el-table-column>
prop="rechargeBalance" <el-table-column prop="giftBalance" label="赠送金额" align="center" > </el-table-column>
label="充值金额" <el-table-column prop="points" label="赠送积分" align="center" > </el-table-column>
align="center" <el-table-column prop="growthValue" label="赠送成长值" align="center" > </el-table-column>
width="120">
</el-table-column>
<el-table-column
prop="giftBalance"
label="赠送金额"
align="center"
width="120">
</el-table-column>
<el-table-column
prop="points"
label="赠送积分"
align="center"
width="120">
</el-table-column>
<el-table-column
prop="growthValue"
label="赠送成长值"
align="center"
width="120">
</el-table-column>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="startTime" label="活动时间" align="center" width="165">
prop="startTime"
label="活动时间"
align="center"
width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.activeTime == 1">不限时间</span> <span v-if="scope.row.activeTime == 1">不限时间</span>
<span v-if="scope.row.activeTime == 2">{{scope.row.startTime }}-{{scope.row.endTime }}</span> <span v-if="scope.row.activeTime == 2">{{scope.row.startTime }}-{{scope.row.endTime }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="activityProgress" label="活动进度" align="center" >
prop="activityProgress"
label="活动进度"
align="center"
width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.activityProgress == 0"> <el-tag>未开始</el-tag></span> <span v-if="scope.row.activityProgress == 0"> <el-tag>未开始</el-tag></span>
<span v-if="scope.row.activityProgress == 1"> <el-tag>进行中</el-tag></span> <span v-if="scope.row.activityProgress == 1"> <el-tag>进行中</el-tag></span>
<span v-if="scope.row.activityProgress == 2"> <el-tag type="danger">已结束</el-tag></span> <span v-if="scope.row.activityProgress == 2"> <el-tag type="danger">已结束</el-tag></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="activityProgress" label="上线/下线" align="center" >
prop="activityProgress"
label="上线/下线"
align="center"
width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.isonline == 0"> <el-tag>上线</el-tag></span> <span v-if="scope.row.isonline == 0"> <el-tag>上线</el-tag></span>
<span v-if="scope.row.isonline == 1"> <el-tag>下线</el-tag></span> <span v-if="scope.row.isonline == 1"> <el-tag>下线</el-tag></span>
@ -119,24 +76,10 @@
</el-table-column>--> </el-table-column>-->
<el-table-column <el-table-column prop="createTime" label="创建时间" align="center" width="160"> </el-table-column>
prop="createTime" <el-table-column prop="createBy" label="操作人" align="center"> </el-table-column>
label="创建时间"
align="center"
width="180">
</el-table-column>
<el-table-column
prop="createBy"
label="操作人"
align="center"
width="150">
</el-table-column>
<el-table-column <el-table-column prop="date" label="操作" align="center" >
prop="date"
label="操作"
align="center"
width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"