diff --git a/config.js b/config.js index d166eb8..dde5b6a 100644 --- a/config.js +++ b/config.js @@ -1,5 +1,5 @@ // config.js -const type = 'prod' +const type = 'local' const config = { local: { diff --git a/pages/manager/order-detail.vue b/pages/manager/order-detail.vue index f0d7092..628af73 100644 --- a/pages/manager/order-detail.vue +++ b/pages/manager/order-detail.vue @@ -240,8 +240,11 @@ export default { { label: '预约时间', value: data.goTime || data.createTime } ] // 质检信息(如有) + + let sum = (data.qualifiedNum || 0) + (data.noQualifiedNum || 0) + (data.unrecyclable || 0) + this.qcInfo = [ - { label: '质检数量', value: data.num ? data.qualifiedNum + data.noQualifiedNum + data.unrecyclable + ' 件' : '' }, + { label: '质检数量', value: sum ? sum + ' 件' : '' }, { label: '质检合格', value: data.qualifiedNum ? data.qualifiedNum + ' 件' : '' }, { label: '质量问题', value: data.noQualifiedNum ? data.noQualifiedNum + ' 件' : '' }, { label: '不可回收', value: data.unrecyclable ? data.unrecyclable + ' 件' : '' } diff --git a/pages/manager/order.vue b/pages/manager/order.vue index a4c67c0..c389827 100644 --- a/pages/manager/order.vue +++ b/pages/manager/order.vue @@ -203,11 +203,11 @@ if (options && options.userId) { this.userId = options.userId; } - this.fetchOrderList() - this.fetchOrderStatusStatistics() + // this.fetchOrderStatusStatistics() }, onShow() { this.fetchOrderStatusStatistics() + this.fetchOrderList() }, computed: { filteredOrders() { @@ -703,7 +703,7 @@ .unread-dot { position: absolute; top: -4px; - left: -4px; + left: -24rpx; width: 12px; height: 12px; background: #ff4d4f; diff --git a/pages/subcomponent/detail.vue b/pages/subcomponent/detail.vue index a1fe98d..79ef130 100644 --- a/pages/subcomponent/detail.vue +++ b/pages/subcomponent/detail.vue @@ -51,9 +51,9 @@ 期待您下次的支持,共同为地球减少碳排放出一份力! - 物流公司 + 物流 - {{ expressCompany }}{{ wuliuNo }} + {{ wuliuNo }} 查看物流 复制 diff --git a/pages/subcomponent/inspection-report.vue b/pages/subcomponent/inspection-report.vue index f770e32..951a351 100644 --- a/pages/subcomponent/inspection-report.vue +++ b/pages/subcomponent/inspection-report.vue @@ -48,8 +48,8 @@ - ¥{{item.price}} - /{{item.unit}} + ¥{{(item.price / item.count).toFixed(2)}} + /{{item.unit}} x{{item.count}} @@ -79,8 +79,8 @@ - + ¥{{(item.price / item.count).toFixed(2)}} + /件 x{{item.count}} @@ -110,8 +110,8 @@ - + ¥{{(item.price / item.count).toFixed(2)}} + /件 x{{item.count}} @@ -167,20 +167,19 @@ export default { return this.goodsList.reduce((sum, item) => sum + item.count, 0) }, totalAmount() { - console.log('this.goodsList', this.goodsList) - return this.goodsList.reduce((sum, item) => sum + item.total, 0).toFixed(2) + return this.goodsList.reduce((sum, item) => sum + item.price, 0).toFixed(2) }, problemCount() { return this.problemList.reduce((sum, item) => sum + item.count, 0) }, problemAmount() { - return this.problemList.reduce((sum, item) => sum + item.total, 0).toFixed(2) + return this.problemList.reduce((sum, item) => sum + item.price, 0).toFixed(2) }, unrecyclableCount() { return this.unrecyclableList.reduce((sum, item) => sum + item.count, 0) }, unrecyclableAmount() { - return this.unrecyclableList.reduce((sum, item) => sum + item.total, 0).toFixed(2) + return this.unrecyclableList.reduce((sum, item) => sum + item.price, 0).toFixed(2) }, fixedHeaderHeight() { // 导航栏高度 + 状态栏高度 + 特性区域高度 (约140rpx转px)