Merge remote-tracking branch 'origin/main' into feature/v1.3_主agent_rxd

Browse Source

# Conflicts:
#	src/styles/lib/reset.scss
#	src/views/creative-generation-workshop/explore/detail/index.vue
#	src/views/creative-generation-workshop/explore/detail/style.scss
#	src/views/creative-generation-workshop/explore/list/index.vue
#	src/views/creative-generation-workshop/manuscript-writer/detail/index.vue
#	src/views/creative-generation-workshop/manuscript/detail/index.vue

...

This commit is contained in:

rd

2025-08-15 17:43:43 +08:00

parent ca53964cfb 8917b549a5

commit b0b9399685

72 changed files with 750 additions and 461 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

src/assets/img/creative-generation-workshop/icon-avatar-default-v2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.5 KiB

BIN

src/assets/img/media-account/icon-dy.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.8 KiB

BIN

src/assets/img/media-account/icon-xhs.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 26 KiB

BIN

src/assets/img/platform/icon-dy.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.2 KiB

BIN

src/assets/img/platform/icon-xhs.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 656 B