diff --git a/pages/order-detail/index.vue b/pages/order-detail/index.vue index 55e2cda..0675914 100644 --- a/pages/order-detail/index.vue +++ b/pages/order-detail/index.vue @@ -82,11 +82,11 @@ - + - + 上传凭证 @@ -200,7 +200,8 @@ export default { return { orderInfo: { deliveryAddress: {}, - supplierOrder: [] + supplierOrder: [], + proofDelivery: [] }, supplierOrderStatusMap: Object.freeze(supplierOrderStatusMap), supplierOrderStatusEnum: Object.freeze(supplierOrderStatusEnum), @@ -464,7 +465,7 @@ export default { }, // 上传送货凭证 uploadVoucher() { - uploadImage(['album'], 5) + uploadImage(['album'], 5 - this.orderInfo.proofDelivery.length) .then((urls) => { if (urls) { supplierUploadVoucher({ @@ -529,6 +530,7 @@ export default { }, // 删除送货凭证 deleteVoucher(id) { + console.log('id', id) supplierDeleteVoucher({ id }).then((res) => { if (res) { uni.showToast({ @@ -644,6 +646,7 @@ export default { .imgs { padding: 16rpx 32rpx 32rpx; min-height: 120rpx; + flex-wrap: wrap; } } .fee { @@ -695,6 +698,7 @@ export default { align-items: center; position: relative; margin-right: 12rpx; + margin-bottom: 12rpx; overflow: hidden; .close-icon { position: absolute; diff --git a/pages/trade/orderList.vue b/pages/trade/orderList.vue index 12619b3..9e67f91 100644 --- a/pages/trade/orderList.vue +++ b/pages/trade/orderList.vue @@ -203,6 +203,10 @@ export default { color: #000000; letter-spacing: 0; font-weight: 600; + max-width: 420rpx; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .list-title-Subtitle { font-family: PingFangSC-Medium;