web/pcac.git - Gitblit

Merge branch 'master' of http://git.cstar.info/r/web/pcac into master

landjj321

2021-03-20 569c2c468b02d4b9021a8b4713b5f4056a995be4

refs
author	landjj321 <landjj321@126.com>
	Saturday, March 20, 2021 19:22 +0800
committer	landjj321 <landjj321@126.com>
	Saturday, March 20, 2021 19:22 +0800
commit	569c2c468b02d4b9021a8b4713b5f4056a995be4
tree	de05b056695d64c793fad4f6c719a719381ac11c tree \| zip \| gz
parent	a864d323f4bd4a2d5614e657fae5f09137e84bb9 view \| diff 7b8a41cc342959a598d2014f7e8d60b0fcfe228b view \| diff

Merge branch 'master' of http://git.cstar.info/r/web/pcac into master

7 files added

19 files deleted

74 files modified

2 files renamed

	src/assets/home/art_classroom/1.jpeg	diff \| view \| raw \| blame \| history
	src/assets/home/art_classroom/1.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_classroom/2.jpeg	diff \| view \| raw \| blame \| history
	src/assets/home/art_classroom/3.jpeg	diff \| view \| raw \| blame \| history
	src/assets/home/art_classroom/4.jpeg	diff \| view \| raw \| blame \| history
	src/assets/home/art_classroom/4.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_classroom/5.jpeg	diff \| view \| raw \| blame \| history
	src/assets/home/art_classroom/5.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_classroom/6.jpeg	diff \| view \| raw \| blame \| history
	src/assets/home/art_classroom/6.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_classroom/7.jpeg	diff \| view \| raw \| blame \| history
	src/assets/home/art_classroom/7.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_classroom/8.jpeg	diff \| view \| raw \| blame \| history
	src/assets/home/art_classroom/8.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_classroom/9.jpeg	diff \| view \| raw \| blame \| history
	src/assets/home/art_classroom/9.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_classroom/bg.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_classroom/desc.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_classroom/header_coffee.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_live/bg.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_live/content_bg.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_live/light-spot.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_live/photo.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_live/photo_frame.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_mien/1.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_mien/2.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_mien/3.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_mien/4.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_mien/5.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_mien/6.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_mien/7.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_mien/8.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_mien/bg.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_original/1.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_original/2.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_original/3.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_original/4.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_original/5.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_original/bg.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_soldier/1.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_soldier/2.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_soldier/3.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_soldier/4.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_soldier/5.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_soldier/6.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_soldier/bg.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_subject/1.jpg	diff \| view \| raw \| blame \| history
	src/assets/home/art_subject/2.jpg	diff \| view \| raw \| blame \| history
	src/assets/home/art_subject/4.jpg	diff \| view \| raw \| blame \| history
	src/assets/home/art_subject/5.jpg	diff \| view \| raw \| blame \| history
	src/assets/home/art_subject/all.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_subject/bak/1.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_subject/bak/2.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_subject/bak/3.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_subject/bak/4.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_subject/bak/5.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_subject/bak/6.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_subject/bg.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_subject/title.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_three/1.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_three/2.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_three/3.png	diff \| view \| raw \| blame \| history
	src/assets/home/art_three/bg.png	diff \| view \| raw \| blame \| history
	src/assets/home/china/china_bg_img1.png	diff \| view \| raw \| blame \| history
	src/assets/home/china/china_bg_img2.png	diff \| view \| raw \| blame \| history
	src/assets/home/china/china_bg_img3.png	diff \| view \| raw \| blame \| history
	src/assets/home/china/china_bg_img4.png	diff \| view \| raw \| blame \| history
	src/assets/home/china/china_bg_img5.png	diff \| view \| raw \| blame \| history
	src/assets/home/china/china_bg_img6.png	diff \| view \| raw \| blame \| history
	src/assets/home/china/china_bg_img7.png	diff \| view \| raw \| blame \| history
	src/assets/home/core_value/bak/1.png	diff \| view \| raw \| blame \| history
	src/assets/home/core_value/bak/2.png	diff \| view \| raw \| blame \| history
	src/assets/home/core_value/bak/3.png	diff \| view \| raw \| blame \| history
	src/assets/home/core_value/bak/4.png	diff \| view \| raw \| blame \| history
	src/assets/home/core_value/bak/5.png	diff \| view \| raw \| blame \| history
	src/assets/home/core_value/bak/6.png	diff \| view \| raw \| blame \| history
	src/assets/home/core_value/bg.png	diff \| view \| raw \| blame \| history
	src/assets/home/military/military_bg_img1.png	diff \| view \| raw \| blame \| history
	src/assets/home/military/military_bg_img2.png	diff \| view \| raw \| blame \| history
	src/assets/home/military/military_bg_img3.png	diff \| view \| raw \| blame \| history
	src/assets/home/military/military_bg_img4.png	diff \| view \| raw \| blame \| history
	src/assets/home/military/military_bg_img5.png	diff \| view \| raw \| blame \| history
	src/assets/home/military/military_bg_img6.png	diff \| view \| raw \| blame \| history
	src/assets/home/military/military_bg_img7.png	diff \| view \| raw \| blame \| history
	src/assets/home/military/military_bg_img8.png	diff \| view \| raw \| blame \| history
	src/assets/home/military/military_bg_img9.png	diff \| view \| raw \| blame \| history
	src/assets/home/video-bg.png	diff \| view \| raw \| blame \| history
	src/assets/home/video-bottom-bg.png	diff \| view \| raw \| blame \| history
	src/assets/home/wenyibingshi_bg.png	diff \| view \| raw \| blame \| history
	src/assets/home/wenyifengcai_bg.png	diff \| view \| raw \| blame \| history
	src/assets/home/wenyisandui_bg.png	diff \| view \| raw \| blame \| history
	src/assets/home/wenyisandui_item.png	diff \| view \| raw \| blame \| history
	src/assets/home/wenyiyuanchuang_bg.png	diff \| view \| raw \| blame \| history
	src/assets/home/wenyizhuanti_bg.png	diff \| view \| raw \| blame \| history
	src/assets/home/world/world_bg_img1.png	diff \| view \| raw \| blame \| history
	src/assets/home/world/world_bg_img2.png	diff \| view \| raw \| blame \| history
	src/assets/home/world/world_bg_img3.png	diff \| view \| raw \| blame \| history
	src/assets/home/world/world_bg_img4.png	diff \| view \| raw \| blame \| history
	src/assets/home/world/world_bg_img5.png	diff \| view \| raw \| blame \| history
	src/assets/home/world/world_bg_img6.png	diff \| view \| raw \| blame \| history
	src/views/home/components/ArtClassroom.vue	18 ●●●●● diff \| view \| raw \| blame \| history
	src/views/home/components/FirstVideo.vue	2 ●●●●● diff \| view \| raw \| blame \| history