From 0ab378f2be7f093ddcb26cc6a8d7bdde30bdfc94 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: Wed, 4 Jun 2025 16:40:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E8=AF=81=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bst/area/edit/edit.vue | 2 +-
 src/views/bst/order/index.vue    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/bst/area/edit/edit.vue b/src/views/bst/area/edit/edit.vue
index d27246b..c9ef5ca 100644
--- a/src/views/bst/area/edit/edit.vue
+++ b/src/views/bst/area/edit/edit.vue
@@ -61,7 +61,7 @@
               <form-col :span="span * 2" label="禁行区内断电" prop="noRidingOutage" label-width="8em" tip="开启后，当车辆进入禁行区内将断电，直到车辆离开禁行区重新上电">
                 <el-switch v-model="form.noRidingOutage" active-text="断电" inactive-text="不断电"/>
               </form-col>
-              <form-col :span="span * 2" label="用户认证" prop="authentication" tip="设置用户需要哪些认证才能解锁骑行">
+              <form-col :span="span * 2" label="用户认证" prop="authentication" tip="设置用户需要同时满足哪些认证才能解锁骑行">
                 <el-select v-model="form.authentication" placeholder="请选择认证类型" multiple style="width: 100%" >
                   <el-option v-for="dict of dict.type.user_auth_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
                 </el-select>
diff --git a/src/views/bst/order/index.vue b/src/views/bst/order/index.vue
index c1695b4..99e4769 100644
--- a/src/views/bst/order/index.vue
+++ b/src/views/bst/order/index.vue
@@ -247,7 +247,7 @@
               <div v-if="d.row.payChannelName != null">{{d.row.payChannelName | dv}}</div>
             </template>
             <template v-else-if="column.key === 'use'">
-              <div v-if="d.row.duration != null">
+              <div>
                 <i class="el-icon-timer" />
                 {{toDescriptionFromSecond(getOrderDuration(d.row)).text | dv}}
               </div>
@@ -256,6 +256,7 @@
                 {{d.row.distance / 1000 | fix2 | dv}} 公里
               </div>
               <div v-if="d.row.endReason != null">{{d.row.endReason | dv}}</div>
+              <div v-else-if="d.row.preRideFee">预估 {{d.row.preRideFee.rideFee | fix2 | dv}} 元</div>
             </template>
             <template v-else-if="column.key === 'userName'">
               <div v-if="d.row.userName != null">