From 2e08d6d4c0710d3e535b5944faa9df4af828c0f7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 02 Nov 2021 10:54:52 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 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 00050a1..db5f1e4 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
@@ -55,17 +55,17 @@
<body>
<div class="panel-body" id="app" v-cloak>
<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: 18px;">每日签到</span>
- <div class="bottom clearfix">
- <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/meiriqiandao.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="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">
@@ -100,19 +100,19 @@
</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>
- </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>-->
+<!-- </el-col>-->
+<!-- </el-row>-->
</div>
</body>
--
Gitblit v1.9.1