diff --git a/fangija-zsyf/images/loan-img02.png b/fangija-zsyf/images/loan-img02.png
index cf7c3c7..55310fb 100644
Binary files a/fangija-zsyf/images/loan-img02.png and b/fangija-zsyf/images/loan-img02.png differ
diff --git a/fangija-zsyf/js/loan/loanInfo.js b/fangija-zsyf/js/loan/loanInfo.js
new file mode 100644
index 0000000..8e502e3
--- /dev/null
+++ b/fangija-zsyf/js/loan/loanInfo.js
@@ -0,0 +1,127 @@
+//短信验证类型
+var APPLY_LOAN = "applyLoan";
+
+//如果是抵押贷款时候,需要上层页面传入houseId
+var houseId;
+var _params = {};
+
+document.addEventListener('plusready', onPlusReady, false);
+
+function onPlusReady(){
+ var self = plus.webview.currentWebview();
+ houseId= self.houseId;
+ $('#input_city').val(self.city);
+ $('#input_phoneNumber').val(self.mobile);
+}
+
+function sendLoanCode(){
+ var mobile = $("#input_phoneNumber").val();
+ if(checkPhoneNum(mobile)){
+ timer.start();
+ axios.post(BASE_PATH+"/rest/user/sendMobileCode", {mobile: mobile, type: APPLY_LOAN})
+ .then(function (response) {
+ var data = response.data
+ if(data.code==200){
+ $.toast("短信验证码发送成功,请注意查收!")
+ }else{
+ $.toast("验证码发送失败")
+ timer.cancel()
+ }
+ })
+ }
+}
+
+function checkPhoneNum(phone){
+ var reg = 11 && /^((13|14|15|17|18)[0-9]{1}\d{8})$/;
+ if(phone==''){
+ $.toast("请输入手机号码");
+ return false;
+ }else if(!reg.test(phone)){
+ $.toast("手机格式不正确");
+ return false;
+ }else{
+ return true;
+ }
+}
+
+//验证码倒计时
+timer = {
+ countdown:60,
+ start:function(){
+ countdown = 60
+ $(".sendCode").hide()
+ $(".waiting").empty().append(countdown + " s").show()
+ timer.down()
+ },
+ down:function(){
+ countdown --
+ $(".waiting").empty().append(countdown + " s")
+ if(countdown <= 0){
+ $(".sendCode").show()
+ $(".waiting").hide()
+ }else{
+ setTimeout(timer.down, 1000)
+ }
+ },
+ cancel:function(){
+ countdown = 0
+ }
+}
+
+/* 错误提示 */
+$("#next_btn").on("click", function () {
+ var city = $("#input_city").val();
+ var mobile = $("#input_phoneNumber").val();
+ var code = $("#input_codeSms").val();
+ //申请金额(万元)
+ var applyMoney = $("#input_price").val();
+ //是否接收抵押(0否 1是 根据选择的贷款类型赋值)
+ var mortgage = $(".checkbox .current").attr('value');
+
+ if(city == ""){
+ $.toast("请选择城市");
+ return false;
+ }
+ if(!checkPhoneNum(mobile)){
+ return false;
+ }
+ if(code == ""){
+ $.toast("请输入验证码");
+ return false;
+ }
+ if(applyMoney == ""){
+ $.toast("请输入申请金额");
+ return false;
+ }
+ if(mortgage == undefined || mortgage == ""){
+ $.toast("请选择贷款类型");
+ return false;
+ }
+ //如果贷款类型是房抵押
+ if(mortgage == "1"){
+ if(houseId == undefined || houseId == ""){
+ $.toast("房抵贷类型获取houseId失败");
+ return false;
+ }
+ }
+ if(mortgage == "1"){
+ _params = {type: 1, city: city, applyMoney: applyMoney, mortgage: mortgage, hid: houseId, mobile: mobile, smsCode: code};
+ }else{
+ _params = {type: 1, city: city, applyMoney: applyMoney, mortgage: mortgage, mobile: mobile, smsCode: code};
+ }
+ axios.post(BASE_PATH + "/rest/loan/apply", _params).then(function (response) {
+ var status = response.data.status;
+ if(status){
+ alert(response.data.data+ '===');
+ $.toast(response.data.data);
+ //直接定位到贷款success页面, 调用back()就只用返回一次
+ window.location.href = "../../views/loan/loanSuccess.html";
+ }else{
+ $.toast(response.data.message);
+ }
+ }).catch(function (error) {
+ console.log(error);
+ });
+
+
+});
\ No newline at end of file
diff --git a/fangija-zsyf/js/user/myHouse.js b/fangija-zsyf/js/user/myHouse.js
index 73d725b..914dfc1 100644
--- a/fangija-zsyf/js/user/myHouse.js
+++ b/fangija-zsyf/js/user/myHouse.js
@@ -126,7 +126,7 @@ function mhAddItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap,
}else{
html += "其他";
}
- html += "立即申请";
+ html += '立即申请';
}
$('#myhouse').append(html);
}
diff --git a/fangija-zsyf/views/house/houseList.html b/fangija-zsyf/views/house/houseList.html
index 49392a9..da795e6 100644
--- a/fangija-zsyf/views/house/houseList.html
+++ b/fangija-zsyf/views/house/houseList.html
@@ -168,6 +168,7 @@ $(document).on('infinite', '.infinite-scroll-bottom', function() {
}, 1000);
});
+
//我的收藏查询请求
function selectHouseInfoList(){
axios.get(BASE_PATH + "/rest/index/ourHouseInfoList",
@@ -182,6 +183,18 @@ function selectHouseInfoList(){
var xqOneMonthUpDownRangeMap = resultsMap.xqOneMonthUpDownRangeMap;
var xqPotentialIndexMap = resultsMap.xqPotentialIndexMap;
var houseInfoTotalMap = resultsMap.houseInfoTotalMap;
+ // 上次加载的序号
+ lastIndex = $('.list-container li').length;
+ //登录状态,但没有数据
+ if(lastIndex == 0 && resultList.length ==0){
+ //控制显示
+ $('#page-group-nologin').show();
+ $('#page-group-login').hide();
+ }else{
+ //控制显示
+ $('#page-group-nologin').hide();
+ $('#page-group-login').show();
+ }
if(resultList != null && resultList.length == 0){
// 删除加载提示符
$('.infinite-scroll-preloader').remove();
@@ -201,16 +214,8 @@ function selectHouseInfoList(){
for(var i in resultList){
dataObj.push(resultList[i])
}
- // 上次加载的序号
- lastIndex = $('.cardInfo').length;
//每次加载添加多少条目
itemsPerLoad = resultList.length;
- //登录状态,但没有数据
- if(lastIndex == 0 && resultList.length ==0){
- //控制显示
- $('#page-group-nologin').hide();
- $('#page-group-login').show();
- }
//请求后对page进行赋值
page = resultsMap.houseInfoPageList.currentPage;
pageSize = resultsMap.houseInfoPageList.limit;
@@ -228,10 +233,8 @@ function checkIsLogin(){
$('#page-group-login').hide();
$('#page-group-nologin').show();
}else{
- selectHouseInfoList();
//控制显示
- /*$('#page-group-nologin').hide();
- $('#page-group-login').show();*/
+ selectHouseInfoList();
}
}
diff --git a/fangija-zsyf/views/loan/loanInfo.html b/fangija-zsyf/views/loan/loanInfo.html
new file mode 100644
index 0000000..a15ba34
--- /dev/null
+++ b/fangija-zsyf/views/loan/loanInfo.html
@@ -0,0 +1,1063 @@
+
+
+
+
+
+贷款申请
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
*具体贷款金额以实际签约为准
+
提交申请
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/fangija-zsyf/views/loan/loanSuccess.html b/fangija-zsyf/views/loan/loanSuccess.html
new file mode 100644
index 0000000..4e7e5d5
--- /dev/null
+++ b/fangija-zsyf/views/loan/loanSuccess.html
@@ -0,0 +1,68 @@
+
+
+
+
+
+贷款申请
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
提交成功
+
我们会在1个工作日内联系您
请注意接听来电
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/fangija-zsyf/views/user/userInfo.html b/fangija-zsyf/views/user/userInfo.html
index f3b90c4..2840d4d 100644
--- a/fangija-zsyf/views/user/userInfo.html
+++ b/fangija-zsyf/views/user/userInfo.html
@@ -257,6 +257,9 @@ $(".cardInfo01,.cardInfo02").on("click", function(){
//初始化init
$.init();
+//定义个人手机号,贷款页面需要传参数
+var _mobile;
+
var tab = new Vue({
el:"#tab",
data:{
@@ -298,6 +301,11 @@ function gotoUpdatePass(){
clicked('/views/user/updatePass.html',true,false,{},{},function(){})
}
+//调整房产申请贷款
+function gotoLoanApply(houseId, city){
+ clicked('/views/loan/loanInfo.html',true,false,{},{houseId: houseId, city: city, mobile: _mobile},function(){})
+}
+
//注册'infinite'事件处理函数
$(document).on('infinite', '.infinite-scroll',function() {
if($("#tabList1").hasClass("active")){
@@ -382,6 +390,8 @@ function selectUserInfo(){
}).then(function (response) {
var result = response.data.data;
var mobile = result.mobile;
+ //加载个人信息时候为该变量赋值
+ _mobile = result.mobile;
$('#user_mobile').html(mobile.substring(0,3)+'****'+mobile.substring(7)+'
');
if(result.headImg != null && result.headImg.length > 0){
$('#user_headImg').attr('src', result.headImg);