Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1

Conflicts:
	fangija-zsyf/views/house/houseDetail.html
This commit is contained in:
2018-04-12 17:08:04 +08:00
20 changed files with 367 additions and 224 deletions
+2 -2
View File
@@ -3,8 +3,8 @@
//var BASE_PATH = "http://192.168.10.47:8086";
//var BASE_PATH = "http://192.168.10.161:8084";
//var BASE_PATH = "http://192.168.10.47:8086";
//var BASE_PATH = "http://192.168.10.161:8084";
var BASE_PATH = "http://192.168.10.53:8084";
var BASE_PATH = "http://192.168.10.161:8084";
//var BASE_PATH = "http://192.168.10.53:8084";
//var BASE_PATH = "http://192.168.10.171:8084";
/**是否显示过启动页面**/
var lauchFlag = false;
+1 -1
View File
@@ -4,7 +4,7 @@ axios.defaults.headers.post['Content-Type'] = 'application/json';
// 添加请求拦截器
axios.interceptors.request.use(function (config) {
var token = localStorage.getItem("user_token");
config.headers.Authorization = token
config.headers.Authorization = token;
return config;
}, function (error) {
return Promise.reject(error);
+1 -1
View File
@@ -74,7 +74,7 @@ var mapConfig = {
/* 打开银行、餐饮等tab大类*/
$('.bar,#aroundLink').on('click', 'a', function () {
var $this = $(this);
//$this.addClass('current').siblings().removeClass('current');
$this.addClass('active').siblings().removeClass('active');
var id = $this.attr('id');
that.hidden_all_mark()
that.openTypeWrap(id);
+2 -7
View File
@@ -33,7 +33,7 @@ function addCollect(){
$(".collection02").show();
$.toast("随时掌握小区动态");
}
plus.webview.getWebviewById('/views/user/userInfo.html').reload();
})
.catch(function (error) {
console.log(error);
@@ -65,7 +65,7 @@ function removeCollect(){
$(".collection01").show();
$.toast("取消关注");
}
plus.webview.getWebviewById('/views/user/userInfo.html').reload();
})
.catch(function (error) {
console.log(error);
@@ -714,21 +714,16 @@ function loadRentTrends(city, region, name){
}
}).then(function (response) {
var re = response.data.data
var categories = new Array();
var series = new Array();
var m = re.times;
var pm = re.distMap
var rooms = re.rooms;
if(m && rooms.length>0){
for(var i=0;i<m.length;i++){
categories.push(m[i]);
}
for(var k in rooms){
var room = rooms[k]
var distM = pm[room];
+7 -7
View File
@@ -14,13 +14,13 @@ function savePageLog() {
var device = plus.device.uuid;
var model = plus.device.model;
plus.geolocation.getCurrentPosition(function(p){
province = p.address.province;
city = p.address.city;
region = p.address.district;
lng = p.coords.longitude;
lat = p.coords.latitude;
address = p.address.street;
doSavePageLog({page:page, lng:lng, lat:lat, province:province, city:city, region:region, address:address, device:device, model:model});
baidu_province = p.address.province;
baidu_city = p.address.city;
baidu_region = p.address.district;
baidu_lng = p.coords.longitude;
baidu_lat = p.coords.latitude;
baidu_address = p.address.street;
doSavePageLog({page:page, lng:baidu_lng, lat:baidu_lat, province:baidu_province, city:baidu_city, region:baidu_region, address:baidu_address, device:device, model:model});
}, function(e){
doSavePageLog({page:page, device:device, model:model});
},
+1 -1
View File
@@ -55,7 +55,7 @@ function addEstate(number, lastIndex) {
}
}
html+= '<li>'+
'<a onclick="clicked(\'${basePath}/district/details?city='+this.city+'&region='+this.region+'&name='+this.name+'\',true)" class="item-content">'+
'<a onclick="gotoDistrictDetail(\''+this.city+'\',\''+this.region+'\',\''+this.name+'\')" class="item-content">'+
'<div class="item-inner">'+
'<div class="item-title-row">'+
'<div class="item-title">'+this.name+'</div>'+
+1 -1
View File
@@ -79,7 +79,7 @@ function mhAddItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap,
tempTotalPricePercent = (parseFloat(tempTotalPrice)*0.7/10000).toFixed(2);
tempTotalPrice = (parseFloat(tempTotalPrice)/10000).toFixed(2);
}
html += "<li><a href='#' class='item-content'>";
html += '<li onclick="gotoHouseDetail(\''+result.id+'\')"><a href="#" class="item-content">';
html += "<div class='item-inner'><div class='item-title-row'>";
html += "<div class='item-title'>"+result.name+" <em>"+tempTotalPrice+"万</em><span class='tag'><small>"+result.liveStatus+"</small></span></div>";
html += "</div><div class='item-subtitle'>";
+29 -2
View File
@@ -1544,7 +1544,8 @@
"views/news/newsDetail.html",
"error.html",
"views/rent/rent.html",
"views/district/detail.html"
"views/district/detail.html",
"views/house/houseList.html"
],
"priority": 0
},
@@ -1613,7 +1614,10 @@
"images/topBg.png",
"images/icon-set.png"
],
"refer": [],
"refer": [
"views/user/passLogin.html",
"views/district/detail.html"
],
"priority": 0
},
"views/evaluate/evaluateList.html": {
@@ -1635,6 +1639,29 @@
],
"refer": [],
"priority": 0
},
"views/user/passLogin.html": {
"resources": [],
"refer": [
"views/user/bindingMobile.html",
"views/user/codeSms.html"
],
"priority": 0
},
"views/house/houseList.html": {
"resources": [],
"refer": [
"views/house/add.html",
"views/house/detail.html"
],
"priority": 0
},
"views/house/add.html": {
"resources": [],
"refer": [
"views/evaluate/evaluateReport.html"
],
"priority": 0
}
},
"idle": {
@@ -63,5 +63,4 @@ Vue.component('my_focus',{
},mounted:function(){
this.loadMyFocus();
}
})
+21 -17
View File
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title></title>
<title>房产分析</title>
<meta name="viewport" content="initial-scale=1, maximum-scale=1">
<link rel="shortcut icon" href="/favicon.ico">
<meta name="apple-mobile-web-app-capable" content="yes">
@@ -83,19 +83,19 @@
<div class="topic">
<div class="topicContent" style="padding-left:0;padding-right:0;">
<div class="topicContent_center home">
<div onclick="window.location.href='01_index01_myHouse04_evaluationResult01_saleAnalysis01_index.html'">
<!--<div onclick="window.location.href='+BASE_PATH+'/saleAnalysis/index'">
<i class="icon icon-evaluation01"></i>
<span>出售分析</span>
</div>
<div onclick="window.location.href='01_index01_myHouse04_evaluationResult02_rentManagement01_index.html'">
</div>-->
<div onclick="openNewView('/views/rent/rent.html')">
<i class="icon icon-evaluation02"></i>
<span>出租管理</span>
</div>
<div onclick="window.location.href='01_index01_myHouse04_evaluationResult03_exchange01_index.html'">
<!--<div onclick="window.location.href='01_index01_myHouse04_evaluationResult03_exchange01_index.html'">
<i class="icon icon-evaluation03"></i>
<span>我要置换</span>
</div>
<div onclick="window.location.href='01_index01_myHouse04_evaluationResult04_loan01_inputInfo.html'">
</div>-->
<div onclick="openNewView('/views/loan/loanInfo.html')">
<i class="icon icon-personal03"></i>
<span>我要贷款</span>
</div>
@@ -201,7 +201,7 @@
<div class="buttons-row theme" style="padding:0 0.75rem;" id="trendDiv1">
<a t-v="6" class="tab-link button active">半年</a>
<a t-v="12" class="tab-link button">一年</a>
<a t-v="24" class="tab-link button">三年</a>
<a t-v="36" class="tab-link button">三年</a>
</div>
<div class="chart" id="chart01" style="height:360px;"></div>
</div>
@@ -296,6 +296,9 @@ var lng;
var city;
var region;
var name;
var oriCity;
var oriRegion;
var oriName;
//扩展API加载完毕,现在可以正常调用扩展API
function onPlusReady(){
var self = plus.webview.currentWebview();
@@ -344,9 +347,9 @@ function init(){
var houseInfo = response.data.data.houseInfo;
lat = houseInfo.lat;
lng = houseInfo.lng;
city = houseInfo.city;
region = houseInfo.region;
name = houseInfo.name;
oriCity = houseInfo.city;
oriRegion = houseInfo.region;
oriName = houseInfo.name;
address = houseInfo.address;
var text = houseInfo.name;
var length = text.length;
@@ -359,6 +362,9 @@ function init(){
if(response.data.data.rentRooms){
rentRooms = response.data.data.rentRooms;
}
city = houseInfo.city;
region = houseInfo.region;
name = houseInfo.name;
baseInfo.id=houseInfo.id;
baseInfo.city = houseInfo.city;
baseInfo.name = houseInfo.name;
@@ -482,12 +488,6 @@ $("#trendTabDiv .button").on("click", function () {
$(this).parent().children().removeClass("active");
$(this).addClass("active");
});
$("#trendDiv2").on("click", function () {
$("#trendDiv2 a").removeClass("active")
$(this).addClass("active")
//alert()
loadRentTrends(city, region, name);
});
/* 图表切换 */
$("#tabAvgDiv").on("click", function () {
$("#tabChart1").css("z-index","1");
@@ -497,6 +497,10 @@ $("#tabRentDiv").on("click", function () {
$("#tabChart2").css("z-index","1");
$("#tabChart1").css("z-index","-1");
});
function openNewView(viewHtml) {
alert(viewHtml)
clicked(viewHtml,true,false,{},{city:oriCity,region:oriRegion,name:oriName})
}
</script>
</body>
+17 -2
View File
@@ -370,9 +370,24 @@ $.config = {router: false}
var cityChoose = new Vue({
el:"#cityChoose",
data:{
city:city
city:''
}
})
plus.geolocation.getCurrentPosition(function(p){
//province = p.address.province;
var cityStr = p.address.city;
if(cityStr){
cityChoose.city = cityStr.endsWith("市")?cityStr.substring(0,cityStr.length-1):cityStr;
}
//region = p.address.district;
}, function(e){
},
{
provider:'baidu',
enableHighAccuracy:true,
coordsType:'bd09ll'
}
);
/* 关注&已关注切换 */
$(".collection01").on("click", function () {
$(this).hide();
@@ -421,6 +436,7 @@ $.config = {router: false}
$("#input_city").val($(this).find("p").text());
$(".cityChoice a").text($(this).find("p").text());
$(".popup-about01 p").removeClass("active");
addFocus($(this).find("p").text())
});
$(".popup-about01 p").on("click", function () {
$("#input_city").val($(this).text());
@@ -575,7 +591,6 @@ function markFocus(){
function addFocus(city){
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
//reloadMyFocus()
}).catch(function(error){
console.log(error)
})
+39 -4
View File
@@ -93,6 +93,30 @@
</div>
</div>
<div class="page-group" style="display: none;" id="page-group-login-temp">
<div class="page page-current">
<!-- 加载loading页 -->
<div class="loadingBg">
<div class="infinite-scroll-preloader">
<div class="preloader"></div>
</div>
</div>
<div class="content">
<div class="list-block media-list">
<!-- 动态封装部分 begin -->
<ul>
</ul>
<!-- 动态封装部分 end -->
</div>
<div class="content-block" style="display: none;">
<p><a onclick="openaddWindow()" class="button button-big button-fill theme">立即评估</a></p>
</div>
</div>
</div>
</div>
<script type="text/javascript" src="http://g.alicdn.com/sj/lib/zepto/zepto.js" charset="utf-8"></script>
<script>
@@ -168,7 +192,6 @@ $(document).on('infinite', '.infinite-scroll-bottom', function() {
}, 1000);
});
//我的收藏查询请求
function selectHouseInfoList(){
axios.get(BASE_PATH + "/rest/index/ourHouseInfoList",
@@ -186,7 +209,7 @@ function selectHouseInfoList(){
// 上次加载的序号
lastIndex = $('.list-container li').length;
//登录状态,但没有数据
if(lastIndex == 0 && resultList.length ==0){
if(lastIndex == 0 && (resultList != null && resultList.length == 0)){
//控制显示
$('#page-group-nologin').show();
$('#page-group-login').hide();
@@ -238,12 +261,24 @@ function checkIsLogin(){
}
}
//跳转添加房产
function gotoAddHouse(){
clicked('/views/house/add.html',true,false,{},{type:0},function(){
checkIsLogin();
})
}
//跳转房产详情
function gotoHouseDetail(id){
clicked('/views/house/detail.html',true,false,{},{houseId:id},function(){
})
}
//跳转房产申请贷款
function gotoLoanApply(houseId, city){
clicked('/views/loan/loanInfo.html',true,false,{},{houseId: houseId, city: city, mobile: ""},function(){})
}
//界面加载
$(document).ready(function () {
checkIsLogin();
@@ -285,7 +320,7 @@ function addItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap, xq
tempTotalPricePercent = (parseFloat(tempTotalPrice)*0.7/10000).toFixed(2);
tempTotalPrice = (parseFloat(tempTotalPrice)/10000).toFixed(2);
}
html += "<li><a href='#' class='item-content'>";
html += '<li onclick="gotoHouseDetail(\''+result.id+'\')"><a href="#" class="item-content">';
html += "<div class='item-inner'><div class='item-title-row'>";
html += "<div class='item-title'>"+result.name+" <em>"+tempTotalPrice+"万</em><span class='tag'><small>"+result.liveStatus+"</small></span></div>";
html += "</div><div class='item-subtitle'>";
@@ -332,7 +367,7 @@ function addItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap, xq
}else{
html += "<a class='add alert-text-title'><i class='icon icon-houseLevel'></i>其他</a>";
}
html += "<a class='button theme add add01 add01a' href='#'>立即申请</a></li>";
html += '<a class="button theme add add01 add01a" href="#" onclick="gotoLoanApply(\''+result.id+'\', \''+result.city+'\')">立即申请</a></li>';
}
$('.infinite-scroll-bottom .list-container').append(html);
}
+27 -16
View File
@@ -25,8 +25,14 @@
.list-block .item-subtitle div.price{position:absolute;bottom:-0.3rem;right:0;}
.list-block .item-subtitle div.price em strong{font-size:1.4rem;color:#EB5F34;font-weight:bold;margin-right:0.1rem;}
/**添加loading加载效果**/
.loadingBg{width:100%;height:100%;background:#fff;overflow:hidden;position:absolute;top:71px;left:0;z-index:100;}
.loadingBg .infinite-scroll-preloader{margin-top:60%;}
.loadingBgDiv{width:100%;height:70%;background:#fff;overflow:hidden;position:absolute;top:2.2rem;left:0;z-index:100;}
.loadingBgDiv .infinite-scroll-preloader{margin-top:60%;}
.list-block{margin-bottom:4rem;}
.content-block{width:100%;background:#fff;position:fixed;bottom:0;z-index:10000;}
@media(min-height:750px){
.list-block{margin-bottom:4.5rem;}
.content-block{bottom:4.5rem;}
}
</style>
</head>
@@ -36,17 +42,13 @@
<div class="page-group">
<div class="page page-current" id="dataList" style="display: none;">
<header class="bar bar-nav">
<!--<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
</button>-->
<h1 class="title">房产评估</h1>
</header>
<!-- 加载loading页 -->
<div class="loadingBg">
<div class="infinite-scroll-preloader">
<div class="preloader"></div>
</div>
</div>
<div class="loadingBgDiv">
<div class="infinite-scroll-preloader">
<div class="preloader"></div>
</div>
</div>
<div class="content">
<div class="list-block media-list">
<!-- 动态封装部分 begin -->
@@ -62,11 +64,13 @@
</div>
<div class="page page-current" id="noData" style="display: none;">
<header class="bar bar-nav">
<!--<button class="button button-link button-nav pull-left" onclick="history.go(-1)">
<span class="icon icon-left"></span>
</button>-->
<h1 class="title">房产评估</h1>
</header>
<div class="loadingBgDiv">
<div class="infinite-scroll-preloader">
<div class="preloader"></div>
</div>
</div>
<div class="content contentSuggest">
<div class="noData">
<img src="../../images/noData.png">
@@ -101,6 +105,7 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/shara/sharaMine.js" ></script>
<script type="text/javascript" src="../../js/log/log_stat.js" ></script>
<script>
//调用mui.init方法
$.init()
@@ -149,7 +154,10 @@ function addManagement(id, houseStatus, liveStatus){
var status = response.data.status;
if(status){
$.toast(response.data.data);
window.location.reload();
$('.loadingBgDiv').show();
checkIsLogin();
plus.webview.getWebviewById('views/user/userInfo.html').reload();
plus.webview.getWebviewById('yfindex.html').reload();
}else{
$.toast(response.data.message);
}
@@ -170,9 +178,11 @@ function selectEvaluateList(){
if(response.data.data==null || resultsMap.houseInfoList==null || resultsMap.houseInfoList.length==0){
$('#dataList').hide();
$('#noData').show();
$('.loadingBgDiv').hide()
}else{
$('#dataList').show();
$('#noData').hide();
$('.loadingBgDiv').hide()
var results = resultsMap.houseInfoList;
var xqOneMonthUpDownRangeMap = resultsMap.xqOneMonthUpDownRangeMap;
var cityAvgPriceMap = resultsMap.cityAvgPriceMap;
@@ -181,7 +191,7 @@ function selectEvaluateList(){
//动态追加内容
$('.list-block ul').html(htmlContent);
//添加loading等待效果
$(".loadingBg").hide();
//$(".loadingBg").hide();
$(".content-block").show();
}
@@ -257,6 +267,7 @@ function checkIsLogin(){
if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){
$('#dataList').hide();
$('#noData').show();
$('.loadingBgDiv').hide();
}else{
selectEvaluateList();
}
@@ -207,7 +207,6 @@ function onPlusReady(){
this.mapObj = new BMap.Map("map", {minZoom:this.datas.minZoom,maxZoom:this.datas.maxZoom})
}
this.mapObj.enableScrollWheelZoom();
alert(this.datas.center.lat);
this.mapObj.centerAndZoom(this.datas.center, this.datas.zoom);
var that = this;
+1 -1
View File
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>贷款申请</title>
<title>贷款申请成功</title>
<meta name="viewport" content="initial-scale=1, maximum-scale=1">
<link rel="shortcut icon" href="/favicon.ico">
<meta name="apple-mobile-web-app-capable" content="yes">
+2 -1
View File
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title id="title2"></title>
<title id="title2">咨询详情</title>
<meta name="viewport" content="initial-scale=1, maximum-scale=1">
<link rel="shortcut icon" href="/favicon.ico">
<meta name="apple-mobile-web-app-capable" content="yes">
@@ -525,6 +525,7 @@ function collect(){
$(".collection").removeClass("collection02")
$(".collection i").removeClass("icon-collection02")
}
plus.webview.getWebviewById('/views/user/userInfo.html').reload()
}
$.toast(msg);
+139 -141
View File
@@ -123,146 +123,86 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/axiosPlugin.js"></script>
<script type="text/javascript" src="../../js/log/log_stat.js" ></script>
<script>
// 获取周期 1-30
function getnumber(){
var data = new Array();
for(var i=1;i<31;i++){
data.push(i);
}
return data;
};
///* 错误提示 */
//$("#confirm_btn").on("click", function () {
// var a = $("#input_time01").val();
// var b = $("#input_time02").val();
// var c = $("#input_rent01").val();
// var d = $("#input_time03").val();
// if(a == ""){
// $.toast("请选择起租日期");
// return false;
// }
// else if(b == ""){
// $.toast("请选择到期日期");
// return false;
// }
// else if(c == ""){
// $.toast("请输入每期租金");
// return false;
// }
// else if(d == ""){
// $.toast("请选择下次收租日期");
// return false;
// }
//});
</script>
<script>
var edit = new Vue({
el:"#edit",
data:{liveStatus:"",leaseStartDate:"",leaseEndDate:"",lastRentDate:"",nowDay:"",rent:"",cycle:""}
});
function getNowFormatDate(time) {
if(typeof(time)=="undefined"||time==null){
return ""
}
var date = new Date(time)
var seperator1 = "-";
var year = date.getFullYear();
var month = date.getMonth() + 1;
var strDate = date.getDate();
if (month >= 1 && month <= 9) {
month = "0" + month;
}
if (strDate >= 0 && strDate <= 9) {
strDate = "0" + strDate;
}
var currentdate = year + seperator1 + month + seperator1 + strDate;
return currentdate;
}
var id="165878889770385408"
$(function (){
//var self = plus.webview.currentWebview();
// id = self.newsId;
axios.get('/rest/rent/queryHouseRent',{params:{id:id}}).then(function(response){
var data = response.data.data.houses;
$.each(data,function(i){
var active = "";
var houseRoomNum = "";
if(this.id == id){
active = "active"
}
if(this.houseRoomNum){
houseRoomNum = '<small>'+this.houseRoomNum+'</small>';
}
$("#titleList").append('<a v-bind:val="'+this.id+'" class="tab-link button '+active+'">'+
'<label>'+this.name+'</label>'+houseRoomNum+'</a>')
$(".buttons-tab01 a").click(function(){
var id = $(this).attr("val")
window.location.href = "index?id="+id;
});
})
var houseInfo = response.data.data.houseInfo;
edit.liveStatus=houseInfo.liveStatus;
edit.leaseStartDate=getNowFormatDate(houseInfo.leaseStartDate);
edit.leaseEndDate = getNowFormatDate(houseInfo.leaseEndDate);
edit.lastRentDate = getNowFormatDate(houseInfo.lastRentDate);
edit.nowDay = getNowFormatDate(response.data.data.nowDay);
edit.rent = houseInfo.rent;
edit.cycle = response.data.data.cycle;
/* 选择-起租日期 */
$("#input_time01").datetimePicker({
toolbarTemplate: '<header class="bar bar-nav bar-nav01 bar-nav01a">\
<button class="button button-link pull-right close-picker">确定</button>\
<h1 class="title">起租日期</h1>\
</header>'
});
/* 选择-到期日期 */
$("#input_time02").datetimePicker({
toolbarTemplate: '<header class="bar bar-nav bar-nav01 bar-nav01a">\
<button class="button button-link pull-right close-picker">确定</button>\
<h1 class="title">到期日期</h1>\
</header>'
});
/* 选择-下次收租日期 */
$("#input_time03").datetimePicker({
toolbarTemplate: '<header class="bar bar-nav bar-nav01 bar-nav01a">\
<button class="button button-link pull-right close-picker">确定</button>\
<h1 class="title">下次收租日期</h1>\
</header>'
});
/* 选择-收租周期 */
$("#input_cycle").picker({
toolbarTemplate: '<header class="bar bar-nav bar-nav01 bar-nav01a">\
<button class="button button-link pull-right close-picker">确定</button>\
<h1 class="title">收租周期</h1>\
</header>',
cols: [
{
textAlign: 'center',
values: getnumber()
},
{
textAlign: 'center',
values: ["年", "季", "月"]
},
{
textAlign: 'center',
values: ["/次"]
}
]
});
}).catch(function(error){
console.log(error)
document.addEventListener('plusready', onPlusReady, false);
function onPlusReady() {
var self = plus.webview.currentWebview();
id = self.id
axios.get('/rest/rent/queryHouseRent',{params:{id:id}}).then(function(response){
var data = response.data.data.houses;
$.each(data,function(i){
var active = "";
var houseRoomNum = "";
if(this.id == id){
active = "active"
}
if(this.houseRoomNum){
houseRoomNum = '<small>'+this.houseRoomNum+'</small>';
}
$("#titleList").append('<a v-bind:val="'+this.id+'" class="tab-link button '+active+'">'+
'<label>'+this.name+'</label>'+houseRoomNum+'</a>')
$(".buttons-tab01 a").click(function(){
var id = $(this).attr("val")
window.location.href = "index?id="+id;
});
})
var houseInfo = response.data.data.houseInfo;
edit.liveStatus=houseInfo.liveStatus;
edit.leaseStartDate=getNowFormatDate(houseInfo.leaseStartDate);
edit.leaseEndDate = getNowFormatDate(houseInfo.leaseEndDate);
edit.lastRentDate = getNowFormatDate(houseInfo.lastRentDate);
edit.nowDay = getNowFormatDate(response.data.data.nowDay);
edit.rent = houseInfo.rent;
edit.cycle = response.data.data.cycle;
/* 选择-起租日期 */
$("#input_time01").datetimePicker({
toolbarTemplate: '<header class="bar bar-nav bar-nav01 bar-nav01a">\
<button class="button button-link pull-right close-picker">确定</button>\
<h1 class="title">起租日期</h1>\
</header>'
});
})
/* 选择-到期日期 */
$("#input_time02").datetimePicker({
toolbarTemplate: '<header class="bar bar-nav bar-nav01 bar-nav01a">\
<button class="button button-link pull-right close-picker">确定</button>\
<h1 class="title">到期日期</h1>\
</header>'
});
/* 选择-下次收租日期 */
$("#input_time03").datetimePicker({
toolbarTemplate: '<header class="bar bar-nav bar-nav01 bar-nav01a">\
<button class="button button-link pull-right close-picker">确定</button>\
<h1 class="title">下次收租日期</h1>\
</header>'
});
/* 选择-收租周期 */
$("#input_cycle").picker({
toolbarTemplate: '<header class="bar bar-nav bar-nav01 bar-nav01a">\
<button class="button button-link pull-right close-picker">确定</button>\
<h1 class="title">收租周期</h1>\
</header>',
cols: [
{
textAlign: 'center',
values: getnumber()
},
{
textAlign: 'center',
values: ["年", "季", "月"]
},
{
textAlign: 'center',
values: ["/次"]
}
]
});
}).catch(function(error){
console.log(error)
});
//var id="165878889770385408"
/* 编辑状态-确定 */
$(document).on('click','#confirm_btn', function () {
@@ -341,12 +281,70 @@ $("#input_cycle").picker({
}
axios.post("/rest/rent/changeStatus",d).then(function(response){
//$.toast(response.data.data);
console.log(1);
back(),plus.nativeUI.closeWaiting();
}).catch(function(error){
console.log(error)
});
});
}
// 获取周期 1-30
function getnumber(){
var data = new Array();
for(var i=1;i<31;i++){
data.push(i);
}
return data;
};
///* 错误提示 */
//$("#confirm_btn").on("click", function () {
// var a = $("#input_time01").val();
// var b = $("#input_time02").val();
// var c = $("#input_rent01").val();
// var d = $("#input_time03").val();
// if(a == ""){
// $.toast("请选择起租日期");
// return false;
// }
// else if(b == ""){
// $.toast("请选择到期日期");
// return false;
// }
// else if(c == ""){
// $.toast("请输入每期租金");
// return false;
// }
// else if(d == ""){
// $.toast("请选择下次收租日期");
// return false;
// }
//});
var edit = new Vue({
el:"#edit",
data:{liveStatus:"",leaseStartDate:"",leaseEndDate:"",lastRentDate:"",nowDay:"",rent:"",cycle:""}
});
function getNowFormatDate(time) {
if(typeof(time)=="undefined"||time==null){
return ""
}
var date = new Date(time)
var seperator1 = "-";
var year = date.getFullYear();
var month = date.getMonth() + 1;
var strDate = date.getDate();
if (month >= 1 && month <= 9) {
month = "0" + month;
}
if (strDate >= 0 && strDate <= 9) {
strDate = "0" + strDate;
}
var currentdate = year + seperator1 + month + seperator1 + strDate;
return currentdate;
}
</script>
</body>
</html>
+53 -11
View File
@@ -26,9 +26,18 @@
</button>
<h1 class="title">管理设置</h1>
</header>
<div class="content">
<div class="content" id="app">
<div class="list-block media-list">
<ul>
<li>
<a onclick="clicked('/views/user/updatePass.html',true);" class="item-link item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">设置密码</div>
</div>
</div>
</a>
</li>
<li>
<a onclick="clicked('about.html',true);" class="item-link item-content">
<div class="item-inner">
@@ -43,10 +52,13 @@
</div>
<div class="content-block">
<p>微信交流群</p>
<img src="images/wx.png" style="width:180px;margin:0 auto;">
<img id="img" style="width:180px;margin:0 auto;">
<p style="text-align:center;">扫码加入</p>
<p>商务合作QQ:275525147</p>
<p style="margin-top:2rem;"><a href="01_index.html" class="button button-big button-fill theme">退出登录</a></p>
<p style="margin-top:2rem;">
<a v-show="showLogout" onclick="logout()" class="button button-big button-fill theme">退出登录</a>
<!--<a v-show="showLogin" onclick="clicked('../user/codeSms.html',true)" class="button button-big button-fill theme">马上登录</a>-->
</p>
</div>
</div>
</div>
@@ -62,20 +74,40 @@ Zepto = $
$.config = {router: false}
</script>
<script type="text/javascript" src="../../js/light7.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/cn.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/common.js"></script>
<script type="text/javascript" src="../../js/mui.min.js"></script>
<script type="text/javascript" src="../../config.js"></script>
<script type="text/javascript" src="../../js/axios.min.js"></script>
<script type="text/javascript" src="../../js/axiosPlugin.js"></script>
<script type="text/javascript" src="../../js/vue.js" ></script>
<script type="text/javascript">
new Vue({
el: '#app',
data: {
showLogin:false,
showLogout:false
},
mounted() {
if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") {
this.showLogin = true;
} else {
this.showLogout = true;
}
}
});
mui.init({
gestureConfig: {
longtap: true
}
});
function logout() {
localStorage.removeItem("user_token");
localStorage.removeItem("user_token_add_time");
back();
}
function download(imgUrl) {
var suffix = '/qun.png';
var downLoader = plus.downloader.createDownload(imgUrl, {
@@ -90,11 +122,21 @@ function download(imgUrl) {
downLoader.start();
}
/*mui.plusReady(function() {
document.getElementById("img").addEventListener("longtap", function(event) {
download("${basePath}/img/${advertisement.imgId?c}");
})
});*/
mui.plusReady(function() {
axios.get("/rest/ad/position",{params:{position : 7}}).then(function (response) {
var data = response.data.data;
if (data) {
document.getElementById("img").setAttribute("src", BASE_PATH+"/img/"+data.imgId);
document.getElementById("img").addEventListener("longtap", function(event) {
download(BASE_PATH+"/img/"+data.imgId);
})
}
})
.catch(function (error) {
console.log(error);
});
});
</script>
</body>
+23 -6
View File
@@ -41,7 +41,7 @@
<button class="button button-link button-nav pull-left" style="display: none;" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
</button>
<button class="button button-link button-nav pull-right" onclick="clicked('../setting/setting.html', true)">
<button class="button button-link button-nav pull-right" onclick="openSettingPage()">
<span class="icon icon-set"></span>
</button>
</header>
@@ -110,7 +110,7 @@
<button class="button button-link button-nav pull-left" style="display: none;" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
</button>
<button class="button button-link button-nav pull-right" onclick="clicked('../setting/setting.html', true)">
<button class="button button-link button-nav pull-right" onclick="openSettingPage()">
<span class="icon icon-set"></span>
</button>
</header>
@@ -275,6 +275,9 @@ function checkIsLogin(){
$('#page-group-login').hide();
$('#page-group-nologin').show();
}else{
//控制显示
$('#page-group-nologin').hide();
$('#page-group-login').show();
//加载个人信息
selectUserInfo();
//加载我的关注
@@ -283,9 +286,6 @@ function checkIsLogin(){
selectHouseInfoList();
//加载我的收藏
selectNewsCollectList();
//控制显示
$('#page-group-nologin').hide();
$('#page-group-login').show();
}
}
@@ -301,10 +301,22 @@ 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(){})
}
//跳转到小区详情
function gotoDistrictDetail(city,region,name){
alert(city)
alert(region)
alert(name)
clicked('/views/district/detail.html',true,false,{},{city:city,region:region,name:name},function(){})
}
//跳转房产详情
function gotoHouseDetail(id){
clicked('/views/house/detail.html',true,false,{},{houseId:id},function(){
})
}
//注册'infinite'事件处理函数
$(document).on('infinite', '.infinite-scroll',function() {
@@ -401,6 +413,11 @@ function selectUserInfo(){
});
}
function openSettingPage() {
clicked('../setting/setting.html',true,false,{},{},function(){
checkIsLogin();
})
}
$(document).ready(function () {
checkIsLogin();
});
+1 -1
View File
@@ -1504,7 +1504,7 @@ function initNearDistricts(cityParam,latParam,lngParam,regionParam,order,minPric
textStr = textName.substr(0,5)+ "...";
}
html += '<div class="card cardNearby" onclick="openDistWindow('+response.data.data.dtos[i].city+','+response.data.data.dtos[i].district+','+response.data.data.dtos[i].name+')"><div class="card-header">'+
html += '<div class="card cardNearby" onclick="openDistWindow(\''+response.data.data.dtos[i].city+'\',\''+response.data.data.dtos[i].district+'\',\''+response.data.data.dtos[i].name+'\')"><div class="card-header">'+
textStr+
'</div><div class="card-content"><div class="card-content-inner">'+response.data.data.dtos[i].avgPrice+'元/㎡</div></div><div class="card-footer">'+
'距您'+response.data.data.dtos[i].distance+'m</div></div>';