This commit is contained in:
@@ -859,10 +859,10 @@
|
|||||||
"createForm": {
|
"createForm": {
|
||||||
"packageIds": "选择套餐",
|
"packageIds": "选择套餐",
|
||||||
"packageIdsPlaceholder": "请选择套餐",
|
"packageIdsPlaceholder": "请选择套餐",
|
||||||
"iotCardId": "IoT卡ID",
|
"iotCardId": "ICCID",
|
||||||
"iotCardIdPlaceholder": "请输入IoT卡ID",
|
"iotCardIdPlaceholder": "请选择ICCID卡",
|
||||||
"deviceId": "设备ID",
|
"deviceId": "设备号",
|
||||||
"deviceIdPlaceholder": "请输入设备ID"
|
"deviceIdPlaceholder": "请选择设备号"
|
||||||
},
|
},
|
||||||
"items": {
|
"items": {
|
||||||
"packageName": "套餐名称",
|
"packageName": "套餐名称",
|
||||||
|
|||||||
@@ -198,7 +198,6 @@
|
|||||||
import { useCheckedColumns } from '@/composables/useCheckedColumns'
|
import { useCheckedColumns } from '@/composables/useCheckedColumns'
|
||||||
import { useAuth } from '@/composables/useAuth'
|
import { useAuth } from '@/composables/useAuth'
|
||||||
import { useTableContextMenu } from '@/composables/useTableContextMenu'
|
import { useTableContextMenu } from '@/composables/useTableContextMenu'
|
||||||
import ArtButtonTable from '@/components/core/forms/ArtButtonTable.vue'
|
|
||||||
import ArtMenuRight from '@/components/core/others/ArtMenuRight.vue'
|
import ArtMenuRight from '@/components/core/others/ArtMenuRight.vue'
|
||||||
import TableContextMenuHint from '@/components/core/others/TableContextMenuHint.vue'
|
import TableContextMenuHint from '@/components/core/others/TableContextMenuHint.vue'
|
||||||
import type { MenuItemType } from '@/components/core/others/ArtMenuRight.vue'
|
import type { MenuItemType } from '@/components/core/others/ArtMenuRight.vue'
|
||||||
@@ -416,7 +415,7 @@
|
|||||||
try {
|
try {
|
||||||
await AccountService.deleteAccount(row.id)
|
await AccountService.deleteAccount(row.id)
|
||||||
ElMessage.success('删除成功')
|
ElMessage.success('删除成功')
|
||||||
getAccountList()
|
await getAccountList()
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(error)
|
console.error(error)
|
||||||
}
|
}
|
||||||
@@ -754,7 +753,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
dialogVisible.value = false
|
dialogVisible.value = false
|
||||||
getAccountList()
|
await getAccountList()
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(error)
|
console.error(error)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -83,8 +83,9 @@
|
|||||||
placeholder="请选择支付方式"
|
placeholder="请选择支付方式"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
>
|
>
|
||||||
<!--<ElOption label="微信在线支付" value="wechat" />-->
|
<!-- 所有用户都显示微信在线支付 -->
|
||||||
<!-- 只有平台用户才显示线下转账选项 -->
|
<ElOption label="微信在线支付" value="wechat" />
|
||||||
|
<!-- 平台用户额外显示线下转账 -->
|
||||||
<ElOption
|
<ElOption
|
||||||
v-if="userStore.info.user_type === 1 || userStore.info.user_type === 2"
|
v-if="userStore.info.user_type === 1 || userStore.info.user_type === 2"
|
||||||
label="线下转账"
|
label="线下转账"
|
||||||
@@ -298,7 +299,7 @@
|
|||||||
|
|
||||||
const createForm = reactive<{ amount: number; payment_method: string; shop_id: number | null }>({
|
const createForm = reactive<{ amount: number; payment_method: string; shop_id: number | null }>({
|
||||||
amount: 100,
|
amount: 100,
|
||||||
payment_method: '线下转账',
|
payment_method: '',
|
||||||
shop_id: null
|
shop_id: null
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -530,6 +531,8 @@
|
|||||||
const showCreateDialog = async () => {
|
const showCreateDialog = async () => {
|
||||||
// 重新加载店铺列表,确保获取最新数据
|
// 重新加载店铺列表,确保获取最新数据
|
||||||
await loadShops()
|
await loadShops()
|
||||||
|
// 所有用户默认微信支付
|
||||||
|
createForm.payment_method = 'wechat'
|
||||||
createDialogVisible.value = true
|
createDialogVisible.value = true
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -537,7 +540,7 @@
|
|||||||
const handleCreateDialogClosed = () => {
|
const handleCreateDialogClosed = () => {
|
||||||
createFormRef.value?.resetFields()
|
createFormRef.value?.resetFields()
|
||||||
createForm.amount = 100
|
createForm.amount = 100
|
||||||
createForm.payment_method = '线下转账'
|
createForm.payment_method = ''
|
||||||
createForm.shop_id = null
|
createForm.shop_id = null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -65,7 +65,7 @@
|
|||||||
:close-on-click-modal="false"
|
:close-on-click-modal="false"
|
||||||
@closed="handleDialogClosed"
|
@closed="handleDialogClosed"
|
||||||
>
|
>
|
||||||
<ElForm ref="formRef" :model="form" :rules="rules" label-width="150px">
|
<ElForm ref="formRef" :model="form" :rules="rules" label-width="165px">
|
||||||
<ElRow :gutter="20">
|
<ElRow :gutter="20">
|
||||||
<ElCol :span="24">
|
<ElCol :span="24">
|
||||||
<ElFormItem label="套餐编码" prop="package_code">
|
<ElFormItem label="套餐编码" prop="package_code">
|
||||||
@@ -183,7 +183,10 @@
|
|||||||
</ElRow>
|
</ElRow>
|
||||||
|
|
||||||
<!-- 套餐天数(流量重置周期为每日,或calendar_type为by_day时显示) -->
|
<!-- 套餐天数(流量重置周期为每日,或calendar_type为by_day时显示) -->
|
||||||
<ElRow :gutter="20" v-if="form.data_reset_cycle === 'daily' || form.calendar_type === 'by_day'">
|
<ElRow
|
||||||
|
:gutter="20"
|
||||||
|
v-if="form.data_reset_cycle === 'daily' || form.calendar_type === 'by_day'"
|
||||||
|
>
|
||||||
<ElCol :span="12">
|
<ElCol :span="12">
|
||||||
<ElFormItem label="套餐天数" prop="duration_days">
|
<ElFormItem label="套餐天数" prop="duration_days">
|
||||||
<ElInputNumber
|
<ElInputNumber
|
||||||
@@ -1067,7 +1070,10 @@
|
|||||||
data.calendar_type = form.calendar_type
|
data.calendar_type = form.calendar_type
|
||||||
}
|
}
|
||||||
// 当流量重置周期为每日,或套餐周期类型为按天时,传递套餐天数
|
// 当流量重置周期为每日,或套餐周期类型为按天时,传递套餐天数
|
||||||
if ((form.data_reset_cycle === 'daily' || form.calendar_type === 'by_day') && form.duration_days) {
|
if (
|
||||||
|
(form.data_reset_cycle === 'daily' || form.calendar_type === 'by_day') &&
|
||||||
|
form.duration_days
|
||||||
|
) {
|
||||||
data.duration_days = form.duration_days
|
data.duration_days = form.duration_days
|
||||||
}
|
}
|
||||||
if (suggestedRetailPriceInCents !== undefined) {
|
if (suggestedRetailPriceInCents !== undefined) {
|
||||||
|
|||||||
@@ -379,7 +379,7 @@
|
|||||||
/>
|
/>
|
||||||
<div class="form-tip">
|
<div class="form-tip">
|
||||||
该代理能获得的固定佣金金额(单位:元)
|
该代理能获得的固定佣金金额(单位:元)
|
||||||
<span v-if="form.series_max_commission_amount > 0" class="max-amount-hint">
|
<span class="max-amount-hint">
|
||||||
<br />
|
<br />
|
||||||
该系列最大佣金金额:
|
该系列最大佣金金额:
|
||||||
<span class="amount-value"
|
<span class="amount-value"
|
||||||
@@ -543,7 +543,7 @@
|
|||||||
/>
|
/>
|
||||||
<div class="form-tip">
|
<div class="form-tip">
|
||||||
该代理能获得的固定佣金金额(单位:元)
|
该代理能获得的固定佣金金额(单位:元)
|
||||||
<span v-if="form.series_max_commission_amount > 0" class="max-amount-hint">
|
<span class="max-amount-hint">
|
||||||
<br />
|
<br />
|
||||||
该系列最大佣金金额:
|
该系列最大佣金金额:
|
||||||
<span class="amount-value"
|
<span class="amount-value"
|
||||||
|
|||||||
Reference in New Issue
Block a user