From ec87cf1ee2b9382bf9d089711f0ff82ae8e7077c Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Wed, 09 Jun 2021 20:44:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/resources/templates/views/admin/activity/activity-luckyDraw.html | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/activity/activity-luckyDraw.html b/zq-erp/src/main/resources/templates/views/admin/activity/activity-luckyDraw.html
index ec580a8..b8c948a 100644
--- a/zq-erp/src/main/resources/templates/views/admin/activity/activity-luckyDraw.html
+++ b/zq-erp/src/main/resources/templates/views/admin/activity/activity-luckyDraw.html
@@ -94,13 +94,6 @@
</el-button>
</div>
</el-col>
- <el-col>
- <div style="padding:5px;font-size: 15px;text-align: right;">
- <el-button type="primary" size="mini" round>
- <span>抽奖记录</span>
- </el-button>
- </div>
- </el-col>
</el-row>
<el-row>
@@ -533,7 +526,7 @@
</el-form-item>
</div>
- <div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
+ <!--<div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
<el-form-item label="转盘背景">
<el-upload
action="/admin/multipleUploadFile/doUpload"
@@ -543,7 +536,7 @@
<i v-else></i>
</el-upload>
</el-form-item>
- </div>
+ </div>-->
</el-tab-pane>
<el-tab-pane label="规则说明" name="fourth">
@@ -658,8 +651,8 @@
//标题图片
imageLine: "../../../images/luckyDraw/line.png",
imageUrlTitle: "../../../images/luckyDraw/start.png",
- imageUrlButton: "../../../images/luckyDraw/zhuanpan.png",
- imageUrlHead: "../../../images/sign/signHead.png",
+ imageUrlButton: "",
+ imageUrlHead: "../../../images/luckyDraw/zhuanpan.png",
//字体颜色
typographyColor: '#409EFF',
--
Gitblit v1.9.1