Commit 403c430ba3dd564a67684ab5d0c516174acd5e92
1 parent
f7bb0565
Exists in
dev
fix:员工端订单状态值修改、会员端上传图片限制大小
Showing
3 changed files
with
11 additions
and
3 deletions
Show diff stats
frontend/app-employee/pages/home/home.vue
| @@ -363,7 +363,7 @@ | @@ -363,7 +363,7 @@ | ||
| 363 | }, | 363 | }, |
| 364 | async getStaffOrderPage() { | 364 | async getStaffOrderPage() { |
| 365 | let params = { | 365 | let params = { |
| 366 | - zt: '待配送', | 366 | + zt: '202', |
| 367 | current: this.pageParams.currentPage, | 367 | current: this.pageParams.currentPage, |
| 368 | size: 10, | 368 | size: 10, |
| 369 | } | 369 | } |
frontend/app-user/pages/home/repairReport.vue
| @@ -37,7 +37,7 @@ | @@ -37,7 +37,7 @@ | ||
| 37 | <view class="flex justify-start align-end"> | 37 | <view class="flex justify-start align-end"> |
| 38 | <view class=""> | 38 | <view class=""> |
| 39 | <u-upload :fileList="fileList" uploadIcon="plus" @afterRead="afterRead" @delete="deletePic" | 39 | <u-upload :fileList="fileList" uploadIcon="plus" @afterRead="afterRead" @delete="deletePic" |
| 40 | - multiple :maxCount="5"></u-upload> | 40 | + multiple :maxCount="5" :maxSize="maxSize * 1024 * 1024" @oversize="overSize"></u-upload> |
| 41 | </view> | 41 | </view> |
| 42 | <view class="margin-left-sm text-gray text-lg"> | 42 | <view class="margin-left-sm text-gray text-lg"> |
| 43 | {{ fileList.length }}/5 | 43 | {{ fileList.length }}/5 |
| @@ -140,6 +140,7 @@ | @@ -140,6 +140,7 @@ | ||
| 140 | trigger: ['blur', 'change'] | 140 | trigger: ['blur', 'change'] |
| 141 | }, | 141 | }, |
| 142 | }, | 142 | }, |
| 143 | + maxSize:10, | ||
| 143 | } | 144 | } |
| 144 | }, | 145 | }, |
| 145 | onLoad() { | 146 | onLoad() { |
| @@ -235,6 +236,10 @@ | @@ -235,6 +236,10 @@ | ||
| 235 | deletePic(event) { | 236 | deletePic(event) { |
| 236 | this[`fileList${event.name}`].splice(event.index, 1) | 237 | this[`fileList${event.name}`].splice(event.index, 1) |
| 237 | }, | 238 | }, |
| 239 | + // 图片大小超出最大允许大小 | ||
| 240 | + overSize(e) { | ||
| 241 | + uni.$u.toast(`上传图片大小不能超过${this.maxSize}MB!`) | ||
| 242 | + }, | ||
| 238 | // 新增图片 | 243 | // 新增图片 |
| 239 | async afterRead(event) { | 244 | async afterRead(event) { |
| 240 | console.log('打印event', event); | 245 | console.log('打印event', event); |
frontend/front/src/views/pages/regionalManage/components/regionManage.vue
| @@ -370,6 +370,7 @@ export default { | @@ -370,6 +370,7 @@ export default { | ||
| 370 | projection: 'EPSG:900913' | 370 | projection: 'EPSG:900913' |
| 371 | }); | 371 | }); |
| 372 | } | 372 | } |
| 373 | + this.map.clearOverLays(); | ||
| 373 | this.map.centerAndZoom(new T.LngLat(this.centerPoint[0], this.centerPoint[1]), 16); | 374 | this.map.centerAndZoom(new T.LngLat(this.centerPoint[0], this.centerPoint[1]), 16); |
| 374 | //允许鼠标双击放大地图 | 375 | //允许鼠标双击放大地图 |
| 375 | this.map.enableScrollWheelZoom(); | 376 | this.map.enableScrollWheelZoom(); |
| @@ -614,7 +615,9 @@ export default { | @@ -614,7 +615,9 @@ export default { | ||
| 614 | //draw 绘制圆形，矩形，多边形 | 615 | //draw 绘制圆形，矩形，多边形 |
| 615 | draw(type,shapType){ | 616 | draw(type,shapType){ |
| 616 | if(this.dialogParams.dialogType == 'edit'){ | 617 | if(this.dialogParams.dialogType == 'edit'){ |
| 617 | - this.handler.close(); | 618 | + if(this.handler){ |
| 619 | + this.handler.close(); | ||
| 620 | + } | ||
| 618 | // this.handler.clear(); | 621 | // this.handler.clear(); |
| 619 | // this.mapEditor.close(); | 622 | // this.mapEditor.close(); |
| 620 | } | 623 | } |