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

This commit is contained in:
raoyanhui
2018-04-26 19:25:15 +08:00
7 changed files with 1656 additions and 795 deletions
+1
View File
@@ -699,6 +699,7 @@ input::-webkit-input-placeholder{
.topic .topicTitle > div:nth-child(2){text-align:right;float:right;}
.topic .topicTitle > div:nth-child(2) p label{color:#999;}
.topic .topicTitle > div:nth-child(2) p em{color:#EB5F34;}
.topic .topicTitle.topicTitle01{border-bottom:none;}
.topic .topicContent .topicTitle01{color:#333;margin-top:0;font-size:0.8rem;}
.topic .topicContent .topicTitle01 em{font-size:1.2rem;}
+48
View File
@@ -12,6 +12,12 @@ var searchDistVue = new Vue({
}else{
clicked('views/district/detail.html',true,false,{},{city:this.searchDistricts[index].city,region:this.searchDistricts[index].region,name:this.searchDistricts[index].name});
}
},
clickDistrict:function(index){
saveHistory({district:this.searchDistricts[index].region,name:this.searchDistricts[index].name,city:this.searchDistricts[index].city})
$("#input_district").val(this.searchDistricts[index].name);
$("input[name=region]").val(this.searchDistricts[index].region);
$("input[name=city]").val(this.searchDistricts[index].city);
}
}
})
@@ -122,9 +128,30 @@ $("body").delegate(".open-about02", "click", function () {
addHotDistricts($("#input_city").text());
addHistory();
$.popup(".popup-about02")
$.popup(".popup-about02")
$("input").blur()
});
/* 弹出置换小区搜索页面 */
$("body").delegate(".open-about02b", "click", function () {
$("#districtName").val("");
if($("#input_city").text()==""){
$.toast("请选择城市")
return false;
}
$('.historyList').show();
$("#notFound").hide();
$('.hotList').show();
$('.searchList').hide();
addHotDistricts($("#input_city").text());
addHistoryFilter($("#input_city").text());
$.popup(".popup-about02b")
$("input").blur()
});
//添加热门小区
function addHotDistricts(cityParam){
axios.get(BASE_PATH+"/rest/districts/hotDistricts", {
@@ -164,6 +191,11 @@ var historyVue = new Vue({
}else{
clicked('views/district/detail.html',true,false,{},{city:this.histories[index].city,region:this.histories[index].region,name:this.histories[index].name});
}
},
clickDistrict:function(index){
$("#input_district").val(this.histories[index].name);
$("input[name=region]").val(this.histories[index].region);
$("input[name=city]").val(this.histories[index].city);
}
}
})
@@ -183,6 +215,22 @@ function addHistory(){
}*/
}
function addHistoryFilter(curCity){
var history = recover()
if(history.length>0){
histories = []
$(history).each(function(){
if(this.city==curCity){
var map={city:this.city, region:this.district, name:this.name};
histories.push(map)
}
})
historyVue.histories=histories;
}/*else{
$(".historyList #districtList").empty();
}*/
}
//点击清空
$("#clearSearchHistory").click(function(){
//$.cookie('history',JSON.stringify([]) ,{ expires: 7});
+12 -1
View File
@@ -6,9 +6,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1,user-scalable=no">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<link rel="stylesheet" href="css/sm.css">
<link rel="stylesheet" href="css/mui.min.css">
<link rel="stylesheet" href="css/main.css">
<style>
.mui-bar-tab{background:#fff;box-shadow:none;}
.mui-bar-tab .mui-tab-item{border-top:solid 1px #e7e7e7;}
@@ -16,10 +17,18 @@
.mui-bar-tab .mui-tab-item.mui-active .mui-icon{color:#F18D00;}
.mui-bar-tab .mui-tab-item .mui-icon~.mui-tab-label{color:#C3C0BC;}
.mui-bar-tab .mui-tab-item.mui-active .mui-icon~.mui-tab-label{color:#F18D00;}
.loadingBg{width:100%;height:100%;background:#fff;overflow:hidden;position:absolute;top:11px;left:0;z-index:100;}
.loadingBg .infinite-scroll-preloader{margin-top:30%;}
</style>
</head>
<body>
<div class="loadingBg">
<div class="infinite-scroll-preloader">
<div class="preloader"></div>
</div>
</div>
<nav class="mui-bar mui-bar-tab">
<a class="mui-tab-item mui-active" id="defaultTab" href="yfindex.html">
<span class="mui-icon iconfont icon-tab01"></span>
@@ -89,6 +98,7 @@
} else {
loadStartPage();
//显示启动导航
mui.openWindow({
id: 'guide',
@@ -103,6 +113,7 @@
autoShow: false
}
});
setTimeout(function(){$(".loadingBg").hide();},1000)
}
var self = plus.webview.currentWebview();
for (var i = 0; i < 4; i++) {
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+3 -3
View File
@@ -227,9 +227,9 @@ $.config = {router: false}
<script>
var city = "北京"
var region = "朝阳"
var name = "姜庄湖园林一期"
var city = "上海"
var region = "长宁"
var name = "新泾三村"
//var lat = 31.292437
//var lng = 121.48703
-1
View File
@@ -2035,7 +2035,6 @@ function addItems(number, lastIndex) {
function loadImg(url, obj){
if($(obj).attr("src") == 'cardInfoPlaceholderImg.png'){
$(obj).attr("src", url)
console.log("+=============="+url);
}
}
//数量进行转换