Merge remote-tracking branch 'yudao/dev' into dev-to-dev

Author: puhui999

src/api/point/config/index.ts

@@ -8,32 +8,12 @@ export interface ConfigVO {
   tradeGivePoint: number
 }
 
-// 查询积分设置列表
-export const getConfigPage = async (params) => {
-  return await request.get({ url: `/point/config/page`, params })
-}
-
 // 查询积分设置详情
-export const getConfig = async (id: number) => {
-  return await request.get({ url: `/point/config/get?id=` + id })
-}
-
-// 新增积分设置
-export const createConfig = async (data: ConfigVO) => {
-  return await request.post({ url: `/point/config/create`, data })
-}
-
-// 修改积分设置
-export const updateConfig = async (data: ConfigVO) => {
-  return await request.put({ url: `/point/config/update`, data })
-}
-
-// 删除积分设置
-export const deleteConfig = async (id: number) => {
-  return await request.delete({ url: `/point/config/delete?id=` + id })
+export const getConfig = async () => {
+  return await request.get({ url: `/point/config/get` })
 }
 
-// 导出积分设置 Excel
-export const exportConfig = async (params) => {
-  return await request.download({ url: `/point/config/export-excel`, params })
+// 新增修改积分设置
+export const saveConfig = async (data: ConfigVO) => {
+  return await request.put({ url: `/point/config/save`, data })
 }

src/utils/dict.ts

@@ -146,9 +146,8 @@ export enum DICT_TYPE {
   MP_MESSAGE_TYPE = 'mp_message_type', // 消息类型
 
   // ========== MALL - 会员模块 ==========
-  // 积分模块 TODO 芋艿：改成 member_ 前缀；包括枚举和值；
-  POINT_BIZ_TYPE = 'point_biz_type',
-  POINT_STATUS = 'point_status',
+  MEMBER_POINT_BIZ_TYPE = 'member_point_biz_type', // 积分的业务类型
+  MEMBER_POINT_STATUS = 'member_point_status', // 积分的状态
 
   // ========== MALL - 商品模块 ==========
   PRODUCT_UNIT = 'product_unit', // 商品单位

src/views/mall/product/spu/components/index.ts

@@ -7,6 +7,7 @@ import SkuList from './SkuList.vue'
 
 import { Spu } from '@/api/mall/product/spu'
 
+// TODO @puhui999：Properties 改成 Property 更合适？
 interface Properties {
   id: number
   name: string
@@ -30,8 +31,10 @@ interface RuleConfig {
 }
 
 /**
- *  商品通用函数
+ * 获得商品的规格列表
+ *
  * @param spu
+ * @return Property 规格列表
  */
 const getPropertyList = (spu: Spu): Properties[] => {
   //  直接拿返回的 skus 属性逆向生成出 propertyList

src/views/mall/product/spu/index.vue

@@ -437,6 +437,7 @@ const categoryList = ref() // 分类树
 const categoryString = (categoryId) => {
   return treeToString(categoryList.value, categoryId)
 }
+
 /**
  * 校验所选是否为二级及以下节点
  */
@@ -446,6 +447,7 @@ const nodeClick = () => {
     message.warning('必须选择二级及以下节点！！')
   }
 }
+
 /** 初始化 **/
 onMounted(async () => {
   await getTabsCount()

src/views/mall/promotion/components/SpuSelect.vue

@@ -256,7 +256,6 @@ const imagePreview = (imgUrl: string) => {
 
 const categoryList = ref() // 分类树
 
-// TODO @puhui999：商品搜索的时候，可以通过一级搜二级；所以这个校验可以去掉哈；也就是说，只允许挂在二级，但是一级可搜索到
 /** 初始化 **/
 onMounted(async () => {
   await getList()

src/views/mall/promotion/components/index.ts

@@ -7,6 +7,7 @@ type SpuProperty<T> = {
   spuDetail: T
   propertyList: Properties[]
 }
+
 /**
  * 提供商品活动商品选择通用组件
  */

src/views/mall/promotion/seckill/activity/index.vue

@@ -89,13 +89,16 @@ const openForm = (type: string, id?: number) => {
 const handleDelete = (id: number) => {
   tableMethods.delList(id, false)
 }
+
+// TODO @puhui：是不是直接叫 configList 就好啦
 const seckillConfigAllSimple = ref([]) // 时段配置精简列表
 const convertSeckillConfigNames = computed(
   () => (row) =>
     seckillConfigAllSimple.value
       ?.filter((item) => row.configIds.includes(item.id))
       ?.map((config) => config.name)
 )
+
 const expandChange = (row, expandedRows) => {
   // TODO puhui：等 CRUD 完事后弄
   console.log(row, expandedRows)

src/views/mall/promotion/seckill/activity/seckillActivity.data.ts

@@ -219,7 +219,7 @@ const crudSchemas = reactive<CrudSchema[]>([
   },
   {
     label: '状态',
-    field: 'status', // TODO @puhui999：状态在 table 格式化不对；建表插入的数据状态值不对，改为 0 或 1 就好了
+    field: 'status',
     dictType: DICT_TYPE.COMMON_STATUS,
     dictClass: 'number',
     isForm: false,

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

@@ -0,0 +1,93 @@
+<template>
+  <ContentWrap>
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="120px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="hideId" v-show="false">
+        <el-input v-model="formData.id" />
+      </el-form-item>
+      <!-- TODO @xiaqing：展示给用户的字段名，可以和 crmeb 保持一直，然后每一个表单都有类似 crmeb 的 tip；例如说：积分抵用比例(1积分抵多少金额)单位：元 -->
+      <el-form-item label="积分抵扣" prop="tradeDeductEnable">
+        <el-switch v-model="formData.tradeDeductEnable" />
+      </el-form-item>
+      <!-- TODO @xiaqing：用户看到的是元，最多 2 位；分是后端的存储哈 -->
+      <el-form-item label="抵扣单位(分)" prop="tradeDeductUnitPrice">
+        <el-input-number
+          v-model="formData.tradeDeductUnitPrice"
+          placeholder="请输入抵扣单位(分)"
+          style="width: 300px"
+        />
+      </el-form-item>
+      <el-form-item label="积分抵扣最大值" prop="tradeDeductMaxPrice">
+        <el-input-number
+          v-model="formData.tradeDeductMaxPrice"
+          placeholder="请输入积分抵扣最大值"
+          style="width: 300px"
+        />
+      </el-form-item>
+      <el-form-item label="1 元赠送多少分" prop="tradeGivePoint">
+        <el-input-number
+          v-model="formData.tradeGivePoint"
+          placeholder="请输入 1 元赠送多少积分"
+          style="width: 300px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSubmit">提交</el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+</template>
+<script lang="ts" setup>
+import * as ConfigApi from '@/api/point/config'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  id: undefined,
+  tradeDeductEnable: undefined,
+  tradeDeductUnitPrice: undefined,
+  tradeDeductMaxPrice: undefined,
+  tradeGivePoint: undefined
+})
+const formRules = reactive({})
+const formRef = ref() // 表单 Ref
+
+/** 修改积分配置 */
+const onSubmit = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as ConfigApi.ConfigVO
+    await ConfigApi.saveConfig(data)
+    message.success(t('common.updateSuccess'))
+    dialogVisible.value = false
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 获得积分配置 */
+const getConfig = async () => {
+  try {
+    const data = await ConfigApi.getConfig()
+    formData.value = data
+  } finally {
+  }
+}
+
+onMounted(() => {
+  getConfig()
+})
+</script>

src/views/point/record/RecordForm.vue renamed to src/views/member/point/record/RecordForm.vue

@@ -13,7 +13,7 @@
       <el-form-item label="业务类型" prop="bizType">
         <el-select v-model="formData.bizType" placeholder="请选择业务类型">
           <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.POINT_BIZ_TYPE)"
+            v-for="dict in getStrDictOptions(DICT_TYPE.MEMBER_POINT_BIZ_TYPE)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -41,7 +41,7 @@
       <el-form-item label="积分状态" prop="status">
         <el-select v-model="formData.status" placeholder="积分状态">
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.POINT_STATUS)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.MEMBER_POINT_STATUS)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -157,6 +157,7 @@ const submitForm = async () => {
   }
 }
 
+// TODO @xiaqing：不需要更新操作哇？
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {