From 12990a5138e3fa8874a601bfb784a2b1147f0f24 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 06 Apr 2021 11:53:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html |   67 +++++++++++++++++++++++++++++++++
 1 files changed, 66 insertions(+), 1 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..ea543fc 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
@@ -54,13 +54,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">
                 <div style="padding: 5px;">
                     <span style="padding:5px;font-size: 30px;">每日签到</span>
                     <div class="bottom clearfix">
                         <el-button type="primary" 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="https://shadow.elemecdn.com/app/element/hamburger.9cf7b091-55e9-11e9-a976-7f4d0b07eef6.png" class="image">
+                <div style="padding: 5px;">
+                    <span style="padding:5px;font-size: 30px;">拼团</span>
+                    <div class="bottom clearfix">
+                        <el-button type="primary" 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="https://shadow.elemecdn.com/app/element/hamburger.9cf7b091-55e9-11e9-a976-7f4d0b07eef6.png" class="image">
+                <div style="padding: 5px;">
+                    <span style="padding:5px;font-size: 30px;">秒杀</span>
+                    <div class="bottom clearfix">
+                        <el-button type="primary" 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="https://shadow.elemecdn.com/app/element/hamburger.9cf7b091-55e9-11e9-a976-7f4d0b07eef6.png" class="image">
+                <div style="padding: 5px;">
+                    <span style="padding:5px;font-size: 30px;">沙龙</span>
+                    <div class="bottom clearfix">
+                        <el-button type="primary" class="button" @click="openSalon()" round>马上创建</el-button>
                     </div>
                 </div>
             </el-card>
@@ -96,6 +129,38 @@
                     content : [ basePath + '/admin/redirect/activity/activity-sign']
                 }));
             },
+            // 打新增拼团界面
+            openAdd(value) {
+                layer.full(layer.open({
+                    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']
+                }));
+            },
         }
     })
 </script>

--
Gitblit v1.9.1