Merge branch 'master' of ssh://10.10.101.21/source/platform-home into dev

src/main/java/com/uas/platform/home/controller/FinanceController.java

@@ -0,0 +1,41 @@
+package com.uas.platform.home.controller;
+
+
+import com.uas.platform.home.core.support.SystemSession;
+import com.uas.platform.home.core.util.HttpUtil;
+import com.uas.platform.home.model.HttpAddress;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * created by shicr on 2017/11/23
+ **/
+@RestController
+@RequestMapping("/finance")
+public class FinanceController {
+
+    @Autowired
+    private HttpAddress httpAddress;
+
+    @RequestMapping(value = "/loan")
+    public String loan(String jsonStr) {
+        String url = httpAddress.getLoanAddress();
+        if (null != SystemSession.getUser() && null != SystemSession.getUser().getDialectUID()) {
+            url = url + "?UID=" + Long.parseLong(SystemSession.getUser().getDialectUID());
+        }
+        try {
+           HttpUtil.Response response =  HttpUtil.doPost(url + "?UID=" + "", jsonStr, 5000);
+           if(200 == response.getStatusCode())
+               return "success";
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return "申请失败";
+    }
+
+
+}

src/main/java/com/uas/platform/home/controller/UuzcController.java

@@ -137,7 +137,9 @@ public class UuzcController extends BaseController {
      */
     @RequestMapping(value = "/hrInfo", method = RequestMethod.GET)
     public ModelMap getHrInfo() throws Exception {
-        User user = AccountUtils.getHrInfo(SystemSession.getUser().getSpaceUID());
-        return new ModelMap("user", user);
+        if(null != SystemSession.getUser()) {
+            return new ModelMap("user", AccountUtils.getHrInfo(SystemSession.getUser().getSpaceUID()));
+        }
+        return null;
     }
 }

src/main/java/com/uas/platform/home/model/HttpAddress.java

@@ -0,0 +1,33 @@
+package com.uas.platform.home.model;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+/**
+ * created by shicr on 2017/11/27
+ **/
+@Component
+public class HttpAddress {
+    private static final long serialVersionUID = 1L;
+
+    private String sys;
+
+    @Value("#{url.loanAddress}")
+    private String loanAddress;
+
+    public String getLoanAddress() {
+        return loanAddress;
+    }
+
+    public void setLoanAddress(String loanAddress) {
+        this.loanAddress = loanAddress;
+    }
+
+    public String getSys() {
+        return sys;
+    }
+
+    public void setSys(String sys) {
+        this.sys = sys;
+    }
+}

src/main/resources/conf/account.properties

@@ -12,4 +12,4 @@ sso.login.url=https://account.ubtob.com/sso/login
 account.us.save.url=http://10.10.100.133:8080/api/userspace
 account.user.save.url=http://10.10.100.133:8080/api/user
 account.user.getPartners.url = http://10.10.100.133:8080/api/partners
-account.user.getContactPage.url=https://account.ubtob.com/business/groups
+account.user.getContactPage.url=https://account.ubtob.com/business/groups

src/main/resources/conf/httpAddress.properties

@@ -0,0 +1 @@
+loanAddress=http://192.168.253.227:8082/loan/saveInfo

src/main/resources/spring/applicationContext.xml

@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:task="http://www.springframework.org/schema/task"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
 	xmlns:cache="http://www.springframework.org/schema/cache" xmlns:util="http://www.springframework.org/schema/util"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd   
 	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd
-	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.1.xsd
-	http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.1.xsd
-	http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.1.xsd
-	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
-	http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache-4.1.xsd">
+	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
 	<!-- 注册spring上下文对象 -->
 	<bean class="com.uas.platform.home.core.support.ApplicationContextRegister" />
@@ -26,4 +21,6 @@
 		<property name="configPath" value="classpath:conf/account.properties" />
 	</bean>
 
+	<util:properties id="url"
+					 location="classpath:conf/httpAddress.properties" />
 </beans>

src/main/webapp/WEB-INF/views/normal/finance.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" xmlns="http://www.w3.org/1999/html">
 <head>
     <meta charset="UTF-8">
     <title>金融服务</title>
@@ -9,64 +9,73 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="renderer" content="webkit">
-    <link href="static/images/icon.png" rel="icon" type="image/x-icon" />
-    <link rel="stylesheet" href="static/lib/bootstrap/css/bootstrap.min.css" />
-    <link rel="stylesheet" href="static/css/common.css" />
-    <link rel="stylesheet" href="static/css/index.css" />
+    <link href="static/images/icon.png" rel="icon" type="image/x-icon"/>
+    <link rel="stylesheet" href="static/lib/bootstrap/css/bootstrap.min.css"/>
+    <link rel="stylesheet" href="static/css/common.css"/>
+    <link rel="stylesheet" href="static/css/index.css"/>
 
 </head>
 <style>
-    .finance{
+    .finance {
         width: 100%;
         margin: 0 auto;
         z-index: 1;
     }
-    .width1170{
+
+    .width1170 {
         width: 1170px;
         margin: 0 auto;
     }
-    .finance .banner{
+
+    .finance .banner {
         width: 100%;
         margin: 0 auto;
         max-height: 600px;
     }
-    .finance .banner img{
+
+    .finance .banner img {
         width: 100%;
-        margin-top:20px;
+        margin-top: 20px;
     }
 
-    .finance .item{
+    .finance .item {
         width: 100%;
         margin: 0 auto;
         height: 540px;
     }
-    .finance .img{
+
+    .finance .img {
         float: left;
         margin: 0px 0 0 15px;
     }
-    .finance .title{
+
+    .finance .title {
         float: right;
         text-align: center;
         margin: 15px 180px 0 0
     }
-    .finance .title h2{
+
+    .finance .title h2 {
         font-size: 30px;
         color: #0080cc;
         line-height: 30px;
         text-align: left;
     }
-    .finance .title p{
+
+    .finance .title p {
         font-size: 14px;
         color: #666;
         line-height: 25px;
         text-align: left;
     }
-    .finance .item .title p.f18{
+
+    .finance .item .title p.f18 {
         font-size: 18px;
         color: #333;
         margin: 12px 0 6px 0;
     }
-    .finance .title a{
+
+    .finance .title a {
         display: inline-block;
         width: 200px;
         height: 50px;
@@ -81,82 +90,220 @@
 
         top: 12px;
     }
-    .finance .title a:hover{
+
+    .finance .title a:hover {
         text-decoration: none;
         background: #25a0cc;
         cursor: pointer;
     }
 
-    #loan{
-    z-index:20;
-    position:absolute;
-    width:800px;
-    height:720px;
-    margin-top:400px;
-    margin-left:240px;
-    padding:30px;
-    background-color:white;
-    border-radius: 5px;
-    box-shadow:0 0 15px rgba(0, 0, 0, 0.7);
-    background: linear-gradient(0deg, rgb(238, 238, 238) 0%, whitesmoke 100%)
-    }
-    #loan div input{
-        font: 13.3333px Arial;
-        color: initial;
-        letter-spacing: normal;
-        word-spacing: normal;
-    }
-    #loan button{
-        background-color: #56a2cf;
-        color: white;
-    }
-    #note{
+
+    #note {
         padding-bottom: 12px;
     }
-    #layer{
-        height:1500px;
-        display:block;
-        background-color:black;
-        z-index:10;
-        position:absolute;
-        top:0px;
-        opacity: 0.4
-    }
-    #span2{
+
+    #span2 {
         padding-left: 150px;
     }
-    #span4{
+
+    #span4 {
         padding-left: 95px;
     }
-    #span6{
+
+    #span6 {
         padding-left: 25px;
     }
-    #span11{
-        padding-left: 65px;
+
+    #span11 {
+        padding-left: 145px;
+    }
+    #check2{
+        color:cornflowerblue;
+        margin-left:30px;
+        cursor: pointer;
     }
+    #note{
+        display: none;
+        padding-left: 30px;
+    }
+    .p2{
+        text-indent:30px
+    }
+    .modal-dialog {
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+    }
+
+    .modal-content {
+        /*overflow-y: scroll; */
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        width: 100%;
+    }
+
+    .modal-body {
+        overflow-y: scroll;
+        position: absolute;
+        top: 55px;
+        bottom: 65px;
+        width: 100%;
+    }
+
+    .modal-header .close {margin-right: 15px;}
 
+    .modal-footer {
+        position: absolute;
+        width: 100%;
+        bottom: 0;
+    }
 </style>
 <body>
+<!--企业征信查询及系统数据获取授权书-->
+<div class="modal fade" id="applyModal1" tabindex="-1" role="dialog" aria-labelledby="applyModalLabel">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span>
+                </button>
+                <h4 class="modal-title" >企业征信查询及系统数据获取授权书</h4>
+            </div>
+            <div class="modal-body">
+                <br>重要提示：</br>
+                <p class="p2">为了保障贵司的合法权益，贵司应当阅读并遵守本授权书，请贵司务必审慎阅读、充分理解本授权书条款内容，特别是免除或减轻我公司责任，或限制贵公司权力的条款，其中免除或者减轻责任条款可能以加粗形式提示贵司注意。贵公司的使用、登录、发起申请等行为即视为贵公司已阅读并同意本授权书条款的约束。</p>
+                <p class="p2"> 致深圳市英唐金控科技有限公司：</p>
+                <p>   一、本公司同意并不可撤销地授权：贵公司按照国家相关规定采集符合法律法规规定的公司信息及包括信贷信息在内的信用信息；</p>
+                <p>   二、本公司同意并不可撤销地授权：贵公司可以根据国家有关规定，通过中国人民银行金融信用信息基础数据库、其他依法设立的征信机构查询打印、保存符合法律法规的企业信息和包括信贷信息在内的信用信息。</p>
+                <p>   三、本公司同意并不可撤销地授权：贵公司在本公司使用的深圳市优软科技有限公司ERP系统、B2B平台、优软商城等上自动获取包括但不限于我公司的基本企业信息、财务数据数据信息、采购数据信息、销售数据信息、交易数据信息、生产加工信息、产品信息等。</p>
+                <p class="p2">    以上相关信息和数据的采集及使用期限为与贵公司的业务存续期用途如下：</p>
+                <p>  （一）审核本公司相关金融业务申请；
+                <p>   （二）处理贷后管理事务；
+                <p>  （三）处理企业征信异议；
+                <p>  （四）依法或经有权部门要求；
+                <p>   （五）其他本公司向贵公司申请或办理的业务。
+                <p class="p2">  我司已知悉本授权书全部内容（特别是加粗字体内容）的含义及因此产生的法律效力，自愿作出以上授权。本授权书是我司真实意思表示，我司同意承担由此带来的一切法律后果。
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal">取消</button>
+                <button class="btn btn-primary" id="agree">同意</button>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- Modal -->
+<div class="modal fade" id="applyModal" tabindex="-1" role="dialog" aria-labelledby="applyModalLabel">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span>
+                </button>
+                <h4 class="modal-title" id="applyModalLabel">立即申请</h4>
+            </div>
+            <div class="modal-body">
+                <div class="form-horizontal">
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">企业名称</label>
+                        <div class="col-sm-6">
+                            <input type="text" placeholder="请输入企业名称" class="form-control" id="loanCommpanyName">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">拟融资金额</label>
+                        <div class="col-sm-4">
+                            <div class="input-group">
+                                <input type="text" placeholder="请输入融资金额" class="form-control" id="loanAmount"
+                                       onkeyup="if(isNaN(value))execCommand('undo')"
+                                       onafterpaste="if(isNaN(value))execCommand('undo')">
+                                <div class="input-group-addon">元</div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">联系人</label>
+                        <div class="col-sm-4">
+                            <input type="text" placeholder="请输入您的姓名" class="form-control" id="loanName">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">联系方式</label>
+                        <div class="col-sm-4">
+                            <input type="text" placeholder="请输入您的手机号" class="form-control" id="loanTelphone">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <div class="col-sm-10 col-sm-offset-2">
+                            <input type="checkbox" id="check">同意应开展应收账款保理业务而查询相关数据
+                        </div>
+                        <div class="col-sm-10 col-sm-offset-2">
+                            <input type="checkbox" id="check1">同意因开展应收账款保理业务提供相关材料
+                        </div>
+                        <p id="check2">需提供资料清单</p>
+                    </div>
+                    <div id="note">
+                        需提供以下资料清单（加盖公章)<br>
+                        <span>1、营业执照复印件</span> <span id="span2"> 2、组织机构代码证复印件</span><br>
+                        <span>3、国税、地税登记证复印件</span> <span id="span4"> 4、开户许可证复印件</span><br>
+                        <span>5、法人代表及实际控制人身份证复印件</span> <span id="span6">6、法人代表证明书</span><br>
+                        <span>7、公司近三年审计报告及最近一期的财务报表及科目明细（前五大）</span><br>
+                        <span>8、近1年主要结算银行流水对账单和用于公司账务结算的个人账户结算单复印件</span><br>
+                        <span>9、前五大上下游客户近一年贸易合同，货运证明或其他表明货物确已发运的单据；交易发票；提货单、质检证明（凭证）、预付款（定金）凭证复印件</span><br>
+                        <span>10、公司基本情况表</span><span id="span11">11、拟融资应收账款发票清单、采购合同明细</span><br>
+                        <span>12、拟融资应收账款客户近一年的付款凭证（银行回单）</span><br>
+                        <span>13、拟融资应收账款相关贸易合同，货运证明或其他表明货物确已发运的单据；交易发票；提货单、质检证明（凭证）、预付款（定金）凭证</span><br>
+                        <span> 14、近两年缴税完税凭证、水电费单、员工工资单等证明文件</span><br>
+                        <span>15、我公司要求的其他资料</span><br>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal">取消</button>
+                <button class="btn btn-primary" id="loanSubmit">提交申请</button>
+            </div>
+        </div>
+    </div>
+</div>
+
 
 <!-- nav start -->
 <nav id="nav" class="navbar navbar-inverse navbar-fixed-top">
     <div class="container">
         <div class="navbar-header">
-            <a href="./" id="logo"><img src="static/img/logo.png" alt="" height="25px" /></a>
+            <a href="" id="logo"><img src="static/img/logo.png" alt="" height="25px"/></a>
         </div>
         <div class="collapse navbar-collapse">
             <ul class="nav navbar-nav navbar-left">
                 <li><a href="http://uas.ubtob.com" class="link-b2b">B2B商务</a></li>
-                <li><a href="http://www.usoftmall.com" class="link-mall">优软商城</a></li>
+                <li><a href="http://www.usoftmall.com/" class="link-mall">优软商城</a></li>
                 <li><a href="saas/about" class="link-saas">优企云服</a></li>
-                <li><a href="#/finance" class="link-finance">金融服务</a></li>
-                <!-- http://finance.ubtob.com -->
-                <li><a href="#/public" class="link-public">公共服务</a></li>
-                <!-- http://public.ubtob.com -->
-                <li><a href="#/member" class="link-member">会员中心</a></li>
-                <!-- http://member.ubtob.com -->
-                <li><a href="#/help" class="link-help">服务专区</a></li>
-                <!-- http://help.ubtob.com -->
+                <li><a href="/finance" class="link-finance">金融服务</a></li><!-- http://finance.ubtob.com -->
+                <li><a href="#/uuzcJob" class="link-job">人才招聘</a></li><!-- http://public.ubtob.com -->
+                <li>
+                    <!--<a href="http://www.uuzcc.com/" class="">UU众创</a>-->
+                    <!--<ul>-->
+                    <!--<li><a href="http://zb.uuzcc.com/">任务外包</a></li>-->
+                    <!--<li><a href="http://fangan.uuzcc.com/">方案商城</a></li>-->
+                    <!--<li><a href="http://bbs.uuzcc.com/forum.php">技术论坛</a></li>-->
+                    <!--</ul>-->
+                    <a href="#" class="x-link-info">UU众创</a>
+                    <ul>
+                        <li><a href="http://zb.uuzcc.com/">任务外包</a></li>
+                        <li><a href="http://fangan.uuzcc.com/">方案商城</a></li>
+                        <li><a href="http://bbs.uuzcc.com/forum.php">技术论坛</a></li>
+                    </ul>
+                </li><!-- http://public.ubtob.com -->
+                <li>
+                    <a href="#/help" class="link-help">服务专区</a>
+                    <ul>
+                        <li><a href="#/public" class="link-public">公共服务</a></li><!-- http://public.ubtob.com -->
+                        <li><a href="#/member" class="link-member">会员中心</a></li><!-- http://member.ubtob.com -->
+                    </ul>
+                </li><!-- http://help.ubtob.com -->
+                <li>
+                    <a href="http://diymall.ubtob.com/" class="link-diymall">定制商城</a></li><!-- http://diymall.ubtob.com -->
+                </li>
             </ul>
             <ul class="nav navbar-nav navbar-right x-nologin">
                 <li><a href="#" class="link-login">登录</a></li>
@@ -170,12 +317,10 @@
         </div>
     </div>
 </nav>
-<!-- nav end -->
-
 <header class="finance">
     <div class="banner"><img src="static/images/banner.jpg" /></div>
 </header>
-
+<!-- nav end -->
 <section class="finance">
     <div class="container">
         <div>
@@ -196,7 +341,6 @@
         </div>
     </div>
 </section>
-
 <!-- footer start -->
 <footer>
     <div class="container">
@@ -205,7 +349,7 @@
                 <div class="qrcode qrcode-uu">
                     <div class="qrcode-img pull-left">
                         <img src="static/img/qrcode/uu.png" width="100px" height="100px"
-                             alt="UU互联" />
+                             alt="UU互联"/>
                     </div>
                     <div class="qrcode-text pull-left">
                         <div>手机UU</div>
@@ -218,7 +362,7 @@
                 <div class="qrcode qrcode-uas">
                     <div class="qrcode-img pull-left">
                         <img src="static/img/qrcode/uas.png" width="100px" height="100px"
-                             alt="优软公众号" />
+                             alt="优软公众号"/>
                     </div>
                     <div class="qrcode-text pull-left">
                         <div>微信扫描</div>
@@ -239,80 +383,84 @@
         </div>
     </div>
 </footer>
-
-<!-- Modal -->
-<div class="modal fade" id="applyModal" tabindex="-1" role="dialog" aria-labelledby="applyModalLabel">
-    <div class="modal-dialog modal-lg" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="applyModalLabel">立即申请</h4>
-            </div>
-            <div class="modal-body">
-                <form class="form-horizontal" action="">
-                    <div class="form-group">
-                        <input type="text" style="display: none" class="form-control" id="loanUserId">
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-2 control-label">企业名称</label>
-                        <div class="col-sm-6">
-                            <input type="text" placeholder="请输入您的企业全称"  class="form-control" id="loanCommpanyName">
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-2 control-label">拟融资金额</label>
-                        <div class="col-sm-4">
-                            <div class="input-group">
-                                <input type="text" placeholder="请输入融资金额" class="form-control" id="loanAmount" onkeyup="if(isNaN(value))execCommand('undo')" onafterpaste="if(isNaN(value))execCommand('undo')">
-                                <div class="input-group-addon">元</div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-2 control-label">联系人</label>
-                        <div class="col-sm-4">
-                            <input type="text" placeholder="请输入您的姓名" class="form-control" id="loanName">
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-2 control-label">联系方式</label>
-                        <div class="col-sm-4">
-                            <input type="text" placeholder="请输入您的手机号" class="form-control" id="loanTelphone">
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <div class="col-sm-10 col-sm-offset-2">
-                            <input type="checkbox" id="check">同意查询人民银行征信记录授权协议
-                        </div>
-                    </div>
-                    <div id="note">
-                        需提供以下资料清单（加盖公章)<br>
-                        <span>1、营业执照复印件</span>        <span id="span2"> 2、组织机构代码证复印件</span><br>
-                        <span>3、国税、地税登记证复印件</span>  <span id="span4"> 4、开户许可证复印件</span><br>
-                        <span>5、法人代表及实际控制人身份证复印件</span> <span id="span6">6、法人代表证明书（见附件1）</span><br>
-                        <span>7、公司近三年审计报告及最近一期的财务报表及科目明细（前五大）</span><br>
-                        <span>8、近1年主要结算银行流水对账单和用于公司账务结算的个人账户结算单复印件</span><br>
-                        <span>9、前五大上下游客户近一年贸易合同，货运证明或其他表明货物确已发运的单据；交易发票；提货单、质检证明（凭证）、预付款（定金）凭证复印件</span><br>
-                        <span>10、公司基本情况表（见附件2）</span><span id="span11">11、拟融资应收账款发票清单、采购合同明细（见附件3）</span><br>
-                        <span>12、拟融资应收账款客户近一年的付款凭证（银行回单）</span><br>
-                        <span>13、拟融资应收账款相关贸易合同，货运证明或其他表明货物确已发运的单据；交易发票；提货单、质检证明（凭证）、预付款（定金）凭证</span><br>
-                        <span> 14、近两年缴税完税凭证、水电费单、员工工资单等证明文件</span><br>
-                        <span>15、我公司要求的其他资料</span><br>
-                    </div>
-                </form>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
-                <button type="button" class="btn btn-primary" id="applySubmit">提交申请</button>
-            </div>
-        </div>
-    </div>
-</div>
-
-<!-- footer end -->
 </body>
