From f2a411a50eb4eb51bf206a2d2aed0937baaec13b Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Wed, 20 May 2026 14:51:34 +0800
Subject: [PATCH] 1

---
 components/print/index.js       | 32 ++++++++++++++++++++++++++++++--
 components/tab-bar/delivery.vue |  4 ++--
 components/tab-bar/myCenter.vue | 15 ++++++---------
 3 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/components/print/index.js b/components/print/index.js
index 97e67dc..9691016 100644
--- a/components/print/index.js
+++ b/components/print/index.js
@@ -122,7 +122,7 @@
 				
 				let printerJobs = new PrinterJobs();
 				printerJobs.setAlign('ct').setSize(2, 2).setLineSpacing(80).print(data1.numberCode + ((data1.status == 7 || data1.status == 11)? '待退款' :data1.deliveryType == 1?'配送':data1.isPack== 0?'自取-堂食':data1.isPack== 1?'自取-打包':'自取'))
-					.setAlign('lt').setSize(1, 1).setLineSpacing(40).print('预计时间:'+ data1.deliveryInfo == null?'暂无':data1.deliveryInfo.mustFinishTime)
+					.setAlign('lt').setSize(1, 1).setLineSpacing(40).print('预计时间:'+ (data1.deliveryInfo == null?'暂无':this.formatTime(data1.deliveryInfo.mustFinishTime)))
 					.setAlign('lt').setSize(1, 1).setLineSpacing(40).print(data1.shopName)
 					.print(printerUtil.fillLine('-', 1, 50))
 					.setAlign('lt').setSize(2, 2).setLineSpacing(80).print(data1.receiverName == null?'暂无':data1.receiverName)
@@ -134,7 +134,9 @@
 				
 				for (var i = 0; i < data1.goodsList.length; i++) {
 					printerJobs.setAlign('lt').setSize(1, 1).setLineSpacing(40).print(data1.goodsList[i].productName)
-					printerJobs.setAlign('lt').setSize(1, 1).setLineSpacing(40).print(this.delNode(data1.goodsList[i].specs))
+					if(!data1.goodsList[i].specs){
+						printerJobs.setAlign('lt').setSize(1, 1).setLineSpacing(40).print(this.delNode(data1.goodsList[i].specs))
+					}
 					let setLineSpacing = 40
 					printerJobs.setLineSpacing(setLineSpacing).print(printerUtil.inlineArr([{
 						'text': data1.goodsList[i].price,
@@ -153,6 +155,32 @@
 				let buffer = printerJobs.buffer();
 				this.sendPrint(buffer, onDone);
 			},
+			formatTime(value) {
+				if (!value) return '';
+				if (value == '尽快送达') return '尽快送达';
+				const date = new Date(value);
+			
+				// 获取年份
+				const year = date.getFullYear();
+			
+				// 获取月份 (getMonth 返回 0-11，所以需要 +1)，并补齐0
+				const month = String(date.getMonth() + 1).padStart(2, '0');
+			
+				// 获取日 (getDate)，并补齐0
+				const day = String(date.getDate()).padStart(2, '0');
+			
+				// 获取小时 (getHours)，并补齐0
+				const hour = String(date.getHours()).padStart(2, '0');
+			
+				// 获取分钟 (getMinutes)，并补齐0
+				const minute = String(date.getMinutes()).padStart(2, '0');
+			
+				// 获取秒 (getSeconds)，并补齐0
+				const second = String(date.getSeconds()).padStart(2, '0');
+			
+				// 拼接格式：年-月-日 时:分:秒
+				return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
+			},
 			delNode(data) {
 				// 1. 统一转为字符串
 				let str;
diff --git a/components/tab-bar/delivery.vue b/components/tab-bar/delivery.vue
index e041d59..4117f22 100644
--- a/components/tab-bar/delivery.vue
+++ b/components/tab-bar/delivery.vue
@@ -22,10 +22,10 @@
 		<scroll-view @scrolltolower="onReachPage" scroll-y style="width:100%;height: 1240rpx;overflow: scroll;">
 			<view class="box1" @tap="goDetail(item.id)" v-for="(item,index) in orderList" :key="index">
 				<view style="display: flex;height: 50rpx;border-bottom: 1px solid #eee;">
-					<view>
+					<view style="display: flex;padding-right: 20rpx;" v-if="item.numberCode">
 						{{'#' + item.numberCode}}
 					</view>
-					<view style="flex: 1;display: flex;padding-left: 20rpx;">
+					<view style="flex: 1;display: flex;">
 						{{item.createTime | formatISOTime}} 
 						<!-- <text>已退款</text> -->
 					</view>
diff --git a/components/tab-bar/myCenter.vue b/components/tab-bar/myCenter.vue
index f151cdf..2f22f5e 100644
--- a/components/tab-bar/myCenter.vue
+++ b/components/tab-bar/myCenter.vue
@@ -38,7 +38,7 @@
 					<uni-icons type="right" size="22"></uni-icons>
 				</view>
 			</view>
-			<view class="list-1">
+			<!-- <view class="list-1">
 				<view class="list-icon">
 					<uni-icons type="wallet" size="22"></uni-icons>
 				</view>
@@ -48,8 +48,8 @@
 				<view class="list-right">
 					<uni-icons type="right" size="22"></uni-icons>
 				</view>
-			</view>
-			<view class="list-1">
+			</view> -->
+			<!-- <view class="list-1">
 				<view class="list-icon">
 					<uni-icons type="wallet" size="22"></uni-icons>
 				</view>
@@ -59,8 +59,8 @@
 				<view class="list-right">
 					<uni-icons type="right" size="22"></uni-icons>
 				</view>
-			</view>
-			<view class="list-1">
+			</view> -->
+			<!-- <view class="list-1">
 				<view class="list-icon">
 					<uni-icons type="wallet" size="22"></uni-icons>
 				</view>
@@ -70,15 +70,12 @@
 				<view class="list-right">
 					<uni-icons type="right" size="22"></uni-icons>
 				</view>
-			</view>
+			</view> -->
 		</view>
 		<view class="list-box">
 			<view class="list-2" @click="logOut">
 				退出登录
 			</view>
-			<view class="list-2">
-				注销当前账号
-			</view>
 		</view>
 	</view>
 </template>