Skip to content

G
gk
Commit 29c7bd65 authored by daniel's avatar daniel
Browse files
Options

feat(cmpt): logo尺寸修复

parent 6da433d7
Show whitespace changes
Inline Side-by-side
Showing with 393 additions and 358 deletions
src/main/webapp/WEB-INF/views/cmpt/index.jsp
View file @ 29c7bd65
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="fns" uri="/WEB-INF/tlds/fns.tld" %> <%@ taglib prefix="fns" uri="/WEB-INF/tlds/fns.tld" %>
<%@ taglib prefix="fnc" uri="/WEB-INF/tlds/fnc.tld" %> <%@ taglib prefix="fnc" uri="/WEB-INF/tlds/fnc.tld" %>
<c:set var="ctx" value="${pageContext.request.contextPath}${fns:getAdminPath()}"/> <c:set var="ctx" value="${pageContext.request.contextPath}${fns:getAdminPath()}" />
<c:set var="path" value="${pageContext.request.contextPath}${fns:getPath()}"/> <c:set var="path" value="${pageContext.request.contextPath}${fns:getPath()}" />
<c:set var="jaaproot" value="${pageContext.request.contextPath}"/> <c:set var="jaaproot" value="${pageContext.request.contextPath}" />
<c:set var="ctxStatic" value="${pageContext.request.contextPath}/static"/> <c:set var="ctxStatic" value="${pageContext.request.contextPath}/static" />
<!-- JavaScript files--> <!-- JavaScript files-->
<script src="${ctxStatic}/newdermon/vendor/jquery/jquery.min.js"></script> <script src="${ctxStatic}/newdermon/vendor/jquery/jquery.min.js"></script>
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no, minimal-ui"/> <meta name="viewport"
content="width=device-width, initial-scale=1, user-scalable=no, minimal-ui" />
<meta name="description" content=""> <meta name="description" content="">
<meta name="robots" content="all,follow"> <meta name="robots" content="all,follow">
<!-- Bootstrap CSS--> <!-- Bootstrap CSS-->
<link rel="stylesheet" href="${ctxStatic}/newdermon/vendor/bootstrap/css/bootstrap.min.css"> <link rel="stylesheet"
href="${ctxStatic}/newdermon/vendor/bootstrap/css/bootstrap.min.css">
<!-- Font Awesome CSS--> <!-- Font Awesome CSS-->
<link rel="stylesheet" href="${ctxStatic}/newdermon/vendor/font-awesome/css/font-awesome.min.css"> <link rel="stylesheet"
href="${ctxStatic}/newdermon/vendor/font-awesome/css/font-awesome.min.css">
<!-- Fontastic Custom icon font--> <!-- Fontastic Custom icon font-->
<link rel="stylesheet" href="${ctxStatic}/newdermon/css/fontastic.css"> <link rel="stylesheet" href="${ctxStatic}/newdermon/css/fontastic.css">
<!-- Google fonts - Poppins --> <!-- Google fonts - Poppins -->
<link rel="stylesheet" href="${ctxStatic}/newdermon/css/font-css.css"> <link rel="stylesheet" href="${ctxStatic}/newdermon/css/font-css.css">
<!-- theme stylesheet--> <!-- theme stylesheet-->
<link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css?v=<%=System.currentTimeMillis()%>" <link rel="stylesheet"
href="${ctxStatic}/newdermon/css/style.default.css?v=<%=System.currentTimeMillis()%>"
id="theme-stylesheet"> id="theme-stylesheet">
<!-- Custom stylesheet - for your changes--> <!-- Custom stylesheet - for your changes-->
<link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css?v=<%=System.currentTimeMillis()%>"> <link rel="stylesheet"
href="${ctxStatic}/newdermon/css/custom.css?v=<%=System.currentTimeMillis()%>">
<!-- Favicon--> <!-- Favicon-->
<link rel="shortcut icon" href="https://img.geexek.com/files/home/favicon.ico"> <link rel="shortcut icon" href="https://img.geexek.com/files/home/favicon.ico">
<script type="text/javascript" charset="utf-8" src="${ctxStatic}/layer/layer.js"></script> <script type="text/javascript" charset="utf-8"
src="${ctxStatic}/layer/layer.js"></script>
<link rel="stylesheet" href="${ctxStatic}/layer/skin/layer.css"> <link rel="stylesheet" href="${ctxStatic}/layer/skin/layer.css">
<link rel="stylesheet" href="${ctxStatic}/cmpt/index.css?v=<%=System.currentTimeMillis()%>"> <link rel="stylesheet"
<link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css?v=<%=System.currentTimeMillis()%>"> href="${ctxStatic}/cmpt/index.css?v=<%=System.currentTimeMillis()%>">
<link rel="stylesheet"
href="${ctxStatic}/cmpt/setting.css?v=<%=System.currentTimeMillis()%>">
<title>视觉管理</title> <title>视觉管理</title>
<style> <style>
.input_cxcolor { .input_cxcolor {
...@@ -109,7 +117,8 @@ ...@@ -109,7 +117,8 @@
display: inline-block; display: inline-block;
width: 18px; width: 18px;
height: 18px; height: 18px;
background: rgba(206, 57, 57, 1);; background: rgba(206, 57, 57, 1);
;
border-radius: 50%; border-radius: 50%;
color: white; color: white;
text-align: center; text-align: center;
...@@ -119,7 +128,8 @@ ...@@ -119,7 +128,8 @@
.tip-txt { .tip-txt {
height: 24px; height: 24px;
font-size: 16px; font-size: 16px;
color: rgba(206, 57, 57, 1);; color: rgba(206, 57, 57, 1);
;
} }
.wx-logo { .wx-logo {
...@@ -136,6 +146,7 @@ ...@@ -136,6 +146,7 @@
color: #999999; color: #999999;
font-size: 14px; font-size: 14px;
} }
.active-style { .active-style {
border: solid 3px #e31515; border: solid 3px #e31515;
} }
...@@ -156,6 +167,7 @@ ...@@ -156,6 +167,7 @@
background-color: rgba(250, 250, 250, 1) !important; background-color: rgba(250, 250, 250, 1) !important;
color: #333 !important; color: #333 !important;
} }
/* 开关样式 */ /* 开关样式 */
.switch { .switch {
position: relative; position: relative;
...@@ -194,15 +206,15 @@ ...@@ -194,15 +206,15 @@
transition: .4s; transition: .4s;
} }
input:checked + .slider { input:checked+.slider {
background-color: #2196F3; background-color: #2196F3;
} }
input:focus + .slider { input:focus+.slider {
box-shadow: 0 0 1px #2196F3; box-shadow: 0 0 1px #2196F3;
} }
input:checked + .slider:before { input:checked+.slider:before {
-webkit-transform: translateX(26px); -webkit-transform: translateX(26px);
-ms-transform: translateX(26px); -ms-transform: translateX(26px);
transform: translateX(26px); transform: translateX(26px);
...@@ -217,12 +229,13 @@ ...@@ -217,12 +229,13 @@
border-radius: 50%; border-radius: 50%;
} }
</style> </style>
</head> </head>
<body>
<style type="text/css">
</style> <body>
<div class="page"> <style type="text/css">
</style>
<div class="page">
<jsp:include page="../common/header.jsp"></jsp:include> <jsp:include page="../common/header.jsp"></jsp:include>
<div class="page-content d-flex align-items-stretch main-body"> <div class="page-content d-flex align-items-stretch main-body">
<!-- Side Navbar --> <!-- Side Navbar -->
...@@ -240,16 +253,21 @@ ...@@ -240,16 +253,21 @@
<div class="card-header d-flex align-items-center"> <div class="card-header d-flex align-items-center">
<h2 class="h3">主色</h2> <h2 class="h3">主色</h2>
</div> </div>
<input id="color_c" type="text" class="input_cxcolor" readonly <input id="color_c" type="text"
style="background: ${cmpt.cmptbgColor == null ? "#49b4b7":cmpt.cmptbgColor}"> class="input_cxcolor" readonly
<input class="maincolorcode jscolor" id="cmptBgColorInput" style="background: ${cmpt.cmptbgColor == null ? "
#49b4b7":cmpt.cmptbgColor}">
<input class="maincolorcode jscolor"
id="cmptBgColorInput"
placeholder="请输入主题颜色，例：#000000" placeholder="请输入主题颜色，例：#000000"
onchange="cmptBgColorChange()" onchange="cmptBgColorChange()"
value='${cmpt.cmptbgColor == null ? "#49b4b7":cmpt.cmptbgColor}' style=""> value='${cmpt.cmptbgColor == null ? "#49b4b7":cmpt.cmptbgColor}'
style="">
</div> </div>
<input type="hidden" name="hdcmptBgColorInput" id="hdcmptBgColorInput" <input type="hidden" name="hdcmptBgColorInput"
value="${cmpt.cmptbgColor}"/> id="hdcmptBgColorInput"
value="${cmpt.cmptbgColor}" />
</div> </div>
<!-- Check List --> <!-- Check List -->
<div class="cmptLogo"> <div class="cmptLogo">
...@@ -259,17 +277,20 @@ ...@@ -259,17 +277,20 @@
</div> </div>
<div class="card-body no-padding"> <div class="card-body no-padding">
<div class="logo-div"> <div class="logo-div">
<img src="${cmpt.logo}" class="logo ${cmpt.logo != null ? 'cmpt-logo':''}" <img src="${cmpt.logo}"
alt="${ctxStatic}/managerPagePhoto/file.png" id="cmptLogo" class="logo ${cmpt.logo != null ? 'cmpt-logo':''}"
alt="${ctxStatic}/managerPagePhoto/file.png"
id="cmptLogo"
onerror="this.src='${ctxStatic}/managerPagePhoto/insertManual.png'"> onerror="this.src='${ctxStatic}/managerPagePhoto/insertManual.png'">
<input type="hidden" name="hdcmptLogo" id="hdcmptLogo" <input type="hidden" name="hdcmptLogo"
value="${cmpt.logo}"/> id="hdcmptLogo" value="${cmpt.logo}" />
<input id="upload" type="file" <input id="upload" type="file"
onchange="changeLogoImg('cmptLogo', 'upload','0','0','100%','100%')"/> onchange="changeLogoImg('cmptLogo', 'upload','0','0','100%','100%')" />
</div> </div>
<img src="${ctxStatic}/managerPagePhoto/zhu.png" <img src="${ctxStatic}/managerPagePhoto/zhu.png"
style="width: 20px;margin: 0 5px 3px 25px;"/> style="width: 20px;margin: 0 5px 3px 25px;" />
<span class="PagePhotoDange">建议LOGO分辨率1000*800px</span> <span
class="PagePhotoDange">建议LOGO分辨率800*800px</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -282,13 +303,19 @@ ...@@ -282,13 +303,19 @@
<h2 class="h3">赛事详情样式</h2> <h2 class="h3">赛事详情样式</h2>
</div> </div>
<div class="card-body" <div class="card-body"
style="display: flex;flex-display:row;align-items: center" id="style-select"> style="display: flex;flex-display:row;align-items: center"
<img data-style="1" class="${(cmpt.detailStyle==1||cmpt.detailStyle==null)?'active-style':''}" style="width: 120px;height:200px;box-sizing: border-box;" id="style-select">
src="https://geexekimgoss-sxk.oss-cn-hangzhou.aliyuncs.com/gk/common/detail-style/style-1.png"/> <img data-style="1"
<img data-style="2" class="${cmpt.detailStyle==2?'active-style':''}" style="width: 120px;height:200px;margin-left:20px;box-sizing: border-box;" class="${(cmpt.detailStyle==1||cmpt.detailStyle==null)?'active-style':''}"
src="https://geexekimgoss-sxk.oss-cn-hangzhou.aliyuncs.com/gk/common/detail-style/style-2.png"/> style="width: 120px;height:200px;box-sizing: border-box;"
<input type="hidden" name="detailStyle" id="detailStyle" src="https://geexekimgoss-sxk.oss-cn-hangzhou.aliyuncs.com/gk/common/detail-style/style-1.png" />
value="${cmpt.detailStyle}"/> <img data-style="2"
class="${cmpt.detailStyle==2?'active-style':''}"
style="width: 120px;height:200px;margin-left:20px;box-sizing: border-box;"
src="https://geexekimgoss-sxk.oss-cn-hangzhou.aliyuncs.com/gk/common/detail-style/style-2.png" />
<input type="hidden" name="detailStyle"
id="detailStyle"
value="${cmpt.detailStyle}" />
</div> </div>
</div> </div>
</div> </div>
...@@ -300,10 +327,14 @@ ...@@ -300,10 +327,14 @@
<div style="margin-left: 20px;"> <div style="margin-left: 20px;">
<!-- 模拟 switch 开关 --> <!-- 模拟 switch 开关 -->
<label class="switch"> <label class="switch">
<input type="checkbox" id="isShowTabSwitch" ${cmpt.isShowTab==1 ? 'checked' : ''}> <input type="checkbox"
id="isShowTabSwitch"
${cmpt.isShowTab==1 ? 'checked' : ''
}>
<span class="slider round"></span> <span class="slider round"></span>
</label> </label>
<input type="hidden" id="isShowInput" value="${cmpt.isShowTab ? 1 : 0}" /> <input type="hidden" id="isShowInput"
value="${cmpt.isShowTab ? 1 : 0}" />
</div> </div>
</div> </div>
</div> </div>
...@@ -316,15 +347,18 @@ ...@@ -316,15 +347,18 @@
<c:if test="${cmpt.auditStatus == 1}"> <c:if test="${cmpt.auditStatus == 1}">
<div class="flex flex-row"> <div class="flex flex-row">
<div style="position: relative" id="wx-logo"> <div style="position: relative" id="wx-logo">
<img class="qr-img" src="/img/${cmpt.cmptId}" alt=""> <img class="qr-img" src="/img/${cmpt.cmptId}"
alt="">
<%-- <img src="${cmpt.logo}" class="wx-logo" <%-- <img src="${cmpt.logo}" class="wx-logo"
onerror="this.src='${ctxStatic}/managerPagePhoto/insertManual.png'">--%> onerror="this.src='${ctxStatic}/managerPagePhoto/insertManual.png'">--%>
</div> </div>
<div class="flex flex-column download-sec"> <div class="flex flex-column download-sec">
<span class="download-qr" id="download">下载小程序码</span> <span class="download-qr"
id="download">下载小程序码</span>
<div class="flex flex-row"> <div class="flex flex-row">
<span class="warning">注</span> <span class="warning">注</span>
<span class="tip-txt">上传赛事logo后，将替换小程序码中的赛客LOGO</span> <span
class="tip-txt">上传赛事logo后，将替换小程序码中的赛客LOGO</span>
</div> </div>
<div><span class="tip-txt" <div><span class="tip-txt"
style="padding-left: 10px">微信扫描小程序码直接进入小程序中赛事首页</span> style="padding-left: 10px">微信扫描小程序码直接进入小程序中赛事首页</span>
...@@ -342,22 +376,23 @@ ...@@ -342,22 +376,23 @@
</div> </div>
</section> </section>
<!-- Updates Section --> <!-- Updates Section -->
<input type="hidden" name="cmptId" id="cmptId" value="${cmptId}"/> <input type="hidden" name="cmptId" id="cmptId" value="${cmptId}" />
<div class="savebtn">保存</div> <div class="savebtn">保存</div>
</form> </form>
</div> </div>
</div> </div>
</div> </div>
<script src="${ctxStatic}/newdermon/vendor/popper.js/umd/popper.min.js"></script> <script src="${ctxStatic}/newdermon/vendor/popper.js/umd/popper.min.js"></script>
<script src="${ctxStatic}/newdermon/vendor/bootstrap/js/bootstrap.min.js"></script> <script src="${ctxStatic}/newdermon/vendor/bootstrap/js/bootstrap.min.js"></script>
<script src="${ctxStatic}/newdermon/vendor/jquery.cookie/jquery.cookie.js"></script> <script src="${ctxStatic}/newdermon/vendor/jquery.cookie/jquery.cookie.js"></script>
<script src="${ctxStatic}/newdermon/vendor/jquery-validation/jquery.validate.min.js"></script> <script
<script src="${ctxStatic}/jscolor/jscolor.js"></script> src="${ctxStatic}/newdermon/vendor/jquery-validation/jquery.validate.min.js"></script>
<!-- Main File--> <script src="${ctxStatic}/jscolor/jscolor.js"></script>
<script src="${ctxStatic}/newdermon/js/front.js"></script> <!-- Main File-->
<script src="${ctxStatic}/js/index.js?v=<%=System.currentTimeMillis()%>"></script> <script src="${ctxStatic}/newdermon/js/front.js"></script>
<script type="text/javascript">var ctx = '${ctx}', ctxStatic = '${ctxStatic}';</script> <script src="${ctxStatic}/js/index.js?v=<%=System.currentTimeMillis()%>"></script>
</body> <script type="text/javascript">var ctx = '${ctx}', ctxStatic = '${ctxStatic}';</script>
</body>
</html>
\ No newline at end of file </html>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment