zcy
/
mall_study
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "用户页面优化" 

This reverts commit 68b1786b58.
master
Bosen 2021-05-29 04:25:16 +08:00
parent 68b1786b58
commit 79957d07d2
4 changed files with 270 additions and 288 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jieyue.sql
View File

@ -239,6 +239,9 @@ INSERT INTO `sys_notice` VALUES (5, '测试标题', '测试内容', '1', 9, 1607
INSERT INTO `sys_notice` VALUES (7, '测试标题', '测试内容', '2', 2, 1607238284600); INSERT INTO `sys_notice` VALUES (7, '测试标题', '测试内容', '2', 2, 1607238284600);
INSERT INTO `sys_notice` VALUES (8, '测试标题', '测试内容', '2', 3, 1607238284601); INSERT INTO `sys_notice` VALUES (8, '测试标题', '测试内容', '2', 3, 1607238284601);
INSERT INTO `sys_notice` VALUES (9, '测试标题', '测试内容', '2', 4, 1607238284601); INSERT INTO `sys_notice` VALUES (9, '测试标题', '测试内容', '2', 4, 1607238284601);
INSERT INTO `sys_notice` VALUES (11, '测试标题2', '测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2', '2', 3, 1609926809535);
INSERT INTO `sys_notice` VALUES (12, '测试标题2', '测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2', '2', 4, 1609926809536);
INSERT INTO `sys_notice` VALUES (13, '测试标题2', '测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2测试内容2', '2', 5, 1609926809536);
INSERT INTO `sys_notice` VALUES (14, '测试群发系统消息', '测试群发系统消息测试群发系统消息测试群发系统消息测试群发系统消息测试群发系统消息测试群发系统消息测试群发系统消息', '2', 1, 1610251470774); INSERT INTO `sys_notice` VALUES (14, '测试群发系统消息', '测试群发系统消息测试群发系统消息测试群发系统消息测试群发系统消息测试群发系统消息测试群发系统消息测试群发系统消息', '2', 1, 1610251470774);
INSERT INTO `sys_notice` VALUES (15, '测试群发系统消息', '测试群发系统消息测试群发系统消息测试群发系统消息测试群发系统消息测试群发系统消息测试群发系统消息测试群发系统消息', '2', 3, 1610251470775); INSERT INTO `sys_notice` VALUES (15, '测试群发系统消息', '测试群发系统消息测试群发系统消息测试群发系统消息测试群发系统消息测试群发系统消息测试群发系统消息测试群发系统消息', '2', 3, 1610251470775);
INSERT INTO `sys_notice` VALUES (16, '测试群发系统消息', '测试群发系统消息测试群发系统消息测试群发系统消息测试群发系统消息测试群发系统消息测试群发系统消息测试群发系统消息', '2', 4, 1610251470776); INSERT INTO `sys_notice` VALUES (16, '测试群发系统消息', '测试群发系统消息测试群发系统消息测试群发系统消息测试群发系统消息测试群发系统消息测试群发系统消息测试群发系统消息', '2', 4, 1610251470776);

13
src/main/resources/templates/admin/rbac/alert.html
View File

@ -1,13 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>您还未拥有此权限！</title>
</head>
<body>
<script>
alert("您还未拥有此权限！");
history.back();
</script>
</body>
</html>

18
src/main/resources/templates/user/notice/index.html
View File

@ -80,16 +80,12 @@
<script th:src="@{/js/user/home/vendor/modernizr-2.8.3.min.js}"></script> <script th:src="@{/js/user/home/vendor/modernizr-2.8.3.min.js}"></script>
<style> <style>
table { table {
background: #bcc2e4; background: #bcc2d8;
border-radius: 20px; border-radius: 20px;
width: 85%; width: 85%;
height: 100px; height: 100px;
color: darkslategrey; color: darkslategrey;
} }
pre {
background: #bcc2e4;
border: 0;
}
.context{ .context{
position: relative; position: relative;
height: 100px; height: 100px;
@ -138,10 +134,8 @@
<table th:each="notice : ${noticeList}"> <table th:each="notice : ${noticeList}">
<tr style="height: 36px"> <tr style="height: 36px">
<td style="width: 50px;"></td> <td style="width: 50px;"></td>
<td style="position:relative;font-size: 24px"> <td style="position:relative;font-size: 24px"
<br/><br/> th:text="${notice.getTitle()}">
<b>[[${notice.getTitle()}]]</b>
<br/><br/>
</td> </td>
<td> <td>
<a href="#" th:onclick="delNotice('[[${notice.getId()}]]')" style="font-weight: bold;font-size: 30px;float: right; <a href="#" th:onclick="delNotice('[[${notice.getId()}]]')" style="font-weight: bold;font-size: 30px;float: right;
@ -167,14 +161,12 @@
</tr> </tr>
<tr> <tr>
<td colspan="3"> <td colspan="3">
<hr style="color: black"/> <hr/>
</td> </td>
</tr> </tr>
<tr style="overflow-x: hidden;"> <tr style="overflow-x: hidden;">
<td style="width: 50px;"></td> <td style="width: 50px;"></td>
<td class="context"> <td class="context" th:text="'系统消息：'+${notice.getContext()}"></td>
<pre>[[${notice.getContext()}]]</pre>
</td>
</tr> </tr>
<tr> <tr>
<td colspan="3"> <td colspan="3">

122
src/main/resources/templates/user/shop/index.html
View File

@ -1,6 +1,6 @@
<!doctype html> <!doctype html>
<html class="no-js" lang="en" xmlns:th="http://www.thymeleaf.org"> <html class="no-js" lang="en" xmlns:th="http://www.thymeleaf.org">
<head> <head>
<!-- Basic page needs <!-- Basic page needs
============================================ --> ============================================ -->
<meta charset="utf-8"> <meta charset="utf-8">
@ -82,19 +82,19 @@
<!-- jquery-ui CSS <!-- jquery-ui CSS
============================================ --> ============================================ -->
<link rel="stylesheet" th:href="@{/css/user/home/jquery-ui.css}"> <link rel="stylesheet" th:href="@{/css/user/home/jquery-ui.css}">
</head> </head>
<body> <body>
<!--[if lt IE 8]> <!--[if lt IE 8]>
<p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p> <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<![endif]--> <![endif]-->
<!-- Add your site or application content here --> <!-- Add your site or application content here -->
<!-- header start --> <!-- header start -->
<header class="header-home" th:include="user/common/model::header"></header> <header class="header-home" th:include="user/common/model::header"></header>
<!-- header end --> <!-- header end -->
<!-- shop-header-area start --> <!-- shop-header-area start -->
<div class="shop-header-area" style="position: relative;top: 200px"> <div class="shop-header-area" style="position: relative;top: 200px">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-md-12 col-sm-12"> <div class="col-md-12 col-sm-12">
@ -110,10 +110,10 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!-- shop-header-area end --> <!-- shop-header-area end -->
<!-- breadcrumb-area start --> <!-- breadcrumb-area start -->
<div class="breadcrumb-area" style="position: relative;top: 200px"> <div class="breadcrumb-area" style="position: relative;top: 200px">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
@ -126,10 +126,10 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!-- breadcrumb-area end --> <!-- breadcrumb-area end -->
<!-- blog-area start --> <!-- blog-area start -->
<div class="shop-area" style="position: relative;top: 200px"> <div class="shop-area" style="position: relative;top: 200px">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<!-- shop-left-sidebar start --> <!-- shop-left-sidebar start -->
@ -247,10 +247,10 @@
<ul> <ul>
<li th:each="curPage : ${#numbers.sequence(1,allPage)}"> <li th:each="curPage : ${#numbers.sequence(1,allPage)}">
<a th:if="${page==curPage}" th:href="@{/user/shop(id=${merchant.getId()},page=${curPage})}" style="background: orangered;color: white"> <a th:if="${page==curPage}" th:href="@{/user/shop(id=${merchant.getId()},page=${curPage})}" style="background: orangered;color: white">
<b>[[${curPage}]]</b> <b>[[${page}]]</b>
</a> </a>
<a th:if="${page!=curPage}" th:href="@{/user/shop(id=${merchant.getId()},page=${curPage})}"> <a th:if="${page!=curPage}" th:href="@{/user/shop(id=${merchant.getId()},page=${curPage})}">
[[${curPage}]] [[${page}]]
</a> </a>
</li> </li>
<li> <li>
@ -268,58 +268,58 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/> <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
<!-- blog-area end --> <!-- blog-area end -->
<!-- brand-area start --> <!-- brand-area start -->
<div th:include="user/common/model::brand"></div> <div th:include="user/common/model::brand"></div>
<!-- brand-area end --> <!-- brand-area end -->
<!-- footer start --> <!-- footer start -->
<footer th:include="user/common/model::footer"></footer> <footer th:include="user/common/model::footer"></footer>
<!-- footer end --> <!-- footer end -->
<!-- JS --> <!-- JS -->
<!-- jquery js --> <!-- jquery js -->
<script th:src="@{/js/user/home/vendor/jquery-1.12.0.min.js}"></script> <script th:src="@{/js/user/home/vendor/jquery-1.12.0.min.js}"></script>
<!-- price-slider js --> <!-- price-slider js -->
<script th:src="@{/js/user/home/price-slider.js}"></script> <script th:src="@{/js/user/home/price-slider.js}"></script>
<!-- bootstrap js --> <!-- bootstrap js -->
<script th:src="@{/js/user/home/bootstrap.min.js}"></script> <script th:src="@{/js/user/home/bootstrap.min.js}"></script>
<!-- owl.carousel.min js --> <!-- owl.carousel.min js -->
<script th:src="@{/js/user/home/owl.carousel.min.js}"></script> <script th:src="@{/js/user/home/owl.carousel.min.js}"></script>
<!-- jquery.scrollUp js --> <!-- jquery.scrollUp js -->
<script th:src="@{/js/user/home/jquery.scrollUp.min.js}"></script> <script th:src="@{/js/user/home/jquery.scrollUp.min.js}"></script>
<!-- mixitup js --> <!-- mixitup js -->
<script th:src="@{/js/user/home/jquery.mixitup.min.js}"></script> <script th:src="@{/js/user/home/jquery.mixitup.min.js}"></script>
<!-- fancybox js --> <!-- fancybox js -->
<script th:src="@{/js/user/home/fancybox/jquery.fancybox.pack.js}"></script> <script th:src="@{/js/user/home/fancybox/jquery.fancybox.pack.js}"></script>
<!-- jquery-counterup js --> <!-- jquery-counterup js -->
<script th:src="@{/js/user/home/jquery.counterup.min.js}"></script> <script th:src="@{/js/user/home/jquery.counterup.min.js}"></script>
<script th:src="@{/js/user/home/waypoints.min.js}"></script> <script th:src="@{/js/user/home/waypoints.min.js}"></script>
<!-- jquery-meanmenu js --> <!-- jquery-meanmenu js -->
<script th:src="@{/js/user/home/jquery.meanmenu.js}"></script> <script th:src="@{/js/user/home/jquery.meanmenu.js}"></script>
<!-- RS-Plugin JS <!-- RS-Plugin JS
============================================ --> ============================================ -->
<script type="text/javascript" th:src="@{/lib/user/home/rs-plugin/js/jquery.themepunch.tools.min.js}"></script> <script type="text/javascript" th:src="@{/lib/user/home/rs-plugin/js/jquery.themepunch.tools.min.js}"></script>
<script type="text/javascript" th:src="@{/lib/user/home/rs-plugin/js/jquery.themepunch.revolution.min.js}"></script> <script type="text/javascript" th:src="@{/lib/user/home/rs-plugin/js/jquery.themepunch.revolution.min.js}"></script>
<script th:src="@{/lib/user/home/rs-plugin/rs.home.js}"></script> <script th:src="@{/lib/user/home/rs-plugin/rs.home.js}"></script>
<!-- plugins js --> <!-- plugins js -->
<script th:src="@{/js/user/home/plugins.js}"></script> <script th:src="@{/js/user/home/plugins.js}"></script>
<!-- main js --> <!-- main js -->
<script th:src="@{/js/user/home/main.js}"></script> <script th:src="@{/js/user/home/main.js}"></script>
</body> </body>
</html> </html>