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

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,6 +89,8 @@ const openForm = (type: string, id?: number) => {
 const handleDelete = (id: number) => {
   tableMethods.delList(id, false)
 }
+
+// TODO @puhui：是不是直接叫 configList 就好啦
 const seckillConfigAllSimple = ref([]) // 时段配置精简列表
 const convertSeckillConfigNames = computed(
   () => (row) =>
@@ -96,6 +98,7 @@ const convertSeckillConfigNames = computed(
       ?.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,