+
 <script type="text/javascript" src="static/lib/jquery/jquery.min.js"></script>
 <script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="static/js/common/common.js"></script>
-<script type="text/javascript" src="static/js/finance/base.js"></script>
+<script>
+    $("#applyLoan").click(function () {
+        $('#applyModal1').modal('toggle');
+
+    })
+    $("#agree").click(function () {
+        $('#applyModal1').modal('toggle');
+        $('#applyModal').modal('toggle');
+        $("#loanAmount").val('');
+    })
+
+    $("#loanSubmit").click(function () {
+        var product = $("#applyLoan").siblings('h2').text();
+        var loanName = $("#loanName").val();//姓名
+        var loanTelphone = $("#loanTelphone").val();//手机号
+        var loanCommpanyName = $("#loanCommpanyName").val();//公司名
+        var loanAmount = $("#loanAmount").val();//借款金额
+        var check = $("#check").is(":checked");//是否同意查询相关数据
+        var check1=$("#check1").is(":checked");//是否同意查询相关材料
+        var flag = false;
+        var message = "";
+        if (loanCommpanyName == '') {
+            message = '企业全称不能为空'
+        } else if (loanAmount == '') {
+            message = '借贷金额不能为空';
+        } else if (loanName == '') {
+            message = "联系人不能为空";
+        } else if (loanTelphone == '') {
+            message = "联系方式不能为空！";
+        } else if (loanTelphone.length != 11) {
+            message = "请输入有效的手机号码！";
+        } else if (check != true) {
+            message = '请同意应开展应收账款保理业务而查询相关数据';
+        } else if(check1 != true){
+            message = '请同意因开展应收账款保理业务提供相关材料';
+        }else {
+            flag = true;
+        }
+        if (!flag) {
+            alert(message);
+        } else {
+            var jsonStr = {
+                product: product,
+                name: loanName,
+                telphone: loanTelphone,
+                companyName: loanCommpanyName,
+                amount: loanAmount
+            }
+            $.ajax({
+                url: "/finance/loan",
+                type: "post",
+                dataType: "json",
+                data: {jsonStr: JSON.stringify(jsonStr)},
+                success: function () {
+                    alert('已申请 ');
+                    $('#applyModal').modal('toggle');
+
+                },
+                error: function (XMLHttpRequest) {
+                    alert('申请失败');
+                    $('#applyModal').modal('toggle');
+                }
+            })
+        }
+    })
+    $("#check2").click(function(){
+        if($("#note").css("display")=="none"){
+            $("#note").css("display","block");
+        }else{
+            $("#note").css("display","none");
+        }
+        }
+    )
+
+</script>
 </html>

