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

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

Browse Source 
# Conflicts:
#	src/views/property-marketing/media-account/account-manage/components/add-account-modal/index.vue
This commit is contained in:
rd
2025-08-15 10:32:57 +08:00
parent 9571c2bf7b af174dbbed
commit 1b0554a3cf
28 changed files with 176 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/property-marketing/media-account/account-detail/components/account-info/index.vue
View File

@ -143,8 +143,8 @@ import icon1 from '@/assets/img/media-account/icon5.png';
import icon2 from '@/assets/img/media-account/icon-warn.png';
import icon3 from '@/assets/img/media-account/icon-warn-1.png';
import icon4 from '@/assets/img/media-account/icon-success.png';
import icon5 from '@/assets/img/media-account/icon-dy.png';
import icon6 from '@/assets/img/media-account/icon-xhs.png';
import icon5 from '@/assets/img/platform/icon-dy.png';
import icon6 from '@/assets/img/platform/icon-xhs.png';
const route = useRoute();
const id = route.params.id;

4
src/views/property-marketing/media-account/account-manage/components/account-table/index.vue
View File

@ -157,8 +157,8 @@ import ReauthorizeAccountModal from '../reauthorize-account-modal';
import AuthorizedAccountModal from '../authorized-account-modal';
import FooterBtn from './footer-btn';
import icon1 from '@/assets/img/media-account/icon-dy.png';
import icon2 from '@/assets/img/media-account/icon-xhs.png';
import icon1 from '@/assets/img/platform/icon-dy.png';
import icon2 from '@/assets/img/platform/icon-xhs.png';
import icon3 from '@/assets/img/media-account/icon-warn.png';
import icon4 from '@/assets/img/media-account/icon-sph.png';
const props = defineProps({

4
src/views/property-marketing/media-account/account-manage/components/add-account-modal/index.vue
View File

@ -41,8 +41,8 @@ import {
import icon1 from '@/assets/img/media-account/icon-download.png';
import icon2 from '@/assets/img/media-account/icon-delete.png';
import icon3 from '@/assets/img/media-account/icon-dy.png';
import icon4 from '@/assets/img/media-account/icon-xhs.png';
import icon3 from '@/assets/img/platform/icon-dy.png';
import icon4 from '@/assets/img/platform/icon-xhs.png';
import icon5 from '@/assets/img/media-account/icon-sph.png';
// import icon5 from '@/assets/img/media-account/icon-warn-1.png';
// import icon6 from '@/assets/img/media-account/icon-success.png';