From ebbe59b6ee3378fa296441cabe8bb81b2bc200b5 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 26 Apr 2021 13:47:22 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 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..f235797 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;
}
@@ -58,9 +59,9 @@
<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,9 @@
<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>
@@ -126,13 +127,22 @@
methods: {
//跳转到设置签到活动
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) {
--
Gitblit v1.9.1