mirror of
https://gitee.com/java110/PropertyApp.git
synced 2026-02-24 05:46:09 +08:00
Merge remote-tracking branch 'origin/master' into xinghong-dev
This commit is contained in:
commit
672610f55b
@ -91,6 +91,9 @@
|
||||
},{
|
||||
id: '888800010016',
|
||||
name: '电费'
|
||||
},{
|
||||
id: '888800010009',
|
||||
name: '电费'
|
||||
}
|
||||
],
|
||||
feeConfig_index: -1,
|
||||
@ -179,7 +182,9 @@
|
||||
let _feeTypeCd = this.feeTypes[this.feeType_index].id;
|
||||
if (_feeTypeCd == '888800010015') {
|
||||
_meterType = '2020';
|
||||
}
|
||||
}else if(_feeTypeCd == '888800010009'){
|
||||
_meterType = '3030';
|
||||
}
|
||||
let _objData = {
|
||||
communityId: this.communityId,
|
||||
objId: this.roomId,
|
||||
|
||||
@ -132,24 +132,13 @@
|
||||
let _objData = {
|
||||
page: 1,
|
||||
row: 5,
|
||||
communityId: this.currentCommunityId
|
||||
locationTypeCd: '4000'
|
||||
};
|
||||
loadAdvert(this, _objData)
|
||||
.then(function(res) {
|
||||
if (res.statusCode == 200) {
|
||||
let _advertPhotos = res.data;
|
||||
let _aPhotos = [];
|
||||
let _urlPath = '';
|
||||
// #ifdef MP-WEIXIN
|
||||
_urlPath = _that.java110Constant.url.hcBaseUrl
|
||||
// #endif
|
||||
_advertPhotos.forEach(function(_item) {
|
||||
_item.type = "image";
|
||||
_item.url = _urlPath + _item.url + "&time=" + new Date();
|
||||
_aPhotos.push(_item);
|
||||
});
|
||||
|
||||
_that.swiperList = _aPhotos;
|
||||
_that.swiperList = _advertPhotos;
|
||||
_that._loadActivitys();
|
||||
return;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user