From 57f58199fc5f98fce4384078287f29fcaab3ce5d Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Mon, 27 Jul 2026 18:53:26 +0800
Subject: [PATCH] 1
---
components/print/index.js | 21 +++++++++++----------
components/tab-bar/myCenter.vue | 6 ++++--
components/worker/delivery.vue | 2 +-
components/worker/tab-bar.vue | 10 ++++++++--
4 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/components/print/index.js b/components/print/index.js
index 369ffe3..73ed493 100644
--- a/components/print/index.js
+++ b/components/print/index.js
@@ -116,8 +116,9 @@ export default {
data1.status == 8? '已退款':
data1.status == 12? '已售后':
data1.isPack == 0 ? '到店-堂食':
- data1.isPack == 1 ? '到店-打包':
- data1.deliveryType == 1 ? '配送': ''
+ data1.deliveryType == 1 && data1.isPack == 1 ? '配送':
+ data1.isPack == 1 ? '到店-打包': ''
+
);
if(data1.deliveryInfo && data1.deliveryInfo.appointmentDelivery == 1){
printerJobs.setAlign('lt').print(
@@ -169,37 +170,37 @@ export default {
printerJobs.print(printerUtil.fillLine('-', 1, 32));
for (var i = 0; i < data1.goodsList.length; i++) {
var productName = this.removeEmojis(data1.goodsList[i].productName)
- printerJobs.setAlign('lt').setSize(2, 2).print(productName);
+ printerJobs.setAlign('lt').setSize(2, 2).setLineSpacing(70).print(productName);
if (data1.goodsList[i].specs) {
printerJobs.setSize(1, 1).print(this.delNode(data1.goodsList[i].specs));
}
printerJobs.setSize(2, 2);
- printerJobs.setAlign('lt').text('￥' + data1.goodsList[i].price);
+ printerJobs.setAlign('lt').setLineSpacing(30).text('￥' + data1.goodsList[i].price);
printerJobs.text(" ");
printerJobs.print('X' + data1.goodsList[i].quantity);
printerJobs.setSize(1, 1);
}
printerJobs.print(printerUtil.fillLine('-', 1, 32));
- printerJobs.setAlign('lt').print('配送费：' + data1.deliveryFee);
+ printerJobs.setAlign('lt').print('配 送 费：' + data1.deliveryFee);
if(data1.packageFee > 0){
- printerJobs.print('打包费：' + data1.packageFee);
+ printerJobs.print('打 包 费：' + data1.packageFee);
}
+ printerJobs.print('商品金额：' + data1.goodsAmount);
if(data1.userCoupon && data1.userCoupon.length >0){
- printerJobs.print('优惠券：-' + data1.userCoupon[0].discountAmount);
+ printerJobs.print('优 惠 券：-' + data1.userCoupon[0].discountAmount);
}
if(data1.freeAmount > 0){
printerJobs.print('锦鲤免单：-' + data1.freeAmount);
}
- printerJobs.print('商品金额：' + data1.goodsAmount);
printerJobs.print('合计金额：' + (data1.goodsAmount + data1.deliveryFee + data1.packageFee));
if(data1.mallRefundRecord != null){
printerJobs.print('应退金额：' + data1.totalAmount);
}else{
printerJobs.print('实付金额：' + data1.totalAmount);
}
- printerJobs.setSize(2, 2).print('备注：' + data1.remark);
+ printerJobs.setSize(2, 2).setLineSpacing(70).print('备注：' + data1.remark);
if(data1.mallRefundRecord != null){
- printerJobs.setAlign('lt').print(
+ printerJobs.setAlign('lt').setLineSpacing(30).print(
'退款原因:' + (data1.mallRefundRecord == null ? ' ' : data1.mallRefundRecord[0].reason)
);
}
diff --git a/components/tab-bar/myCenter.vue b/components/tab-bar/myCenter.vue
index 1caad8e..63799b1 100644
--- a/components/tab-bar/myCenter.vue
+++ b/components/tab-bar/myCenter.vue
@@ -20,8 +20,8 @@
-
- 入驻审核
+
+ 我的钱包
@@ -146,6 +146,8 @@
url = '/pages/login/regist?type=3'
}else if(e == 'jianzhi'){
url = '/pages/worker/index'
+ }else if(e == 'wodeqianbao'){
+ url = '/pages/shop/wallet'
}
uni.navigateTo({
diff --git a/components/worker/delivery.vue b/components/worker/delivery.vue
index 7dca5ed..61087db 100644
--- a/components/worker/delivery.vue
+++ b/components/worker/delivery.vue
@@ -720,7 +720,7 @@
this.isOnLine = uni.getStorageSync('worker').isOnLine
this.zhipaiCheck = uni.getStorageSync('worker').getPushOrder == 1 ? true : false
if (uni.getStorageSync('area')) {
- this.searchForm.regionId = JSON.parse(uni.getStorageSync('area')).id;
+ this.searchForm.regionId = JSON.parse(uni.getStorageSync('area')).regionId;
}
if (uni.getStorageSync('worker')) {
this.searchForm.workerId = uni.getStorageSync('worker').workerId
diff --git a/components/worker/tab-bar.vue b/components/worker/tab-bar.vue
index 0d256ac..3ded8e6 100644
--- a/components/worker/tab-bar.vue
+++ b/components/worker/tab-bar.vue
@@ -186,7 +186,10 @@
}
workerResult = result
} else {
- this.tui.toast(res.message);
+ uni.showToast({
+ title: res.message,
+ icon: 'none'
+ })
}
uni.hideLoading();
}));
@@ -227,7 +230,10 @@
total += transferDeliveryPendingCount
shopCounts = total
} else {
- this.tui.toast(res.message)
+ uni.showToast({
+ title: res.message,
+ icon: 'none'
+ })
}
uni.hideLoading()
}))