From f96dccb8c8ba1226bfb41c7be5a8744fc70a4f23 Mon Sep 17 00:00:00 2001
From: zhangyouji <zhangyouji@sdxkhlw.cn>
Date: Fri, 2 Feb 2024 14:50:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageIntegral/orderDetails/index.vue | 6 +++---
 packageIntegral/takeGoods/index.vue    | 9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packageIntegral/orderDetails/index.vue b/packageIntegral/orderDetails/index.vue
index 339fbd1..eeec860 100644
--- a/packageIntegral/orderDetails/index.vue
+++ b/packageIntegral/orderDetails/index.vue
@@ -8,17 +8,17 @@
 		<view class="status-frame">
 			<view v-if="info.orderStatus">{{statusEnum[info.orderStatus].value}}</view>
 			<view>提货码: <text>{{info.takeCode}}</text></view>
-			<view>提货时间：2024-1-9</view>
+			<view v-if="info.orderStatus==2">提货时间：{{info.takeTime}}</view>
 		</view>
 
 
 		<view class="info-frame">
-			<view class="header">用户手机: 18879008955<text>用户名: 张小明</text></view>
+			<view class="header">用户手机: {{info.customerPhone}}<text>用户名: {{info.customerName}}</text></view>
 			<view class="introduce" v-for="item,index in info.mallOrderInfoDetails" :key="index">
 				<image :src="item.oderDetailImg"></image>
 				<view>{{item.productName}}</view>
 				<view>规格：{{handler(item.attributeJson)}}</view>
-				<view>￥120.61 X1</view>
+				<view>￥{{item.marketPrice}} X{{item.orderNum}}</view>
 			</view>
 			<view class="detial">
 				<view>订单编号: <text>{{info.orderCode}}</text></view>
diff --git a/packageIntegral/takeGoods/index.vue b/packageIntegral/takeGoods/index.vue
index 6fc91f1..1fd931f 100644
--- a/packageIntegral/takeGoods/index.vue
+++ b/packageIntegral/takeGoods/index.vue
@@ -31,7 +31,7 @@
 
 		<view class="take-frame" v-if="controlWindows.code">
 			<view>请输入提货码</view>
-			<view>提货码或手机后四位</view>
+			<view>提货码</view>
 			<view class="code">
 				<xt-verify-code v-model="code" cursorColor="#333" boxNormalColor="#EAEAEA" boxActiveColor="#EAEAEA"
 					@confirm="confirm" :size="4" :isFocus="false"></xt-verify-code>
@@ -73,7 +73,7 @@
 					pagesize: 20,
 					params: {
 						takeCode: '',
-						customerPhone:''
+						// customerPhone:''
 					},
 				},
 				dataList: []
@@ -99,7 +99,7 @@
 			confirm() {
 				this.controlWindows.code = false
 				this.paramter.params.takeCode = this.code
-				this.paramter.params.customerPhone = this.code
+				// this.paramter.params.customerPhone = this.code
 				this.getByPageCloudMini()
 			},
 			getByPageCloudMini() {
@@ -132,8 +132,9 @@
 							icon: 'none'
 						});
 						this.$refs.popup.close();
+						this;getByPageCloudMini()
 						uni.navigateTo({
-							url: '/packageIntegral/orderDetails/index'
+							url: `../orderDetails/index?orderId=${this.dataList[0].orderId}`
 						})
 					}
 				})