From 69b36eb7734d197cea6d977c6619a681a75885ae Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 05 Dec 2020 06:55:06 +0800
Subject: [PATCH] Merge branch 'master' into hive2.0
---
zq-erp/src/main/resources/templates/views/common/login.html | 56 ++++-----------------------
zq-erp/src/main/resources/static/css/login.min.css | 2
zq-erp/src/main/resources/static/css/styleOne/style.min.css | 2
zq-erp/src/main/resources/static/images/ls.jpg | 0
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupInfoDao.xml | 4 +-
zq-erp/src/main/resources/static/css/styleOne/login.min.css | 2
6 files changed, 14 insertions(+), 52 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupInfoDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupInfoDao.xml
index 877aa14..bab793a 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupInfoDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupInfoDao.xml
@@ -274,7 +274,7 @@
left join shop_product t3 on t2.goods_id=t3.id
left join shop_activities_group_price t4 on t1.id=t4.act_id and t4.seq=1
where find_in_set(#{record.shopId}, t1.shop_ids) and t1.act_status=1 and t1.act_type=1
- and company_id=#{companyId}
+ and company_id=#{record.companyId}
<if test="record !=null"><!-- 判断pageVo对象是否为空 -->
<if test="record.sort !=null and record.order !=null">
order by
@@ -294,7 +294,7 @@
left join shop_product t3 on t2.goods_id=t3.id
left join shop_activities_group_price t4 on t1.id=t4.act_id and t4.seq=1
where find_in_set(#{record.shopId}, t1.shop_ids) and t1.act_status=1
- and company_id=#{companyId}
+ and company_id=#{record.companyId}
</select>
<select id="selectGroupInfoByActId" resultMap="ShopActivitiesGroupInfoMap">
diff --git a/zq-erp/src/main/resources/static/css/login.min.css b/zq-erp/src/main/resources/static/css/login.min.css
index f2a9afe..f920d28 100644
--- a/zq-erp/src/main/resources/static/css/login.min.css
+++ b/zq-erp/src/main/resources/static/css/login.min.css
@@ -1 +1 @@
-html{height:100%}body.signin{height:auto;background:url(../images/login-background.jpg) no-repeat center fixed;-webkit-background-size:cover;-moz-background-size:cover;-o-background-size:cover;background-size:cover;color:rgba(255,255,255,.95)}.signinpanel{width:750px;margin:10% auto 0}.signinpanel .logopanel{float:none;width:auto;padding:0;background:0 0}.signinpanel .signin-info ul{list-style:none;padding:0;margin:20px 0}.signinpanel .form-control{display:block;margin-top:15px}.signinpanel .uname{background:#fff url(../images/user.png) no-repeat 95% center;color:#333}.signinpanel .pword{background:#fff url(../images/locked.png) no-repeat 95% center;color:#333}.signinpanel .btn{margin-top:15px}.signinpanel form{background:rgba(255,255,255,.2);border:1px solid rgba(255,255,255,.3);-moz-box-shadow:0 3px 0 rgba(12,12,12,.03);-webkit-box-shadow:0 3px 0 rgba(12,12,12,.03);box-shadow:0 3px 0 rgba(12,12,12,.03);-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;padding:30px}.signup-footer{border-top:solid 1px rgba(255,255,255,.3);margin:20px 0;padding-top:15px}@media screen and (max-width:768px){.signinpanel,.signuppanel{margin:0 auto;width:420px!important;padding:20px}.signinpanel form{margin-top:20px}.signup-footer,.signuppanel .form-control{margin-bottom:10px}.signup-footer .pull-left,.signup-footer .pull-right{float:none!important;text-align:center}.signinpanel .signin-info ul{display:none}}@media screen and (max-width:320px){.signinpanel,.signuppanel{margin:0 20px;width:auto}}
\ No newline at end of file
+html{height:100%}body.signin{height:auto;background:url(../images/login-background.jpg) no-repeat center fixed;-webkit-background-size:cover;-moz-background-size:cover;-o-background-size:cover;background-size:cover;color:rgba(255,255,255,.95)}.signinpanel{width:1000px;margin:10% auto 0}.signinpanel .logopanel{float:none;width:auto;padding:0;background:0 0}.signinpanel .signin-info ul{list-style:none;padding:0;margin:20px 0}.signinpanel .form-control{display:block;margin-top:15px}.signinpanel .uname{background:#fff url(../images/user.png) no-repeat 95% center;color:#333}.signinpanel .pword{background:#fff url(../images/locked.png) no-repeat 95% center;color:#333}.signinpanel .btn{margin-top:15px}.signinpanel form{background:rgba(255,255,255,.2);border:1px solid rgba(255,255,255,.3);-moz-box-shadow:0 3px 0 rgba(12,12,12,.03);-webkit-box-shadow:0 3px 0 rgba(12,12,12,.03);box-shadow:0 3px 0 rgba(12,12,12,.03);-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;padding:30px}.signup-footer{border-top:solid 1px rgba(255,255,255,.3);margin:20px 0;padding-top:15px}@media screen and (max-width:768px){.signinpanel,.signuppanel{margin:0 auto;width:420px!important;padding:20px}.signinpanel form{margin-top:20px}.signup-footer,.signuppanel .form-control{margin-bottom:10px}.signup-footer .pull-left,.signup-footer .pull-right{float:none!important;text-align:center}.signinpanel .signin-info ul{display:none}}@media screen and (max-width:320px){.signinpanel,.signuppanel{margin:0 20px;width:auto}}
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/static/css/styleOne/login.min.css b/zq-erp/src/main/resources/static/css/styleOne/login.min.css
index 46a58b5..f00b606 100644
--- a/zq-erp/src/main/resources/static/css/styleOne/login.min.css
+++ b/zq-erp/src/main/resources/static/css/styleOne/login.min.css
@@ -13,7 +13,7 @@
}
.signinpanel {
- width: 750px;
+ width: 1000px;
margin: 10% auto 0
}
diff --git a/zq-erp/src/main/resources/static/css/styleOne/style.min.css b/zq-erp/src/main/resources/static/css/styleOne/style.min.css
index 5e1b542..a1a6404 100644
--- a/zq-erp/src/main/resources/static/css/styleOne/style.min.css
+++ b/zq-erp/src/main/resources/static/css/styleOne/style.min.css
@@ -1833,7 +1833,7 @@
border: 1px solid #d7d8d9;
color: #373d41;
display: block;
- padding: 6px 12px;
+ padding: 20px 12px;
width: 100%;
font-size: 14px -webkit-box-shadow: none !important;
box-shadow: none !important;
diff --git a/zq-erp/src/main/resources/static/images/ls.jpg b/zq-erp/src/main/resources/static/images/ls.jpg
index 3b58a28..2ab196f 100644
--- a/zq-erp/src/main/resources/static/images/ls.jpg
+++ b/zq-erp/src/main/resources/static/images/ls.jpg
Binary files differ
diff --git a/zq-erp/src/main/resources/templates/views/common/login.html b/zq-erp/src/main/resources/templates/views/common/login.html
index 2e657eb..7679c14 100644
--- a/zq-erp/src/main/resources/templates/views/common/login.html
+++ b/zq-erp/src/main/resources/templates/views/common/login.html
@@ -17,20 +17,20 @@
.row > div:nth-child(1) {
background: url(../../images/login-title.jpg) no-repeat;
background-size: 100% 100%;
- height: 380px;
+ height: 450px;
}
.row > div:nth-child(2) {
background: #fff;
- height: 380px;
+ height: 450px;
}
.download-bar {
margin-top: 15px;
- color: #fff;
+ color: #4968bd;
}
.download-bar a {
- color: #fff;
+ color: #4968bd;
margin: 0 5px;
}
@@ -84,7 +84,7 @@
.signinpanel .dataForm > div > img {
position: absolute;
- top: 9px;
+ top: 13px;
left: 5px;
}
@@ -107,11 +107,11 @@
<body class="signin" onkeypress="dologin(event)">
<div class="signinpanel">
- <div class="row" style="box-shadow: 1px 5px 10px #f1e2e2;">
+ <div class="row" style="box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);">
<div class="col-sm-6"></div>
<div class="col-sm-6">
<form method="post" class="dataForm">
- <h3 class="no-margins text-center title" style="color: #E60012;font-size: 18px;">登录</h3>
+ <h3 class="no-margins text-center title" style="color: #666666;font-size: 24px;font-weight: bold">欢迎登录</h3>
<div>
<input autocomplete="off" id="account" type="text" placeholder="请输入用户名"
class="form-control uname"/>
@@ -126,53 +126,15 @@
</div>
<br> <br>
- <button type="button" onclick="login()" style="background-color: #E60012;border: none;"
+ <button type="button" onclick="login()" style="background-color: #4f6cff;border: none;font-size: 18px;"
class="btn btn-success btn-block">登录
</button>
</form>
</div>
- <!-- <div class="col-sm-7">
- <div class="signin-info">
- <div class="logopanel m-b">
- <h1>[ Matrix-Java 简化你的开发 ]</h1>
- </div>
- <div class="m-b"></div>
- <h4>
- 欢迎使用 <strong>Matrix-Java v4.0框架</strong>
- </h4>
- <ul class="m-b">
- <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i>
- 代码，界面一键生成</li>
- <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> 集团化权限控制</li>
- <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i>
- 集成微信、支付宝接口</li>
- <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i>
- 满足App接口开发</li>
- <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i>
- N多基础功能：短信、邮件、文章、广告、留言...</li>
- <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> 安全</li>
- <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> 易用</li>
- <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i>
- 架构【SpingMvc+Mybatis+Mysql】</li>
- </ul>
- </div>
- </div>
- <div class="col-sm-5">
- <form method="post" class="dataForm">
- <h2 class="no-margins text-center">登录</h2>
- <input autocomplete="off" id="account" type="text" placeholder="账户"
- class="form-control uname" /> <br> <input autocomplete="off" id="password"
- type="password" class="form-control pword m-b" nullmsg="密码不能为空"
- placeholder="密码" /> <a href=""> </a> <br> <br>
- <button type="button" onclick="login()"
- class="btn btn-success btn-block">登录</button>
-
- </form>
- </div> -->
</div>
- <div class="signup-footer" style="color: #fff;">
+ <div class="signup-footer" style="color: #4968bd;">
<div class="" style="font-size: 16px;">HIVE管理系统V2.2.0</div>
<div class="">
--
Gitblit v1.9.1