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-market.html | 76 +++++++++++++++++++++++++++++--------
1 files changed, 59 insertions(+), 17 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html b/zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html
index cd166ff..00050a1 100644
--- a/zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html
+++ b/zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html
@@ -31,6 +31,7 @@
.image {
width: 100%;
+ height: 100%;
display: block;
}
@@ -53,14 +54,14 @@
<body>
<div class="panel-body" id="app" v-cloak>
- <el-row>
+ <el-row style="padding:20px;">
<el-col :span="4">
<el-card class="box-card" :body-style="{ padding: '10px 10px'}">
<img src="../../../images/sign/meiriqiandao.png" class="image">
<div style="padding: 5px;">
- <span style="padding:5px;font-size: 30px;">每日签到</span>
+ <span style="padding:5px;font-size: 18px;">每日签到</span>
<div class="bottom clearfix">
- <el-button type="primary" class="button" @click="createSign()" round>马上创建</el-button>
+ <el-button type="primary" size="mini" class="button" @click="createSign()" round>马上创建</el-button>
</div>
</div>
</el-card>
@@ -69,9 +70,9 @@
<el-card class="box-card" :body-style="{ padding: '10px 10px'}">
<img src="../../../images/sign/tiantianpingtuan.png" class="image">
<div style="padding: 5px;">
- <span style="padding:5px;font-size: 30px;">拼团</span>
+ <span style="padding:5px;font-size: 18px;">拼团</span>
<div class="bottom clearfix">
- <el-button type="primary" class="button" @click="openAdd(1)" round>马上创建</el-button>
+ <el-button type="primary" size="mini" class="button" @click="openAdd(1)" round>马上创建</el-button>
</div>
</div>
</el-card>
@@ -80,9 +81,9 @@
<el-card class="box-card" :body-style="{ padding: '10px 10px'}">
<img src="../../../images/sign/jisumiaosha.png" class="image">
<div style="padding: 5px;">
- <span style="padding:5px;font-size: 30px;">秒杀</span>
+ <span style="padding:5px;font-size: 18px;">秒杀</span>
<div class="bottom clearfix">
- <el-button type="primary" class="button" @click="openSecKill()" round>马上创建</el-button>
+ <el-button type="primary" size="mini" class="button" @click="openSecKill()" round>马上创建</el-button>
</div>
</div>
</el-card>
@@ -91,9 +92,22 @@
<el-card class="box-card" :body-style="{ padding: '10px 10px'}">
<img src="../../../images/sign/shalonghuodong.png" class="image">
<div style="padding: 5px;">
- <span style="padding:5px;font-size: 30px;">沙龙</span>
+ <span style="padding:5px;font-size: 18px;">沙龙</span>
<div class="bottom clearfix">
- <el-button type="primary" class="button" @click="openSalon()" round>马上创建</el-button>
+ <el-button type="primary" size="mini" class="button" @click="openSalon()" round>马上创建</el-button>
+ </div>
+ </div>
+ </el-card>
+ </el-col>
+ </el-row>
+ <el-row style="padding:20px;">
+ <el-col :span="4">
+ <el-card class="box-card" :body-style="{ padding: '10px 10px'}">
+ <img src="../../../images/luckyDraw/zhuanpanchoujian.png" class="image">
+ <div style="padding: 5px;">
+ <span style="padding:5px;font-size: 18px;">转盘抽奖</span>
+ <div class="bottom clearfix">
+ <el-button type="primary" size="mini" class="button" @click="createLuckyDraw()" round>马上创建</el-button>
</div>
</div>
</el-card>
@@ -124,15 +138,43 @@
created: function () {
},
methods: {
+ //跳转到设置转盘抽奖
+ createLuckyDraw(){
+ $.AjaxProxy().invoke(basePath + "/admin/activitySignAwardSet/createLuckyDrawSet", function(loj) {
+ if (loj[0].result.status == '200') {
+ layer.full(layer.open({
+ type: 2,
+ title: "转盘抽奖管理",
+ maxmin: true,
+ area: [MUI.SIZE_L, '500px'],
+ content : [ basePath + '/admin/redirect/activity/activity-luckyDraw']
+ }));
+ }else{
+ _this.$message({
+ message: data.info,
+ type: 'success',
+ });
+ }
+ });
+ },
//跳转到设置签到活动
createSign(){
- layer.full(layer.open({
- type: 2,
- title: "签到管理",
- maxmin: true,
- area: [MUI.SIZE_L, '500px'],
- content : [ basePath + '/admin/redirect/activity/activity-sign']
- }));
+ $.AjaxProxy().invoke(basePath + "/admin/activitySignAwardSet/createSignAwardSet", function(loj) {
+ if (loj[0].result.status == '200') {
+ layer.full(layer.open({
+ type: 2,
+ title: "签到管理",
+ maxmin: true,
+ area: [MUI.SIZE_L, '500px'],
+ content : [ basePath + '/admin/redirect/activity/activity-sign']
+ }));
+ }else{
+ _this.$message({
+ message: data.info,
+ type: 'success',
+ });
+ }
+ });
},
// 打新增拼团界面
openAdd(value) {
@@ -160,7 +202,7 @@
openSalon() {
layer.full(layer.open({
type : 2,
- title : "新建秒杀",
+ title : "新建沙龙",
area : [ MUI.SIZE_L, MUI.SIZE_L ],
maxmin : true,
content : [ basePath+'/admin/redirect/shop/activities/activitiesSalon-form']
--
Gitblit v1.9.1