renxiaodong/lingji-work-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into feature/v1.2灵机空间-内容上传审核_rxd

Browse Source 
# Conflicts:
#	src/components/_base/navbar/components/navbar-menu/index.vue
This commit is contained in:
rd
2025-07-31 11:27:09 +08:00
parent d8a4fc73e2 559f3774b9
commit 41d3f7c93b
22 changed files with 617 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/property-marketing/put-account/account-data/components/board-table/index.vue
View File

@ -135,7 +135,7 @@
<script setup>
import { ref, computed } from 'vue';
import { STATUS_LIST } from '@/views/property-marketing/media-account/components/status-select/constants';
import { STATUS_LIST } from '@/views/property-marketing/put-account/components/status-select/constants';
import { formatTableField, exactFormatTime } from '@/utils/tools';
import { TABLE_COLUMNS } from './constants';
import { useRouter } from 'vue-router';

2
src/views/property-marketing/put-account/account-data/components/plan-table/index.vue
View File

@ -133,7 +133,7 @@
<script setup>
import { ref, computed } from 'vue';
import { STATUS_LIST } from '@/views/property-marketing/media-account/components/status-select/constants';
import { STATUS_LIST } from '@/views/property-marketing/put-account/components/status-select/constants';
import { formatTableField } from '@/utils/tools';
import { TABLE_COLUMNS } from './constants';
import { useRouter } from 'vue-router';