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

src/utils/dict.ts

@@ -184,7 +184,7 @@ export enum DICT_TYPE {
   PROMOTION_CONDITION_TYPE = 'promotion_condition_type', // 营销的条件类型枚举
   PROMOTION_BARGAIN_RECORD_STATUS = 'promotion_bargain_record_status', // 砍价记录的状态
   PROMOTION_COMBINATION_RECORD_STATUS = 'promotion_combination_record_status', // 拼团记录的状态
-  BANNER_POSITION = 'banner_position', // banner 定位
+  PROMOTION_BANNER_POSITION = 'promotion_banner_position', // banner 定位
 
   // ========== CRM - 客户管理模块 ==========
   CRM_RECEIVABLE_CHECK_STATUS = 'crm_receivable_check_status',

src/views/mall/product/spu/form/OtherSettingsForm.vue

@@ -109,59 +109,24 @@ const props = defineProps({
 const promotionTypes = ref<DictDataType[]>([
   {
     dictType: 'promotionTypes',
-    label: '秒杀活动',
+    label: '秒杀',
     value: 1,
     colorType: 'warning',
     cssClass: ''
   },
   {
     dictType: 'promotionTypes',
-    label: '砍价活动',
+    label: '砍价',
     value: 2,
     colorType: 'warning',
     cssClass: ''
   },
   {
     dictType: 'promotionTypes',
-    label: '拼团活动',
+    label: '拼团',
     value: 3,
     colorType: 'warning',
     cssClass: ''
-  },
-  {
-    dictType: 'promotionTypes',
-    label: '限时折扣',
-    value: 4,
-    colorType: 'warning',
-    cssClass: ''
-  },
-  {
-    dictType: 'promotionTypes',
-    label: '满减送',
-    value: 5,
-    colorType: 'warning',
-    cssClass: ''
-  },
-  {
-    dictType: 'promotionTypes',
-    label: '会员折扣',
-    value: 6,
-    colorType: 'warning',
-    cssClass: ''
-  },
-  {
-    dictType: 'promotionTypes',
-    label: '优惠劵',
-    value: 7,
-    colorType: 'warning',
-    cssClass: ''
-  },
-  {
-    dictType: 'promotionTypes',
-    label: '积分',
-    value: 8,
-    colorType: 'warning',
-    cssClass: ''
   }
 ])
 

src/views/mall/promotion/banner/BannerForm.vue

@@ -45,7 +45,7 @@
           <el-form-item label="定位" prop="position">
             <el-radio-group v-model="formData.position">
               <el-radio
-                v-for="dict in getIntDictOptions(DICT_TYPE.BANNER_POSITION)"
+                v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_BANNER_POSITION)"
                 :key="dict.value"
                 :label="dict.value"
               >

src/views/mall/promotion/banner/index.vue

@@ -76,7 +76,7 @@
       </el-table-column>
       <el-table-column align="center" label="定位" prop="position">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.BANNER_POSITION" :value="scope.row.position" />
+          <dict-tag :type="DICT_TYPE.PROMOTION_BANNER_POSITION" :value="scope.row.position" />
         </template>
       </el-table-column>
       <el-table-column align="center" label="跳转地址" prop="url" />