Commit 946eab95144af14885eebe17fed39c914402c318
1 parent
1f106db5
v1.9 优化客户周反馈bug
Showing
7 changed files
with
20 additions
and
9 deletions
src/api/simplify/simplifyOwnerTransactionCarApi.js
| @@ -16,9 +16,16 @@ export function listMachineTranslates(params) { | @@ -16,9 +16,16 @@ export function listMachineTranslates(params) { | ||
| 16 | } | 16 | } |
| 17 | 17 | ||
| 18 | export function queryOwnerCars(params) { | 18 | export function queryOwnerCars(params) { |
| 19 | - return request({ | ||
| 20 | - url: '/owner.queryOwnerCars', | ||
| 21 | - method: 'get', | ||
| 22 | - params | 19 | + return new Promise((resolve, reject) => { |
| 20 | + request({ | ||
| 21 | + url: '/owner.queryOwnerCars', | ||
| 22 | + method: 'get', | ||
| 23 | + params | ||
| 24 | + }).then(response => { | ||
| 25 | + const res = response.data | ||
| 26 | + resolve(res) | ||
| 27 | + }).catch(error => { | ||
| 28 | + reject(error) | ||
| 29 | + }) | ||
| 23 | }) | 30 | }) |
| 24 | } | 31 | } |
| 25 | \ No newline at end of file | 32 | \ No newline at end of file |
src/components/fee/simplifyMeterWaterLog.vue
| @@ -84,7 +84,7 @@ export default { | @@ -84,7 +84,7 @@ export default { | ||
| 84 | page, | 84 | page, |
| 85 | row, | 85 | row, |
| 86 | communityId: this.communityId, | 86 | communityId: this.communityId, |
| 87 | - roomNum: this.simplifyMeterWaterFeeInfo.roomName, | 87 | + objId: this.simplifyMeterWaterFeeInfo.roomId, |
| 88 | meterType: this.simplifyMeterWaterFeeInfo.meterType | 88 | meterType: this.simplifyMeterWaterFeeInfo.meterType |
| 89 | } | 89 | } |
| 90 | 90 |
src/components/owner/ownerDetailCar.vue
| @@ -160,7 +160,7 @@ export default { | @@ -160,7 +160,7 @@ export default { | ||
| 160 | }, | 160 | }, |
| 161 | _addOwnerCar() { | 161 | _addOwnerCar() { |
| 162 | this.$router.push({ | 162 | this.$router.push({ |
| 163 | - path: '/pages/property/hireParkingSpace', | 163 | + path: '/views/car/hireParkingSpace', |
| 164 | query: { | 164 | query: { |
| 165 | ownerId: this.ownerDetailCarInfo.ownerId, | 165 | ownerId: this.ownerDetailCarInfo.ownerId, |
| 166 | ownerName: this.ownerDetailCarInfo.ownerName | 166 | ownerName: this.ownerDetailCarInfo.ownerName |
src/components/owner/ownerDetailComplaint.vue
| @@ -83,6 +83,7 @@ export default { | @@ -83,6 +83,7 @@ export default { | ||
| 83 | const params = { | 83 | const params = { |
| 84 | communityId: getCommunityId(), | 84 | communityId: getCommunityId(), |
| 85 | memberId: this.ownerDetailComplaintInfo.ownerId, | 85 | memberId: this.ownerDetailComplaintInfo.ownerId, |
| 86 | + tel: this.ownerDetailComplaintInfo.link, | ||
| 86 | page: page, | 87 | page: page, |
| 87 | row: row | 88 | row: row |
| 88 | } | 89 | } |
src/components/simplify/simplifyOwnerTransactionCar.vue
| @@ -83,6 +83,7 @@ export default { | @@ -83,6 +83,7 @@ export default { | ||
| 83 | }) | 83 | }) |
| 84 | }, | 84 | }, |
| 85 | async listMachineTranslates() { | 85 | async listMachineTranslates() { |
| 86 | + if(!this.simplifyOwnerTransactionCarInfo.carId) return | ||
| 86 | try { | 87 | try { |
| 87 | const params = { | 88 | const params = { |
| 88 | page: this.currentPage, | 89 | page: this.currentPage, |
src/views/simplify/simplifyAcceptanceList.vue
| @@ -459,6 +459,7 @@ export default { | @@ -459,6 +459,7 @@ export default { | ||
| 459 | Object.assign(this.simplifyAcceptanceInfo, _owner) | 459 | Object.assign(this.simplifyAcceptanceInfo, _owner) |
| 460 | this.simplifyAcceptanceInfo.ownerRemark = _owner.remark | 460 | this.simplifyAcceptanceInfo.ownerRemark = _owner.remark |
| 461 | this.simplifyAcceptanceInfo.ownerPhoto = _owner.faceUrl | 461 | this.simplifyAcceptanceInfo.ownerPhoto = _owner.faceUrl |
| 462 | + this.simplifyAcceptanceInfo.ownerName = _owner.name | ||
| 462 | 463 | ||
| 463 | if (!Object.prototype.hasOwnProperty.call(_owner, 'rooms')) { | 464 | if (!Object.prototype.hasOwnProperty.call(_owner, 'rooms')) { |
| 464 | return | 465 | return |
| @@ -531,7 +532,8 @@ export default { | @@ -531,7 +532,8 @@ export default { | ||
| 531 | ownerId: this.simplifyAcceptanceInfo.ownerId, | 532 | ownerId: this.simplifyAcceptanceInfo.ownerId, |
| 532 | ownerName: this.simplifyAcceptanceInfo.ownerName, | 533 | ownerName: this.simplifyAcceptanceInfo.ownerName, |
| 533 | roomId: this.simplifyAcceptanceInfo.roomId, | 534 | roomId: this.simplifyAcceptanceInfo.roomId, |
| 534 | - roomName: this.simplifyAcceptanceInfo.roomName | 535 | + roomName: this.simplifyAcceptanceInfo.roomName, |
| 536 | + objId: this.simplifyAcceptanceInfo.roomId | ||
| 535 | }) | 537 | }) |
| 536 | } | 538 | } |
| 537 | }, 1000); | 539 | }, 1000); |
src/views/user/login/Login.vue
| @@ -44,8 +44,8 @@ export default { | @@ -44,8 +44,8 @@ export default { | ||
| 44 | logo: '', | 44 | logo: '', |
| 45 | companyName:'', | 45 | companyName:'', |
| 46 | loginForm: { | 46 | loginForm: { |
| 47 | - username: '', | ||
| 48 | - passwd: '', | 47 | + username: 'wuxw', |
| 48 | + passwd: 'admin', | ||
| 49 | validateCode: '' | 49 | validateCode: '' |
| 50 | }, | 50 | }, |
| 51 | captchaUrl: '', | 51 | captchaUrl: '', |