From 569c2c468b02d4b9021a8b4713b5f4056a995be4 Mon Sep 17 00:00:00 2001 From: landjj321 <landjj321@126.com> Date: Sat, 20 Mar 2021 19:22:12 +0800 Subject: [PATCH] Merge branch 'master' of http://git.cstar.info/r/web/pcac into master --- src/assets/home/art_original/4.png | 0 src/assets/home/art_classroom/3.jpeg | 0 src/assets/home/china/china_bg_img6.png | 0 src/assets/home/art_mien/1.png | 0 src/assets/home/video-bottom-bg.png | 0 src/assets/home/china/china_bg_img5.png | 0 src/assets/home/world/world_bg_img1.png | 0 src/assets/home/military/military_bg_img5.png | 0 src/assets/home/art_original/3.png | 0 src/assets/home/art_classroom/bg.png | 0 src/assets/home/art_soldier/1.png | 0 src/assets/home/video-bg.png | 0 src/assets/home/art_classroom/9.jpeg | 0 src/views/home/components/ArtClassroom.vue | 18 +++++++++--------- src/assets/home/world/world_bg_img3.png | 0 src/assets/home/china/china_bg_img4.png | 0 src/assets/home/military/military_bg_img7.png | 0 src/assets/home/art_live/photo.png | 0 src/assets/home/art_mien/2.png | 0 src/assets/home/art_original/2.png | 0 src/assets/home/art_subject/title.png | 0 src/assets/home/military/military_bg_img6.png | 0 src/assets/home/world/world_bg_img2.png | 0 src/assets/home/art_mien/bg.png | 0 src/assets/home/art_soldier/bg.png | 0 src/assets/home/world/world_bg_img4.png | 0 src/assets/home/art_subject/2.jpg | 0 src/assets/home/wenyiyuanchuang_bg.png | 0 src/assets/home/military/military_bg_img8.png | 0 src/assets/home/art_live/bg.png | 0 src/views/home/components/FirstVideo.vue | 2 +- src/assets/home/wenyisandui_item.png | 0 src/assets/home/art_original/1.png | 0 src/assets/home/art_live/photo_frame.png | 0 src/assets/home/wenyizhuanti_bg.png | 0 src/assets/home/art_classroom/5.jpeg | 0 src/assets/home/core_value/bg.png | 0 src/assets/home/art_classroom/2.jpeg | 0 src/assets/home/world/world_bg_img5.png | 0 src/assets/home/art_classroom/8.jpeg | 0 src/assets/home/art_subject/1.jpg | 0 src/assets/home/china/china_bg_img7.png | 0 src/assets/home/military/military_bg_img9.png | 0 src/assets/home/art_mien/8.png | 0 src/assets/home/art_original/bg.png | 0 src/assets/home/art_mien/6.png | 0 src/assets/home/art_classroom/desc.png | 0 src/assets/home/world/world_bg_img6.png | 0 src/assets/home/art_soldier/6.png | 0 src/assets/home/art_subject/5.jpg | 0 src/assets/home/wenyibingshi_bg.png | 0 src/assets/home/art_soldier/5.png | 0 src/assets/home/art_three/1.png | 0 src/assets/home/art_classroom/6.jpeg | 0 src/assets/home/china/china_bg_img1.png | 0 src/assets/home/art_mien/7.png | 0 src/assets/home/wenyifengcai_bg.png | 0 src/assets/home/military/military_bg_img1.png | 0 src/assets/home/art_mien/5.png | 0 src/assets/home/art_soldier/4.png | 0 src/assets/home/art_subject/all.png | 0 src/assets/home/art_subject/4.jpg | 0 src/assets/home/art_three/bg.png | 0 src/assets/home/military/military_bg_img2.png | 0 src/assets/home/art_classroom/header_coffee.png | 0 src/assets/home/military/military_bg_img3.png | 0 src/assets/home/art_live/light-spot.png | 0 src/assets/home/wenyisandui_bg.png | 0 src/assets/home/art_soldier/3.png | 0 src/assets/home/china/china_bg_img3.png | 0 src/assets/home/art_classroom/7.jpeg | 0 src/assets/home/art_mien/4.png | 0 src/assets/home/art_subject/bg.png | 0 src/assets/home/art_three/3.png | 0 src/assets/home/art_classroom/1.jpeg | 0 src/assets/home/art_mien/3.png | 0 src/assets/home/art_classroom/4.jpeg | 0 /dev/null | 0 src/assets/home/art_original/5.png | 0 src/assets/home/art_soldier/2.png | 0 src/assets/home/china/china_bg_img2.png | 0 src/assets/home/military/military_bg_img4.png | 0 src/assets/home/art_live/content_bg.png | 0 src/assets/home/art_three/2.png | 0 84 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/assets/home/art_classroom/1.jpeg b/src/assets/home/art_classroom/1.jpeg new file mode 100644 index 0000000..f6f0344 --- /dev/null +++ b/src/assets/home/art_classroom/1.jpeg Binary files differ diff --git a/src/assets/home/art_classroom/1.png b/src/assets/home/art_classroom/1.png deleted file mode 100755 index aedeb9c..0000000 --- a/src/assets/home/art_classroom/1.png +++ /dev/null Binary files differ diff --git a/src/assets/home/art_classroom/2.png b/src/assets/home/art_classroom/2.jpeg old mode 100755 new mode 100644 similarity index 100% rename from src/assets/home/art_classroom/2.png rename to src/assets/home/art_classroom/2.jpeg Binary files differ diff --git a/src/assets/home/art_classroom/3.png b/src/assets/home/art_classroom/3.jpeg old mode 100755 new mode 100644 similarity index 100% rename from src/assets/home/art_classroom/3.png rename to src/assets/home/art_classroom/3.jpeg Binary files differ diff --git a/src/assets/home/art_classroom/4.jpeg b/src/assets/home/art_classroom/4.jpeg new file mode 100644 index 0000000..2ea7486 --- /dev/null +++ b/src/assets/home/art_classroom/4.jpeg Binary files differ diff --git a/src/assets/home/art_classroom/4.png b/src/assets/home/art_classroom/4.png deleted file mode 100755 index 66c339b..0000000 --- a/src/assets/home/art_classroom/4.png +++ /dev/null Binary files differ diff --git a/src/assets/home/art_classroom/5.jpeg b/src/assets/home/art_classroom/5.jpeg new file mode 100644 index 0000000..b406ce9 --- /dev/null +++ b/src/assets/home/art_classroom/5.jpeg Binary files differ diff --git a/src/assets/home/art_classroom/5.png b/src/assets/home/art_classroom/5.png deleted file mode 100755 index 7762825..0000000 --- a/src/assets/home/art_classroom/5.png +++ /dev/null Binary files differ diff --git a/src/assets/home/art_classroom/6.jpeg b/src/assets/home/art_classroom/6.jpeg new file mode 100644 index 0000000..52c0f25 --- /dev/null +++ b/src/assets/home/art_classroom/6.jpeg Binary files differ diff --git a/src/assets/home/art_classroom/6.png b/src/assets/home/art_classroom/6.png deleted file mode 100755 index ec3fd00..0000000 --- a/src/assets/home/art_classroom/6.png +++ /dev/null Binary files differ diff --git a/src/assets/home/art_classroom/7.jpeg b/src/assets/home/art_classroom/7.jpeg new file mode 100644 index 0000000..bdbf700 --- /dev/null +++ b/src/assets/home/art_classroom/7.jpeg Binary files differ diff --git a/src/assets/home/art_classroom/7.png b/src/assets/home/art_classroom/7.png deleted file mode 100755 index b5e1b86..0000000 --- a/src/assets/home/art_classroom/7.png +++ /dev/null Binary files differ diff --git a/src/assets/home/art_classroom/8.jpeg b/src/assets/home/art_classroom/8.jpeg new file mode 100644 index 0000000..ed59c02 --- /dev/null +++ b/src/assets/home/art_classroom/8.jpeg Binary files differ diff --git a/src/assets/home/art_classroom/8.png b/src/assets/home/art_classroom/8.png deleted file mode 100755 index d0149ed..0000000 --- a/src/assets/home/art_classroom/8.png +++ /dev/null Binary files differ diff --git a/src/assets/home/art_classroom/9.jpeg b/src/assets/home/art_classroom/9.jpeg new file mode 100644 index 0000000..dc3115e --- /dev/null +++ b/src/assets/home/art_classroom/9.jpeg Binary files differ diff --git a/src/assets/home/art_classroom/9.png b/src/assets/home/art_classroom/9.png deleted file mode 100755 index b66dccf..0000000 --- a/src/assets/home/art_classroom/9.png +++ /dev/null Binary files differ diff --git a/src/assets/home/art_classroom/bg.png b/src/assets/home/art_classroom/bg.png index 8f0577c..0a40181 100644 --- a/src/assets/home/art_classroom/bg.png +++ b/src/assets/home/art_classroom/bg.png Binary files differ diff --git a/src/assets/home/art_classroom/desc.png b/src/assets/home/art_classroom/desc.png index c9e4081..e0c96ad 100644 --- a/src/assets/home/art_classroom/desc.png +++ b/src/assets/home/art_classroom/desc.png Binary files differ diff --git a/src/assets/home/art_classroom/header_coffee.png b/src/assets/home/art_classroom/header_coffee.png index b5083b6..01d86ec 100644 --- a/src/assets/home/art_classroom/header_coffee.png +++ b/src/assets/home/art_classroom/header_coffee.png Binary files differ diff --git a/src/assets/home/art_live/bg.png b/src/assets/home/art_live/bg.png old mode 100644 new mode 100755 index 5b6c076..df795f8 --- a/src/assets/home/art_live/bg.png +++ b/src/assets/home/art_live/bg.png Binary files differ diff --git a/src/assets/home/art_live/content_bg.png b/src/assets/home/art_live/content_bg.png old mode 100644 new mode 100755 index 5f229bc..2076a9c --- a/src/assets/home/art_live/content_bg.png +++ b/src/assets/home/art_live/content_bg.png Binary files differ diff --git a/src/assets/home/art_live/light-spot.png b/src/assets/home/art_live/light-spot.png old mode 100644 new mode 100755 index a0c46fb..6c9938e --- a/src/assets/home/art_live/light-spot.png +++ b/src/assets/home/art_live/light-spot.png Binary files differ diff --git a/src/assets/home/art_live/photo.png b/src/assets/home/art_live/photo.png index f7178b7..dca5ad0 100644 --- a/src/assets/home/art_live/photo.png +++ b/src/assets/home/art_live/photo.png Binary files differ diff --git a/src/assets/home/art_live/photo_frame.png b/src/assets/home/art_live/photo_frame.png old mode 100644 new mode 100755 index 93fe8c7..e32c026 --- a/src/assets/home/art_live/photo_frame.png +++ b/src/assets/home/art_live/photo_frame.png Binary files differ diff --git a/src/assets/home/art_mien/1.png b/src/assets/home/art_mien/1.png index 4d403bf..9c72dec 100755 --- a/src/assets/home/art_mien/1.png +++ b/src/assets/home/art_mien/1.png Binary files differ diff --git a/src/assets/home/art_mien/2.png b/src/assets/home/art_mien/2.png index 4a5b6a5..723c3a4 100755 --- a/src/assets/home/art_mien/2.png +++ b/src/assets/home/art_mien/2.png Binary files differ diff --git a/src/assets/home/art_mien/3.png b/src/assets/home/art_mien/3.png index f9203f4..4b62782 100755 --- a/src/assets/home/art_mien/3.png +++ b/src/assets/home/art_mien/3.png Binary files differ diff --git a/src/assets/home/art_mien/4.png b/src/assets/home/art_mien/4.png index 4f22a41..4c4b1c4 100755 --- a/src/assets/home/art_mien/4.png +++ b/src/assets/home/art_mien/4.png Binary files differ diff --git a/src/assets/home/art_mien/5.png b/src/assets/home/art_mien/5.png index a5ced87..8df4caa 100755 --- a/src/assets/home/art_mien/5.png +++ b/src/assets/home/art_mien/5.png Binary files differ diff --git a/src/assets/home/art_mien/6.png b/src/assets/home/art_mien/6.png index c8795a2..e0c2db2 100755 --- a/src/assets/home/art_mien/6.png +++ b/src/assets/home/art_mien/6.png Binary files differ diff --git a/src/assets/home/art_mien/7.png b/src/assets/home/art_mien/7.png index bc9f160..eceb068 100755 --- a/src/assets/home/art_mien/7.png +++ b/src/assets/home/art_mien/7.png Binary files differ diff --git a/src/assets/home/art_mien/8.png b/src/assets/home/art_mien/8.png index a7f06b9..4d62374 100755 --- a/src/assets/home/art_mien/8.png +++ b/src/assets/home/art_mien/8.png Binary files differ diff --git a/src/assets/home/art_mien/bg.png b/src/assets/home/art_mien/bg.png index 2e5710d..ccca593 100644 --- a/src/assets/home/art_mien/bg.png +++ b/src/assets/home/art_mien/bg.png Binary files differ diff --git a/src/assets/home/art_original/1.png b/src/assets/home/art_original/1.png old mode 100644 new mode 100755 Binary files differ diff --git a/src/assets/home/art_original/2.png b/src/assets/home/art_original/2.png old mode 100644 new mode 100755 Binary files differ diff --git a/src/assets/home/art_original/3.png b/src/assets/home/art_original/3.png old mode 100644 new mode 100755 index 6cade2a..1a5b009 --- a/src/assets/home/art_original/3.png +++ b/src/assets/home/art_original/3.png Binary files differ diff --git a/src/assets/home/art_original/4.png b/src/assets/home/art_original/4.png old mode 100644 new mode 100755 Binary files differ diff --git a/src/assets/home/art_original/5.png b/src/assets/home/art_original/5.png old mode 100644 new mode 100755 index a1a4181..6bfd6ab --- a/src/assets/home/art_original/5.png +++ b/src/assets/home/art_original/5.png Binary files differ diff --git a/src/assets/home/art_original/bg.png b/src/assets/home/art_original/bg.png old mode 100644 new mode 100755 index b863ff6..dbd69dd --- a/src/assets/home/art_original/bg.png +++ b/src/assets/home/art_original/bg.png Binary files differ diff --git a/src/assets/home/art_soldier/1.png b/src/assets/home/art_soldier/1.png old mode 100644 new mode 100755 Binary files differ diff --git a/src/assets/home/art_soldier/2.png b/src/assets/home/art_soldier/2.png old mode 100644 new mode 100755 Binary files differ diff --git a/src/assets/home/art_soldier/3.png b/src/assets/home/art_soldier/3.png old mode 100644 new mode 100755 index c366917..7b3e4ba --- a/src/assets/home/art_soldier/3.png +++ b/src/assets/home/art_soldier/3.png Binary files differ diff --git a/src/assets/home/art_soldier/4.png b/src/assets/home/art_soldier/4.png old mode 100644 new mode 100755 Binary files differ diff --git a/src/assets/home/art_soldier/5.png b/src/assets/home/art_soldier/5.png old mode 100644 new mode 100755 Binary files differ diff --git a/src/assets/home/art_soldier/6.png b/src/assets/home/art_soldier/6.png old mode 100644 new mode 100755 Binary files differ diff --git a/src/assets/home/art_soldier/bg.png b/src/assets/home/art_soldier/bg.png old mode 100644 new mode 100755 index 3982869..4bbe1f0 --- a/src/assets/home/art_soldier/bg.png +++ b/src/assets/home/art_soldier/bg.png Binary files differ diff --git a/src/assets/home/art_subject/1.jpg b/src/assets/home/art_subject/1.jpg index e422880..ee86b61 100755 --- a/src/assets/home/art_subject/1.jpg +++ b/src/assets/home/art_subject/1.jpg Binary files differ diff --git a/src/assets/home/art_subject/2.jpg b/src/assets/home/art_subject/2.jpg index ee7b57f..e926dc7 100755 --- a/src/assets/home/art_subject/2.jpg +++ b/src/assets/home/art_subject/2.jpg Binary files differ diff --git a/src/assets/home/art_subject/4.jpg b/src/assets/home/art_subject/4.jpg index 59882ff..5a4f16d 100755 --- a/src/assets/home/art_subject/4.jpg +++ b/src/assets/home/art_subject/4.jpg Binary files differ diff --git a/src/assets/home/art_subject/5.jpg b/src/assets/home/art_subject/5.jpg index cfcc098..1c20ef1 100755 --- a/src/assets/home/art_subject/5.jpg +++ b/src/assets/home/art_subject/5.jpg Binary files differ diff --git a/src/assets/home/art_subject/all.png b/src/assets/home/art_subject/all.png old mode 100644 new mode 100755 Binary files differ diff --git a/src/assets/home/art_subject/bak/1.png b/src/assets/home/art_subject/bak/1.png deleted file mode 100644 index 86ee58b..0000000 --- a/src/assets/home/art_subject/bak/1.png +++ /dev/null Binary files differ diff --git a/src/assets/home/art_subject/bak/2.png b/src/assets/home/art_subject/bak/2.png deleted file mode 100644 index 25ae436..0000000 --- a/src/assets/home/art_subject/bak/2.png +++ /dev/null Binary files differ diff --git a/src/assets/home/art_subject/bak/3.png b/src/assets/home/art_subject/bak/3.png deleted file mode 100644 index b0bd344..0000000 --- a/src/assets/home/art_subject/bak/3.png +++ /dev/null Binary files differ diff --git a/src/assets/home/art_subject/bak/4.png b/src/assets/home/art_subject/bak/4.png deleted file mode 100644 index 602a83c..0000000 --- a/src/assets/home/art_subject/bak/4.png +++ /dev/null Binary files differ diff --git a/src/assets/home/art_subject/bak/5.png b/src/assets/home/art_subject/bak/5.png deleted file mode 100644 index 2555c1b..0000000 --- a/src/assets/home/art_subject/bak/5.png +++ /dev/null Binary files differ diff --git a/src/assets/home/art_subject/bak/6.png b/src/assets/home/art_subject/bak/6.png deleted file mode 100644 index 86fe673..0000000 --- a/src/assets/home/art_subject/bak/6.png +++ /dev/null Binary files differ diff --git a/src/assets/home/art_subject/bg.png b/src/assets/home/art_subject/bg.png old mode 100644 new mode 100755 Binary files differ diff --git a/src/assets/home/art_subject/title.png b/src/assets/home/art_subject/title.png old mode 100644 new mode 100755 index eefe949..7c50c80 --- a/src/assets/home/art_subject/title.png +++ b/src/assets/home/art_subject/title.png Binary files differ diff --git a/src/assets/home/art_three/1.png b/src/assets/home/art_three/1.png old mode 100644 new mode 100755 index 6671c85..70d6b3e --- a/src/assets/home/art_three/1.png +++ b/src/assets/home/art_three/1.png Binary files differ diff --git a/src/assets/home/art_three/2.png b/src/assets/home/art_three/2.png old mode 100644 new mode 100755 index 060425c..019889a --- a/src/assets/home/art_three/2.png +++ b/src/assets/home/art_three/2.png Binary files differ diff --git a/src/assets/home/art_three/3.png b/src/assets/home/art_three/3.png old mode 100644 new mode 100755 index 87186cd..91b4c09 --- a/src/assets/home/art_three/3.png +++ b/src/assets/home/art_three/3.png Binary files differ diff --git a/src/assets/home/art_three/bg.png b/src/assets/home/art_three/bg.png old mode 100644 new mode 100755 index 5c78a84..befad3d --- a/src/assets/home/art_three/bg.png +++ b/src/assets/home/art_three/bg.png Binary files differ diff --git a/src/assets/home/china/china_bg_img1.png b/src/assets/home/china/china_bg_img1.png old mode 100644 new mode 100755 index 6e0e82a..d1214a8 --- a/src/assets/home/china/china_bg_img1.png +++ b/src/assets/home/china/china_bg_img1.png Binary files differ diff --git a/src/assets/home/china/china_bg_img2.png b/src/assets/home/china/china_bg_img2.png old mode 100644 new mode 100755 index 594fe9c..a7682d5 --- a/src/assets/home/china/china_bg_img2.png +++ b/src/assets/home/china/china_bg_img2.png Binary files differ diff --git a/src/assets/home/china/china_bg_img3.png b/src/assets/home/china/china_bg_img3.png old mode 100644 new mode 100755 index c38b7f5..cde5de0 --- a/src/assets/home/china/china_bg_img3.png +++ b/src/assets/home/china/china_bg_img3.png Binary files differ diff --git a/src/assets/home/china/china_bg_img4.png b/src/assets/home/china/china_bg_img4.png old mode 100644 new mode 100755 index 9a75c19..7c6a54a --- a/src/assets/home/china/china_bg_img4.png +++ b/src/assets/home/china/china_bg_img4.png Binary files differ diff --git a/src/assets/home/china/china_bg_img5.png b/src/assets/home/china/china_bg_img5.png old mode 100644 new mode 100755 index 7f7e5f2..a513a52 --- a/src/assets/home/china/china_bg_img5.png +++ b/src/assets/home/china/china_bg_img5.png Binary files differ diff --git a/src/assets/home/china/china_bg_img6.png b/src/assets/home/china/china_bg_img6.png old mode 100644 new mode 100755 index 01b7e4a..ca8c15e --- a/src/assets/home/china/china_bg_img6.png +++ b/src/assets/home/china/china_bg_img6.png Binary files differ diff --git a/src/assets/home/china/china_bg_img7.png b/src/assets/home/china/china_bg_img7.png old mode 100644 new mode 100755 index 67b0724..98362e5 --- a/src/assets/home/china/china_bg_img7.png +++ b/src/assets/home/china/china_bg_img7.png Binary files differ diff --git a/src/assets/home/core_value/bak/1.png b/src/assets/home/core_value/bak/1.png deleted file mode 100644 index 14fc4b6..0000000 --- a/src/assets/home/core_value/bak/1.png +++ /dev/null Binary files differ diff --git a/src/assets/home/core_value/bak/2.png b/src/assets/home/core_value/bak/2.png deleted file mode 100644 index 204c770..0000000 --- a/src/assets/home/core_value/bak/2.png +++ /dev/null Binary files differ diff --git a/src/assets/home/core_value/bak/3.png b/src/assets/home/core_value/bak/3.png deleted file mode 100644 index 8812784..0000000 --- a/src/assets/home/core_value/bak/3.png +++ /dev/null Binary files differ diff --git a/src/assets/home/core_value/bak/4.png b/src/assets/home/core_value/bak/4.png deleted file mode 100644 index 572e71f..0000000 --- a/src/assets/home/core_value/bak/4.png +++ /dev/null Binary files differ diff --git a/src/assets/home/core_value/bak/5.png b/src/assets/home/core_value/bak/5.png deleted file mode 100644 index 3d98910..0000000 --- a/src/assets/home/core_value/bak/5.png +++ /dev/null Binary files differ diff --git a/src/assets/home/core_value/bak/6.png b/src/assets/home/core_value/bak/6.png deleted file mode 100644 index 81d1223..0000000 --- a/src/assets/home/core_value/bak/6.png +++ /dev/null Binary files differ diff --git a/src/assets/home/core_value/bg.png b/src/assets/home/core_value/bg.png index 398d659..fbd5fab 100644 --- a/src/assets/home/core_value/bg.png +++ b/src/assets/home/core_value/bg.png Binary files differ diff --git a/src/assets/home/military/military_bg_img1.png b/src/assets/home/military/military_bg_img1.png old mode 100644 new mode 100755 index 443fd79..7b93479 --- a/src/assets/home/military/military_bg_img1.png +++ b/src/assets/home/military/military_bg_img1.png Binary files differ diff --git a/src/assets/home/military/military_bg_img2.png b/src/assets/home/military/military_bg_img2.png old mode 100644 new mode 100755 index 8effa23..6603b3c --- a/src/assets/home/military/military_bg_img2.png +++ b/src/assets/home/military/military_bg_img2.png Binary files differ diff --git a/src/assets/home/military/military_bg_img3.png b/src/assets/home/military/military_bg_img3.png old mode 100644 new mode 100755 index cbedf7b..eee94b9 --- a/src/assets/home/military/military_bg_img3.png +++ b/src/assets/home/military/military_bg_img3.png Binary files differ diff --git a/src/assets/home/military/military_bg_img4.png b/src/assets/home/military/military_bg_img4.png old mode 100644 new mode 100755 index af866fb..2ee8092 --- a/src/assets/home/military/military_bg_img4.png +++ b/src/assets/home/military/military_bg_img4.png Binary files differ diff --git a/src/assets/home/military/military_bg_img5.png b/src/assets/home/military/military_bg_img5.png old mode 100644 new mode 100755 index 109be6f..76b0367 --- a/src/assets/home/military/military_bg_img5.png +++ b/src/assets/home/military/military_bg_img5.png Binary files differ diff --git a/src/assets/home/military/military_bg_img6.png b/src/assets/home/military/military_bg_img6.png old mode 100644 new mode 100755 index 92ff533..529c6a4 --- a/src/assets/home/military/military_bg_img6.png +++ b/src/assets/home/military/military_bg_img6.png Binary files differ diff --git a/src/assets/home/military/military_bg_img7.png b/src/assets/home/military/military_bg_img7.png old mode 100644 new mode 100755 index 9c631e5..2c562a7 --- a/src/assets/home/military/military_bg_img7.png +++ b/src/assets/home/military/military_bg_img7.png Binary files differ diff --git a/src/assets/home/military/military_bg_img8.png b/src/assets/home/military/military_bg_img8.png old mode 100644 new mode 100755 index 1d02346..61a7889 --- a/src/assets/home/military/military_bg_img8.png +++ b/src/assets/home/military/military_bg_img8.png Binary files differ diff --git a/src/assets/home/military/military_bg_img9.png b/src/assets/home/military/military_bg_img9.png old mode 100644 new mode 100755 index efc7561..b25507c --- a/src/assets/home/military/military_bg_img9.png +++ b/src/assets/home/military/military_bg_img9.png Binary files differ diff --git a/src/assets/home/video-bg.png b/src/assets/home/video-bg.png old mode 100644 new mode 100755 index 897bff2..1c45ac2 --- a/src/assets/home/video-bg.png +++ b/src/assets/home/video-bg.png Binary files differ diff --git a/src/assets/home/video-bottom-bg.png b/src/assets/home/video-bottom-bg.png old mode 100644 new mode 100755 index 4e4f4ca..6fcc479 --- a/src/assets/home/video-bottom-bg.png +++ b/src/assets/home/video-bottom-bg.png Binary files differ diff --git a/src/assets/home/wenyibingshi_bg.png b/src/assets/home/wenyibingshi_bg.png old mode 100644 new mode 100755 index 0cc5b2c..7e2a610 --- a/src/assets/home/wenyibingshi_bg.png +++ b/src/assets/home/wenyibingshi_bg.png Binary files differ diff --git a/src/assets/home/wenyifengcai_bg.png b/src/assets/home/wenyifengcai_bg.png old mode 100644 new mode 100755 index ad2ec7a..43149af --- a/src/assets/home/wenyifengcai_bg.png +++ b/src/assets/home/wenyifengcai_bg.png Binary files differ diff --git a/src/assets/home/wenyisandui_bg.png b/src/assets/home/wenyisandui_bg.png old mode 100644 new mode 100755 index 0cc5b2c..7e2a610 --- a/src/assets/home/wenyisandui_bg.png +++ b/src/assets/home/wenyisandui_bg.png Binary files differ diff --git a/src/assets/home/wenyisandui_item.png b/src/assets/home/wenyisandui_item.png old mode 100644 new mode 100755 index 8a5f0dd..a11f936 --- a/src/assets/home/wenyisandui_item.png +++ b/src/assets/home/wenyisandui_item.png Binary files differ diff --git a/src/assets/home/wenyiyuanchuang_bg.png b/src/assets/home/wenyiyuanchuang_bg.png old mode 100644 new mode 100755 index d089ff5..0008c91 --- a/src/assets/home/wenyiyuanchuang_bg.png +++ b/src/assets/home/wenyiyuanchuang_bg.png Binary files differ diff --git a/src/assets/home/wenyizhuanti_bg.png b/src/assets/home/wenyizhuanti_bg.png old mode 100644 new mode 100755 index 089d476..7891ee6 --- a/src/assets/home/wenyizhuanti_bg.png +++ b/src/assets/home/wenyizhuanti_bg.png Binary files differ diff --git a/src/assets/home/world/world_bg_img1.png b/src/assets/home/world/world_bg_img1.png old mode 100644 new mode 100755 index 19c69e7..5337117 --- a/src/assets/home/world/world_bg_img1.png +++ b/src/assets/home/world/world_bg_img1.png Binary files differ diff --git a/src/assets/home/world/world_bg_img2.png b/src/assets/home/world/world_bg_img2.png old mode 100644 new mode 100755 index 1c7e715..3ccd108 --- a/src/assets/home/world/world_bg_img2.png +++ b/src/assets/home/world/world_bg_img2.png Binary files differ diff --git a/src/assets/home/world/world_bg_img3.png b/src/assets/home/world/world_bg_img3.png old mode 100644 new mode 100755 index 4e2d2d0..eaf6bd5 --- a/src/assets/home/world/world_bg_img3.png +++ b/src/assets/home/world/world_bg_img3.png Binary files differ diff --git a/src/assets/home/world/world_bg_img4.png b/src/assets/home/world/world_bg_img4.png old mode 100644 new mode 100755 index eab8894..6a76a14 --- a/src/assets/home/world/world_bg_img4.png +++ b/src/assets/home/world/world_bg_img4.png Binary files differ diff --git a/src/assets/home/world/world_bg_img5.png b/src/assets/home/world/world_bg_img5.png old mode 100644 new mode 100755 index c923754..702b3d6 --- a/src/assets/home/world/world_bg_img5.png +++ b/src/assets/home/world/world_bg_img5.png Binary files differ diff --git a/src/assets/home/world/world_bg_img6.png b/src/assets/home/world/world_bg_img6.png old mode 100644 new mode 100755 index e34e6fa..55336e7 --- a/src/assets/home/world/world_bg_img6.png +++ b/src/assets/home/world/world_bg_img6.png Binary files differ diff --git a/src/views/home/components/ArtClassroom.vue b/src/views/home/components/ArtClassroom.vue index bc68a8c..e2fe345 100644 --- a/src/views/home/components/ArtClassroom.vue +++ b/src/views/home/components/ArtClassroom.vue @@ -5,51 +5,51 @@ <div class="up"> <div class="item"> <div class="img"> - <img src="@/assets/home/art_classroom/1.png"> + <img src="@/assets/home/art_classroom/1.jpeg"> </div> </div> <div class="item"> <div class="img"> - <img src="@/assets/home/art_classroom/2.png"> + <img src="@/assets/home/art_classroom/2.jpeg"> </div> </div> <div class="item"> <div class="img"> - <img src="@/assets/home/art_classroom/3.png"> + <img src="@/assets/home/art_classroom/3.jpeg"> </div> </div> </div> <div class="middle"> <div class="item"> <div class="img"> - <img src="@/assets/home/art_classroom/4.png"> + <img src="@/assets/home/art_classroom/4.jpeg"> </div> </div> <div class="item"> <div class="img"> - <img src="@/assets/home/art_classroom/5.png"> + <img src="@/assets/home/art_classroom/5.jpeg"> </div> </div> <div class="item"> <div class="img"> - <img src="@/assets/home/art_classroom/6.png"> + <img src="@/assets/home/art_classroom/6.jpeg"> </div> </div> </div> <div class="down"> <div class="item"> <div class="img"> - <img src="@/assets/home/art_classroom/7.png"> + <img src="@/assets/home/art_classroom/7.jpeg"> </div> </div> <div class="item"> <div class="img"> - <img src="@/assets/home/art_classroom/8.png"> + <img src="@/assets/home/art_classroom/8.jpeg"> </div> </div> <div class="item"> <div class="img"> - <img src="@/assets/home/art_classroom/9.png"> + <img src="@/assets/home/art_classroom/9.jpeg"> </div> </div> </div> diff --git a/src/views/home/components/FirstVideo.vue b/src/views/home/components/FirstVideo.vue index 2664e80..b693182 100644 --- a/src/views/home/components/FirstVideo.vue +++ b/src/views/home/components/FirstVideo.vue @@ -3,7 +3,7 @@ <div class="top-color" /> <div class="bottom-color" /> <div class="video-content"> - <video class="video-bg" ref="vid" src="/first-video.mov" loop="loop" preload="load" controls="controls" playsinline=""> + <video class="video-bg" ref="vid" src="/first-video.mov" loop="loop" preload="load" controls="controls" playsinline=""> </video> </div> <div class="overlay-info" @click="pauseVideo($event)"> -- Gitblit v1.8.0