From 1a2331b92c1e6dbcd88b03e98abcb9ec99fc5847 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Sat, 12 Oct 2024 10:25:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesOrder/detail/components/order.vue  | 2 +-
 pagesOrder/detail/components/tuicai.vue | 6 +++---
 pagesOrder/pay-order/pay-order.vue      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pagesOrder/detail/components/order.vue b/pagesOrder/detail/components/order.vue
index 7b44686..522ee2d 100644
--- a/pagesOrder/detail/components/order.vue
+++ b/pagesOrder/detail/components/order.vue
@@ -26,7 +26,7 @@
 		</view> -->
 		<view class="u-flex u-row-between u-m-t-20">
 			<view>下单时间</view>
-			<view><up-text v-if="data.createdAt" mode="date" :text="data.createdAt"></up-text></view>
+			<view><up-text v-if="data.createdAt" mode="date" format="yyyy-mm-dd hh:MM:ss" :text="data.createdAt"></up-text></view>
 		</view>
 		<view class="u-flex u-row-between u-m-t-20">
 			<view>订单编号</view>
diff --git a/pagesOrder/detail/components/tuicai.vue b/pagesOrder/detail/components/tuicai.vue
index a03d2df..180ee70 100644
--- a/pagesOrder/detail/components/tuicai.vue
+++ b/pagesOrder/detail/components/tuicai.vue
@@ -3,11 +3,11 @@
 		<template #desc>
 			<view class="u-p-30 u-text-left">
 				<view>
-					{{data.name}}
+					{{data.productName}}
 				</view>
-				<view class="u-flex  u-m-t-32">
+				<!-- <view class="u-flex  u-m-t-32">
 					<up-number-box :buttonSize="44" :inputWidth="220" v-model="number"></up-number-box>
-				</view>
+				</view> -->
 				<view class="u-m-t-32">
 					<view class="u-font-24">
 						<text class="color-999">退菜理由</text>
diff --git a/pagesOrder/pay-order/pay-order.vue b/pagesOrder/pay-order/pay-order.vue
index 1753d68..a4cdff8 100644
--- a/pagesOrder/pay-order/pay-order.vue
+++ b/pagesOrder/pay-order/pay-order.vue
@@ -126,7 +126,7 @@
 	let payFinish=ref(false)
 	onBackPress(() => {
 		console.log('onBackPress');
-		uni.$emit('update:createOrderIndex')
+		// uni.$emit('update:createOrderIndex')
 		// if (option.isNowPay&&!payFinish.value) {
 		// 	infoBox.showToast('先付费模式，请先结算订单')
 		// 	return true
@@ -242,7 +242,7 @@
 		setTimeout(() => {
 			// uni.$emit('orderDetail:update')
 			payFinish.value=true
-			uni.$emit('update:createOrderIndex')
+			// uni.$emit('update:createOrderIndex')
 			uni.navigateBack({
 				delta: 1
 			})