diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index b67f403..20b6550 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -5,7 +5,7 @@ //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.170:8084"; //var BASE_PATH = "http://192.168.10.171:8084"; /**是否显示过启动页面**/ var lauchFlag = false; \ No newline at end of file diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css index 6e0726a..c5e791b 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -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;} diff --git a/fangija-zsyf/images/guideImg01.png b/fangija-zsyf/images/guideImg01.png new file mode 100644 index 0000000..da45972 Binary files /dev/null and b/fangija-zsyf/images/guideImg01.png differ diff --git a/fangija-zsyf/images/guideImg02.png b/fangija-zsyf/images/guideImg02.png new file mode 100644 index 0000000..752e2e4 Binary files /dev/null and b/fangija-zsyf/images/guideImg02.png differ diff --git a/fangija-zsyf/images/guideImg03.png b/fangija-zsyf/images/guideImg03.png new file mode 100644 index 0000000..70ca6b6 Binary files /dev/null and b/fangija-zsyf/images/guideImg03.png differ diff --git a/fangija-zsyf/js/searchDistrict-app.js b/fangija-zsyf/js/searchDistrict-app.js index fbe4401..24f9940 100644 --- a/fangija-zsyf/js/searchDistrict-app.js +++ b/fangija-zsyf/js/searchDistrict-app.js @@ -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}); diff --git a/fangija-zsyf/js/updateVersion/updateVersion.js b/fangija-zsyf/js/updateVersion/updateVersion.js index 69cfb64..179a24f 100644 --- a/fangija-zsyf/js/updateVersion/updateVersion.js +++ b/fangija-zsyf/js/updateVersion/updateVersion.js @@ -1,13 +1,15 @@ var versionUpdate = function(){ - var isAndroid = isAndroidUser(); - plus.runtime.getProperty(plus.runtime.appid, function(inf) { - var localVersion =inf.version; - var curVersion = versionInfo(); - if(parseFloat(localVersion) parseFloat(currentVersion[0])){ + return true; + }else if(parseFloat(onLineVersion[0]) == parseFloat(currentVersion[0])){ + //在比较第二位 + if(parseFloat(onLineVersion[1]) > parseFloat(currentVersion[1])){ + return true; + }else if(parseFloat(onLineVersion[1]) == parseFloat(currentVersion[1])){ + //判断第三位是否存在,存在才可以进行比较 + if(onLineVersion.length > currentVersion.length){ + //如果当前输入的version大于maxVersion的length + return true; + }else if(onLineVersion.length == currentVersion.length){ + if(onLineVersion.length == 2){ + return false; + }else{ + //当length相等,且存在第三位 + if(parseFloat(onLineVersion[2]) > parseFloat(currentVersion[2])){ + return true; + }else if(parseFloat(onLineVersion[2]) == parseFloat(currentVersion[2])){ + return false; + }else{ + return false; + } + } + }else{ + //如果当前输入的version小于maxVersion的length + return false; + } + }else{ + return false; + } + }else{ + return false; + } + }catch(e){ + return false; + } } \ No newline at end of file diff --git a/fangija-zsyf/main.html b/fangija-zsyf/main.html index 05e57f7..f3eebe6 100644 --- a/fangija-zsyf/main.html +++ b/fangija-zsyf/main.html @@ -6,9 +6,10 @@ - + + +
+
+
+
+