sync dev-20230606

src/router/modules/remaining.ts

@@ -371,7 +371,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
     },
     children: [
       {
-        path: 'spu/add', // TODO @puhui999：最好拆成 add 和 edit 两个路由；添加商品；修改商品 fix
+        path: 'productSpuAdd', // TODO @puhui999：最好拆成 add 和 edit 两个路由；添加商品；修改商品 fix
         component: () => import('@/views/mall/product/spu/addForm.vue'),
         name: 'ProductSpuAdd',
         meta: {
@@ -384,9 +384,9 @@ const remainingRouter: AppRouteRecordRaw[] = [
         }
       },
       {
-        path: 'spu/edit/:spuId(\\d+)',
+        path: 'productSpuEdit/:spuId(\\d+)',
         component: () => import('@/views/mall/product/spu/addForm.vue'),
-        name: 'ProductSpuEdit',
+        name: 'productSpuEdit',
         meta: {
           noCache: true,
           hidden: true,
@@ -395,19 +395,6 @@ const remainingRouter: AppRouteRecordRaw[] = [
           title: '编辑商品',
           activeMenu: '/product/product-spu'
         }
-      },
-      {
-        path: 'spu/detail/:spuId(\\d+)',
-        component: () => import('@/views/mall/product/spu/addForm.vue'),
-        name: 'productSpuDetail',
-        meta: {
-          noCache: true,
-          hidden: true,
-          canTo: true,
-          icon: 'ep:view',
-          title: '商品详情',
-          activeMenu: '/product/product-spu'
-        }
       }
     ]
   }

src/utils/dict.ts

@@ -150,6 +150,9 @@ export enum DICT_TYPE {
   PRODUCT_UNIT = 'product_unit', // 商品单位
   PRODUCT_SPU_STATUS = 'product_spu_status', //商品状态
 
+  // ========== MALL 交易模块 ==========
+  EXPRESS_CHARGE_MODE = 'trade_delivery_express_charge_mode', //快递的计费方式
+
   //===add by 20230530====
   // ========== MALL - ORDER 模块 ==========
   TRADE_AFTER_SALE_STATUS = 'trade_after_sale_status', // 售后 - 状态