diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css index 861cb4f..9bccd0c 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -1291,11 +1291,12 @@ input[type=range]::-webkit-slider-thumb { .rangeNote span.span07{float:right;} /* 启动页 */ -.contentStart{background:#21a5fe;} -.contentStart .time{width:65px;height:30px;line-height:1.6rem;text-align:center;font-size:0.7rem;color:#fff;background:rgba(0,0,0,0.3);border-radius:1.25rem;display:block;position:absolute;top:0.75rem;right:0.75rem;} +.contentStart{background:#F18D00;} +.contentStart .time{width:65px;height:30px;line-height:1.6rem;text-align:center;font-size:0.7rem;color:#fff;background:rgba(0,0,0,0.3);border-radius:1.25rem;display:block;position:absolute;top:0.75rem;right:0.75rem;z-index:4;} .contentStart #time{font-size:0.7rem;vertical-align:middle;} -.contentStart img{width:70%;margin:0 auto;margin-top:30%;} -.contentStart #test_btn{background:#fff;color:#21a5fe;width:10rem;margin:0 auto;margin-top:1.5rem;} +.contentStart .startImg01{width:50%;position:absolute;top:30%;left:50%;margin-left:-25%;z-index:3;} +.contentStart .startImg02{width:100%;position:absolute;bottom:0;z-index:2;} +.contentStart .startImg03{width:100%;position:absolute;top:0;z-index:1;} /* 引导页 */ .swiper-container{width:100%;height:100%;background:#fff;z-index:10000;} diff --git a/fangija-zsyf/images/icon-home02.png b/fangija-zsyf/images/icon-home02.png index e00a576..c13cc19 100644 Binary files a/fangija-zsyf/images/icon-home02.png and b/fangija-zsyf/images/icon-home02.png differ diff --git a/fangija-zsyf/images/startImg01.png b/fangija-zsyf/images/startImg01.png new file mode 100644 index 0000000..454233f Binary files /dev/null and b/fangija-zsyf/images/startImg01.png differ diff --git a/fangija-zsyf/images/startImg02.png b/fangija-zsyf/images/startImg02.png new file mode 100644 index 0000000..218bf5c Binary files /dev/null and b/fangija-zsyf/images/startImg02.png differ diff --git a/fangija-zsyf/images/startImg02a.png b/fangija-zsyf/images/startImg02a.png new file mode 100644 index 0000000..2f2b929 Binary files /dev/null and b/fangija-zsyf/images/startImg02a.png differ diff --git a/fangija-zsyf/images/startImg03.png b/fangija-zsyf/images/startImg03.png new file mode 100644 index 0000000..2b2bb11 Binary files /dev/null and b/fangija-zsyf/images/startImg03.png differ diff --git a/fangija-zsyf/js/axiosPlugin.js b/fangija-zsyf/js/axiosPlugin.js index 531b3ee..bf0c8cc 100644 --- a/fangija-zsyf/js/axiosPlugin.js +++ b/fangija-zsyf/js/axiosPlugin.js @@ -1,6 +1,6 @@ axios.defaults.baseURL = BASE_PATH; axios.defaults.headers.post['Content-Type'] = 'application/json'; -axios.defaults.timeout = 15000; +axios.defaults.timeout = 120000; // 添加请求拦截器 axios.interceptors.request.use(function (config) { diff --git a/fangija-zsyf/js/city.js b/fangija-zsyf/js/city.js index c4024e4..d0a3459 100644 --- a/fangija-zsyf/js/city.js +++ b/fangija-zsyf/js/city.js @@ -77,7 +77,7 @@ function formatBaiduCity(baiduCity) { break; } } - if (newCity == "" && baiduCity.endWith("市")) { + if (newCity == "" && baiduCity && baiduCity.endWith("市")) { newCity = baiduCity.substring(0,baiduCity.length-1); } return newCity; diff --git a/fangija-zsyf/js/district/districtDetail.js b/fangija-zsyf/js/district/districtDetail.js index f8d2cdc..dab296b 100644 --- a/fangija-zsyf/js/district/districtDetail.js +++ b/fangija-zsyf/js/district/districtDetail.js @@ -12,6 +12,9 @@ var mapLoadCount = 0; function doAddCollect(){ if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") { clicked('../user/codeSms.html',true,false,{},{},function(){ + plus.webview.getWebviewById('views/user/userInfo.html').reload(); + plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); doAddCollect(); }) return; @@ -29,10 +32,9 @@ function addCollect(){ $(".collection01").hide(); $(".collection02").show(); $.toast("随时掌握小区动态"); + plus.webview.getWebviewById('views/user/userInfo.html').reload(); } - plus.webview.getWebviewById('views/user/userInfo.html').reload(); - plus.webview.getWebviewById('yfindex.html').reload(); - plus.webview.getWebviewById('views/house/houseManageList.html').reload(); + }) .catch(function (error) { console.log(error); @@ -47,6 +49,7 @@ function doRemoveCollect(){ if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") { clicked('../user/codeSms.html',true,false,{},{},function(){ doRemoveCollect(); + plus.webview.getWebviewById('views/user/userInfo.html').reload(); }) return; } else { @@ -311,6 +314,8 @@ function showTrends(v){ clicked('../user/codeSms.html',true,false,{},{},function(){ showTrends(v); plus.webview.getWebviewById('views/user/userInfo.html').reload(); + plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); }) return; } else { diff --git a/fangija-zsyf/js/quotations/cityDetail.js b/fangija-zsyf/js/quotations/cityDetail.js index bca5fe0..3fb27b6 100644 --- a/fangija-zsyf/js/quotations/cityDetail.js +++ b/fangija-zsyf/js/quotations/cityDetail.js @@ -198,6 +198,9 @@ function clickTrend(city, type){ if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") { clicked('../user/codeSms.html',true,false,{},{},function(){ clickTrend(city, type); + plus.webview.getWebviewById('views/user/userInfo.html').reload(); + plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); }) return; } else { @@ -542,6 +545,7 @@ function collectCity(city, type){ collectCity(city, type) plus.webview.getWebviewById('views/house/houseManageList.html').reload(); plus.webview.getWebviewById('views/user/userInfo.html').reload(); + //plus.webview.getWebviewById('views/house/houseDetail.html').reload(); }) return; } else { diff --git a/fangija-zsyf/manifest.json b/fangija-zsyf/manifest.json index 2d43317..8cf9750 100644 --- a/fangija-zsyf/manifest.json +++ b/fangija-zsyf/manifest.json @@ -7,7 +7,7 @@ "id": "H5693FF3D",/*应用的标识,创建应用时自动生成,勿手动修改*/ "name": "有房",/*应用名称,程序桌面图标名称*/ "version": { - "name": "1.1",/*应用版本名称*/ + "name": "1.1.1",/*应用版本名称*/ "code": "20109" }, "description": "有房,围绕房产提供全方位数据分析的房产及金融服务平台,通过个性化的智能推荐,定制专属的个人投资或购房计划,多维度管理自有房产并提供房产融资通道。",/*应用描述信息*/ @@ -254,31 +254,31 @@ "ios": { "iphone": { "default": "", - "retina35": "E:/房价网/201712/最新启动页面/有房-启动画面/iPhone/640x960.png", - "retina40": "E:/房价网/201712/最新启动页面/有房-启动画面/iPhone/640x1136.png", - "retina47": "E:/房价网/201712/最新启动页面/有房-启动画面/iPhone/750x1334.png", - "retina55": "E:/房价网/201712/最新启动页面/有房-启动画面/iPhone/1242x2208.png", - "retina55l": "E:/房价网/201712/最新启动页面/有房-启动画面/iPhone/2208x1242.png", - "iphonex": "E:/房价网/201712/最新启动页面/有房-启动画面/iPhone/1125x2436.png", - "iphonexl": "E:/房价网/201712/最新启动页面/有房-启动画面/iPhone/2436x1125.png" + "retina35": "E:/房价网/201804/启动页尺寸/iphone/启动页iphone4_4s.png", + "retina40": "E:/房价网/201804/启动页尺寸/iphone/启动页iphone5_5s.png", + "retina47": "E:/房价网/201804/启动页尺寸/iphone/启动页iphone6.png", + "retina55": "E:/房价网/201804/启动页尺寸/iphone/启动页iphone6plus竖版.png", + "retina55l": "E:/房价网/201804/启动页尺寸/iphone/启动页iphone6plus横版.png", + "iphonex": "E:/房价网/201804/启动页尺寸/iphone/启动页iphonex竖屏.png", + "iphonexl": "E:/房价网/201804/启动页尺寸/iphone/启动页iphonex横版.png" }, "ipad": { - "portrait": "E:/房价网/201712/最新启动页面/有房-启动画面/iPad/768x1004.png", - "portrait7": "E:/房价网/201712/最新启动页面/有房-启动画面/iPad/768x1024.png", - "landscape": "E:/房价网/201712/最新启动页面/有房-启动画面/iPad/1024x748.png", - "landscape7": "E:/房价网/201712/最新启动页面/有房-启动画面/iPad/1024x768.png", - "portrait-retina": "E:/房价网/201712/最新启动页面/有房-启动画面/iPad/1536x2008.png", - "portrait-retina7": "E:/房价网/201712/最新启动页面/有房-启动画面/iPad/1536x2048.png", - "landscape-retina": "E:/房价网/201712/最新启动页面/有房-启动画面/iPad/2048x1496.png", - "landscape-retina7": "E:/房价网/201712/最新启动页面/有房-启动画面/iPad/2048x1536.png" + "portrait": "E:/房价网/201804/启动页尺寸/ipad/启动页ipad竖屏768_1004.png", + "portrait7": "E:/房价网/201804/启动页尺寸/ipad/启动页ipad-ios7竖屏768_1024.png", + "landscape": "E:/房价网/201804/启动页尺寸/ipad/启动页ipad1024_748横屏.png", + "landscape7": "E:/房价网/201804/启动页尺寸/ipad/启动页ipad-ios7横屏1024_768.png", + "portrait-retina": "E:/房价网/201804/启动页尺寸/ipad/启动页ipad高分屏竖屏.png", + "portrait-retina7": "E:/房价网/201804/启动页尺寸/ipad/启动页ipad-ios7高分屏竖屏.png", + "landscape-retina": "E:/房价网/201804/启动页尺寸/ipad/启动页ipad高分屏横屏.png", + "landscape-retina7": "E:/房价网/201804/启动页尺寸/ipad/启动页ipad-ios7高分屏横屏.png" } }, "android": { "mdpi": "", /*普通屏启动图片,分辨率:240x282*/ "ldpi": "", - "hdpi": "E:/房价网/201712/最新启动页面/有房-启动画面/Android/480x762.png", - "xhdpi": "E:/房价网/201712/最新启动页面/有房-启动画面/Android/720x1242.png", - "xxhdpi": "E:/房价网/201712/最新启动页面/有房-启动画面/Android/1080x1882.png" + "hdpi": "E:/房价网/201804/安卓启动页/启动页android高分屏1.png", + "xhdpi": "E:/房价网/201804/安卓启动页/启动页android-720P高分屏2.png", + "xxhdpi": "E:/房价网/201804/安卓启动页/启动页android-1080高分屏3.png" } }, "plugins": { diff --git a/fangija-zsyf/start.html b/fangija-zsyf/start.html index cb0ba88..776f27b 100644 --- a/fangija-zsyf/start.html +++ b/fangija-zsyf/start.html @@ -22,10 +22,9 @@
跳过 5 - - + + +
diff --git a/fangija-zsyf/views/component/cityIncreaseRankingComponent.js b/fangija-zsyf/views/component/cityIncreaseRankingComponent.js index 52a9a8f..09e3987 100644 --- a/fangija-zsyf/views/component/cityIncreaseRankingComponent.js +++ b/fangija-zsyf/views/component/cityIncreaseRankingComponent.js @@ -50,7 +50,7 @@ Vue.component('city_increase_ranking',{ follow:function(city,event, type){ if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ - clicked('/views/user/passLogin.html',true,false,{},{},function(){ + clicked('/views/user/codeSms.html',true,false,{},{},function(){ if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ }else{ $.confirm('您确定要关注'+city+"?", function () { diff --git a/fangija-zsyf/views/house/add.html b/fangija-zsyf/views/house/add.html index 342aa2f..5643018 100644 --- a/fangija-zsyf/views/house/add.html +++ b/fangija-zsyf/views/house/add.html @@ -1845,7 +1845,9 @@ function checkIsLogin(){ }else{ addEvaluation(); - + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); + plus.webview.getWebviewById('views/user/userInfo.html').reload(); + plus.webview.getWebviewById('views/house/houseDetail.html').reload(); } }) }else{ diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index ab55c78..75d3004 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -1271,15 +1271,12 @@ $.config = {router: false} var city = ""; plus.geolocation.getCurrentPosition(function(p){ city = p.address.city; - - if(city && city.endsWith("市")){ + var formatCity = formatBaiduCity(city); + positionCity = formatCity + city = formatCity; + $(".nowCity").html(city); + loadAllCityData(); - var formatCity = formatBaiduCity(city); - positionCity = formatCity - city = formatCity; - $(".nowCity").html(city); - loadAllCityData(); - } loadMyCollectCity(); }, function(e){ diff --git a/fangija-zsyf/views/news/newsDetail.html b/fangija-zsyf/views/news/newsDetail.html index 99d598f..a0c37fd 100644 --- a/fangija-zsyf/views/news/newsDetail.html +++ b/fangija-zsyf/views/news/newsDetail.html @@ -504,6 +504,9 @@ $(".collection").on("click", function () { function doCollect() { if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") { clicked('../user/codeSms.html',true,false,{},{},function(){ + plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + plus.webview.getWebviewById('views/user/userInfo.html').reload() + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); doCollect(); }) return; @@ -533,7 +536,7 @@ function collect(){ $(".collection").removeClass("collection02") $(".collection i").removeClass("icon-collection02") } - plus.webview.getWebviewById('views/user/userInfo.html').reload() + } $.toast(msg); diff --git a/fangija-zsyf/yfindex.html b/fangija-zsyf/yfindex.html index ce512cf..69be1ef 100644 --- a/fangija-zsyf/yfindex.html +++ b/fangija-zsyf/yfindex.html @@ -1546,6 +1546,9 @@ function initNews(page){ } }) .then(function (response) { + if(page == 1){ + dataObj = [] + } //合并数组 if(response.data.data.list.length == 0){ //隐藏加载框 @@ -2226,13 +2229,6 @@ function changeCity(cityStr){ city = cityStr console.log(oriCity + "==" + cityStr) if(oriCity== cityStr){ - if(oriRegion!=""){ - //$("#region").text(oriRegion); - setTimeout(function(){ - baseInfo.region = oriRegion; - },1000) - - } lat = oriLat; lng = oriLng; if(cityStr=="上海"){ @@ -2271,7 +2267,7 @@ function changeCity(cityStr){ $("#ShangHaiDiv").show(); $("#otherCityDiv").hide(); //initNearDistricts($(this).text(),0,0,"",0,0,0,""); - initBaseInfo(cityStr,"",address,lat,lng); + //initBaseInfo(cityStr,oriRegion,address,lat,lng); }else{ $("#ShangHaiDiv").hide(); $("#otherCityDiv").show(); @@ -2288,9 +2284,21 @@ function changeCity(cityStr){ //加载列表 sort=6; getDistrictList(cityStr,lat,lng,"",sort,0,0,""); - initBaseInfo(cityStr,"","",0,0); } + if(oriCity== cityStr){ + if(oriRegion!=""){ + setTimeout(function(){ + //alert(oriRegion) + baseInfo.region = oriRegion; + //changeRegion(); + },1000) + } + initBaseInfo(cityStr,oriRegion,"",0,0); + }else{ + initBaseInfo(cityStr,"","",0,0); + } + $(".selectContent").hide(); //刷新下拉滚动加载事件 $.attachInfiniteScroll($('.infinite-scroll'))