From cad79143aeae484fcd500b39ac07fde1a67f0ee6 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 11 二月 2026 18:31:44 +0800
Subject: [PATCH] 合并
---
admin/src/components/business/OperaGoodsOrderDetail.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/admin/src/components/business/OperaGoodsOrderDetail.vue b/admin/src/components/business/OperaGoodsOrderDetail.vue
index dc6a2ac..edf1c08 100644
--- a/admin/src/components/business/OperaGoodsOrderDetail.vue
+++ b/admin/src/components/business/OperaGoodsOrderDetail.vue
@@ -16,7 +16,6 @@
<div style="text-align: right;">
<div class="header-red-btn" v-if="info.status == 0 || info.status == 1" @click="$refs.OperaOrderCancelWindow.open('鍙栨秷璁㈠崟', info)">鍙栨秷璁㈠崟</div>
<div class="header-red-btn" v-if="info.status == 3" @click="$refs.OperaOrderRefundWindow.open('璁㈠崟閫�娆�', info)">璁㈠崟閫�娆�</div>
- <div class="header-blue-btn" @click="showChangeRecord">鍙樻洿璁板綍</div>
</div>
</div>
<div class="info-item">
@@ -55,6 +54,7 @@
<div class="header-b">蹇�掍俊鎭�</div>
<div class="header-blue-btn" v-if="info.status==1 && info.receiveType!=1" @click="$refs.operaShipmentsWindow.open('鍙戣揣',info)">鍙戣揣</div>
<div class="header-blue-btn" v-if="info.status==2 && info.receiveType!=1" @click="$refs.operaShipmentsWindow.open('蹇�掑彉鏇�',info)">蹇�掑彉鏇�</div>
+ <div class="header-blue-btn" @click="showChangeRecord">蹇�掑彉鏇磋褰�</div>
</div>
<div class="info-item" >
<div class="info-item-a">鏀惰揣浜猴細<span class="el-icon-user">{{info.linkname}}</span></div>
@@ -80,11 +80,11 @@
</div>
<div class="info-item" >
<div class="info-item-a">閫�娆鹃噾棰濓細<span class="orange">锟{(info.refundMoney||0).toFixed(2)}}</span></div>
- <div class="info-item-a" >鎿嶄綔浜猴細<span>{{info.refundUserName }}</span></div>
- <div class="info-item-a" >閫�娆炬椂闂达細<span>{{info.refundTime }}</span></div>
+ <div class="info-item-a" >鎿嶄綔浜猴細<span>{{info.refundUserName ||''}}</span></div>
+ <div class="info-item-a" >閫�娆炬椂闂达細<span>{{info.refundTime ||'' }}</span></div>
</div>
<div class="info-item" >
- <div class="info-item-a" >閫�娆惧娉細<span>{{info.kdInfo }}</span></div>
+ <div class="info-item-a" >閫�娆惧娉細<span>{{info.refundInfo ||''}}</span></div>
</div>
<div class="info-item"></div>
</template>
@@ -105,7 +105,7 @@
<div class="info-item" >
<div class="info-item-a">杩旇繕鐢ㄦ埛绉垎锛�<span class="orange"> {{(info.returnMemberIntegral||0)}}</span></div>
<div class="info-item-a">杩旇繕缁忛攢鍟嗙Н鍒嗭細<span class="orange">{{info.returnCustomerIntegral || 0 }}</span></div>
- <div class="info-item-a"></div>
+ <div class="info-item-a">缁忛攢鍟嗛噾棰濓細<span class="orange"> 锟{(info.shopSettlement||0).toFixed(2)}}</span></div>
</div>
<div class="info-item"></div>
<div class="header">
--
Gitblit v1.9.3