Skip to content

Commit 0066d79

Browse files
committed
签到:签到后增加用户积分、经验
1 parent 6508d84 commit 0066d79

File tree

3 files changed

+39
-18
lines changed

3 files changed

+39
-18
lines changed

src/api/member/signin/config/index.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import request from '@/config/axios'
22

33
export interface SignInConfigVO {
4-
id: number
5-
day: number | null
6-
point: number | null
7-
enable: boolean | null
4+
id?: number
5+
day?: number
6+
point?: number
7+
experience?: number
8+
status?: number
89
}
910

1011
// 查询积分签到规则列表

src/views/member/signin/config/SignInConfigForm.vue

Lines changed: 32 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@
1313
只允许设置 1-7,默认签到 7 天为一个周期
1414
</el-text>
1515
</el-form-item>
16-
<el-form-item label="签到分数" prop="point">
17-
<el-input-number v-model="formData.point" :precision="0" />
16+
<el-form-item label="奖励积分" prop="point">
17+
<el-input-number v-model="formData.point" :min="0" :precision="0" />
18+
</el-form-item>
19+
<el-form-item label="奖励经验" prop="experience">
20+
<el-input-number v-model="formData.experience" :min="0" :precision="0" />
1821
</el-form-item>
1922
<el-form-item label="开启状态" prop="status">
2023
<el-radio-group v-model="formData.status">
@@ -46,12 +49,30 @@ const dialogVisible = ref(false) // 弹窗的是否展示
4649
const dialogTitle = ref('') // 弹窗的标题
4750
const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用
4851
const formType = ref('') // 表单的类型:create - 新增;update - 修改
49-
const formData = ref({
50-
id: undefined,
51-
day: undefined,
52-
point: undefined
52+
const formData = ref<SignInConfigApi.SignInConfigVO>({} as SignInConfigApi.SignInConfigVO)
53+
// 奖励校验规则
54+
const awardValidator = (rule: any, _value: any, callback: any) => {
55+
if (!formData.value.point && !formData.value.experience) {
56+
callback(new Error('奖励积分与奖励经验至少配置一个'))
57+
return
58+
}
59+
60+
// 清除另一个字段的错误提示
61+
const otherAwardField = rule?.field === 'point' ? 'experience' : 'point'
62+
formRef.value.validateField(otherAwardField, () => null)
63+
callback()
64+
}
65+
const formRules = reactive({
66+
day: [{ required: true, message: '签到天数不能空', trigger: 'blur' }],
67+
point: [
68+
{ required: true, message: '奖励积分不能空', trigger: 'blur' },
69+
{ validator: awardValidator, trigger: 'blur' }
70+
],
71+
experience: [
72+
{ required: true, message: '奖励经验不能空', trigger: 'blur' },
73+
{ validator: awardValidator, trigger: 'blur' }
74+
]
5375
})
54-
const formRules = reactive({})
5576
const formRef = ref() // 表单 Ref
5677
5778
/** 打开弹窗 */
@@ -82,14 +103,11 @@ const submitForm = async () => {
82103
// 提交请求
83104
formLoading.value = true
84105
try {
85-
const data = formData.value as unknown as SignInConfigApi.SignInConfigVO
86106
if (formType.value === 'create') {
87-
//默认新创建的自动启动
88-
data.enable = true
89-
await SignInConfigApi.createSignInConfig(data)
107+
await SignInConfigApi.createSignInConfig(formData.value)
90108
message.success(t('common.createSuccess'))
91109
} else {
92-
await SignInConfigApi.updateSignInConfig(data)
110+
await SignInConfigApi.updateSignInConfig(formData.value)
93111
message.success(t('common.updateSuccess'))
94112
}
95113
dialogVisible.value = false
@@ -105,7 +123,8 @@ const resetForm = () => {
105123
formData.value = {
106124
id: undefined,
107125
day: undefined,
108-
point: undefined,
126+
point: 0,
127+
experience: 0,
109128
status: CommonStatusEnum.ENABLE
110129
}
111130
formRef.value?.resetFields()

src/views/member/signin/config/index.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
prop="day"
2121
:formatter="(_, __, cellValue) => ['第', cellValue, '天'].join(' ')"
2222
/>
23-
<el-table-column label="获得积分" align="center" prop="point" />
23+
<el-table-column label="奖励积分" align="center" prop="point" />
24+
<el-table-column label="奖励经验" align="center" prop="experience" />
2425
<el-table-column label="状态" align="center" prop="status">
2526
<template #default="scope">
2627
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />

0 commit comments

Comments
 (0)