From e916467e18bce77406776d47f8f1b824aed22d53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com>
Date: Tue, 8 Oct 2024 08:57:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=98=8E=E7=BB=86=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/recharge/detail.vue | 30 ++++++++++++++++------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/views/system/recharge/detail.vue b/src/views/system/recharge/detail.vue
index cc81e8b..50edf8a 100644
--- a/src/views/system/recharge/detail.vue
+++ b/src/views/system/recharge/detail.vue
@@ -13,6 +13,7 @@
             </template>
 
             <el-descriptions-item label="订单编号">{{detail.billNo | defaultValue}}</el-descriptions-item>
+            <el-descriptions-item label="创建时间">{{detail.createTime | defaultValue}}</el-descriptions-item>
             <el-descriptions-item label="交易状态">
               <dict-tag :value="detail.status" :options="dict.type.sm_transaction_bill_status" size="small"/>
             </el-descriptions-item>
@@ -20,6 +21,7 @@
               {{detail.money | money | defaultValue}} 元
               <template v-show="detail.refundAmount">（退款{{detail.refundAmount | money | defaultValue}} 元）</template>
             </el-descriptions-item>
+            <el-descriptions-item label="渠道成本">{{detail.channelCost | money | defaultValue}} 元</el-descriptions-item>
 <!--            <el-descriptions-item label="商户到账">-->
 <!--              {{detail.arrivalAmount | money | defaultValue}} 元-->
 <!--              <template v-show="detail.refundMchAmount">（退款{{detail.refundMchAmount | money | defaultValue}} 元）</template>-->
@@ -40,19 +42,19 @@
             <el-descriptions-item label="设备SN">
               <device-link :id="detail.deviceId" :text="detail.deviceNo"/>
             </el-descriptions-item>
-            <el-descriptions-item label="设备MAC-1">
+            <el-descriptions-item label="MAC-1">
               <device-link :id="detail.deviceId" :text="detail.deviceMac"/>
             </el-descriptions-item>
-            <el-descriptions-item label="设备MAC-2">
+            <el-descriptions-item label="MAC-2">
               <device-link :id="detail.deviceId" :text="detail.deviceMac2"/>
             </el-descriptions-item>
             <el-descriptions-item label="设备产品ID">
               {{detail.deviceProductId | defaultValue}}
             </el-descriptions-item>
-            <el-descriptions-item label="设备服务模式">
+            <el-descriptions-item label="服务模式">
               <dict-tag :value="detail.deviceServiceMode" :options="dict.type.device_service_mode" size="small"/>
             </el-descriptions-item>
-            <el-descriptions-item label="设备充值状态"  v-if="[SuitFeeType.TIMING, SuitFeeType.COUNT].includes(detail.suitFeeType)">
+            <el-descriptions-item label="充值状态"  v-if="[SuitFeeType.TIMING, SuitFeeType.COUNT].includes(detail.suitFeeType)">
               <dict-tag :value="detail.deviceRechargeStatus"
                         :options="dict.type.sm_transaction_bill_device_recharge_status"
                         size="small"/>
@@ -63,10 +65,10 @@
               <el-tag type="info" v-else size="small">未开始</el-tag>
             </el-descriptions-item>
             <template v-if="detail.isFinished">
-              <el-descriptions-item label="设备关闭状态">
+              <el-descriptions-item label="关闭状态">
                 <dict-tag :value="detail.closeStatus" :options="dict.type.recharge_close_status" size="small"/>
               </el-descriptions-item>
-              <el-descriptions-item label="设备关闭状态描述">
+              <el-descriptions-item label="关闭状态描述">
                 {{detail.closeResult | defaultValue}}
               </el-descriptions-item>
             </template>
@@ -76,24 +78,26 @@
         <el-card class="box-card">
           <el-descriptions title="套餐信息" :column="4">
             <el-descriptions-item label="套餐名称">{{detail.suitName | defaultValue}}</el-descriptions-item>
-            <el-descriptions-item label="套餐计费模式">
+            <el-descriptions-item label="计费模式">
               <dict-tag :value="detail.suitFeeMode" :options="dict.type.suit_fee_mode" size="small"/>
             </el-descriptions-item>
-            <el-descriptions-item label="套餐计费类型">
+            <el-descriptions-item label="计费类型">
               <dict-tag :value="detail.suitFeeType" :options="dict.type.suit_fee_type" size="small"/>
             </el-descriptions-item>
             <el-descriptions-item label="套餐时长" v-if="detail.suitFeeType === SuitFeeType.TIMING">{{detail.suitTime | defaultValue}} {{suitTimeUnit(detail.suitTimeUnit)}}</el-descriptions-item>
             <el-descriptions-item label="套餐电量" v-if="detail.suitFeeType === SuitFeeType.COUNT">{{detail.suitTime | defaultValue}} 度</el-descriptions-item>
             <el-descriptions-item label="使用时长" v-if="SuitFeeType.timeList().includes(detail.suitFeeType)">{{toDescriptionFromSecond(detail.totalUse).text | defaultValue}}</el-descriptions-item>
-            <el-descriptions-item label="使用电量" v-if="SuitFeeType.eleList().includes(detail.suitFeeType)">{{detail.totalUse | defaultValue}} 度</el-descriptions-item>
             <el-descriptions-item label="开始时间">{{detail.suitStartTime | defaultValue}}</el-descriptions-item>
             <el-descriptions-item label="结束时间">{{detail.suitEndTime | defaultValue}}</el-descriptions-item>
             <el-descriptions-item label="失效时间">{{detail.suitExpireTime | defaultValue}}</el-descriptions-item>
-            <el-descriptions-item label="开始总用电量">{{detail.suitStartEle | money | defaultValue}} 度</el-descriptions-item>
-            <el-descriptions-item label="结束总用电量">{{detail.suitEndEle | money | defaultValue}} 度</el-descriptions-item>
+            <template v-if="SuitFeeType.eleList().includes(detail.suitFeeType)">
+              <el-descriptions-item label="使用电量">{{detail.totalUse | defaultValue}} 度</el-descriptions-item>
+              <el-descriptions-item label="开始电量">{{detail.suitStartEle | money | defaultValue}} 度</el-descriptions-item>
+              <el-descriptions-item label="结束电量">{{detail.suitEndEle | money | defaultValue}} 度</el-descriptions-item>
+            </template>
           </el-descriptions>
           <el-descriptions :column="4">
-            <el-descriptions-item label="低功率自动关闭" :span="2">
+            <el-descriptions-item label="低功率自动关闭" :span="2" v-if="SuitFeeType.eleList().includes(detail.suitFeeType)">
               <template v-if="detail.suitEnableLowPowerClose">
                 <span style="color: green;margin-right: 0.5em;">已开启<i class="el-icon-check"/></span>
                 设备功率低于 {{detail.suitLowPower | money | defaultValue}} 瓦将自动关闭设备并结束订单
@@ -103,7 +107,7 @@
               </template>
             </el-descriptions-item>
 
-            <el-descriptions-item label="语音播报" :span="2">
+            <el-descriptions-item label="语音播报" :span="2" v-if="SuitFeeType.timeList().includes(detail.suitFeeType)">
               <template v-if="detail.suitEnabledVoid">
                 <span style="color: green;margin-right: 0.5em;">已开启<i class="el-icon-check"/></span>
                 设备时长低于 {{detail.suitVoidMinute | money | defaultValue}} 分钟将播放语音通知