diff --git a/src/api/simplify/simplifyOwnerTransactionCarApi.js b/src/api/simplify/simplifyOwnerTransactionCarApi.js index b0754b915..d0962a1ad 100644 --- a/src/api/simplify/simplifyOwnerTransactionCarApi.js +++ b/src/api/simplify/simplifyOwnerTransactionCarApi.js @@ -16,9 +16,16 @@ export function listMachineTranslates(params) { } export function queryOwnerCars(params) { - return request({ - url: '/owner.queryOwnerCars', - method: 'get', - params + return new Promise((resolve, reject) => { + request({ + url: '/owner.queryOwnerCars', + method: 'get', + params + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) }) } \ No newline at end of file diff --git a/src/components/fee/simplifyMeterWaterLog.vue b/src/components/fee/simplifyMeterWaterLog.vue index 0903252e5..8c612d610 100644 --- a/src/components/fee/simplifyMeterWaterLog.vue +++ b/src/components/fee/simplifyMeterWaterLog.vue @@ -84,7 +84,7 @@ export default { page, row, communityId: this.communityId, - roomNum: this.simplifyMeterWaterFeeInfo.roomName, + objId: this.simplifyMeterWaterFeeInfo.roomId, meterType: this.simplifyMeterWaterFeeInfo.meterType } diff --git a/src/components/owner/ownerDetailCar.vue b/src/components/owner/ownerDetailCar.vue index 9653a849c..35169df7d 100644 --- a/src/components/owner/ownerDetailCar.vue +++ b/src/components/owner/ownerDetailCar.vue @@ -160,7 +160,7 @@ export default { }, _addOwnerCar() { this.$router.push({ - path: '/pages/property/hireParkingSpace', + path: '/views/car/hireParkingSpace', query: { ownerId: this.ownerDetailCarInfo.ownerId, ownerName: this.ownerDetailCarInfo.ownerName diff --git a/src/components/owner/ownerDetailComplaint.vue b/src/components/owner/ownerDetailComplaint.vue index 4beb3421b..eecae4ff9 100644 --- a/src/components/owner/ownerDetailComplaint.vue +++ b/src/components/owner/ownerDetailComplaint.vue @@ -83,6 +83,7 @@ export default { const params = { communityId: getCommunityId(), memberId: this.ownerDetailComplaintInfo.ownerId, + tel: this.ownerDetailComplaintInfo.link, page: page, row: row } diff --git a/src/components/simplify/simplifyOwnerTransactionCar.vue b/src/components/simplify/simplifyOwnerTransactionCar.vue index 6606b4b03..22aa13dd8 100644 --- a/src/components/simplify/simplifyOwnerTransactionCar.vue +++ b/src/components/simplify/simplifyOwnerTransactionCar.vue @@ -83,6 +83,7 @@ export default { }) }, async listMachineTranslates() { + if(!this.simplifyOwnerTransactionCarInfo.carId) return try { const params = { page: this.currentPage, diff --git a/src/views/simplify/simplifyAcceptanceList.vue b/src/views/simplify/simplifyAcceptanceList.vue index 9c2fda5d2..358d074e4 100644 --- a/src/views/simplify/simplifyAcceptanceList.vue +++ b/src/views/simplify/simplifyAcceptanceList.vue @@ -459,6 +459,7 @@ export default { Object.assign(this.simplifyAcceptanceInfo, _owner) this.simplifyAcceptanceInfo.ownerRemark = _owner.remark this.simplifyAcceptanceInfo.ownerPhoto = _owner.faceUrl + this.simplifyAcceptanceInfo.ownerName = _owner.name if (!Object.prototype.hasOwnProperty.call(_owner, 'rooms')) { return @@ -531,7 +532,8 @@ export default { ownerId: this.simplifyAcceptanceInfo.ownerId, ownerName: this.simplifyAcceptanceInfo.ownerName, roomId: this.simplifyAcceptanceInfo.roomId, - roomName: this.simplifyAcceptanceInfo.roomName + roomName: this.simplifyAcceptanceInfo.roomName, + objId: this.simplifyAcceptanceInfo.roomId }) } }, 1000); diff --git a/src/views/user/login/Login.vue b/src/views/user/login/Login.vue index c71049145..d5c7d40ba 100644 --- a/src/views/user/login/Login.vue +++ b/src/views/user/login/Login.vue @@ -44,8 +44,8 @@ export default { logo: '', companyName:'', loginForm: { - username: '', - passwd: '', + username: 'wuxw', + passwd: 'admin', validateCode: '' }, captchaUrl: '',