1.修复index.vue表格翻译错误
2.限制统一订单类型审核 3.统一订单手动推送报错PlayX 接口未配置
This commit is contained in:
@@ -11,4 +11,8 @@ export default {
|
||||
[adminBaseRoutePath + '/user/rule']: ['./backend/${lang}/auth/rule.ts'],
|
||||
[adminBaseRoutePath + '/user/scoreLog']: ['./backend/${lang}/user/moneyLog.ts'],
|
||||
[adminBaseRoutePath + '/crud/crud']: ['./backend/${lang}/crud/log.ts', './backend/${lang}/crud/state.ts'],
|
||||
[adminBaseRoutePath + '/mall/item']: ['./backend/${lang}/mall/item.ts'],
|
||||
[adminBaseRoutePath + '/mall/item/index']: ['./backend/${lang}/mall/item.ts'],
|
||||
[adminBaseRoutePath + '/mall.Item']: ['./backend/${lang}/mall/item.ts'],
|
||||
[adminBaseRoutePath + '/mall.Item/index']: ['./backend/${lang}/mall/item.ts'],
|
||||
}
|
||||
|
||||
@@ -1,23 +1,26 @@
|
||||
export default {
|
||||
id: 'id',
|
||||
title: 'title',
|
||||
description: 'description',
|
||||
remark: 'remark',
|
||||
score: 'score',
|
||||
type: 'type',
|
||||
'type 1': 'type 1',
|
||||
'type 2': 'type 2',
|
||||
'type 3': 'type 3',
|
||||
amount: 'amount',
|
||||
multiplier: 'multiplier',
|
||||
category: 'category',
|
||||
category_title: 'category_title',
|
||||
admin_id: 'admin_id',
|
||||
admin__username: 'username',
|
||||
image: 'show image',
|
||||
stock: 'stock',
|
||||
sort: 'sort',
|
||||
create_time: 'create_time',
|
||||
update_time: 'update_time',
|
||||
'quick Search Fields': 'id',
|
||||
id: 'ID',
|
||||
title: 'Title',
|
||||
description: 'Description',
|
||||
remark: 'Remark',
|
||||
score: 'Points',
|
||||
type: 'Type',
|
||||
'type 1': 'Bonus',
|
||||
'type 2': 'Physical',
|
||||
'type 3': 'Withdraw',
|
||||
amount: 'Cash amount',
|
||||
multiplier: 'Turnover multiplier',
|
||||
category: 'Category',
|
||||
category_title: 'Category title',
|
||||
admin_id: 'Created by',
|
||||
admin__username: 'Created by',
|
||||
image: 'Image',
|
||||
stock: 'Stock',
|
||||
sort: 'Sort',
|
||||
status: 'Status',
|
||||
'status 0': 'Disabled',
|
||||
'status 1': 'Enabled',
|
||||
create_time: 'Created at',
|
||||
update_time: 'Updated at',
|
||||
'quick Search Fields': 'ID',
|
||||
}
|
||||
|
||||
@@ -38,6 +38,7 @@ const optButtons: OptButton[] = defaultOptButtons(['edit', 'delete']).map((btn)
|
||||
type: 'primary',
|
||||
class: 'table-row-edit',
|
||||
icon: 'fa fa-check',
|
||||
display: (row: TableRow) => ['PHYSICAL', 'WITHDRAW'].includes(String(row.type)) && row.status === 'PENDING',
|
||||
}
|
||||
: btn
|
||||
)
|
||||
|
||||
@@ -85,7 +85,7 @@
|
||||
:placeholder="t('Please input field', { field: t('mall.order.reject_reason') })"
|
||||
/>
|
||||
<el-alert v-else type="info" :closable="false" show-icon>
|
||||
确认后将驳回该订单并退回积分(红利/提现订单无需填写驳回原因)。
|
||||
确认后将驳回该订单并退回积分(提现订单无需填写驳回原因)。
|
||||
</el-alert>
|
||||
</template>
|
||||
</template>
|
||||
@@ -182,9 +182,10 @@ const { t } = useI18n()
|
||||
|
||||
const isEdit = computed(() => baTable.form.operate === 'Edit')
|
||||
const isPending = computed(() => isEdit.value && baTable.form.items?.status === 'PENDING')
|
||||
const needsReviewType = computed(() => ['PHYSICAL', 'WITHDRAW'].includes(String(baTable.form.items?.type || '')))
|
||||
const isPhysical = computed(() => baTable.form.items?.type === 'PHYSICAL')
|
||||
const canApprove = computed(() => isPending.value)
|
||||
const usePagedActions = computed(() => isPending.value)
|
||||
const canApprove = computed(() => isPending.value && needsReviewType.value)
|
||||
const usePagedActions = computed(() => isPending.value && needsReviewType.value)
|
||||
|
||||
const page = ref<1 | 2>(1)
|
||||
const action = ref<'approveShip' | 'reject' | null>(null)
|
||||
|
||||
Reference in New Issue
Block a user