src/main/webapp/resources/js/finance/base.js

@@ -1,70 +1,59 @@
 $(function(){
-    $("#applyLoan").click(function(){
+    $("#applyLoan").click(function () {
         $('#applyModal').modal('toggle');
+        $("#loanAmount").val('');
     })
 
-    $("#applySubmit").click(function(){
-        var product=$("#applyLoan").siblings('h2').text();
-        var loanUserId=$("#loanUserId").val();//uuid
-        var loanName=$("#loanName").val();//姓名
-        var loanTelphone=$("#loanTelphone").val();//手机号
-        var loanCommpanyName=$("#loanCommpanyName").val();//公司名
-        var loanAmount=$("#loanAmount").val();//借款金额
-        var check=$("#check").is(":checked");//是否同意查询银行记录
+    $("#loanSubmit").click(function () {
+        var product = $("#applyLoan").siblings('h2').text();
+        var loanName = $("#loanName").val();//姓名
+        var loanTelphone = $("#loanTelphone").val();//手机号
+        var loanCommpanyName = $("#loanCommpanyName").val();//公司名
+        var loanAmount = $("#loanAmount").val();//借款金额
+        var check = $("#check").is(":checked");//是否同意查询银行记录
         var flag = false;
-        var message="";
-        if(loanUserId==''){
-            message='请先登录';
-        }else if(loanName==''){
-            message='姓名不能为空'
-        }else if(loanTelphone == ''){
-            message = "手机号码不能为空！";
-        }else if(loanTelphone.length !=11){
+        var message = "";
+        if (loanCommpanyName == '') {
+            message = '企业全称不能为空'
+        } else if (loanAmount == '') {
+            message = '借贷金额不能为空';
+        } else if (loanName == '') {
+            message = "联系人不能为空";
+        } else if (loanTelphone == '') {
+            message = "联系方式不能为空！";
+        } else if (loanTelphone.length != 11) {
             message = "请输入有效的手机号码！";
-        }else if(loanCommpanyName==''){
-            message="公司名不能为空";
-        }
-        else if(loanAmount==''){
-            message='借贷金额不能为空';
-        }else if(check!=true){
-            message='请同意查询人民银行征信记录';
+        } else if (check != true) {
+            message = '请同意查询人民银行征信记录';
         } else {
             flag = true;
         }
-        if(!flag){
+        if (!flag) {
             alert(message);
-        }else {
+        } else {
+            var jsonStr = {
+                product: product,
+                name: loanName,
+                telphone: loanTelphone,
+                companyName: loanCommpanyName,
+                amount: loanAmount
+            }
             $.ajax({
-                url: "http://192.168.253.227:8083/loan/save",
+                url: "/finance/loan",
                 type: "post",
                 dataType: "json",
-                data: {
-                    product:product,
-                    userId: loanUserId,
-                    name: loanName,
-                    telphone: loanTelphone,
-                    companyName: loanCommpanyName,
-                    amount: loanAmount
-                },
-                success: function (data) {
-                    alert('已申请');
-                    console.log("success");
-                    $("#loan").css("display", "none");
-                    $("#layer").css({
-                        "display": "none"
-                    })
+                data: {jsonStr: JSON.stringify(jsonStr)},
+                success: function () {
+                    alert('已申请 ');
+                    $('#applyModal').modal('toggle');
+
                 },
                 error: function (XMLHttpRequest) {
-                    alert("跨域请求错误");
-                    checkError(XMLHttpRequest);
-                    $("#loan").css("display", "none");
-                    $("#layer").css({
-                        "display": "none"
-                    })
+                    alert('申请失败');
+                    $('#applyModal').modal('toggle');
                 }
             })
         }
     })
-
 })