@@ -325,7 +345,7 @@ import DeviceLink from '@/components/Business/Device/DeviceLink.vue'
import UserLink from '@/components/Business/User/UserLink.vue'
import CollapsePanel from '@/components/CollapsePanel/index.vue'
import { getLastDateTimeEndStr, toDescriptionFromSecond } from '@/utils/date'
-import { BonusBstType, LogBizType, OrderStatus, PayBstType, SuitRidingRule } from '@/utils/enums'
+import { BonusBstType, LogBizType, OrderStatus, PayBstType, SuitRidingRule, VipType } 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'
@@ -372,6 +392,7 @@ export default {
},
data() {
return {
+ VipType,
payBstTypes: [PayBstType.ORDER, PayBstType.ORDER_RIDE],
OrderStatus,
id: null,
diff --git a/src/views/bst/vip/index.vue b/src/views/bst/vip/index.vue
index bb6fc85..ab1d7cc 100644
--- a/src/views/bst/vip/index.vue
+++ b/src/views/bst/vip/index.vue
@@ -99,7 +99,7 @@
{{d.row[column.key]}}
- 总计可用 {{ d.row.limitTotal }} 次
+ 可用 {{ d.row.limitTotal }} 次
,使用门槛 {{ d.row.minAmount | fix2 | dv}} 元
@@ -110,8 +110,8 @@
{{ d.row.validDays }} 天
-
- {{ d.row.price | fix2 | dv}} 元
+
+ {{ d.row[column.key] | fix2 | dv}} 元
{{ d.row.discountValue | dv}} {{ VipType.getUnit(d.row.type) }}
@@ -206,10 +206,10 @@ export default {
{key: 'price', visible: true, label: '售价', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'discountValue', visible: true, label: '优惠', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'validDays', visible: true, label: '有效期', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
- {key: 'enableLimit', visible: true, label: '使用限制', minWidth: null, sortable: true, overflow: false, align: 'center', width: "250"},
- {key: 'description', visible: true, label: '使用说明', minWidth: null, sortable: true, overflow: true, align: 'center', width: null},
+ {key: 'enableLimit', visible: true, label: '限制', minWidth: null, sortable: true, overflow: false, align: 'left', width: "250"},
+ {key: 'description', visible: true, label: '说明', minWidth: null, sortable: true, overflow: true, align: 'left', width: null},
{key: 'sort', visible: true, label: '排序', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
- {key: 'createTime', visible: true, label: '创建时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+ {key: 'createTime', visible: true, label: '创建时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: "180"},
],
// 排序方式
orderSorts: ['ascending', 'descending', null],