admingit/PropertyApp
1
0
Fork 0
mirror of https://gitee.com/java110/PropertyApp.git synced 2026-06-12 10:00:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into xinghong-dev

Browse Source
This commit is contained in:
905166056 2021-05-27 09:23:01 +08:00
commit 672610f55b
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pages/addmeter/addmeter.vue
View File

@ -91,6 +91,9 @@
},{ },{
id: '888800010016', id: '888800010016',
name: '电费' name: '电费'
},{
id: '888800010009',
name: '电费'
} }
], ],
feeConfig_index: -1, feeConfig_index: -1,
@ -179,7 +182,9 @@
let _feeTypeCd = this.feeTypes[this.feeType_index].id; let _feeTypeCd = this.feeTypes[this.feeType_index].id;
if (_feeTypeCd == '888800010015') { if (_feeTypeCd == '888800010015') {
_meterType = '2020'; _meterType = '2020';
} }else if(_feeTypeCd == '888800010009'){
_meterType = '3030';
}
let _objData = { let _objData = {
communityId: this.communityId, communityId: this.communityId,
objId: this.roomId, objId: this.roomId,

15
pages/index/index.vue
View File

@ -132,24 +132,13 @@
let _objData = { let _objData = {
page: 1, page: 1,
row: 5, row: 5,
communityId: this.currentCommunityId locationTypeCd: '4000'
}; };
loadAdvert(this, _objData) loadAdvert(this, _objData)
.then(function(res) { .then(function(res) {
if (res.statusCode == 200) { if (res.statusCode == 200) {
let _advertPhotos = res.data; let _advertPhotos = res.data;
let _aPhotos = []; _that.swiperList = _advertPhotos;
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._loadActivitys(); _that._loadActivitys();
return; return;
} }