From ef660f114967c3ac5cbf9d1ed979ff8ae455c4b5 Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Mon, 24 Mar 2025 08:36:32 +0800
Subject: [PATCH] 111
---
src/views/system/channelWithdraw/index.vue | 1 -
src/views/system/device/device_detail.vue | 2 +-
src/views/system/order/orderDetail.vue | 5 ++++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/views/system/channelWithdraw/index.vue b/src/views/system/channelWithdraw/index.vue
index d1cafab..8c8f37c 100644
--- a/src/views/system/channelWithdraw/index.vue
+++ b/src/views/system/channelWithdraw/index.vue
@@ -179,7 +179,6 @@
<script>
import { listChannelWithdraw, getChannelWithdraw, delChannelWithdraw, addChannelWithdraw, updateChannelWithdraw } from "@/api/system/channelWithdraw";
import { $showColumns, $withdrawServiceType } from '@/utils/mixins'
-import { updateBill } from '@/api/system/withdraw'
// 默认排序字段
const defaultSort = {
diff --git a/src/views/system/device/device_detail.vue b/src/views/system/device/device_detail.vue
index 58a3f71..13d0fb9 100644
--- a/src/views/system/device/device_detail.vue
+++ b/src/views/system/device/device_detail.vue
@@ -8,7 +8,7 @@
<div slot="header" class="card-header">
<span class="header-title">设备信息</span>
<div class="header-actions">
- <el-popover placement="right" width="180" trigger="hover">
+ <el-popover placement="left" width="180" trigger="hover">
<div class="qr-code-box">
<qr-code :text="deviceInfo.qrText" :width="150" :height="150" />
</div>
diff --git a/src/views/system/order/orderDetail.vue b/src/views/system/order/orderDetail.vue
index 5a07a71..b528d5a 100644
--- a/src/views/system/order/orderDetail.vue
+++ b/src/views/system/order/orderDetail.vue
@@ -85,7 +85,7 @@
<el-descriptions-item label="停车点外调度费">{{ detail.dispatchFee + '元' || '--' }}</el-descriptions-item>
<el-descriptions-item label="运营区外调度费">{{ detail.manageFee + '元' || '--' }}</el-descriptions-item>
<el-descriptions-item label="总费用">{{ detail.totalFee + '元' || '--' }}</el-descriptions-item>
- <el-descriptions-item label="计费模版">{{ detail.rule.name || '--' }}</el-descriptions-item>
+ <el-descriptions-item label="计费模版">{{ (detail.rule && detail.rule.name) || '--' }}</el-descriptions-item>
<el-descriptions-item label="描述">{{ detail.description || '--' }}</el-descriptions-item>
</el-descriptions>
@@ -241,6 +241,9 @@ export default {
tripRouteStr: '',
tripLogs: [],
commandLogs: [],
+ rule: {
+ name: ''
+ },
// 其他字段...
},
loading: false,