优化提示信息样式

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.account.entity.User;
 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;
@@ -34,16 +35,12 @@ public class FinanceController {
             jsonObject.putAll(JSON.parseObject(JSON.toJSONString(SystemSession.getUser())));
             url = url + "?UID=" + Long.parseLong(SystemSession.getUser().getDialectUID());
         }
-//        try {
-//           HttpUtil.Response response =  HttpUtil.doPost(url, JSON.toJSONString(jsonObject), 5000);
-//           if(200 == response.getStatusCode())
-//               return "success";
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
         com.uas.sso.common.util.HttpUtil.ResponseWrap res = null;
         try {
             res = com.uas.sso.common.util.HttpUtil.doPost(url, jsonObject);
+            if(res.isSuccess()) {
+                return "申请成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -13,6 +13,7 @@
     <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 rel="stylesheet" href="static/css/toastr.css">
     <base href="../">
 </head>
 <style>
@@ -253,7 +254,7 @@
                         <span>10、公司基本情况表</span><span id="span11">11、拟融资应收账款发票清单、采购合同明细</span><br>
                         <span>12、拟融资应收账款客户近一年的付款凭证（银行回单）</span><br>
                         <span>13、拟融资应收账款相关贸易合同，货运证明或其他表明货物确已发运的单据；交易发票；提货单、质检证明（凭证）、预付款（定金）凭证</span><br>
-                        <span> 14、近两年缴税完税凭证、水电费单、员工工资单等证明文件</span><br>
+                        <span>14、近两年缴税完税凭证、水电费单、员工工资单等证明文件</span><br>
                         <span>15、我公司要求的其他资料</span><br>
                     </div>
                 </div>
@@ -384,79 +385,6 @@
 <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>
-    $("#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>
+<script type="text/javascript" src='static/js/common/toastr.js'></script>
+<script type="text/javascript" src="static/js/finance/finance.js"></script>
 </html>

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

@@ -0,0 +1,94 @@
+
+/**
+ * 引入toaster方法
+ */
+document.write("<script language=javascript src='static/js/common/toastr.js'></script>");
+
+function applyModal1() {
+    $('#applyModal1').modal('toggle');
+}
+
+function agreeEvent() {
+    $('#applyModal1').modal('toggle');
+    $('#applyModal').modal('toggle');
+    $("#loanAmount").val('');
+}
+
+function submitApply() {
+    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);
+        toastr.info(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 (data) {
+                toastr.info(data);
+                setTimeout( $('#applyModal').modal('toggle'), 800);
+            },
+            error: function (XMLHttpRequest) {
+                toastr.error("申请失败");
+                $('#applyModal').modal('toggle');
+            }
+        })
+    }
+}
+
+function checkEvent() {
+    if ($("#note").css("display") == "none") {
+        $("#note").css("display", "block");
+    } else {
+        $("#note").css("display", "none");
+    }
+}
+
+$(function() {
+    'use strict';
+
+    // 打开申请页面
+    $('#applyLoan').click(applyModal1);
+
+    // 同意申请
+    $('#agree').click(agreeEvent);
+
+    // 提交申请
+    $('#loanSubmit').click(submitApply);
+
+    // 判断是否已同意
+    $("#check2").click(checkEvent);
+});