From 2774be4bb9be7a55b5ca8bee21a4d56b102486cb Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Mon, 17 Apr 2023 13:22:46 +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

---
 orderList/orderDetails/orderDetails.vue           | 4 +++-
 salesRanking/page/orderQuantity/orderQuantity.vue | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/orderList/orderDetails/orderDetails.vue b/orderList/orderDetails/orderDetails.vue
index 456c3b5..3b1624b 100644
--- a/orderList/orderDetails/orderDetails.vue
+++ b/orderList/orderDetails/orderDetails.vue
@@ -76,8 +76,10 @@
 					</view>
 				</view>
 			</view>
-			<view v-if="" @tap='codeFn' :style="{marginBottom:!moreOpen?'':'0',background:details.orderWfStatus==0?'#2866FF':'#BBBBBB'}"
+			<view v-if="details.orderWfStatus==0" @tap='codeFn' :style="{marginBottom:!moreOpen?'':'0',background:'#228B22'}"
 				class="writeOff felx justifyContent alignItems ">待核销</view>
+			<view v-else  :style="{marginBottom:!moreOpen?'':'0',background:'#BBBBBB'}"
+				class="writeOff felx justifyContent alignItems ">已核销</view>
 			<view v-if="!moreOpen" @click="moreOpen=!moreOpen" class="moreButten felx justifyContent alignItems smallText ">
 				更多信息&退款信息
 				<uni-icons :style="{transform:moreOpen?'rotate(180deg)':'rotate(0deg)',transition:'transform .3s' }"  size="15" class="content-clear-icon" type="bottom" color="#c0c4cc" ></uni-icons>
diff --git a/salesRanking/page/orderQuantity/orderQuantity.vue b/salesRanking/page/orderQuantity/orderQuantity.vue
index b75b58f..00e471d 100644
--- a/salesRanking/page/orderQuantity/orderQuantity.vue
+++ b/salesRanking/page/orderQuantity/orderQuantity.vue
@@ -44,7 +44,7 @@
 						<view style="width: 100%;white-space:nowrap;overflow:hidden;text-overflow: ellipsis;" >{{item.name}}</view>
 						<view style="display: flex;justify-content: space-between;">
 							<view> <text>{{item.volume.toFixed(2)}}</text>L </view>
-							<view> <text>{{item.realPrice|price}}</text>￥</view>
+							<view> <text>{{item.payRealAmount|price}}</text>￥</view>
 						</view>
 					</view>
 				</view>