From 6b6c9f5f02c75cd57458bcb1445d9c61a027acbe Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Sun, 1 Oct 2023 09:53:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E5=88=B0=EF=BC=9A=E7=AD=BE=E5=88=B0?=
 =?UTF-8?q?=E5=90=8E=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E3=80=81=E7=BB=8F=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 0066d79876b7c406bf70d4c03f4eeed2d3ede5e5)
---
 src/api/member/signin/config/index.ts         |  9 ++--
 .../member/signin/config/SignInConfigForm.vue | 45 +++++++++++++------
 src/views/member/signin/config/index.vue      |  3 +-
 3 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/src/api/member/signin/config/index.ts b/src/api/member/signin/config/index.ts
index 558bdc70..50a7d63c 100644
--- a/src/api/member/signin/config/index.ts
+++ b/src/api/member/signin/config/index.ts
@@ -1,10 +1,11 @@
 import request from '@/config/axios'
 
 export interface SignInConfigVO {
-  id: number
-  day: number | null
-  point: number | null
-  enable: boolean | null
+  id?: number
+  day?: number
+  point?: number
+  experience?: number
+  status?: number
 }
 
 // 查询积分签到规则列表
diff --git a/src/views/member/signin/config/SignInConfigForm.vue b/src/views/member/signin/config/SignInConfigForm.vue
index 4d5c3d2d..616fd8fc 100644
--- a/src/views/member/signin/config/SignInConfigForm.vue
+++ b/src/views/member/signin/config/SignInConfigForm.vue
@@ -13,8 +13,11 @@
           只允许设置 1-7，默认签到 7 天为一个周期
         </el-text>
       </el-form-item>
-      <el-form-item label="签到分数" prop="point">
-        <el-input-number v-model="formData.point" :precision="0" />
+      <el-form-item label="奖励积分" prop="point">
+        <el-input-number v-model="formData.point" :min="0" :precision="0" />
+      </el-form-item>
+      <el-form-item label="奖励经验" prop="experience">
+        <el-input-number v-model="formData.experience" :min="0" :precision="0" />
       </el-form-item>
       <el-form-item label="开启状态" prop="status">
         <el-radio-group v-model="formData.status">
@@ -46,12 +49,30 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-  id: undefined,
-  day: undefined,
-  point: undefined
+const formData = ref<SignInConfigApi.SignInConfigVO>({} as SignInConfigApi.SignInConfigVO)
+// 奖励校验规则
+const awardValidator = (rule: any, _value: any, callback: any) => {
+  if (!formData.value.point && !formData.value.experience) {
+    callback(new Error('奖励积分与奖励经验至少配置一个'))
+    return
+  }
+
+  // 清除另一个字段的错误提示
+  const otherAwardField = rule?.field === 'point' ? 'experience' : 'point'
+  formRef.value.validateField(otherAwardField, () => null)
+  callback()
+}
+const formRules = reactive({
+  day: [{ required: true, message: '签到天数不能空', trigger: 'blur' }],
+  point: [
+    { required: true, message: '奖励积分不能空', trigger: 'blur' },
+    { validator: awardValidator, trigger: 'blur' }
+  ],
+  experience: [
+    { required: true, message: '奖励经验不能空', trigger: 'blur' },
+    { validator: awardValidator, trigger: 'blur' }
+  ]
 })
-const formRules = reactive({})
 const formRef = ref() // 表单 Ref
 
 /** 打开弹窗 */
@@ -82,14 +103,11 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value as unknown as SignInConfigApi.SignInConfigVO
     if (formType.value === 'create') {
-      //默认新创建的自动启动
-      data.enable = true
-      await SignInConfigApi.createSignInConfig(data)
+      await SignInConfigApi.createSignInConfig(formData.value)
       message.success(t('common.createSuccess'))
     } else {
-      await SignInConfigApi.updateSignInConfig(data)
+      await SignInConfigApi.updateSignInConfig(formData.value)
       message.success(t('common.updateSuccess'))
     }
     dialogVisible.value = false
@@ -105,7 +123,8 @@ const resetForm = () => {
   formData.value = {
     id: undefined,
     day: undefined,
-    point: undefined,
+    point: 0,
+    experience: 0,
     status: CommonStatusEnum.ENABLE
   }
   formRef.value?.resetFields()
diff --git a/src/views/member/signin/config/index.vue b/src/views/member/signin/config/index.vue
index 71dc4c6f..da38dad6 100644
--- a/src/views/member/signin/config/index.vue
+++ b/src/views/member/signin/config/index.vue
@@ -20,7 +20,8 @@
         prop="day"
         :formatter="(_, __, cellValue) => ['第', cellValue, '天'].join(' ')"
       />
-      <el-table-column label="获得积分" align="center" prop="point" />
+      <el-table-column label="奖励积分" align="center" prop="point" />
+      <el-table-column label="奖励经验" align="center" prop="experience" />
       <el-table-column label="状态" align="center" prop="status">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />