From 2c30d24a49f7b57bf8f6240cd5228452e345345c Mon Sep 17 00:00:00 2001
From: jyx <1584081113@qq.com>
Date: Fri, 11 Jan 2019 11:04:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E7=AE=97=E5=99=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2js=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=8F=90=E4=BA=A4=E8=AE=A1=E7=AE=97=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Front-end/计算/index.html | 223 ++++++++++++++++++++++--------------
 Front-end/首页/index.html |  13 ++-
 demo/pom.xml                |   2 +
 3 files changed, 144 insertions(+), 94 deletions(-)

diff --git a/Front-end/计算/index.html b/Front-end/计算/index.html
index 1dc6b64..9151b07 100644
--- a/Front-end/计算/index.html
+++ b/Front-end/计算/index.html
@@ -42,7 +42,7 @@
                                     <h2>贷款金额</h2>
                                 </div>
                                 <div class="aui-flex-box aui-flex-box-right">
-                                    <input type="text" placeholder="请输入贷款金额">
+                                    <input type="text" name="amount" placeholder="请输入贷款金额">
                                     <span></span>
                                 </div>
                             </a>
@@ -51,7 +51,7 @@
                                     <h2>贷款期限</h2>
                                 </div>
                                 <div class="aui-flex-box aui-flex-box-right">
-                                    <input type="text" placeholder="请输入贷款期限">
+                                    <input type="text" name="year"placeholder="请输入贷款期限">
                                     <span>日</span>
                                 </div>
                             </a>
@@ -60,7 +60,7 @@
                                     <h2>贷款利率</h2>
                                 </div>
                                 <div class="aui-flex-box aui-flex-box-right aui-flex-box-dow">
-                                    <select class="cell-select">
+                                    <select name = "intrate"class="cell-select">
                                         <option value="">4.90%</option>
                                         <option value="1">3.80%</option>
                                         <option value="2">3.90%</option>
@@ -73,95 +73,95 @@
                                     <h2>还款方式</h2>
                                 </div>
                                 <div class="aui-flex-box aui-flex-box-right">
-                                    <button>等额本息</button>
-                                    <button>等额本金</button>
-                                </div>
-                            </a>
-                        </div>
-                        <div class="tab-panel-item">
-                            <a href="javascript:;" class="aui-flex b-line">
-                                <div class="aui-calc-title">
-                                    <h2>贷款金额</h2>
-                                </div>
-                                <div class="aui-flex-box aui-flex-box-right">
-                                    <input type="text" placeholder="请输入贷款金额">
-                                    <span></span>
-                                </div>
-                            </a>
-                            <a href="javascript:;" class="aui-flex b-line">
-                                <div class="aui-calc-title">
-                                    <h2>贷款期限</h2>
-                                </div>
-                                <div class="aui-flex-box aui-flex-box-right">
-                                    <input type="text" placeholder="请输入贷款期限">
-                                    <span>年</span>
-                                </div>
-                            </a>
-                            <a href="javascript:;" class="aui-flex b-line">
-                                <div class="aui-calc-title">
-                                    <h2>贷款利率</h2>
-                                </div>
-                                <div class="aui-flex-box aui-flex-box-right aui-flex-box-dow">
-                                    <select class="cell-select">
-                                        <option value="">4.90%</option>
-                                        <option value="1">3.80%</option>
-                                        <option value="2">3.90%</option>
-                                        <option value="3">1.90%</option>
-                                    </select>
-                                </div>
-                            </a>
-                            <a href="javascript:;" class="aui-flex b-line">
-                                <div class="aui-calc-title">
-                                    <h2>还款方式</h2>
-                                </div>
-                                <div class="aui-flex-box aui-flex-box-right">
-                                    <button>等额本息</button>
-                                    <button>等额本金</button>
-                                </div>
-                            </a>
-                        </div>
-                        <div class="tab-panel-item">
-                            <a href="javascript:;" class="aui-flex b-line">
-                                <div class="aui-calc-title">
-                                    <h2>贷款金额</h2>
-                                </div>
-                                <div class="aui-flex-box aui-flex-box-right">
-                                    <input type="text" placeholder="请输入贷款金额">
-                                    <span>万</span>
-                                </div>
-                            </a>
-                            <a href="javascript:;" class="aui-flex b-line">
-                                <div class="aui-calc-title">
-                                    <h2>贷款期限</h2>
-                                </div>
-                                <div class="aui-flex-box aui-flex-box-right">
-                                    <input type="text" placeholder="请输入贷款期限">
-                                    <span>年</span>
-                                </div>
-                            </a>
-                            <a href="javascript:;" class="aui-flex b-line">
-                                <div class="aui-calc-title">
-                                    <h2>贷款利率</h2>
-                                </div>
-                                <div class="aui-flex-box aui-flex-box-right aui-flex-box-dow">
-                                    <select class="cell-select">
-                                        <option value="">4.90%</option>
-                                        <option value="1">3.80%</option>
-                                        <option value="2">3.90%</option>
-                                        <option value="3">1.90%</option>
-                                    </select>
-                                </div>
-                            </a>
-                            <a href="javascript:;" class="aui-flex b-line">
-                                <div class="aui-calc-title">
-                                    <h2>还款方式</h2>
-                                </div>
-                                <div class="aui-flex-box aui-flex-box-right">
-                                    <button>等额本息</button>
-                                    <button>等额本金</button>
+                                    <button name = "button1"onclick="equ(1)">等额本息</button>
+                                    <button name = "button2"onclick="equ(2)">等额本金</button>
                                 </div>
                             </a>
                         </div>
