From 815b7f21921c620e7605c461a3c4b4bbc4a26494 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 19 Apr 2021 14:42:40 +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-sign.html | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html
index eba3a4c..d1bcf13 100644
--- a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html
+++ b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html
@@ -56,13 +56,12 @@
}
.imageTwo {
display: block;
- height: 50px;
+ height: 280px;
padding: 5px 5px;
text-align: center;
}
.imageThree {
display: block;
- height: 50px;
padding: 5px 5px;
text-align: center;
}
@@ -81,14 +80,16 @@
<el-container>
<el-aside width="30%">
<el-card class="box-card" :body-style="{ padding: '10px 10px'}">
- <div @click="uploadImg()" class="imageOne">
+ <!--<div @click="uploadImg()" class="imageOne">
<img v-if="imageUrlTitle" :src="imageUrlTitle" style="width: 100%;">
<el-button type="primary" v-show="imageUrlTitle == ''" round><span style="font-size: 20px;">标题</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
- </div>
- <div @click="uploadImg()" class="imageTwo" >
- <img v-if="imageUrlHead" :src="imageUrlHead" style="width: 100%;">
- <el-button type="primary" v-show="imageUrlHead == ''" round><span style="font-size: 20px;">头部</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
- </div>
+ </div>-->
+ <el-row>
+ <div @click="uploadImg()" class="imageTwo" >
+ <img v-if="imageUrlHead" :src="imageUrlHead" style="width: 100%;height: 100%">
+ <el-button type="primary" v-show="imageUrlHead == ''" round><span style="font-size: 20px;">头部</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
+ </div>
+ </el-row>
<el-row style="display:flex;">
<el-col>
<div style="padding:5px;font-size: 15px;text-align: left;"><span>您已累计签到<span style="color: red;">3</span>天</span></div>
@@ -97,16 +98,24 @@
<div style="padding:5px;font-size: 15px;text-align: right;"><span>签到提醒</span></div>
</el-col>
</el-row>
+
+ <el-row>
<div @click="uploadImg()">
<el-calendar :range="['2019-03-04', '2019-03-24']"></el-calendar>
<img v-if="imageUrlState" :src="imageUrlState" style="width: 100%;">
- <el-button type="primary" v-show="imageUrlState == ''" round><span style="font-size: 20px;">日历签到背景</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
+ <!--<el-button type="primary" v-show="imageUrlState == ''" round><span style="font-size: 20px;">日历签到背景</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>-->
</div>
+ </el-row>
+
+ <el-row>
<div @click="uploadImg()" class="imageThree" >
<el-button type="primary" v-show="imageUrlButton == ''" round><span style="font-size: 20px;">签到按钮</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
<img v-if="imageUrlButton" :src="imageUrlButton" style="width: 100%;">
</div>
+ </el-row>
+
+ <el-row>
<div style="text-align: center;padding: 5px;" @click="gzsmSet()">
<div class="col-sm-8 col-sm-offset-2" style="text-align: left;">
<span style="padding:5px;font-size: 30px;">-- 规则说明--</span>
@@ -124,6 +133,7 @@
<span style="padding:5px;font-size: 15px;">3、每7天重新开始计算</span>
</div>
</div>
+ </el-row>
</el-card>
</el-aside>
@@ -462,7 +472,7 @@
</el-tab-pane>
<el-tab-pane label="背景图片上传" name="third">
- <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"
@@ -471,7 +481,7 @@
<img v-if="imageUrlTitle" :src="imageUrlTitle" style="max-width: 300px;">
</el-upload>
</el-form-item>
- </div>
+ </div>-->
<div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
<el-form-item label="头部">
<el-upload
@@ -482,7 +492,7 @@
</el-upload>
</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"
@@ -491,7 +501,7 @@
<img v-if="imageUrlState" :src="imageUrlState" style="max-width: 300px;">
</el-upload>
</el-form-item>
- </div>
+ </div>-->
<div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
<el-form-item label="签到按钮">
<el-upload
@@ -616,8 +626,8 @@
//标题图片
imageUrlTitle: '',
- imageUrlHead: basePath + "/image/signHead.png",
- imageUrlButton: basePath + "/image/signButton.png",
+ imageUrlHead: "../../../images/sign/signHead.png",
+ imageUrlButton: "../../../images/sign/signButton.png",
imageUrlState: '',
//字体颜色
--
Gitblit v1.9.1