From d8726801c73ad7203267d6739c023dd30bd2ae51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Tue, 6 May 2025 18:42:44 +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

---
 .../bst/index/components/OrderDailyStat.vue   | 20 ++++++++---------
 .../order/components/OrderRefundDialog.vue    |  8 ++-----
 src/views/bst/order/index.vue                 | 18 +++++++--------
 src/views/bst/order/view/view.vue             | 22 +++++++++----------
 .../components/WithdrawVerifyDialog.vue       |  7 +++---
 vue.config.js                                 |  4 ++--
 6 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/src/views/bst/index/components/OrderDailyStat.vue b/src/views/bst/index/components/OrderDailyStat.vue
index 0f8a0f8..d08b917 100644
--- a/src/views/bst/index/components/OrderDailyStat.vue
+++ b/src/views/bst/index/components/OrderDailyStat.vue
@@ -17,11 +17,11 @@
 </template>
 
 <script>
-import { getDailyAmount } from '@/api/dashboard/dashboard'
+import { getDailyAmount } from '@/api/dashboard/dashboard';
 import { getLastDateStr } from '@/utils';
-import * as echarts from 'echarts';
+import { DatePickerOptions } from '@/utils/constants';
 import $resize from '@/views/dashboard/mixins/resize';
-import {DatePickerOptions} from '@/utils/constants';
+import * as echarts from 'echarts';
 
 export default {
   name: "OrderDailyStat",
@@ -133,13 +133,13 @@ export default {
           }
         },
         legend: {
-          data: ['订单数量', '订单金额', '订单退款', '订单实收', '分成金额', '分成退款', '分成实收'],
+          data: ['订单数量', '支付金额', '支付退款', '支付实收', '分成金额', '分成退款', '分成实收'],
           top: 8,
           selected: {
             '订单数量': true,
-            '订单金额': false,
-            '订单退款': false,
-            '订单实收': true,
+            '支付金额': false,
+            '支付退款': false,
+            '支付实收': true,
             '分成金额': false,
             '分成退款': false,
             '分成实收': true
@@ -193,7 +193,7 @@ export default {
             barWidth: '20%'
           },
           {
-            name: '订单金额',
+            name: '支付金额',
             type: 'line',
             yAxisIndex: 0,
             data: orderAmounts,
@@ -205,7 +205,7 @@ export default {
             }
           },
           {
-            name: '订单退款',
+            name: '支付退款',
             type: 'line',
             yAxisIndex: 0,
             data: orderRefunds,
@@ -217,7 +217,7 @@ export default {
             }
           },
           {
-            name: '订单实收',
+            name: '支付实收',
             type: 'line',
             yAxisIndex: 0,
             data: orderNetAmounts,
diff --git a/src/views/bst/order/components/OrderRefundDialog.vue b/src/views/bst/order/components/OrderRefundDialog.vue
index 089bd41..89e5f49 100644
--- a/src/views/bst/order/components/OrderRefundDialog.vue
+++ b/src/views/bst/order/components/OrderRefundDialog.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import {getOrder, refundOrder} from '@/api/bst/order'
+import { getOrder, refundOrder } from '@/api/bst/order';
 
 export default {
   props: {
@@ -59,10 +59,7 @@ export default {
     },
     // 可退款金额
     canRefundAmount() {
-      let payedAmount = this.detail.payedAmount || 0;  
-      let payRefunded = this.detail.payRefunded || 0;
-      let payRefunding = this.detail.payRefunding || 0;
-      return payedAmount - payRefunded - payRefunding;
+      return this.detail.actualAmount || 0;
     }
   },
   methods: {
@@ -70,7 +67,6 @@ export default {
       this.loading = true;
       getOrder(this.id).then(response => {
         this.detail = response.data;
-        this.form.amount = this.canRefundAmount;
       }).finally(() => {
         this.loading = false;
       });
diff --git a/src/views/bst/order/index.vue b/src/views/bst/order/index.vue
index d8061dc..e3dcc21 100644
--- a/src/views/bst/order/index.vue
+++ b/src/views/bst/order/index.vue
@@ -177,7 +177,7 @@
                       <div slot="reference">结算：{{d.row.totalFee | fix2 | dv}} 元 <i class="el-icon-info" /></div>
                     </el-popover>
                   </el-col>
-                  <el-col :span="12" v-if="d.row.payedAmount" style="color: green;font-weight: bold;">实收：{{d.row.payedAmount - d.row.payRefunded - d.row.payRefunding | fix2 | dv}} 元</el-col>
+                  <el-col :span="12" v-if="d.row.payedAmount" style="color: green;font-weight: bold;">实收：{{d.row.actualAmount | fix2 | dv}} 元</el-col>
                   <el-col :span="24" v-if="d.row.payRefunded || d.row.payRefunding" style="color: red;">
                     退款：{{d.row.payRefunded | fix2 | dv}} 元
                     <template v-if="d.row.payRefunding">(退款中：{{d.row.payRefunding | fix2 | dv}} 元)</template>
@@ -283,18 +283,18 @@
 </template>
 
 <script>
-import { listOrder, endOrder } from "@/api/bst/order";
-import { $showColumns } from '@/utils/mixins';
+import { endOrder, listOrder } from "@/api/bst/order";
+import AreaLink from '@/components/Business/Area/AreaLink.vue';
+import AreaRemoteSelect from '@/components/Business/Area/AreaRemoteSelect.vue';
+import DeviceLink from '@/components/Business/Device/DeviceLink.vue';
+import OrderLink from '@/components/Business/Order/OrderLink.vue';
+import UserLink from '@/components/Business/User/UserLink.vue';
 import FormCol from "@/components/FormCol/index.vue";
+import { toDescriptionFromSecond } from '@/utils/date';
 import { OrderStatus } from "@/utils/enums";
+import { $showColumns } from '@/utils/mixins';
 import OrderRefundDialog from "@/views/bst/order/components/OrderRefundDialog.vue";
 import OrderVerifyDialog from "@/views/bst/order/components/OrderVerifyDialog.vue";
-import { toDescriptionFromSecond } from '@/utils/date';
-import UserLink from '@/components/Business/User/UserLink.vue';
-import DeviceLink from '@/components/Business/Device/DeviceLink.vue'
-import OrderLink from '@/components/Business/Order/OrderLink.vue'
-import AreaLink from '@/components/Business/Area/AreaLink.vue';
-import AreaRemoteSelect from '@/components/Business/Area/AreaRemoteSelect.vue'
 
 // 默认排序字段
 const defaultSort = {
diff --git a/src/views/bst/order/view/view.vue b/src/views/bst/order/view/view.vue
index 6e38999..50e7afc 100644
--- a/src/views/bst/order/view/view.vue
+++ b/src/views/bst/order/view/view.vue
@@ -40,7 +40,7 @@
             <el-col>
               <el-statistic 
                 title="实收" 
-                :value="detail.payedAmount - detail.payRefunded - detail.payRefunding" 
+                :value="detail.actualAmount" 
                 :precision="2"
                 suffix="元"
                 value-style="color: #67C23A">
@@ -252,23 +252,23 @@
 </template>
 
 <script>
-import { getOrder, endOrder } from '@/api/bst/order'
+import { endOrder, getOrder } from '@/api/bst/order'
+import AreaLink from '@/components/Business/Area/AreaLink.vue'
+import DeviceLink from '@/components/Business/Device/DeviceLink.vue'
+import UserLink from '@/components/Business/User/UserLink.vue'
 import CollapsePanel from '@/components/CollapsePanel/index.vue'
-import {SuitRidingRule, PayBstType, BonusBstType, OrderStatus, LogBizType} from '@/utils/enums'
-import OrderDevice from '@/views/bst/orderDevice/index.vue'
-import Pay from '@/views/bst/pay/index.vue'
+import { toDescriptionFromSecond } from '@/utils/date'
+import { BonusBstType, LogBizType, OrderStatus, PayBstType, SuitRidingRule } from '@/utils/enums'
 import Bonus from '@/views/bst/bonus/index.vue'
+import CommandLog from '@/views/bst/commandLog/index.vue'
 import DeviceLocation from '@/views/bst/device/view/components/DeviceLocation.vue'
 import OrderRefundDialog from '@/views/bst/order/components/OrderRefundDialog.vue'
 import OrderVerifyDialog from '@/views/bst/order/components/OrderVerifyDialog.vue'
-import { toDescriptionFromSecond } from '@/utils/date'
+import { getOrderDuration } from '@/views/bst/order/util'
+import OrderDevice from '@/views/bst/orderDevice/index.vue'
+import Pay from '@/views/bst/pay/index.vue'
 import Refund from '@/views/bst/refund/index.vue'
 import Operlog from '@/views/monitor/operlog/index.vue'
-import CommandLog from '@/views/bst/commandLog/index.vue'
-import DeviceLink from '@/components/Business/Device/DeviceLink.vue'
-import UserLink from '@/components/Business/User/UserLink.vue'
-import {getOrderDuration} from '@/views/bst/order/util'
-import AreaLink from '@/components/Business/Area/AreaLink.vue'
 
 export default {
   name: 'OrderView',
diff --git a/src/views/bst/withdraw/components/WithdrawVerifyDialog.vue b/src/views/bst/withdraw/components/WithdrawVerifyDialog.vue
index 3309dd2..b3ec09c 100644
--- a/src/views/bst/withdraw/components/WithdrawVerifyDialog.vue
+++ b/src/views/bst/withdraw/components/WithdrawVerifyDialog.vue
@@ -15,7 +15,9 @@
       <el-descriptions-item label="申请时间" :span="2">{{ detail.createTime | dv}}</el-descriptions-item>
       <el-descriptions-item label="用户">{{ detail.userName | dv}}</el-descriptions-item>
       <el-descriptions-item label="申请金额">{{ detail.amount | fix2 | dv }} 元</el-descriptions-item>
-      <el-descriptions-item label="到账金额">{{ detail.arrivalAmount | fix2 | dv }} 元</el-descriptions-item>
+      <el-descriptions-item label="到账金额">
+        <span style="color: red">{{ detail.arrivalAmount | fix2 | dv }} 元</span>
+      </el-descriptions-item>
       <el-descriptions-item label="服务费">
         {{ detail.serviceCharge | fix2 | dv }} 元
         <dict-tag :options="dict.type.withdraw_service_type" :value="detail.serviceType" size="mini" style="margin-left: 4px"/>
@@ -28,9 +30,8 @@
       <el-descriptions-item label="银行名称">{{ detail.bankName | dv}}</el-descriptions-item>
       <el-descriptions-item label="卡面名称">{{ detail.bankCardName | dv}}</el-descriptions-item>
       <el-descriptions-item label="二维码" :span="2" v-if="AccountType.QR == detail.accountType">
-        <image-preview :src="detail.no" :width="100" :height="100" />
+        <image-preview :src="detail.accountNo" :width="100" :height="100" />
       </el-descriptions-item>
-
     </el-descriptions>
 
     <el-form ref="form" :model="form" :rules="rules" label-width="80px" v-if="canVerify">
diff --git a/vue.config.js b/vue.config.js
index 6314d96..6be1a41 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,8 +36,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://localhost:4101`,
-        target: `https://ele.ccttiot.com/prod-api`,
+        target: `http://localhost:4101`,
+        // target: `https://ele.ccttiot.com/prod-api`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''