Merge branch 'ap' into dev

src/views/promotion/components/Table/index.vue

@@ -127,8 +127,7 @@ const emit = defineEmits(['updateColumns', 'getTableList', 'updateShowSearch'])
 
 /*************** 工具栏 ***************/
 // 切换平铺/填报模式
-// const operation = ref('展示模式');
-const operation = ref('填报模式');
+const operation = ref('展示模式');
 const tableRef = ref(null)
 const checkTableColumns = async () => {
   // 通知外面传入 tableColumns / chooseColumns 数据源

src/views/promotion/display_schedule/index.vue

@@ -41,8 +41,7 @@ import Snack from './tabs/snack.vue'
 import ThreeTwoSeconds from './tabs/three_two_seconds.vue'
 import SixLittleDiamonds from './tabs/six_little_diamonds.vue'
 
-// const activeName = ref('常规陈列');
-const activeName = ref('档期陈列');
+const activeName = ref('常规陈列');
 const handleClickTabs = (tab) => {
   activeName.value = tab.name;
 }