+                        <!--<div class="tab-panel-item">-->
+                            <!--<a href="javascript:;" class="aui-flex b-line">-->
+                                <!--<div class="aui-calc-title">-->
+                                    <!--<h2>贷款金额</h2>-->
+                                <!--</div>-->
+                                <!--<div class="aui-flex-box aui-flex-box-right">-->
+                                    <!--<input type="text" placeholder="请输入贷款金额">-->
+                                    <!--<span></span>-->
+                                <!--</div>-->
+                            <!--</a>-->
+                            <!--<a href="javascript:;" class="aui-flex b-line">-->
+                                <!--<div class="aui-calc-title">-->
+                                    <!--<h2>贷款期限</h2>-->
+                                <!--</div>-->
+                                <!--<div class="aui-flex-box aui-flex-box-right">-->
+                                    <!--<input type="text" placeholder="请输入贷款期限">-->
+                                    <!--<span>年</span>-->
+                                <!--</div>-->
+                            <!--</a>-->
+                            <!--<a href="javascript:;" class="aui-flex b-line">-->
+                                <!--<div class="aui-calc-title">-->
+                                    <!--<h2>贷款利率</h2>-->
+                                <!--</div>-->
+                                <!--<div class="aui-flex-box aui-flex-box-right aui-flex-box-dow">-->
+                                    <!--<select class="cell-select">-->
+                                        <!--<option value="">4.90%</option>-->
+                                        <!--<option value="1">3.80%</option>-->
+                                        <!--<option value="2">3.90%</option>-->
+                                        <!--<option value="3">1.90%</option>-->
+                                    <!--</select>-->
+                                <!--</div>-->
+                            <!--</a>-->
+                            <!--<a href="javascript:;" class="aui-flex b-line">-->
+                                <!--<div class="aui-calc-title">-->
+                                    <!--<h2>还款方式</h2>-->
+                                <!--</div>-->
+                                <!--<div class="aui-flex-box aui-flex-box-right">-->
+                                    <!--<button>等额本息</button>-->
+                                    <!--<button>等额本金</button>-->
+                                <!--</div>-->
+                            <!--</a>-->
+                        <!--</div>-->
+                        <!--<div class="tab-panel-item">-->
+                            <!--<a href="javascript:;" class="aui-flex b-line">-->
+                                <!--<div class="aui-calc-title">-->
+                                    <!--<h2>贷款金额</h2>-->
+                                <!--</div>-->
+                                <!--<div class="aui-flex-box aui-flex-box-right">-->
+                                    <!--<input type="text" placeholder="请输入贷款金额">-->
+                                    <!--<span>万</span>-->
+                                <!--</div>-->
+                            <!--</a>-->
+                            <!--<a href="javascript:;" class="aui-flex b-line">-->
+                                <!--<div class="aui-calc-title">-->
+                                    <!--<h2>贷款期限</h2>-->
+                                <!--</div>-->
+                                <!--<div class="aui-flex-box aui-flex-box-right">-->
+                                    <!--<input type="text" placeholder="请输入贷款期限">-->
+                                    <!--<span>年</span>-->
+                                <!--</div>-->
+                            <!--</a>-->
+                            <!--<a href="javascript:;" class="aui-flex b-line">-->
+                                <!--<div class="aui-calc-title">-->
+                                    <!--<h2>贷款利率</h2>-->
+                                <!--</div>-->
+                                <!--<div class="aui-flex-box aui-flex-box-right aui-flex-box-dow">-->
+                                    <!--<select class="cell-select">-->
+                                        <!--<option value="">4.90%</option>-->
+                                        <!--<option value="1">3.80%</option>-->
+                                        <!--<option value="2">3.90%</option>-->
+                                        <!--<option value="3">1.90%</option>-->
+                                    <!--</select>-->
+                                <!--</div>-->
+                            <!--</a>-->
+                            <!--<a href="javascript:;" class="aui-flex b-line">-->
+                                <!--<div class="aui-calc-title">-->
+                                    <!--<h2>还款方式</h2>-->
+                                <!--</div>-->
+                                <!--<div class="aui-flex-box aui-flex-box-right">-->
+                                    <!--<button name="equation"value ="1">等额本息</button>-->
+                                    <!--<button name ="equation" value="2">等额本金</button>-->
+                                <!--</div>-->
+                            <!--</a>-->
+                        <!--</div>-->
                         <div class="tab-button">
                             <button>开始计算</button>
                         </div>
