Merge branch 'release' into dev

src/components/RightToolbar/index.vue

@@ -238,7 +238,9 @@ function initTreeData() {
   }
 }
 watch(() => props.columns, () => {
-  initTreeData();
+  if (props.showColumnsType === 'tree') {
+    initTreeData();
+  }
 })
 // 再添加一个watcher来监听showColumnsType变化
 watch(

src/main.js

@@ -69,7 +69,7 @@ import VConsole from 'vconsole'
 
 // 创建vConsole实例
 // 生产环境不加载
-if (import.meta.env.VITE_APP_ENV !== 'production') {
+if (import.meta.env.VITE_APP_ENV === 'staging') {
   new VConsole()
 }
 

src/views/promotion/display_schedule/index.vue

@@ -2,7 +2,6 @@
   <div class="app-container">
     <div class="container">
       <el-tabs v-model="activeName"
-        type="card"
         class="demo-tabs"
         @tab-click="handleClickTabs">
         <el-tab-pane label="陈列计划"
@@ -21,7 +20,7 @@
 <script setup>
 import Display from './tabs/display.vue'
 import Schedule from './tabs/schedule.vue'
-const activeName = ref('陈列计划');
+const activeName = ref('档期计划');
 const handleClickTabs = (tab) => {
   activeName.value = tab.name;
 }