From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/resources/templates/views/admin/activity/activity-list.html | 212 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 193 insertions(+), 19 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 8487de0..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
@@ -32,20 +32,6 @@
margin: 0px 0px 10px 0px;
text-align: right;
}
-
- .box-card {
- width: 240px;
- border-radius: 5px;
- color: #ffffff;
- padding: 2px 0px;
- margin-right: 20px;
- cursor: pointer;
- float: left;
- text-align: center;
- }
- .el-card__body {
- padding: 0px;
- }
</style>
</head>
@@ -102,13 +88,25 @@
<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">
- <span v-if="scope.row.actStatus == 1">未发布</span>
- <span v-if="scope.row.actStatus == 2">未开始</span>
+
+ <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 && scope.row.actType != 5">
+ <span v-if="scope.row.actStatus == 1">开启</span>
+ </div>
+ <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 && scope.row.actType != 5">
+ <span v-if="scope.row.actStatus == 2">关闭</span>
+ </div>
<span v-if="scope.row.actStatus == 3">进行中</span>
<span v-if="scope.row.actStatus == 4">已结束</span>
<span v-if="scope.row.actStatus == 5">已删除</span>
@@ -136,13 +134,27 @@
</el-table-column>
<el-table-column label="操作" width="400">
<template slot-scope="scope">
- <el-row style="display:flex;">
+ <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)" size="mini">修改</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>
- <el-button type="primary" v-if="[3,4,5].includes(scope.row.actStatus)" size="mini">活动统计</el-button>
+ <el-button type="primary" v-if="[3,4,5].includes(scope.row.actStatus)" @click="openSignReceive(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="[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>
+ <el-button type="danger" @click="delAct(scope.row)" size="mini">删除</el-button>
</el-row>
</template>
</el-table-column>
@@ -211,6 +223,168 @@
let _this = this;
_this.loadActivitysList();
},
+ //删除
+ delAct(row){
+ let _this = this;
+ _this.$confirm('确认删除活动吗?', '删除', {
+ distinguishCancelAndClose: true,//设置关闭按钮和不通过按钮的区别
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'info'
+ }).then(() => {
+ //通过
+ let id = row.id;
+ $.AjaxProxy().invoke(basePath + "/admin/shopActivities/del?keys="+id, function(loj) {
+ if (loj[0].result.status == '200') {
+ _this.loadActivitysList();
+ }
+ });
+ }).catch(action => {
+ //不通过
+ if(action === 'cancel'){
+ console.log("cancel");
+ }else{
+ //关闭按钮
+ console.log("close");
+ }
+ });
+ },
+ //关闭
+ closeAct(row){
+ let _this = this;
+ _this.$confirm('确认关闭活动吗?', '关闭', {
+ distinguishCancelAndClose: true,//设置关闭按钮和不通过按钮的区别
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'info'
+ }).then(() => {
+ //通过
+ let id = row.id;
+ $.AjaxProxy().invoke(basePath + "/admin/shopActivities/closeAct?id="+id, function(loj) {
+ if (loj[0].result.status == '200') {
+ layer.msg(loj[0].result.info, {
+ icon: 1
+ });
+ }
+ });
+ _this.loadActivitysList();
+ }).catch(action => {
+ //不通过
+ if(action === 'cancel'){
+ console.log("cancel");
+ }else{
+ //关闭按钮
+ console.log("close");
+ }
+ });
+ },
+ // 活动统计
+ activityStatistics(row) {
+ let type = row.actType;
+ let id = row.id;
+ let name = row.actName;
+ console.log("-------");
+ if (type == 2) {
+ layer.full(layer.open({
+ type : 2,
+ title : name + "-活动统计",
+ area : [ MUI.SIZE_L, MUI.SIZE_L ],
+ maxmin : true,
+ content : [ basePath+'/admin/redirect/shop/activities/shopActivitiesSecKill-list?id=' + id]
+ }));
+ }
+
+ if (type == 1) {
+ layer.full(layer.open({
+ type : 2,
+ title : name + "-活动统计",
+ area : [ MUI.SIZE_L, MUI.SIZE_L ],
+ maxmin : true,
+ content : [ basePath+'/admin/redirect/shop/activities/shopActivitiesGroupBuy-list?id=' + id]
+ }));
+ }
+
+ if (type == 3) {
+ layer.full(layer.open({
+ type : 2,
+ title : name + "-活动统计",
+ area : [ MUI.SIZE_L, MUI.SIZE_L ],
+ maxmin : true,
+ content : [ basePath+'/admin/redirect/shop/activities/shopActivitiesSalon-list?id=' + id]
+ }));
+ }
+ },
+ //打开编辑界面
+ openEdit(row) {
+ let type = row.actType;
+ let id = row.id;
+ if (type == 1) {
+ layer.full(layer.open({
+ type : 2,
+ title : "编辑拼团",
+ area : [ MUI.SIZE_L, MUI.SIZE_L ],
+ maxmin : true,
+ content : [ basePath+'/admin/redirect/shop/activities/activitiesGroupBuy-form?id=' + id]
+ }));
+ } else if (type == 2) {
+ layer.full(layer.open({
+ type : 2,
+ title : "编辑秒杀",
+ area : [ MUI.SIZE_L, MUI.SIZE_L ],
+ maxmin : true,
+ content : [ basePath+'/admin/redirect/shop/activities/activitiesSecKill-form?id=' + id]
+ }));
+ } else if (type == 3) {
+ layer.full(layer.open({
+ type : 2,
+ title : "编辑沙龙",
+ area : [ MUI.SIZE_L, MUI.SIZE_L ],
+ maxmin : true,
+ content : [ basePath+'/admin/redirect/shop/activities/activitiesSalon-form?id=' + id]
+ }));
+ }
+ },
+ //修改
+ beUpdate(row){
+ layer.full(layer.open({
+ type: 2,
+ title: "修改",
+ maxmin: true,
+ area: [MUI.SIZE_L, '500px'],
+ 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({
+ type: 2,
+ title: "活动统计",
+ maxmin: true,
+ area: [MUI.SIZE_L, '500px'],
+ 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