Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp

� Conflicts:
�	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
�	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java

Author: Why1092164058

src/utils/constants.js

@@ -185,37 +185,54 @@ export const PayOrderRefundStatusEnum = {
  * 支付退款订单状态枚举
  */
 export const PayRefundStatusEnum = {
-  CREATE:{
-    status:0,
+  CREATE: {
+    status: 0,
     name: '退款订单生成'
   },
-  SUCCESS:{
-    status:1,
+  SUCCESS: {
+    status: 1,
     name: '退款成功'
   },
-  FAILURE:{
-    status:2,
+  FAILURE: {
+    status: 2,
     name: '退款失败'
   },
-  PROCESSING_NOTIFY:{
-    status:3,
+  PROCESSING_NOTIFY: {
+    status: 3,
     name: '退款中，渠道通知结果'
   },
-  PROCESSING_QUERY:{
-    status:4,
+  PROCESSING_QUERY: {
+    status: 4,
     name: '退款中，系统查询结果'
   },
-  UNKNOWN_RETRY:{
-    status:5,
+  UNKNOWN_RETRY: {
+    status: 5,
     name: '状态未知，请重试'
   },
-  UNKNOWN_QUERY:{
-    status:6,
+  UNKNOWN_QUERY: {
+    status: 6,
     name: '状态未知，系统查询结果'
   },
-  CLOSE:{
-    status:99,
+  CLOSE: {
+    status: 99,
     name: '退款关闭'
   }
 }
 
+/**
+ * 商品 SPU 状态
+ */
+export const ProductSpuStatusEnum = {
+  RECYCLE: {
+    status: -1,
+    name: '回收站'
+  },
+  DISABLE: {
+    status: 0,
+    name: '下架'
+  },
+  ENABLE: {
+    status: 1,
+    name: '上架'
+  },
+}

src/utils/dict.js

@@ -56,6 +56,9 @@ export const DICT_TYPE = {
   PAY_ORDER_REFUND_STATUS: 'pay_order_refund_status', // 商户支付订单退款状态
   PAY_REFUND_ORDER_STATUS: 'pay_refund_order_status', // 退款订单状态
   PAY_REFUND_ORDER_TYPE: 'pay_refund_order_type', // 退款订单类别
+
+  // ========== MALL - PRODUCT 模块 ==========
+  PRODUCT_SPU_STATUS: 'product_spu_status', // 商品 SPU 状态
 }
 
 /**
@@ -114,6 +117,3 @@ export function getDictDataLabel(dictType, value) {
   const dict = getDictData(dictType, value);
   return dict ? dict.label : '';
 }
-
-export class getDictDataL {
-}