Merge remote-tracking branch 'origin/master'

# Conflicts:
#	demo/src/main/resources/static/myOrders.html
master
jyx 7 years ago
commit 96ccd398de

File diff suppressed because one or more lines are too long

@ -13,7 +13,7 @@
<meta name="format-detection" content="telephone=no" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<link href="SYSFrame.css" rel="stylesheet" type="text/css" />
<link href="iconfont.css" rel="stylesheet" type="text/css" />
<link href="addproduct.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="sys-verification.min.js" >
<script type="text/javascript" src="sha1.js"></script>
<style type="text/css">

File diff suppressed because one or more lines are too long

@ -7,6 +7,9 @@ import com.example.demo.order.service.impl.orderServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@ -18,12 +21,13 @@ import java.util.List;
*/
@Controller
//@Controller
@RestController
public class showController extends HttpServlet {
@Autowired
orderServiceImpl orderService;
@PostMapping("/order")//订单浏览的界面
@RequestMapping(value = "/order",method = RequestMethod.POST)//订单浏览的界面
public List<Audit> doPost(HttpServletResponse response, HttpServletRequest request){
HttpSession session=request.getSession();
User user=new User();

@ -0,0 +1,36 @@
package com.example.demo.userInfo.controller;
import com.alibaba.fastjson.JSONObject;
import com.example.demo.bean.Product;
import com.example.demo.bean.User;
import com.example.demo.loginService.API.impl.UserService;
import com.example.demo.loginService.API.impl.UserServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@RestController
public class UserInfoControler {
@Autowired
private UserService userService;
@RequestMapping(value = "/info",method = RequestMethod.POST)
public void UserInfo(HttpServletRequest request, HttpServletResponse response)throws ServletException, IOException {
response.setContentType("text/html;charset=utf-8");
HttpSession session = request.getSession();
User user1 = (User)session.getAttribute("user");
User user2 =userService.selectUserByuserName(user1.getUserName());
String data = JSONObject.toJSONString(user2);
response.getWriter().print(data);
System.out.println(data);
}
}

@ -0,0 +1,7 @@
package com.example.demo.userInfo.service;
import com.example.demo.bean.User;
public interface UserInfoService {
User selectUserByuserName(String userName);
}

@ -0,0 +1,17 @@
package com.example.demo.userInfo.service.impl;
import com.example.demo.Dao.userMapper;
import com.example.demo.bean.User;
import com.example.demo.userInfo.service.UserInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class UserInfoServiceImpl implements UserInfoService {
@Autowired
userMapper userMapper;
@Override
public User selectUserByuserName(String userName) {
return userMapper.selectUserByuserName(userName);
}
}

@ -4,9 +4,9 @@ spring:
prefix:
suffix: .html
datasource:
url: jdbc:mysql://localhost:3306/loan?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
url: jdbc:mysql://localhost:3306/finance?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
username: root
password: 12345678
password: root1234
driver-class-name: com.mysql.cj.jdbc.Driver
mybatis:
type-aliases-package: com.example.demo.Dao

@ -0,0 +1,74 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="maximum-scale=1.0,minimum-scale=1.0,user-scalable=0,width=device-width,initial-scale=1.0" />
<meta name="format-detection" content="telephone=no, email=no, date=no, address=no">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta http-equiv="Pragma" content="no-cache">
<!-- pragma 清除缓存-->
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="format-detection" content="telephone=no" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<link href="js/SYSFrame.css" rel="stylesheet" type="text/css" />
<link href="js/addproduct.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="sys-verification.min.js" >
<script type="text/javascript" src="sha1.js"></script>
<style type="text/css">
.word_count {
padding: 0 10px;
color: #999999;
}
.word_count .number {
color: #CB2D30
}
</style>
</head>
<body>
<div class="margin20"> </div>
<div class="height100b">
<div class="title-name text-left">产品信息</div>
<div id="pluginContent">
<ul class="info_list clearfix padding15" id="VerifyTips">
<li class=" clearfix content_look mb15">
<label class="label_name"><em style="color:Red;">*</em>产品名:</label>
<span class="info_data"><input data-name="产品名" data-value="name" type="text" name="Required" class="text_input col-sm-4" data-verify="verify" /></span>
</li>
<li class=" clearfix content_look mb15">
<label class="label_name"><em style="color:Red;">*</em>产品序号:</label>
<span class="info_data"><input data-name="序号" type="text" name="Required" data-value="password" class="text_input col-sm-4" data-prompt="password" data-verify="verify"/>
</span>
</li>
<li class=" clearfix content_look mb15">
<label class="label_name"><em style="color:Red;">*</em>产品信息:</label>
<span class="info_data"><input data-name="确认密码" type="text" name="Required" class="text_input col-sm-4" data-prompt="confirm" data-verify="verify"/>
</span>
</li>
<li class=" clearfix content_look mb15">
<label class="label_name">详细介绍:</label>
<span class="info_data">
<textarea data-name="说明" name="Required" data-stint="Wordcount" size="40" data-value="illustrate" class="form-textarea col-sm-6 textarea height100" id="form_textarea" placeholder=""></textarea>
</span>
</li>
<li class=" clearfix content_look mb15">
<label class="label_name"><em style="color:Red;">*</em>简介:</label>
<div class="info_data">
<input data-name="简介" name="Required" type="text" id="addjianjie" data-value="summary" class="text_input col-sm-6" data-verify="verify" />
</div>
</li>
<li class="buttonstyle">
<button type="button" class="btn padding10 bg-deep-blue" id="modifybtn">添加产品</button>
</li>
</ul>
</div>
</div>
</body>
</html>
<script>
</script>

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

@ -9,37 +9,37 @@
<meta content="telephone=no" name="format-detection"/>
<link href="css/myOrders.css" rel="stylesheet" type="text/css"/>
<!--<script type="text/javascript" src="js/myorder.js"></script>-->
<script type="text/javascript" src="http://apps.bdimg.com/libs/jquery/2.1.1/jquery.min.js" ></script>
<!--<script type="text/javascript" src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js" ></script>-->
<script type="text/javascript" src="http://libs.baidu.com/jquery/2.1.4/jquery.min.js" ></script>
<script type="text/javascript">
$(function () {
$(function(){
$.ajax({
url: "/order",
type: "post",
dataType: "json",
success: function(data){
// console.log(data);//查看从后台传值内容
/*这个方法里是ajax发送请求成功之后执行的代码*/
alert(data);
showData(data);//我们仅做数据展示
},
error: function(msg){
alert("连接异常:"+msg);
alert("ajax连接异常:"+msg);
}
});
});
//展示数据
function showData(data) {
$("#userNum").html(data[1].userNum)
$("#num").empty();
for (var i = 0; i < data.length; i++) {
var audit = data[i];
//var str = "";//定义用于拼接的字符串
$("#content").empty();
for (var i = 0; i <data.length; i++) {
var aud = data[i];
var str = "<a href=\"javascript:;\" class=\"aui-list-item\">\n" +
" <div class=\"aui-right-top\"> </div>\n" +
" <div class=\"aui-list-head\">"+audit.applyTime+"</div>\n" +
" <div class=\"aui-list-head\">"+aud.applyTime+"</div>\n" +
" <div class=\"aui-flex\">\n" +
" <div class=\"aui-flex-box\">\n" +
" <h4>"+audit.checkNum+"</h4>\n" +
" <h4>"+aud.checkNum+"</h4>\n" +
" \n" +
" </div>\n" +
" <div class=\"aui-text-time\"> </div>\n" +
@ -49,16 +49,75 @@
" </div>\n" +
" <div class=\"aui-dotted\"> </div>\n" +
" </a>";
//var str=" <h2 >"+data[i].productName+"</h2>"
//var $h2 =$(str);
$("#num").append(str);
$("#content").append(str);
}
}
$(function(){
$.ajax({
url: "/info",
type: "post",
dataType: "json",
success: function(data){
$("#username").empty();
$("#username").html(data.userName);
},
error: function(msg){
alert("ajax连接异常"+msg);
}
});
});
</script>
<!--<script type="text/javascript">-->
<!--$(document).ready(function () {-->
<!--$.ajax({-->
<!--url: "/order",-->
<!--type: "post",-->
<!--dataType: "json",-->
<!--success: function(data){-->
<!--/*这个方法里是ajax发送请求成功之后执行的代码*/-->
<!--alert(data);-->
<!--showData(data);//我们仅做数据展示-->
<!--},-->
<!--error: function(msg){-->
<!--alert("ajax连接异常"+msg);-->
<!--}-->
<!--});-->
<!--});-->
</script>
<!--//展示数据-->
<!--function showData(data) {-->
<!--$("#userNum").html(data[1].userNum)-->
<!--$("#num").empty();-->
<!--for (var i = 0; i < data.length; i++) {-->
<!--var audit = data[i];-->
<!--var str = "<a href=\"javascript:;\" class=\"aui-list-item\">\n" +-->
<!--" <div class=\"aui-right-top\"> </div>\n" +-->
<!--" <div class=\"aui-list-head\">"+audit.applyTime+"</div>\n" +-->
<!--" <div class=\"aui-flex\">\n" +-->
<!--" <div class=\"aui-flex-box\">\n" +-->
<!--" <h4>"+audit.checkNum+"</h4>\n" +-->
<!--" \n" +-->
<!--" </div>\n" +-->
<!--" <div class=\"aui-text-time\"> </div>\n" +-->
<!--" <div class=\"aui-button-get\">\n" +-->
<!--" <button>详情</button>\n" +-->
<!--" </div>\n" +-->
<!--" </div>\n" +-->
<!--" <div class=\"aui-dotted\"> </div>\n" +-->
<!--" </a>";-->
<!--//var str=" <h2 >"+data[i].productName+"</h2>"-->
<!--//var $h2 =$(str);-->
<!--$("#num").append(str);-->
<!--}-->
<!--}-->
<!--</script>-->
</head>
<body>
@ -83,12 +142,12 @@
<img src="images/myOrders.png">
</div>
<div class="aui-flex-box">
<h2>用户 <em id="userNum">XXX</em></h2>
<h2><em id="username">XXX</em></h2>
</div>
<div class="aui-pri-button"> </div>
</div>
</div>
<div class="aui-list-box" id="num">
<div class="aui-list-box" id="content">
<!--<a href="javascript:;" class="aui-list-item">-->
<!--<div class="aui-right-top"> </div>-->
<!--<div class="aui-list-head">订单1</div>-->

@ -8,6 +8,33 @@
<meta content="black" name="apple-mobile-web-app-status-bar-style"/>
<meta content="telephone=no" name="format-detection"/>
<link href="css/personalCenter.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="http://libs.baidu.com/jquery/2.1.4/jquery.min.js" ></script>
<script type="text/javascript">
$(function(){
$.ajax({
url: "/info",
type: "post",
dataType: "json",
success: function(data){
// console.log(data);//查看从后台传值内容
/*这个方法里是ajax发送请求成功之后执行的代码*/
showData(data);//我们仅做数据展示
},
error: function(msg){
alert("ajax连接异常"+msg);
}
});
});
//展示数据
function showData(data) {
//var str = "";//定义用于拼接的字符串
$("#username").empty();
$("#username").html(data.userName);
}
</script>
</head>
<body>
@ -33,7 +60,7 @@
<img src="images/personalCenter-user-logo.png" >
</div>
<div class="aui-flex-box">
<h2>李同学</h2>
<h2 id="username">***</h2>
</div>
<div class="aui-account-arrow"></div>
</div>

Loading…
Cancel
Save