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 | 100 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 90 insertions(+), 10 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 d8f0f9a..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;
}
@@ -54,13 +55,46 @@
<body>
<div class="panel-body" id="app" v-cloak>
<el-row>
- <el-col :span="6">
+ <el-col :span="4">
<el-card class="box-card" :body-style="{ padding: '10px 10px'}">
- <img src="https://shadow.elemecdn.com/app/element/hamburger.9cf7b091-55e9-11e9-a976-7f4d0b07eef6.png" class="image">
+ <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>
+ </el-col>
+ <el-col :span="4">
+ <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: 18px;">拼团</span>
+ <div class="bottom clearfix">
+ <el-button type="primary" size="mini" class="button" @click="openAdd(1)" round>马上创建</el-button>
+ </div>
+ </div>
+ </el-card>
+ </el-col>
+ <el-col :span="4">
+ <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: 18px;">秒杀</span>
+ <div class="bottom clearfix">
+ <el-button type="primary" size="mini" class="button" @click="openSecKill()" round>马上创建</el-button>
+ </div>
+ </div>
+ </el-card>
+ </el-col>
+ <el-col :span="4">
+ <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: 18px;">沙龙</span>
+ <div class="bottom clearfix">
+ <el-button type="primary" size="mini" class="button" @click="openSalon()" round>马上创建</el-button>
</div>
</div>
</el-card>
@@ -82,18 +116,64 @@
<script>
var app = new Vue({
el: '#app',
- data: {},
+ data: {
+ imageUrlqd: "../../images/sign/meiriqiandao.png",
+ imageUrlms: "../../images/sign/jisumiaosha.png",
+ imageUrlpt: "../../images/sign/tiantianpingtuan.png",
+ imageUrlsl: "../../images/sign/shalonghuodong.png",
+ },
created: function () {
},
methods: {
//跳转到设置签到活动
createSign(){
+ $.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) {
layer.full(layer.open({
- type: 2,
- title: "签到管理",
- maxmin: true,
- area: [MUI.SIZE_L, '500px'],
- content : [ basePath + '/admin/redirect/activity/activity-sign']
+ type : 2,
+ title : "新建拼团",
+ area : [ MUI.SIZE_L, MUI.SIZE_L ],
+ maxmin : true,
+ content : [ basePath+'/admin/redirect/shop/activities/activitiesGroupBuy-form']
+ }));
+ },
+
+ // 打开新增秒杀界面
+ openSecKill() {
+ layer.full(layer.open({
+ type : 2,
+ title : "新建秒杀",
+ area : [ MUI.SIZE_L, MUI.SIZE_L ],
+ maxmin : true,
+ content : [ basePath+'/admin/redirect/shop/activities/activitiesSecKill-form']
+ }));
+ },
+
+ // 打开新增沙龙界面
+ openSalon() {
+ layer.full(layer.open({
+ type : 2,
+ title : "新建秒杀",
+ area : [ MUI.SIZE_L, MUI.SIZE_L ],
+ maxmin : true,
+ content : [ basePath+'/admin/redirect/shop/activities/activitiesSalon-form']
}));
},
}
--
Gitblit v1.9.1