From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/resources/templates/views/admin/activity/activity-luckyDraw-update.html | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/activity/activity-luckyDraw-update.html b/zq-erp/src/main/resources/templates/views/admin/activity/activity-luckyDraw-update.html
index e6cefa3..4c3ec30 100644
--- a/zq-erp/src/main/resources/templates/views/admin/activity/activity-luckyDraw-update.html
+++ b/zq-erp/src/main/resources/templates/views/admin/activity/activity-luckyDraw-update.html
@@ -87,13 +87,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>
@@ -536,7 +529,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"
@@ -546,7 +539,7 @@
<i v-else></i>
</el-upload>
</el-form-item>
- </div>
+ </div>-->
</el-tab-pane>
<el-tab-pane label="规则说明" name="fourth">
@@ -627,8 +620,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",
activeClickTab:0,
--
Gitblit v1.9.1