Merge remote-tracking branch 'origin/master' into feature/v1.3_营销资产中台

Browse Source

# Conflicts:
#	src/main.ts
#	src/styles/components/index.scss
#	src/styles/components/table.scss
#	src/styles/index.ts
#	src/views/components/dataEngine/keyWord.vue

...

This commit is contained in:

rd

2025-07-02 09:22:21 +08:00

parent 30b2eb8211 6ef12fafe4

commit 3f5aa63d89

37 changed files with 1498 additions and 832 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/fonts/Alibaba-PuHuiTi-Bold.otf Normal file

Binary file not shown.

BIN

src/assets/fonts/Alibaba-PuHuiTi-Medium.otf Normal file

Binary file not shown.

BIN

src/assets/fonts/Alibaba-PuHuiTi-Regular.otf Normal file

Binary file not shown.

BIN

src/assets/img/hottranslation/good.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.0 KiB After Width:  |  Height:  |  Size: 1009 B

BIN

src/assets/img/hottranslation/normal.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 865 B After Width:  |  Height:  |  Size: 736 B

BIN

src/assets/img/hottranslation/poor.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 1.0 KiB