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

This commit is contained in:
xuhe@fangjia.com
2018-04-10 13:04:47 +08:00
2 changed files with 85 additions and 8 deletions
+77 -2
View File
@@ -1480,7 +1480,13 @@
},
"main.html": {
"resources": [
"yfindex.html"
"yfindex.html",
"js/common.js",
"css/main.css",
"js/mui.min.js",
"css/mui.min.css",
"js/push-common.js",
"config.js"
],
"refer": [
"start.html",
@@ -1499,7 +1505,38 @@
"yfindex.html": {
"resources": [
"fonts/mui.ttf",
"images/icon-clear.png"
"images/icon-clear.png",
"js/axiosPlugin.js",
"fonts/font_1433401008_2229297.woff",
"images/cardBg.png",
"js/jquery.cookie.js",
"js/cn.js",
"images/icon-home04.png",
"js/zepto.js",
"js/axios.min.js",
"js/vue.js",
"js/beacon_release.js",
"js/updateVersion/updateVersion.js",
"css/sm.css",
"js/cityRegion.js",
"images/icon-home01.png",
"css/main.css",
"images/icon-home02.png",
"images/icon-home03.png",
"images/icon-eye-orange.png",
"images/icon-comments-orange.png",
"images/icon-address04.png",
"css/theme-orange.css",
"images/arrow_select.png",
"css/city.css",
"images/search.png",
"js/searchDistrict-app.js",
"js/city-app.js",
"images/icon-address02.png",
"js/light7-2.js",
"images/icon-address03.png",
"images/icon-star01.png",
"images/icon-star02.png"
],
"refer": [
"views/news/newsDetail.html",
@@ -1558,6 +1595,44 @@
"views/district/arround.html"
],
"priority": 0
},
"views/user/userInfo.html": {
"resources": [
"images/icon-personal01.png",
"js/user/myHouse.js",
"images/icon-personal02.png",
"js/user/myCollect.js",
"images/icon-personal04.png",
"js/user/myFocus.js",
"images/icon-houseLevel.png",
"images/icon-arrow-green.png",
"images/icon-personal03.png",
"images/headPortrait.png",
"images/topBg.png",
"images/icon-set.png"
],
"refer": [],
"priority": 0
},
"views/evaluate/evaluateList.html": {
"resources": [
"images/icon-add.png",
"images/icon-arrow-red.png",
"js/shara/sharaMine.js",
"js/light7.js"
],
"refer": [],
"priority": 0
},
"start.html": {
"resources": [
"fonts/mui.ttf",
"css/mui.min.css",
"images/start.png",
"css/theme-blue.css"
],
"refer": [],
"priority": 0
}
},
"idle": {
+8 -6
View File
@@ -2613,12 +2613,8 @@ function openIntelligentHouseView() {
clicked('views/intelligentHouse/index.html',true,false,{},{})
}
function openDistWindow(city, region, name){
clicked('views/district/detail.html',true,false,{},{city:city,region:region,name:name});
if(cat == "rent"){
clicked('views/rent/rent.html',true,false,{},{city:city,region:region,name:name})
}else{
clicked('views/district/detail.html',true,false,{},{city:city,region:region,name:name});
}
}
</script>
<script>
@@ -2639,7 +2635,13 @@ $("body").delegate("#hotList ul li", "click", function () {
var select_region = $(this).find("a").attr("data-region");
var select_name = $(this).find("a").attr("data-name");
saveHistory({district:select_region,name:select_name,city:select_city})
clicked(BASE_PATH+'/district/details?city='+select_city+'&region='+select_region+'&name='+select_name,true);
//clicked(BASE_PATH+'/district/details?city='+select_city+'&region='+select_region+'&name='+select_name,true);
if(cat == "rent"){
clicked('views/rent/rent.html',true,false,{},{city:select_city,region:select_region,name:select_name})
}else{
clicked('views/district/detail.html',true,false,{},{city:select_city,region:select_region,name:select_name});
}
//var url = '../district/details?city='+select_city+"&region="+select_region+"&name="+select_name;
//clicked(url, true);
});