From e53fcbe9fe844b7788b29c5106c1ac24d17c5535 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 08 May 2021 22:40:19 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/templates/views/admin/activity/activity-list.html | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/activity/activity-list.html b/zq-erp/src/main/resources/templates/views/admin/activity/activity-list.html
index a0a285b..1054379 100644
--- a/zq-erp/src/main/resources/templates/views/admin/activity/activity-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/activity/activity-list.html
@@ -88,22 +88,23 @@
<span v-if="scope.row.actType == 2">秒杀</span>
<span v-if="scope.row.actType == 3">沙龙</span>
<span v-if="scope.row.actType == 4">每日签到</span>
+ <span v-if="scope.row.actType == 5">转盘抽奖</span>
</template>
</el-table-column>
<el-table-column
label="状态">
<template slot-scope="scope">
- <div v-if="scope.row.actType == 4">
+ <div v-if="scope.row.actType == 4 || scope.row.actType == 5">
<span v-if="scope.row.actStatus == 1">未发布</span>
</div>
- <div v-if="scope.row.actType != 4">
+ <div v-if="scope.row.actType != 4 && scope.row.actType != 5">
<span v-if="scope.row.actStatus == 1">开启</span>
</div>
- <div v-if="scope.row.actType == 4">
+ <div v-if="scope.row.actType == 4 || scope.row.actType == 5">
<span v-if="scope.row.actStatus == 2">未开始</span>
</div>
- <div v-if="scope.row.actType != 4">
+ <div v-if="scope.row.actType != 4 && scope.row.actType != 5">
<span v-if="scope.row.actStatus == 2">关闭</span>
</div>
<span v-if="scope.row.actStatus == 3">进行中</span>
@@ -133,7 +134,7 @@
</el-table-column>
<el-table-column label="操作" width="400">
<template slot-scope="scope">
- <el-row style="display:flex;" v-if="scope.row.actType == 4">
+ <el-row style="display:flex;" v-if="[4].includes(scope.row.actType)">
<el-button type="primary" v-if="scope.row.actStatus == 1" size="mini" @click="beReady(scope.row)">发布</el-button>
<el-button type="primary" v-if="[1,2,3].includes(scope.row.actStatus)" @click="beUpdate(scope.row)" size="mini">修改</el-button>
<el-button type="primary" v-if="scope.row.actStatus == 3" size="mini">推广</el-button>
@@ -141,7 +142,15 @@
<el-button type="primary" v-if="scope.row.actStatus == 3" @click="beClose(scope.row)" size="mini">关闭</el-button>
<el-button type="danger" v-if="scope.row.actStatus != 5" size="mini" @click="delRow(scope.row)">删除</el-button>
</el-row>
- <el-row style="display:flex;" v-if="scope.row.actType != 4">
+ <el-row style="display:flex;" v-if="[5].includes(scope.row.actType)">
+ <el-button type="primary" v-if="scope.row.actStatus == 1" size="mini" @click="beReady(scope.row)">发布</el-button>
+ <el-button type="primary" v-if="[1,2,3].includes(scope.row.actStatus)" @click="beUpdateLuckdraw(scope.row)" size="mini">修改</el-button>
+ <el-button type="primary" v-if="scope.row.actStatus == 3" size="mini">推广</el-button>
+ <el-button type="primary" v-if="[3,4,5].includes(scope.row.actStatus)" @click="openLuckdrawReceive(scope.row)" size="mini">活动统计</el-button>
+ <el-button type="primary" v-if="scope.row.actStatus == 3" @click="beClose(scope.row)" size="mini">关闭</el-button>
+ <el-button type="danger" v-if="scope.row.actStatus != 5" size="mini" @click="delRow(scope.row)">删除</el-button>
+ </el-row>
+ <el-row style="display:flex;" v-if="[1,2,3].includes(scope.row.actType)">
<el-button type="primary" @click="openEdit(scope.row)" size="mini">编辑</el-button>
<el-button type="primary" @click="activityStatistics(scope.row)" size="mini">活动统计</el-button>
<el-button type="primary" @click="closeAct(scope.row)" size="mini">关闭</el-button>
@@ -345,6 +354,17 @@
content : [ basePath + '/admin/redirect/activity/activity-sign-update?actId=' + row.id]
}));
},
+ //修改
+ beUpdateLuckdraw(row){
+ layer.full(layer.open({
+ type: 2,
+ title: "修改",
+ maxmin: true,
+ area: [MUI.SIZE_L, '500px'],
+ content : [ basePath + '/admin/redirect/activity/activity-luckyDraw-update?actId=' + row.id]
+ }));
+ },
+
//活动统计
openSignReceive(row){
layer.full(layer.open({
@@ -355,6 +375,16 @@
content : [ basePath + '/admin/redirect/activity/activity-sign-receive?actId=' + row.id]
}));
},
+ //活动统计
+ openLuckdrawReceive(row){
+ layer.full(layer.open({
+ type: 2,
+ title: "活动统计",
+ maxmin: true,
+ area: [MUI.SIZE_L, '500px'],
+ content : [ basePath + '/admin/redirect/activity/activity-luckdraw-receive?actId=' + row.id]
+ }));
+ },
//发布
beReady(row){
let _this = this;
--
Gitblit v1.9.1