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 @@
{{d.row.reason | dv}}
+
@@ -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 @@
-
+
-
+
@@ -66,21 +66,27 @@
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
@@ -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: []
},