@@ -170,5 +170,50 @@
             </section>
         </section>
 
+        <script type="text/javascript">
+            function equ(obj){
+                var equation=1;
+                if(obj==1){
+                    equation=1;
+                    button1.style.backgroundColor="#fa623d";
+                    button1.style.color="#f5f5f5";
+                    button2.style.backgroundColor="#f5f5f5";
+                    button2.style.color="#fa623d";
+                }else if(obj==2){
+                    equation=2;
+                    button1.style.backgroundColor="#f5f5f5";
+                    button1.style.color="#fa623d";
+                    button2.style.backgroundColor="#fa623d";
+                    button2.style.color="#f5f5f5";
+                }
+                //document.getElementsByTagName("equation").value=equation;
+                global.equation = equation;
+            }
+
+
+            $(".btnNotForm").click(function(){
+                var amount =decument.getElementsByName("amount").value;
+                var year = decument.getElementsByName("year").value;
+                var select = decument.getElementsByName("intrate");
+                var intrate = select.value;
+
+                $.ajax({
+
+                    type:"get",
+                    url:"/cir/sum",
+                    data:{
+                        amount:amount,
+                        year:year,
+                        intrate:intrate,
+                        equation:equation
+                    },
+                    async:true,
+                    success:function(data){
+                        console.log(data);
+                    }
+                });
+            });
+        </script>
+
     </body>
 </html>
diff --git a/Front-end/首页/index.html b/Front-end/首页/index.html
index a593e35..904d9ac 100644
--- a/Front-end/首页/index.html
+++ b/Front-end/首页/index.html
@@ -114,8 +114,10 @@
                         </ul>
                     </div>
                 </div>
-                <div class="divHeight"></div>
-                <!--<div class="aui-borrow-head">-->
+                <div class="divHeight" ></div>
+                <div>
+                    <table id = "tab"></table>
+                </div>
                     <!--<div class="aui-borrow-head-title">-->
                         <!--<h2>标题1</h2>-->
                     <!--</div>-->
@@ -178,7 +180,7 @@
 
             window.onload(function requestData(){
                 $.ajax({
-                    url: "/show",
+                    url: "/showIndex",
                     type: "post",
                     dataType: "json",
                     success: function(data){
@@ -195,8 +197,7 @@
             function showData(data) {
                 var str = "";//定义用于拼接的字符串
                 for (var i = 0; i < data.length; i++) {
-                    //拼接表格的行和列
-                    //str = "<tr><td>" + data[i].name + "</td><td>" + data[i].password + "</td></tr>";
+
                     str=   "                <div class=\"aui-borrow-head\">\n" +
                         "                    <div class=\"aui-borrow-head-title\">\n" +
                         "                        <h2>"+data[i].productNum+""</h2>\n" +
@@ -205,6 +206,8 @@
                         "                        <img src=\"\">\n" +
                         "                    </div>\n" +
                         "                </div>";
+
+                    // str = "<tr><td>"+data[i].productNum+"</td></tr>";
                     //追加到table中
                     $("#tab").append(str);         }
             }
diff --git a/demo/pom.xml b/demo/pom.xml
index 796a660..e460242 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -12,6 +12,7 @@
     <artifactId>demo</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>demo</name>
+    <packaging>war</packaging>
     <description>Demo project for Spring Boot</description>
 
     <properties>
@@ -49,6 +50,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>