From 21aed7b09ffca375c084cc1933d3be425449743d Mon Sep 17 00:00:00 2001 From: gaojuan Date: Fri, 13 Apr 2018 10:05:44 +0800 Subject: [PATCH 1/5] update --- fangija-zsyf/js/quotations/collectCity.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fangija-zsyf/js/quotations/collectCity.js b/fangija-zsyf/js/quotations/collectCity.js index 7e54aca..0b8c69a 100644 --- a/fangija-zsyf/js/quotations/collectCity.js +++ b/fangija-zsyf/js/quotations/collectCity.js @@ -134,10 +134,8 @@ function loadMyCollectCity(){ axios.get("/rest/quotations/userCollectCitys",{}).then(function (response) { var curDatas = response.data.data - - collCount = curDatas.length; if(curDatas){ - + collCount = curDatas.length; for(var i in curDatas){ var curCity = curDatas[i] if(!IsInArray(myCollectCitys, curCity)){ From 52eff2c755930f3c3fa4f402379780a708096cef Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Fri, 13 Apr 2018 10:26:00 +0800 Subject: [PATCH 2/5] aa --- fangija-zsyf/yfindex.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fangija-zsyf/yfindex.html b/fangija-zsyf/yfindex.html index a2a4444..196f272 100644 --- a/fangija-zsyf/yfindex.html +++ b/fangija-zsyf/yfindex.html @@ -1939,7 +1939,7 @@ function addItems(number, lastIndex) { html += '
近30天涨跌幅: '+(dataObj2[i].weekendMarkup/100*(-1)).toFixed(2)+'%
'; } }else{ - html += '
涨跌幅: 暂无
'; + html += '
近30天涨跌幅: 暂无
'; } html += ''+tagStr+''; From 37deba64e875ccb6b28e02ad2113ce7babf6f62b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Fri, 13 Apr 2018 10:26:44 +0800 Subject: [PATCH 3/5] fix login bug --- fangija-zsyf/js/plus.info.js | 6 +++++- fangija-zsyf/views/user/userInfo.html | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/fangija-zsyf/js/plus.info.js b/fangija-zsyf/js/plus.info.js index 27dcd88..265545c 100644 --- a/fangija-zsyf/js/plus.info.js +++ b/fangija-zsyf/js/plus.info.js @@ -7,7 +7,11 @@ document.addEventListener('plusready', onPlusReady, false); //扩展API加载完毕,现在可以正常调用扩展API function onPlusReady(){ getPosition(); -} +} +var province = ""; +var city = ""; +var region = ""; + // 获取当前用户位置 function getPosition(){ plus.geolocation.getCurrentPosition(function(p){ diff --git a/fangija-zsyf/views/user/userInfo.html b/fangija-zsyf/views/user/userInfo.html index a0ac6b0..e071a1a 100644 --- a/fangija-zsyf/views/user/userInfo.html +++ b/fangija-zsyf/views/user/userInfo.html @@ -291,7 +291,7 @@ function checkIsLogin(){ //跳转登录方法, 考虑回调 function gotoLogin(){ - clicked('/views/user/passLogin.html',true,false,{},{},function(){ + clicked('/views/user/codeSms.html',true,false,{},{},function(){ checkIsLogin(); }) } From 70e94b92a41ffe6d4ae59e00dff43cfea1f212db Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Fri, 13 Apr 2018 11:17:00 +0800 Subject: [PATCH 4/5] aa --- fangija-zsyf/views/house/add.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/fangija-zsyf/views/house/add.html b/fangija-zsyf/views/house/add.html index 4817c7f..7df2ad5 100644 --- a/fangija-zsyf/views/house/add.html +++ b/fangija-zsyf/views/house/add.html @@ -1171,7 +1171,6 @@
-
没有更多数据
@@ -1207,7 +1206,6 @@
-
没有更多数据
From fefc792038c46e7aa0631f15ad971d208759368a Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Fri, 13 Apr 2018 11:26:44 +0800 Subject: [PATCH 5/5] aa --- fangija-zsyf/views/house/add.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fangija-zsyf/views/house/add.html b/fangija-zsyf/views/house/add.html index 7df2ad5..309833f 100644 --- a/fangija-zsyf/views/house/add.html +++ b/fangija-zsyf/views/house/add.html @@ -33,9 +33,9 @@ -