From 57df63dc3579dfaffa0904d19f96392fee90dddf Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 20 Aug 2023 19:26:50 +0800
Subject: [PATCH] =?UTF-8?q?code=20review=EF=BC=9A=E7=AD=BE=E5=88=B0?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 82628ce78083d04edc7c9521f61bdb4d7abfbfbe)
---
 src/api/{ => member}/point/config/index.ts    |  0
 src/api/{ => member}/point/record/index.ts    |  0
 .../signin/config}/index.ts                   |  2 +-
 .../signin/record}/index.ts                   |  0
 src/views/member/point/config/index.vue       |  2 +-
 src/views/member/point/record/index.vue       |  6 ++---
 .../member/signin/config/SignInConfigForm.vue | 24 +++++++++++++----
 src/views/member/signin/config/index.vue      | 27 ++++---------------
 8 files changed, 29 insertions(+), 32 deletions(-)
 rename src/api/{ => member}/point/config/index.ts (100%)
 rename src/api/{ => member}/point/record/index.ts (100%)
 rename src/api/{point/signInConfig => member/signin/config}/index.ts (95%)
 rename src/api/{point/signInRecord => member/signin/record}/index.ts (100%)

diff --git a/src/api/point/config/index.ts b/src/api/member/point/config/index.ts
similarity index 100%
rename from src/api/point/config/index.ts
rename to src/api/member/point/config/index.ts
diff --git a/src/api/point/record/index.ts b/src/api/member/point/record/index.ts
similarity index 100%
rename from src/api/point/record/index.ts
rename to src/api/member/point/record/index.ts
diff --git a/src/api/point/signInConfig/index.ts b/src/api/member/signin/config/index.ts
similarity index 95%
rename from src/api/point/signInConfig/index.ts
rename to src/api/member/signin/config/index.ts
index 246270ec..833c2e16 100644
--- a/src/api/point/signInConfig/index.ts
+++ b/src/api/member/signin/config/index.ts
@@ -8,7 +8,7 @@ export interface SignInConfigVO {
 }
 
 // 查询积分签到规则列表
-export const getSignInConfigPage = async () => {
+export const getSignInConfigList = async () => {
   return await request.get({ url: `/member/point/sign-in-config/list` })
 }
 
diff --git a/src/api/point/signInRecord/index.ts b/src/api/member/signin/record/index.ts
similarity index 100%
rename from src/api/point/signInRecord/index.ts
rename to src/api/member/signin/record/index.ts
diff --git a/src/views/member/point/config/index.vue b/src/views/member/point/config/index.vue
index 27820c24..27c52085 100644
--- a/src/views/member/point/config/index.vue
+++ b/src/views/member/point/config/index.vue
@@ -58,7 +58,7 @@
   </ContentWrap>
 </template>
 <script lang="ts" setup>
-import * as ConfigApi from '@/api/point/config'
+import * as ConfigApi from '@/api/member/point/config'
 
 defineOptions({ name: 'MemberPointConfig' })
 
diff --git a/src/views/member/point/record/index.vue b/src/views/member/point/record/index.vue
index 20b81bd9..5e2be1db 100644
--- a/src/views/member/point/record/index.vue
+++ b/src/views/member/point/record/index.vue
@@ -25,7 +25,7 @@
           class="!w-240px"
         >
           <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.MEMBER_POINT_BIZ_TYPE)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.MEMBER_POINT_BIZ_TYPE)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -109,9 +109,9 @@
 </template>
 
 <script lang="ts" setup>
-import { DICT_TYPE, getStrDictOptions, getIntDictOptions } from '@/utils/dict'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
-import * as RecordApi from '@/api/point/record'
+import * as RecordApi from '@/api//member/point/record'
 
 defineOptions({ name: 'PointRecord' })
 
diff --git a/src/views/member/signin/config/SignInConfigForm.vue b/src/views/member/signin/config/SignInConfigForm.vue
index bf2112bd..4d5c3d2d 100644
--- a/src/views/member/signin/config/SignInConfigForm.vue
+++ b/src/views/member/signin/config/SignInConfigForm.vue
@@ -10,12 +10,23 @@
       <el-form-item label="签到天数" prop="day">
         <el-input-number v-model="formData.day" :min="1" :max="7" :precision="0" />
         <el-text class="mx-1" style="margin-left: 10px" type="danger">
-          只允许设置1-7，默认签到7天为一个周期</el-text
-        >
+          只允许设置 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>
+      <el-form-item label="开启状态" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
     </el-form>
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@@ -23,8 +34,10 @@
     </template>
   </Dialog>
 </template>
-<script setup lang="ts">
-import * as SignInConfigApi from '@/api/point/signInConfig'
+<script lang="ts" setup>
+import * as SignInConfigApi from '@/api/member/signin/config'
+import { CommonStatusEnum } from '@/utils/constants'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -92,7 +105,8 @@ const resetForm = () => {
   formData.value = {
     id: undefined,
     day: undefined,
-    point: undefined
+    point: undefined,
+    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 99e22589..71dc4c6f 100644
--- a/src/views/member/signin/config/index.vue
+++ b/src/views/member/signin/config/index.vue
@@ -21,17 +21,9 @@
         :formatter="(_, __, cellValue) => ['第', cellValue, '天'].join(' ')"
       />
       <el-table-column label="获得积分" align="center" prop="point" />
-      <el-table-column label="是否开启" align="center">
+      <el-table-column label="状态" align="center" prop="status">
         <template #default="scope">
-          <div>
-            <el-switch
-              v-model="scope.row.enable"
-              @change="handleSwitchChange(scope.row, $event)"
-              inline-prompt
-              active-text="开启"
-              inactive-text="关闭"
-            />
-          </div>
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center">
@@ -60,11 +52,10 @@
   <!-- 表单弹窗：添加/修改 -->
   <SignInConfigForm ref="formRef" @success="getList" />
 </template>
-
 <script lang="ts" setup>
-import * as SignInConfigApi from '@/api/point/signInConfig'
+import * as SignInConfigApi from '@/api/member/signin/config'
 import SignInConfigForm from './SignInConfigForm.vue'
-import { SignInConfigVO } from '@/api/point/signInConfig'
+import { DICT_TYPE } from '@/utils/dict'
 
 defineOptions({ name: 'SignInConfig' })
 
@@ -78,7 +69,7 @@ const list = ref([]) // 列表的数据
 const getList = async () => {
   loading.value = true
   try {
-    const data = await SignInConfigApi.getSignInConfigPage()
+    const data = await SignInConfigApi.getSignInConfigList()
     console.log(data)
     list.value = data
   } finally {
@@ -105,14 +96,6 @@ const handleDelete = async (id: number) => {
   } catch {}
 }
 
-const handleSwitchChange = async (row, e) => {
-  console.log('开关状态变更，id:', row, '新状态：', e)
-  // 创建对象
-  const signInConfig: SignInConfigVO = { enable: e }
-  ;({ id: signInConfig.id, day: signInConfig.day, point: signInConfig.point, enable: e } = row)
-  await SignInConfigApi.updateSignInConfig(signInConfig)
-}
-
 /** 初始化 **/
 onMounted(() => {
   getList()