From b8bf4a007da3cca6049199e57c0d34d1bd4fc22f 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: Mon, 28 Apr 2025 10:11:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bst/areaSub/components/AreaMap.vue |  1 -
 src/views/bst/refund/index.vue               |  3 ++-
 src/views/system/user/view/view.vue          | 27 +++++++++++++-------
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/views/bst/areaSub/components/AreaMap.vue b/src/views/bst/areaSub/components/AreaMap.vue
index 1cc5412..e01e167 100644
--- a/src/views/bst/areaSub/components/AreaMap.vue
+++ b/src/views/bst/areaSub/components/AreaMap.vue
@@ -300,7 +300,6 @@ export default {
     position: absolute;
     top: 15px;
     right: 15px;
-    z-index: 100;
   }
 
   .boundary-tools {
diff --git a/src/views/bst/refund/index.vue b/src/views/bst/refund/index.vue
index ee1d310..431811c 100644
--- a/src/views/bst/refund/index.vue
+++ b/src/views/bst/refund/index.vue
@@ -74,6 +74,7 @@
             <template v-else-if="column.key === 'reason'">
               <order-link v-if="PayBstType.ORDER === d.row.payBstType" :id="d.row.payBstId" :text="d.row.reason" />
               <span v-else>{{d.row.reason | dv}}</span>
+              <dict-tag :options="dict.type.refund_type" :value="d.row.type" size="mini" style="margin-left: 4px;"/>
               <dict-tag :options="dict.type.refund_status" :value="d.row.status" size="mini" style="margin-left: 4px;"/>
               <dict-tag :options="dict.type.pay_bst_type" :value="d.row.payBstType" size="mini" style="margin-left: 4px;"/>
             </template>
@@ -119,7 +120,7 @@ const defaultSort = {
 export default {
   name: "Refund",
   mixins: [$showColumns],
-  dicts: ['refund_status', 'pay_bst_type'],
+  dicts: ['refund_status', 'pay_bst_type', 'refund_type'],
   components: {FormCol, UserLink, OrderLink},
   props: {
     query: {
diff --git a/src/views/system/user/view/view.vue b/src/views/system/user/view/view.vue
index 1ffcea0..ba66805 100644
--- a/src/views/system/user/view/view.vue
+++ b/src/views/system/user/view/view.vue
@@ -48,10 +48,10 @@
 
     <el-card class="card-box" style="margin-top: 12px;" shadow="hover" v-if="detail.userId">
       <el-tabs>
-        <el-tab-pane label="设备" lazy v-if="checkPermi(['bst:device:list'])">
+        <el-tab-pane label="车辆" lazy v-if="checkPermi(['bst:device:list'])">
           <device :query="{mchId: detail.userId}" />
         </el-tab-pane>
-        <el-tab-pane label="车辆型号" lazy v-if="checkPermi(['bst:model:list'])"> 
+        <el-tab-pane label="车型" lazy v-if="checkPermi(['bst:model:list'])"> 
           <model :query="{userId: detail.userId}" />
         </el-tab-pane>
         <el-tab-pane label="套餐" lazy v-if="checkPermi(['bst:suit:list'])">
@@ -66,21 +66,27 @@
         <el-tab-pane label="收入订单" lazy v-if="checkPermi(['bst:order:list'])">
           <order :query="{bonusUserId: detail.userId}" />
         </el-tab-pane>
-        <el-tab-pane label="车辆出租记录" lazy v-if="checkPermi(['bst:orderDevice:list'])">
+        <el-tab-pane label="出租记录" lazy v-if="checkPermi(['bst:orderDevice:list'])">
           <order-device :query="{deviceMchId: detail.userId}" />
         </el-tab-pane>
-        <el-tab-pane label="分成记录" lazy v-if="checkPermi(['bst:bonus:list'])">
+        <el-tab-pane label="分成" lazy v-if="checkPermi(['bst:bonus:list'])">
           <bonus :query="{arrivalId: detail.userId, arrivalTypes: BonusArrivalType.userList()}" />
         </el-tab-pane>
-        <el-tab-pane label="提现记录" lazy v-if="checkPermi(['bst:withdraw:list'])">
+        <el-tab-pane label="提现" lazy v-if="checkPermi(['bst:withdraw:list'])">
           <withdraw :query="{userId: detail.userId}" />
         </el-tab-pane>
-        <el-tab-pane label="账变记录" lazy v-if="checkPermi(['bst:balanceLog:list'])">
+        <el-tab-pane label="账变" lazy v-if="checkPermi(['bst:balanceLog:list'])">
           <balance-log :query="{userId: detail.userId}" />
         </el-tab-pane>
-        <el-tab-pane label="实名认证" lazy v-if="checkPermi(['bst:realName:list'])">
+        <el-tab-pane label="实名" lazy v-if="checkPermi(['bst:realName:list'])">
           <real-name :query="{userId: detail.userId}" />
         </el-tab-pane>
+        <el-tab-pane label="加盟区域" lazy v-if="checkPermi(['bst:areaJoin:list'])">
+          <area-join :query="{userId: detail.userId, types: [AreaJoinType.JOIN, AreaJoinType.COOPERATE]}" />
+        </el-tab-pane>
+        <el-tab-pane label="运维区域" lazy v-if="checkPermi(['bst:areaJoin:list'])">
+          <area-join :query="{userId: detail.userId, types: [AreaJoinType.OPERATION]}" />
+        </el-tab-pane>
         <el-tab-pane label="收款账户" lazy v-if="checkPermi(['bst:account:list'])">
           <account :query="{userId: detail.userId}" />
         </el-tab-pane>
@@ -101,7 +107,7 @@ import UserStatistics from '@/views/system/user/view/components/UserStatistics'
 import CollapsePanel from '@/components/CollapsePanel'
 import BooleanTag from '@/components/BooleanTag'
 import Bonus from '@/views/bst/bonus/index.vue'
-import { BonusArrivalType } from '@/utils/enums'
+import { BonusArrivalType, AreaJoinType } from '@/utils/enums'
 import OrderDailyStat from '@/views/bst/index/components/OrderDailyStat.vue'
 import Device from '@/views/bst/device/index.vue'
 import AreaIndex from '@/views/bst/area/index.vue'
@@ -114,6 +120,7 @@ import Model from '@/views/bst/model/index.vue'
 import OrderDevice from '@/views/bst/orderDevice/index.vue'
 import Withdraw from '@/views/bst/withdraw/index.vue'
 import RealName from '@/views/bst/realName/index.vue'
+import AreaJoin from '@/views/bst/areaJoin/index.vue'
 
 export default {
   name: 'UserView',
@@ -135,11 +142,13 @@ export default {
     Model,
     OrderDevice,
     Withdraw,
-    RealName
+    RealName,
+    AreaJoin
   },
   data() {
     return {
       BonusArrivalType,
+      AreaJoinType,
       detail: {
         roles: []
       },