From 4faa31831e6a723d79ee84eab19236d961801d71 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Mon, 4 Mar 2024 16:10:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/news3/shopOrderDetails.vue | 18 ++++++++++++++----
 pages/order/detail.vue           | 10 ++--------
 pages/order/index.vue            |  2 +-
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/pages/news3/shopOrderDetails.vue b/pages/news3/shopOrderDetails.vue
index b736e0a..c4351e8 100644
--- a/pages/news3/shopOrderDetails.vue
+++ b/pages/news3/shopOrderDetails.vue
@@ -113,7 +113,7 @@
 							<text>联系客户</text>
 						</view>
 						<view class="btnItem" style="border-left:1px solid #F4F4F4"
-							@click="callStore(order.storeInfo.store_phone)">
+							@click="callStore(orderInfo.storeInfo.phone)">
 							<image :src="$picUrl+'/static/news3/kefu.png'" mode="widthFix"></image>
 							<text>联系商家</text>
 						</view>
@@ -250,11 +250,13 @@
 
 <script>
 	import * as newFunApi from '@/api/newFun'
+	import * as OrderApi from '@/api/order'
 	export default {
 		data() {
 			return {
 				status: 1,
 				orderInfo: '',
+				order_id:'',
 				audit_status: 20,
 				audit_notes: '',
 				deleteShow: false,
@@ -262,14 +264,22 @@
 				isToggle: false,
 				refund_image_id: '',
 				refund_notes: '',
-				addressData: ''
+				addressData: '',
 			};
 		},
 		onLoad(option) {
-			this.orderInfo = JSON.parse(option.item)
-			console.log(this.orderInfo)
+			this.order_id = JSON.parse(option.item).order_id
+			this.getOrderDetail(this.order_id)
 		},
 		methods: {
+			// 获取当前订单信息
+			getOrderDetail() {
+				const app = this
+				OrderApi.detail(this.order_id)
+					.then(result => {
+						this.orderInfo=result.data.order
+					})
+			},
 			// 联系商家
 			callStore(phone) {
 				uni.makePhoneCall({
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 1908af0..862b099 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -56,10 +56,6 @@
 					<view class="peo">到店时间</view>
 					<view class="name">{{ order.to_store_time }}</view>
 				</view>
-				<view class="thr">
-					<view class="peo">营业时间</view>
-					<view class="name">{{ order.extract_shop.shop_hours }}</view>
-				</view>
 				<!-- <view class="thr">
 					<view class="peo">预计到店时间</view>
 					<view class="name">2023-12-20 09:15</view>
@@ -210,7 +206,7 @@
 					{{order.pay_time}}
 				</view>
 			</view>
-			<view class="orderTitle">
+			<view class="orderTitle" v-if="order.receipt_time">
 				<view class="total">
 					期待配送时间：
 				</view>
@@ -394,7 +390,6 @@
 				// 当前订单详情
 				order: {},
 				// 当前设置
-				setting: {},
 				// 核销二维码弹窗
 				showQRCodePopup: false,
 				// 核销二维码图片url (通过后端获取)
@@ -496,7 +491,6 @@
 							app.onExtractQRCode(result.data.order.order_id)
 						}
 						app.order = result.data.order
-						app.setting = result.data.setting
 						app.isLoading = false
 					})
 				// 相应全局事件订阅: 刷新上级页面数据
@@ -1442,7 +1436,7 @@
 
 				.codeImg {
 					width: 394rpx;
-					height: 458rpx;
+					height: 394rpx;
 					border-radius: 0rpx 0rpx 0rpx 0rpx;
 					opacity: 1;
 				}
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 2d3c020..b98999f 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -923,7 +923,7 @@
 
 				.codeImg {
 					width: 394rpx;
-					height: 458rpx;
+					height: 394rpx;
 					border-radius: 0rpx 0rpx 0rpx 0rpx;
 					opacity: 1;
 				}