diff --git a/components/print/index.js b/components/print/index.js index a3f3919..cc2fc42 100644 --- a/components/print/index.js +++ b/components/print/index.js @@ -167,9 +167,9 @@ printerJobs.setAlign('lt').print('配送费:' + data1.deliveryFee); printerJobs.print('合计金额:' + data1.totalAmount); - printerJobs.print('备注:' + data1.remark); + printerJobs.setSize(2, 2).print('备注:' + data1.remark); - printerJobs.print(printerUtil.fillLine('-', 1, 32)); + printerJobs.setSize(1, 1).print(printerUtil.fillLine('-', 1, 32)); printerJobs.setAlign('lt').print('商品取到后,如有任何商品问题,请及时联系商家和平台,客服将为您服务,客服电话 15533910775,谢谢您的惠顾'); diff --git a/components/tab-bar/delivery.vue b/components/tab-bar/delivery.vue index cfb9bfc..139a1a3 100644 --- a/components/tab-bar/delivery.vue +++ b/components/tab-bar/delivery.vue @@ -274,6 +274,9 @@ let amount = parseFloat(value) return isNaN(amount) ? 0 : amount }, + isEmptyShopMakeTime(value) { + return value === null || value === undefined || value === '' + }, getOrderRemark(item) { if (!item) return '' return item.remark || (item.mallOrder && item.mallOrder.remark) || ''