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

This commit is contained in:
zongzhimin
2018-04-13 12:02:12 +08:00
5 changed files with 10 additions and 10 deletions
+5 -1
View File
@@ -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){
+1 -3
View File
@@ -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)){
+2 -4
View File
@@ -33,9 +33,9 @@
<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
</button>
<button class="button button-link button-nav pull-right open-popover">
<!--<button class="button button-link button-nav pull-right open-popover">
<span class="icon icon-path"></span>
</button>
</button>-->
<h1 class="title">房产评估</h1>
</header>
<div class="content">
@@ -1171,7 +1171,6 @@
<!-- 加载提示符 -->
<div class="infinite-scroll-preloader">
<div class="preloader"></div>
<div style="color:#999;">没有更多数据</div>
</div>
@@ -1207,7 +1206,6 @@
<!-- 加载提示符 -->
<div class="infinite-scroll-preloader">
<div class="preloader"></div>
<div style="color:#999;">没有更多数据</div>
</div>
+1 -1
View File
@@ -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();
})
}
+1 -1
View File
@@ -1939,7 +1939,7 @@ function addItems(number, lastIndex) {
html += '<div>近30天涨跌幅: <em class="down">'+(dataObj2[i].weekendMarkup/100*(-1)).toFixed(2)+'%<i class="icon icon-arrow-green"></i></em></div>';
}
}else{
html += '<div>涨跌幅: <em class="em01">暂无</em></div>';
html += '<div>近30天涨跌幅: <em class="em01">暂无</em></div>';
}
html += '</div>'+tagStr+'</div></a></li>';