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

This commit is contained in:
尹吉欢
2018-03-15 11:21:06 +08:00
14 changed files with 38 additions and 6 deletions
Binary file not shown.

After

Width:  |  Height:  |  Size: 527 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 463 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 631 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 378 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 113 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 527 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 463 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 631 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 378 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 113 KiB

+38 -6
View File
@@ -104,7 +104,7 @@
<div class="cardNearbyBox" id="nearDistricts">
</div>
<div class="content-block-title" style="font-size:1.5rem;">2018-02-28</div>
<div class="content-block-title" style="font-size:1.5rem;" id="todayDate">{{todayDate}}</div>
<div class="card cardInfo cardInfo01">
<img src="images/cardInfoImg01.png">
<div class="cardInfoMask"></div>
@@ -1449,7 +1449,7 @@
-->
<script type="text/javascript" src="http://g.alicdn.com/sj/lib/zepto/zepto.js" charset="utf-8"></script>
<script type='text/javascript' src="https://unpkg.com/axios/dist/axios.min.js"></script>
<script>
/* 关闭路由,以实现不同页面之间的相互跳转(仅开发环境需要) */
@@ -1465,7 +1465,7 @@ $.config = {router: false}
<script type="text/javascript" src="config.js"></script>
<script type='text/javascript' src="https://unpkg.com/axios/dist/axios.min.js"></script>
<script type='text/javascript' src='js/city-app.js?version=${version!}' charset='utf-8'></script>
<script type='text/javascript' src='js/searchDistrict-app.js?version=${version!}' charset='utf-8'></script>
@@ -1544,8 +1544,8 @@ function getPosition(){
);
}
/* 获取#region字数,截取#region前4字,并添加... */
/*city="上海"
init();*/
city="上海"
init();
function init(){
//显示附近地址
var nearAddressParam = address;
@@ -1570,6 +1570,7 @@ function init(){
}
})
.then(function (response) {
alert("aa");
new Vue({
el: '#baseInfo',
data: {
@@ -1579,6 +1580,12 @@ function init(){
momRate: response.data.data.momRate
}
})
new Vue({
el: '#todayDate',
data: {
todayDate:response.data.data.todayDate
}
})
$("#region").picker({
toolbarTemplate: '<header class="bar bar-nav bar-nav01 bar-nav01c">\
<button class="button button-link pull-right close-picker">确定</button>\
@@ -1613,10 +1620,35 @@ function init(){
})
.catch(function (error) {
alert(error)
console.log(error);
});
//
//资讯列表
/*axios.get(BASE_PATH+"/rest/news/list", {
params: {
city: cityParam,
page:1
}
})
.then(function (response) {
//附近小区列表
var html = '<div class="cardNearbyWin" id="nearbyDistrictList">';
for(var i in response.data.data.dtos){
html += '<div class="card cardNearby"><div class="card-header">'+response.data.data.dtos[i].name+
'</div><div class="card-content"><div class="card-content-inner">'+response.data.data.dtos[i].avgPrice+'元/㎡</div></div><div class="card-footer">'+
'距您'+response.data.data.dtos[i].distance+'m</div></div>';
}
html += '</div>';
$("#nearDistricts").html(html);
$("#nearbyDistrictList").css("width",(7.5*response.data.data.dtos.length)+"rem");
})
.catch(function (error) {
console.log(error);
});*/
}
function regionChange(){