Merge remote-tracking branch 'origin/master'

master
jyx 7 years ago
commit f0e29bfedb

@ -23,11 +23,11 @@ public interface auditMapper {
@Select("select * from audit where userNum = #{userNum} order by applyTime")
public List<Audit> selectAudByNum(long userNum);
@Select("select * from audit where userNum = #{userNum} and checkState=1" +
@Select("select * from audit where userNum = #{userNum} and checkState=1 " +
"order by applyTime")
public List<Audit> selectByNumFinshed(long userNum);
@Select("select * from audit where userNum = #{userNum} and checkState=0" +
@Select("select * from audit where userNum = #{userNum} and checkState=0 " +
"order by applyTime")
public List<Audit> selectByNumUnfinshed(long userNum);

@ -13,12 +13,13 @@ import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.util.List;
@Controller
//@Controller
@RestController
public class compController {
@Autowired
com.example.demo.Dao.auditMapper auditMapper;
@RequestMapping("/finished")//已经完成的订单浏览的界面
@RequestMapping(value = "/finished",method = RequestMethod.POST)//已经完成的订单浏览的界面
public List<Audit> doPost(HttpServletResponse response, HttpServletRequest request){
HttpSession session=request.getSession();
User user=new User();

@ -68,7 +68,7 @@
$("#content").empty();
for (var i = 0; i <data.length; i++) {
var pro = data[i];
var str = "<a href=\"javascript:;\" class=\"aui-list-item\"><div class=\"aui-right-top\"></div><div class=\"aui-list-head\" id=\"proname\">"+pro.productName+"</div><div class=\"aui-flex\"><div class=\"aui-flex-box\"><h4>"+pro.productNum+"</h4></div><div class=\"aui-text-time\"></div><div class=\"aui-button-get\"><button id=\"apply\", onclick=\"location=\'apply.html\'\">申请</button> </div></div><div class=\"aui-dotted\"></div></a>";
var str = "<a href=\"javascript:;\" class=\"aui-list-item\"><div class=\"aui-right-top\"></div><div class=\"aui-list-head\" id=\"proname\">"+pro.productName+"</div><div class=\"aui-flex\"><div class=\"aui-flex-box\"><h4>"+pro.productNum+"</h4></div><div class=\"aui-text-time\"></div><div class=\"aui-button-get\"><button id=\"apply\", onclick=\"location=\'prodescription.html\'\">详情</button> </div></div><div class=\"aui-dotted\"></div></a>";
$("#content").append(str);
}

@ -10,6 +10,54 @@
<style type="text/css">
.tb960x90 {display:none!important;display:none}
</style>
<script type="text/javascript" src="http://libs.baidu.com/jquery/2.1.4/jquery.min.js" ></script>
<script type="text/javascript">
$(function(){
$.ajax({
url: "/finished",
type: "post",
dataType: "json",
success: function(data){
// console.log(data);//查看从后台传值内容
/*这个方法里是ajax发送请求成功之后执行的代码*/
showData(data);//我们仅做数据展示
},
error: function(msg){
alert("ajax连接异常"+msg);
}
});
});
//展示数据
function showData(data) {
//var str = "";//定义用于拼接的字符串
$("#content").empty();
for (var i = 0; i <data.length; i++) {
var aud = data[i];
var str = "<div class=\"on_d\">\n" +
"\t\t<div class=\"sp_pr\">\n" +
"\t\t\t<img src=>\n" +
"\t\t\t<div class=\"text_p\">\n" +
"\t\t\t\t<p>\n" +
"\t\t\t\t\t"+aud.amount+"元<span>银行转账</span>\n" +
"\t\t\t\t</p>\n" +
"\t\t\t\t<span class=\"yue\">"+aud.productNum+"</span>\n" +
"\t\t\t\t<span class=\"yue\">"+aud.bankAccount+"</span>\n" +
"\t\t\t</div>\n" +
"\t\t\t<div class=\"button\">\n" +
"\t\t\t\t<p>\n" +
"\t\t\t\t\t<span>"+aud.checkNum+"</span>\n" +
"\t\t\t\t</p>\n" +
"\t\t\t\t<a href=\"#\" class=\"liji\">详情</a>\n" +
"\t\t\t</div>\n" +
"\t\t</div>\n" +
"\t</div>";
$("#content").append(str);
}
}
</script>
</head>
<body>
<!--top-->
@ -28,115 +76,115 @@
</div>
</div>
<!--列表-->
<div class="ding_d">
<div class="on_d">
<div class="sp_pr">
<img src=>
<div class="text_p">
<p>
订单 <span>银行转账</span>
</p>
<span class="yue">123456</span>
<span class="yue">123456</span>
</div>
<div class="button">
<p>
<span>123456</span>
</p>
<a href="#" class="liji">详情</a>
</div>
</div>
</div>
<div class="on_d">
<div class="sp_pr">
<img src=>
<div class="text_p">
<p>
订单 <span>银行转账</span>
</p>
<span class="yue">123456</span>
<span class="yue">123456</span>
</div>
<div class="button">
<p>
<span>123456</span>
</p>
<a href="#" class="liji">详情</a>
</div>
</div>
</div>
<div class="on_d">
<div class="sp_pr">
<img src=>
<div class="text_p">
<p>
订单 <span>银行转账</span>
</p>
<span class="yue">123456</span>
<span class="yue">123456</span>
</div>
<div class="button">
<p>
<span>123456</span>
</p>
<a href="#" class="liji">详情</a>
</div>
</div>
</div>
<div class="on_d">
<div class="sp_pr">
<img src=>
<div class="text_p">
<p>
订单 <span>银行转账</span>
</p>
<span class="yue">123456</span>
<span class="yue">123456</span>
</div>
<div class="button">
<p>
<span>123456</span>
</p>
<a href="#" class="liji">详情</a>
</div>
</div>
</div>
<div class="on_d">
<div class="sp_pr">
<img src=>
<div class="text_p">
<p>
订单 <span>银行转账</span>
</p>
<span class="yue">123456</span>
<span class="yue">123456</span>
</div>
<div class="button">
<p>
<span>123456</span>
</p>
<a href="#" class="liji">详情</a>
</div>
</div>
</div>
<div class="on_d">
<div class="sp_pr">
<img src=>
<div class="text_p">
<p>
订单 <span>银行转账</span>
</p>
<span class="yue">123456</span>
<span class="yue">123456</span>
</div>
<div class="button">
<p>
<span>123456</span>
</p>
<a href="#" class="liji">详情</a>
</div>
</div>
</div>
<div class="ding_d" id="content">
<!--<div class="on_d">-->
<!--<div class="sp_pr">-->
<!--<img src=>-->
<!--<div class="text_p">-->
<!--<p>-->
<!--订单 <span>银行转账</span>-->
<!--</p>-->
<!--<span class="yue">123456</span>-->
<!--<span class="yue">123456</span>-->
<!--</div>-->
<!--<div class="button">-->
<!--<p>-->
<!--<span>123456</span>-->
<!--</p>-->
<!--<a href="#" class="liji">详情</a>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="on_d">-->
<!--<div class="sp_pr">-->
<!--<img src=>-->
<!--<div class="text_p">-->
<!--<p>-->
<!--订单 <span>银行转账</span>-->
<!--</p>-->
<!--<span class="yue">123456</span>-->
<!--<span class="yue">123456</span>-->
<!--</div>-->
<!--<div class="button">-->
<!--<p>-->
<!--<span>123456</span>-->
<!--</p>-->
<!--<a href="#" class="liji">详情</a>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="on_d">-->
<!--<div class="sp_pr">-->
<!--<img src=>-->
<!--<div class="text_p">-->
<!--<p>-->
<!--订单 <span>银行转账</span>-->
<!--</p>-->
<!--<span class="yue">123456</span>-->
<!--<span class="yue">123456</span>-->
<!--</div>-->
<!--<div class="button">-->
<!--<p>-->
<!--<span>123456</span>-->
<!--</p>-->
<!--<a href="#" class="liji">详情</a>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="on_d">-->
<!--<div class="sp_pr">-->
<!--<img src=>-->
<!--<div class="text_p">-->
<!--<p>-->
<!--订单 <span>银行转账</span>-->
<!--</p>-->
<!--<span class="yue">123456</span>-->
<!--<span class="yue">123456</span>-->
<!--</div>-->
<!--<div class="button">-->
<!--<p>-->
<!--<span>123456</span>-->
<!--</p>-->
<!--<a href="#" class="liji">详情</a>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="on_d">-->
<!--<div class="sp_pr">-->
<!--<img src=>-->
<!--<div class="text_p">-->
<!--<p>-->
<!--订单 <span>银行转账</span>-->
<!--</p>-->
<!--<span class="yue">123456</span>-->
<!--<span class="yue">123456</span>-->
<!--</div>-->
<!--<div class="button">-->
<!--<p>-->
<!--<span>123456</span>-->
<!--</p>-->
<!--<a href="#" class="liji">详情</a>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="on_d">-->
<!--<div class="sp_pr">-->
<!--<img src=>-->
<!--<div class="text_p">-->
<!--<p>-->
<!--订单 <span>银行转账</span>-->
<!--</p>-->
<!--<span class="yue">123456</span>-->
<!--<span class="yue">123456</span>-->
<!--</div>-->
<!--<div class="button">-->
<!--<p>-->
<!--<span>123456</span>-->
<!--</p>-->
<!--<a href="#" class="liji">详情</a>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
</div>
</body>
</html>

@ -10,6 +10,54 @@
<style type="text/css">
.tb960x90 {display:none!important;display:none}
</style>
<script type="text/javascript" src="http://libs.baidu.com/jquery/2.1.4/jquery.min.js" ></script>
<script type="text/javascript">
$(function(){
$.ajax({
url: "/unfinished",
type: "post",
dataType: "json",
success: function(data){
// console.log(data);//查看从后台传值内容
/*这个方法里是ajax发送请求成功之后执行的代码*/
showData(data);//我们仅做数据展示
},
error: function(msg){
alert("ajax连接异常"+msg);
}
});
});
//展示数据
function showData(data) {
//var str = "";//定义用于拼接的字符串
$("#content").empty();
for (var i = 0; i <data.length; i++) {
var aud = data[i];
var str = "<div class=\"on_d\">\n" +
"\t\t<div class=\"sp_pr\">\n" +
"\t\t\t<img src=>\n" +
"\t\t\t<div class=\"text_p\">\n" +
"\t\t\t\t<p>\n" +
"\t\t\t\t\t"+aud.amount+"元<span>银行转账</span>\n" +
"\t\t\t\t</p>\n" +
"\t\t\t\t<span class=\"yue\">"+aud.productNum+"</span>\n" +
"\t\t\t\t<span class=\"yue\">"+aud.bankAccount+"</span>\n" +
"\t\t\t</div>\n" +
"\t\t\t<div class=\"button\">\n" +
"\t\t\t\t<p>\n" +
"\t\t\t\t\t<span>"+aud.checkNum+"</span>\n" +
"\t\t\t\t</p>\n" +
"\t\t\t\t<a href=\"#\" class=\"liji\">详情</a>\n" +
"\t\t\t</div>\n" +
"\t\t</div>\n" +
"\t</div>";
$("#content").append(str);
}
}
</script>
</head>
<body>
<!--top-->
@ -28,115 +76,115 @@
</div>
</div>
<!--列表-->
<div class="ding_d">
<div class="on_d">
<div class="sp_pr">
<img src=>
<div class="text_p">
<p>
订单 <span>银行转账</span>
</p>
<span class="yue">123456</span>
<span class="yue">123456</span>
</div>
<div class="button">
<p>
<span>123456</span>
</p>
<a href="#" class="liji">详情</a>
</div>
</div>
</div>
<div class="on_d">
<div class="sp_pr">
<img src=>
<div class="text_p">
<p>
订单 <span>银行转账</span>
</p>
<span class="yue">123456</span>
<span class="yue">123456</span>
</div>
<div class="button">
<p>
<span>123456</span>
</p>
<a href="#" class="liji">详情</a>
</div>
</div>
</div>
<div class="on_d">
<div class="sp_pr">
<img src=>
<div class="text_p">
<p>
订单 <span>银行转账</span>
</p>
<span class="yue">123456</span>
<span class="yue">123456</span>
</div>
<div class="button">
<p>
<span>123456</span>
</p>
<a href="#" class="liji">详情</a>
</div>
</div>
</div>
<div class="on_d">
<div class="sp_pr">
<img src=>
<div class="text_p">
<p>
订单 <span>银行转账</span>
</p>
<span class="yue">123456</span>
<span class="yue">123456</span>
</div>
<div class="button">
<p>
<span>123456</span>
</p>
<a href="#" class="liji">详情</a>
</div>
</div>
</div>
<div class="on_d">
<div class="sp_pr">
<img src=>
<div class="text_p">
<p>
订单 <span>银行转账</span>
</p>
<span class="yue">123456</span>
<span class="yue">123456</span>
</div>
<div class="button">
<p>
<span>123456</span>
</p>
<a href="#" class="liji">详情</a>
</div>
</div>
</div>
<div class="on_d">
<div class="sp_pr">
<img src=>
<div class="text_p">
<p>
订单 <span>银行转账</span>
</p>
<span class="yue">123456</span>
<span class="yue">123456</span>
</div>
<div class="button">
<p>
<span>123456</span>
</p>
<a href="#" class="liji">详情</a>
</div>
</div>
</div>
<div class="ding_d" id="content">
<!--<div class="on_d">-->
<!--<div class="sp_pr">-->
<!--<img src=>-->
<!--<div class="text_p">-->
<!--<p>-->
<!--订单 <span>银行转账</span>-->
<!--</p>-->
<!--<span class="yue">123456</span>-->
<!--<span class="yue">123456</span>-->
<!--</div>-->
<!--<div class="button">-->
<!--<p>-->
<!--<span>123456</span>-->
<!--</p>-->
<!--<a href="#" class="liji">详情</a>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="on_d">-->
<!--<div class="sp_pr">-->
<!--<img src=>-->
<!--<div class="text_p">-->
<!--<p>-->
<!--订单 <span>银行转账</span>-->
<!--</p>-->
<!--<span class="yue">123456</span>-->
<!--<span class="yue">123456</span>-->
<!--</div>-->
<!--<div class="button">-->
<!--<p>-->
<!--<span>123456</span>-->
<!--</p>-->
<!--<a href="#" class="liji">详情</a>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="on_d">-->
<!--<div class="sp_pr">-->
<!--<img src=>-->
<!--<div class="text_p">-->
<!--<p>-->
<!--订单 <span>银行转账</span>-->
<!--</p>-->
<!--<span class="yue">123456</span>-->
<!--<span class="yue">123456</span>-->
<!--</div>-->
<!--<div class="button">-->
<!--<p>-->
<!--<span>123456</span>-->
<!--</p>-->
<!--<a href="#" class="liji">详情</a>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="on_d">-->
<!--<div class="sp_pr">-->
<!--<img src=>-->
<!--<div class="text_p">-->
<!--<p>-->
<!--订单 <span>银行转账</span>-->
<!--</p>-->
<!--<span class="yue">123456</span>-->
<!--<span class="yue">123456</span>-->
<!--</div>-->
<!--<div class="button">-->
<!--<p>-->
<!--<span>123456</span>-->
<!--</p>-->
<!--<a href="#" class="liji">详情</a>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="on_d">-->
<!--<div class="sp_pr">-->
<!--<img src=>-->
<!--<div class="text_p">-->
<!--<p>-->
<!--订单 <span>银行转账</span>-->
<!--</p>-->
<!--<span class="yue">123456</span>-->
<!--<span class="yue">123456</span>-->
<!--</div>-->
<!--<div class="button">-->
<!--<p>-->
<!--<span>123456</span>-->
<!--</p>-->
<!--<a href="#" class="liji">详情</a>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="on_d">-->
<!--<div class="sp_pr">-->
<!--<img src=>-->
<!--<div class="text_p">-->
<!--<p>-->
<!--订单 <span>银行转账</span>-->
<!--</p>-->
<!--<span class="yue">123456</span>-->
<!--<span class="yue">123456</span>-->
<!--</div>-->
<!--<div class="button">-->
<!--<p>-->
<!--<span>123456</span>-->
<!--</p>-->
<!--<a href="#" class="liji">详情</a>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
</div>
</body>
</html>

@ -32,8 +32,8 @@
</header>
<!-- Hero Section -->
<section class="hero" id="hero">
<h2 class="hero_header">标题 <span class="light">标题</span></h2>
<p class="tagline">标题下面内容</p>
<h2 class="hero_header">产品 <span class="light">标题</span></h2>
<p class="tagline">产品介绍</p>
</section>
<!-- About Section -->
<section class="about" id="about">
@ -87,7 +87,7 @@
<section class="footer_banner" id="contact">
<h2 class="hidden">Footer Banner Section </h2>
<p class="hero_header">了解 &amp; 更多</p>
<div class="button" onclick="window.location=''">申请</div>
<div class="button" onclick="window.location='loanInformation.html'">申请</div>
</section>
<!-- Copyrights Section --></div>
<!-- Main Container Ends -->

@ -34,7 +34,7 @@
$("#content").empty();
for (var i = 0; i <data.length; i++) {
var pro = data[i];
var str = "<a href=\"javascript:;\" class=\"aui-list-item\"><div class=\"aui-right-top\"></div><div class=\"aui-list-head\" id=\"proname\">"+pro.productName+"</div><div class=\"aui-flex\"><div class=\"aui-flex-box\"><h4>"+pro.productNum+"</h4></div><div class=\"aui-text-time\"></div><div class=\"aui-button-get\"><button id=\"apply\", onclick=\"location=\'apply.html\'\">申请</button> </div></div><div class=\"aui-dotted\"></div></a>";
var str = "<a href=\"javascript:;\" class=\"aui-list-item\"><div class=\"aui-right-top\"></div><div class=\"aui-list-head\" id=\"proname\">"+pro.productName+"</div><div class=\"aui-flex\"><div class=\"aui-flex-box\"><h4>"+pro.productNum+"</h4></div><div class=\"aui-text-time\"></div><div class=\"aui-button-get\"><button id=\"apply\", onclick=\"location=\'prodescription.html\'\">详情</button> </div></div><div class=\"aui-dotted\"></div></a>";
$("#content").append(str);
}

@ -46,7 +46,7 @@
"\t\t\t\t\t</div>\n" +
"\t\t\t\t\t<div class=\"aui-text-time\"> </div>\n" +
"\t\t\t\t\t<div class=\"aui-button-get\">\n" +
"\t\t\t\t\t\t<button id=\"apply\", onclick=\"location='loanInformation.html'\">申请</button>\n" +
"\t\t\t\t\t\t<button id=\"apply\", onclick=\"location='prodescription.html'\">详情</button>\n" +
"\t\t\t\t\t</div>\n" +
"\t\t\t\t</div>\n" +
"\t\t\t\t<div class=\"aui-dotted\"> </div>\n" +

Loading…
Cancel
Save