From 55b334eb5f7af6dc17776f9f0abf7a3afe680349 Mon Sep 17 00:00:00 2001
From: gaojuan
Date: Mon, 7 May 2018 10:42:34 +0800
Subject: [PATCH 01/11] log
---
fangija-zsyf/views/changeHouse/index.html | 1 +
fangija-zsyf/views/changeHouse/result.html | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/fangija-zsyf/views/changeHouse/index.html b/fangija-zsyf/views/changeHouse/index.html
index 8fe9bb4..2284b1a 100644
--- a/fangija-zsyf/views/changeHouse/index.html
+++ b/fangija-zsyf/views/changeHouse/index.html
@@ -1353,6 +1353,7 @@ document.addEventListener('plusready', onPlusReady, false);
function onPlusReady() {
var self = plus.webview.currentWebview();
hsId = self.hsId
+ // alert("index:"+hsId);
if(hsId){
//如果是修改置换建议,则默认将值填入
axios.get(BASE_PATH + "/rest/changeHouse/loadHouseSubInfo",{
diff --git a/fangija-zsyf/views/changeHouse/result.html b/fangija-zsyf/views/changeHouse/result.html
index c5ed03f..221add4 100644
--- a/fangija-zsyf/views/changeHouse/result.html
+++ b/fangija-zsyf/views/changeHouse/result.html
@@ -129,7 +129,7 @@
@@ -399,6 +399,7 @@ $(document).on('infinite', '.infinite-scroll-bottom', function() {
});
function updateChangeHouse(){
+ alert(hsId);
clicked('views/changeHouse/index.html',true,false,{},{hsId:hsId});
}
From f34ed386ab60e48bc4ab4183562c9fd1043b56b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?=
Date: Mon, 7 May 2018 11:44:03 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=A1=B5=E8=B4=9F?=
=?UTF-8?q?=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
fangija-zsyf/start.html | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/fangija-zsyf/start.html b/fangija-zsyf/start.html
index 138c66d..125e965 100644
--- a/fangija-zsyf/start.html
+++ b/fangija-zsyf/start.html
@@ -148,7 +148,11 @@ function run(){
}
return false;
}
- time.innerHTML = time.innerHTML * 1 - 1;
+ var ntime = time.innerHTML * 1 - 1;
+ if(ntime <= 0) {
+ ntime = 0;
+ }
+ time.innerHTML = ntime;
}
From e77d1d606bfd25c56be160f7a83d6cdb8b0dd42d Mon Sep 17 00:00:00 2001
From: gaojuan
Date: Mon, 7 May 2018 12:33:23 +0800
Subject: [PATCH 03/11] update
---
fangija-zsyf/config.js | 11 +++----
fangija-zsyf/js/district/districtDetail.js | 7 ++--
fangija-zsyf/views/changeHouse/index.html | 33 ++++++++++++++++---
fangija-zsyf/views/changeHouse/result.html | 3 +-
.../views/component/baseInfoComponent.js | 1 +
fangija-zsyf/views/district/detail.html | 2 +-
6 files changed, 41 insertions(+), 16 deletions(-)
diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js
index 369d1c2..ff023e2 100644
--- a/fangija-zsyf/config.js
+++ b/fangija-zsyf/config.js
@@ -1,14 +1,11 @@
/**服务端地址**/
//var BASE_PATH = "http://youfang.fangjia.com";
//var BASE_PATH = "http://192.168.10.128:8084";
-<<<<<<< HEAD
-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";
->>>>>>> 9c25ef0b2e3f9e2a19df5038da587d6c53827469
-//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.161:8084";
+//var BASE_PATH = "http://192.168.10.47:8086";
+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.170:8084";
//var BASE_PATH = "http://192.168.10.171:8084";
//var BASE_PATH = "http://192.168.10.164:8084";
diff --git a/fangija-zsyf/js/district/districtDetail.js b/fangija-zsyf/js/district/districtDetail.js
index b565f64..4f34b3a 100644
--- a/fangija-zsyf/js/district/districtDetail.js
+++ b/fangija-zsyf/js/district/districtDetail.js
@@ -542,8 +542,11 @@ function showRentChart2(categories, series, roomDatas){
fontSize: 12
},
formatter: function (params) {
- var res = params[0].name + '
' + "租金:"+params[0].value + '元/月';
- return res;
+ if(params[0].value){
+ var res = params[0].name + '
' + "租金:"+params[0].value + '元/月';
+ return res;
+ }
+
}
},
grid:{
diff --git a/fangija-zsyf/views/changeHouse/index.html b/fangija-zsyf/views/changeHouse/index.html
index 2284b1a..a6ab26a 100644
--- a/fangija-zsyf/views/changeHouse/index.html
+++ b/fangija-zsyf/views/changeHouse/index.html
@@ -1353,10 +1353,21 @@ document.addEventListener('plusready', onPlusReady, false);
function onPlusReady() {
var self = plus.webview.currentWebview();
hsId = self.hsId
- // alert("index:"+hsId);
+ houseId = self.houseId
if(hsId){
//如果是修改置换建议,则默认将值填入
- axios.get(BASE_PATH + "/rest/changeHouse/loadHouseSubInfo",{
+ updateChangeSubtation(hsId);
+ }
+
+ if(houseId){
+ //小区报告页带入
+ fillHouseInfo(houseId);
+ }
+
+}
+//修改置换建议填充默认值
+function updateChangeSubtation(hsId){
+ axios.get(BASE_PATH + "/rest/changeHouse/loadHouseSubInfo",{
params:{
hsId:hsId
}
@@ -1398,7 +1409,22 @@ function onPlusReady() {
}).catch(function (error) {
console.log(error);
});
- }
+}
+
+function fillHouseInfo(houseId){
+ axios.get(BASE_PATH + "/rest/index/loadHouse",{
+ params:{
+ houseId:houseId
+ }
+ }).then(function (response) {
+ var data = response.data.data;
+ if(data){
+ addBaseHouseInfo(data);
+ baseInfo.houseId = hs.houseId
+ }
+ }).catch(function (error) {
+ console.log(error);
+ });
}
//填充房产价格信息
@@ -1819,7 +1845,6 @@ $("#citySearchInp").bind('keyup', function() {
});
function openAddHouse(){
- alert("ssss")
clicked('/views/house/add.html',true,false,{},{});
}
diff --git a/fangija-zsyf/views/changeHouse/result.html b/fangija-zsyf/views/changeHouse/result.html
index 221add4..2aeaa8a 100644
--- a/fangija-zsyf/views/changeHouse/result.html
+++ b/fangija-zsyf/views/changeHouse/result.html
@@ -399,8 +399,7 @@ $(document).on('infinite', '.infinite-scroll-bottom', function() {
});
function updateChangeHouse(){
- alert(hsId);
- clicked('views/changeHouse/index.html',true,false,{},{hsId:hsId});
+ clicked('/views/changeHouse/index.html',true,false,{},{hsId:hsId});
}
diff --git a/fangija-zsyf/views/component/baseInfoComponent.js b/fangija-zsyf/views/component/baseInfoComponent.js
index 060a22c..c83766b 100644
--- a/fangija-zsyf/views/component/baseInfoComponent.js
+++ b/fangija-zsyf/views/component/baseInfoComponent.js
@@ -303,5 +303,6 @@ function addSubstitution(sr, hs, house){
// onclick="openUrl('${basePath}/message/openView?url=${basePath}/mad/adUrlLoad?adid=${advertisement.id!?c}')"#if> ><#if advertisement.content??>${advertisement.content!}#if>
// #if>
$("#suggestDiv").text(s);
+ $("#suggestDiv").show();
}
diff --git a/fangija-zsyf/views/district/detail.html b/fangija-zsyf/views/district/detail.html
index 15b88e3..c9954a6 100644
--- a/fangija-zsyf/views/district/detail.html
+++ b/fangija-zsyf/views/district/detail.html
@@ -63,7 +63,7 @@
{{name}}
-
+
购买 龙盛佳苑 90-110㎡ 的房子,总价预计约为587-717万。
查看详情
From 2eafd0be85298006514e7c7984c703a450b71249 Mon Sep 17 00:00:00 2001
From: raoyanhui
Date: Mon, 7 May 2018 12:57:03 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=AA=E4=BA=BA?=
=?UTF-8?q?=E4=B8=AD=E5=BF=83=E7=9A=84=E5=88=A0=E9=99=A4=E5=90=8E=E5=8A=A0?=
=?UTF-8?q?=E8=BD=BD=E6=95=88=E6=9E=9C=EF=BC=8C=20=E4=B8=8D=E7=94=A8reload?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
fangija-zsyf/js/user/myHouse.js | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/fangija-zsyf/js/user/myHouse.js b/fangija-zsyf/js/user/myHouse.js
index c49a6a5..5c2139b 100644
--- a/fangija-zsyf/js/user/myHouse.js
+++ b/fangija-zsyf/js/user/myHouse.js
@@ -28,9 +28,14 @@ function selectHouseInfoList(){
var xqOneMonthUpDownRangeMap = resultsMap.xqOneMonthUpDownRangeMap;
var xqPotentialIndexMap = resultsMap.xqPotentialIndexMap;
var houseInfoTotalMap = resultsMap.houseInfoTotalMap;
+ //调整统计num的顺序
+ mh_totalRecords = resultsMap.houseInfoPageList.totalRecords;
+ tab.mh_num = mh_totalRecords;
+
if(resultList != null && resultList.length == 0){
// 删除加载提示符
- $('#loadTip1').remove();
+ $('#loadTip1').hide();
+ //$('#loadTip1').remove();
//$('.infinite-scroll-preloader').remove();
// 加载完毕,则注销无限加载事件,以防不必要的加载
//$.detachInfiniteScroll($('.infinite-scroll'));
@@ -39,7 +44,8 @@ function selectHouseInfoList(){
if(resultsMap.houseInfoPageList.currentPage == resultsMap.houseInfoPageList.totalPages){
//如果此次查询刚好是page = totalPages
// 删除加载提示符
- $('#loadTip1').remove();
+ $('#loadTip1').hide();
+ //$('#loadTip1').remove();
//$('.infinite-scroll-preloader').remove();
// 加载完毕,则注销无限加载事件,以防不必要的加载
//$.detachInfiniteScroll($('.infinite-scroll'));
@@ -57,8 +63,6 @@ function selectHouseInfoList(){
mh_page = resultsMap.houseInfoPageList.currentPage;
mh_pageSize = resultsMap.houseInfoPageList.limit;
mh_totalPages = resultsMap.houseInfoPageList.totalPages;
- mh_totalRecords = resultsMap.houseInfoPageList.totalRecords;
- tab.mh_num = mh_totalRecords;
mhAddItems(mh_itemsPerLoad, mh_lastIndex, dataObj, xqOneMonthUpDownRangeMap, xqPotentialIndexMap, houseInfoTotalMap);
}).catch(function (error) {
console.log(error);
From 02727c6550d4b4b7acafb71452da16d4dc93b7f0 Mon Sep 17 00:00:00 2001
From: raoyanhui
Date: Mon, 7 May 2018 12:58:20 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=AA=E4=BA=BA?=
=?UTF-8?q?=E4=B8=AD=E5=BF=83=E7=9A=84=E5=88=A0=E9=99=A4=E5=90=8E=E5=8A=A0?=
=?UTF-8?q?=E8=BD=BD=E6=95=88=E6=9E=9C=EF=BC=8C=20=E4=B8=8D=E7=94=A8reload?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
fangija-zsyf/views/user/userInfo.html | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/fangija-zsyf/views/user/userInfo.html b/fangija-zsyf/views/user/userInfo.html
index b332a83..6273d4e 100644
--- a/fangija-zsyf/views/user/userInfo.html
+++ b/fangija-zsyf/views/user/userInfo.html
@@ -227,7 +227,7 @@ $.config = {router: false}
-
+
@@ -350,7 +350,8 @@ $(document).on('infinite', '.infinite-scroll',function() {
// 加载完毕,则注销无限加载事件,以防不必要的加载
//$.detachInfiniteScroll($('.infinite-scroll'));
// 删除加载提示符
- $('#loadTip1').remove();
+ //$('#loadTip1').remove();
+ $('#loadTip1').hide();
return;
}
//控制查询下一页的数据
@@ -466,7 +467,8 @@ $(document).on("click",".confirm-ok", function () {
$.toast(response.data.data);
//删除后,如果需要调用checkIsLogin,需要所有的参数初始化
//checkIsLogin();
- window.location.reload();
+ //window.location.reload();
+ initMyHouseParams();
//删除房产会影响个人中心房产列表, 刷新
/*if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){
plus.webview.getWebviewById('views/user/userInfo.html').reload();
@@ -482,6 +484,24 @@ $(document).on("click",".confirm-ok", function () {
$(".modal-text").css("text-align","center");
});
+//初始化分页参数, 防止回调时候重新请求出错
+function initMyHouseParams(){
+ mh_loading = false;
+ mh_page = undefined;
+ var mh_pageSize = undefined;
+ var mh_totalPages = undefined;
+ var mh_totalRecords = undefined;
+ var mh_lastIndex = undefined;
+ var mh_itemsPerLoad = undefined;
+ var mh_maxItems = 100;
+ //清空构造的container
+ $('#myhouse').html('');
+ // 删除加载提示符
+ $('#loadTip1').show();
+ //加载我的房产
+ selectHouseInfoList();
+}
+
function openSettingPage() {
clicked('../setting/setting.html',true,false,{},{},function(){})
}
From b01066dc8d4888fc440367cf3374fe4a2a103e04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?=
Date: Mon, 7 May 2018 13:41:01 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E9=9D=A2=E6=B6=88?=
=?UTF-8?q?=E6=81=AF=E6=8E=A8=E9=80=81=E5=88=87=E6=8D=A2=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
fangija-zsyf/main.html | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/fangija-zsyf/main.html b/fangija-zsyf/main.html
index 7ac35c6..f85cbe4 100644
--- a/fangija-zsyf/main.html
+++ b/fangija-zsyf/main.html
@@ -30,7 +30,7 @@