diff --git a/fangija-zsyf/js/district/districtDetail.js b/fangija-zsyf/js/district/districtDetail.js index 5fd8772..6206159 100644 --- a/fangija-zsyf/js/district/districtDetail.js +++ b/fangija-zsyf/js/district/districtDetail.js @@ -802,7 +802,7 @@ function showLineChart(times, datas){ color: '#666' }, formatter: function (params) { - var res = params[0].name + '
' + "均价:"+(params[0].value=="undefined"?"暂无":params[0].value) + '元/㎡'; + var res = params[0].name + '
' + "均价:"+(typeof(params[0].value)=="undefined"?"暂无":(params[0].value+ '元/㎡')) ; return res; }, position: function (pos, params, el, elRect, size) { diff --git a/fangija-zsyf/views/setting/setting.html b/fangija-zsyf/views/setting/setting.html index 25c92dc..306869e 100644 --- a/fangija-zsyf/views/setting/setting.html +++ b/fangija-zsyf/views/setting/setting.html @@ -157,9 +157,9 @@ mui.plusReady(function() { axios.get("/rest/ad/position",{params:{position : 7}}).then(function (response) { var data = response.data.data; if (data) { - document.getElementById("img").setAttribute("src", BASE_PATH+"/img/"+data.imgId); + document.getElementById("img").setAttribute("src", data.imgUrl); document.getElementById("img").addEventListener("longtap", function(event) { - download(BASE_PATH+"/img/"+data.imgId); + download(data.imgUrl); }) } }) diff --git a/fangija-zsyf/views/user/userInfo.html b/fangija-zsyf/views/user/userInfo.html index dde1f22..dab3721 100644 --- a/fangija-zsyf/views/user/userInfo.html +++ b/fangija-zsyf/views/user/userInfo.html @@ -541,7 +541,7 @@ function loadToolList (){ } } }); - var city_map = localStorage.getItem("init_city"); + var city_map = localStorage.getItem("origial_city"); axios.get(BASE_PATH + "/rest/usertool/merchantToolList",{params:{city:city_map,position:0}}).then(function(response){ toolList.merchantTools = response.data.data.list; toolList.userId = response.data.data.uid; diff --git a/fangija-zsyf/yfindex.html b/fangija-zsyf/yfindex.html index 9716726..90353b9 100644 --- a/fangija-zsyf/yfindex.html +++ b/fangija-zsyf/yfindex.html @@ -1297,7 +1297,6 @@ function getPosition(){ city = "上海"; $("#input_city").text(city); initRegionSelect(city); - localStorage.setItem("init_city", city); //initBaseInfo(city,"","",0,0); $("#ShangHaiDiv").show(); $("#otherCityDiv").hide(); @@ -1318,6 +1317,8 @@ function getPosition(){ console.log(error); }); } + localStorage.setItem("init_city", city); + localStorage.setItem("origial_city", city); /*} city = "嘉兴"; province = "浙江"; @@ -2324,6 +2325,8 @@ $("body").delegate(".popup-about01 .cityGPS", "click", function () { }); function changeCity(cityStr){ + localStorage.removeItem("init_city"); + localStorage.setItem("init_city", cityStr); axios.get("/rest/index/isHaveNews", { params: { city: cityStr @@ -2914,15 +2917,23 @@ function openUrlNew(adUrl, id, type) { dataMap["type"]=type; dataMap["newId"]=id; saveBehaviorLog(eventType,dataMap); //保存用户点击事件 - - axios.get("/rest/news/addCount",{params:{newsId:id}}).then(function(response){ + if(type=='广告'){ + axios.get("/rest/news/addAdClickCount",{params:{adid:id}}).then(function(response){ + + }).catch(function(error){ + console.log(error) + }); + }else{ + axios.get("/rest/news/addCount",{params:{newsId:id}}).then(function(response){ if(response.data.code==200){ } - }).catch(function(error){ - console.log(error) - }); + }).catch(function(error){ + console.log(error) + }); + } + clicked('views/webview_embed.html', true,false,{},{url:adUrl}) }