Merge branch 'master' of http://222.85.214.245:11036/longfei666/exhibition_page

20920ee6 · 龙菲 · f0bd94a5 · 53a8892f · 20920ee6 · 20920ee6
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
--- a/src/assets/imgs/boutique/bngz-press/1st/title.png
+++ b/src/assets/imgs/boutique/bngz-press/1st/title.png
--- a/src/assets/imgs/boutique/bngz-press/1st/people.png
+++ b/src/assets/imgs/boutique/bngz-press/1st/people.png
--- a/src/assets/imgs/boutique/frgz/3rd/zp1.png
+++ b/src/assets/imgs/boutique/frgz/3rd/zp1.png
--- a/src/assets/imgs/boutique/frgz/3rd/zp2.png
+++ b/src/assets/imgs/boutique/frgz/3rd/zp2.png
--- a/src/assets/imgs/boutique/frgz/3rd/zp3.png
+++ b/src/assets/imgs/boutique/frgz/3rd/zp3.png
--- a/src/assets/imgs/boutique/frgz/halls/1-1.jpg
+++ b/src/assets/imgs/boutique/frgz/halls/1-1.jpg
--- a/src/assets/imgs/boutique/frgz/halls/1-2.jpg
+++ b/src/assets/imgs/boutique/frgz/halls/1-2.jpg
--- a/src/assets/imgs/boutique/frgz/halls/1-3.jpg
+++ b/src/assets/imgs/boutique/frgz/halls/1-3.jpg
--- a/src/assets/imgs/boutique/frgz/halls/2-1.jpg
+++ b/src/assets/imgs/boutique/frgz/halls/2-1.jpg
--- a/src/assets/imgs/boutique/frgz/halls/2-2.jpg
+++ b/src/assets/imgs/boutique/frgz/halls/2-2.jpg
--- a/src/assets/imgs/boutique/frgz/halls/2-3.jpg
+++ b/src/assets/imgs/boutique/frgz/halls/2-3.jpg
--- a/src/assets/imgs/boutique/frgz/halls/3-1.jpg
+++ b/src/assets/imgs/boutique/frgz/halls/3-1.jpg
--- a/src/assets/imgs/boutique/frgz/halls/3-2.jpg
+++ b/src/assets/imgs/boutique/frgz/halls/3-2.jpg
--- a/src/assets/imgs/boutique/frgz/halls/3-3.jpg
+++ b/src/assets/imgs/boutique/frgz/halls/3-3.jpg
--- a/src/assets/imgs/boutique/frgz/halls/4-1.jpg
+++ b/src/assets/imgs/boutique/frgz/halls/4-1.jpg
--- a/src/assets/imgs/boutique/frgz/halls/4-2.jpg
+++ b/src/assets/imgs/boutique/frgz/halls/4-2.jpg
--- a/src/assets/imgs/boutique/frgz/halls/4-3.jpg
+++ b/src/assets/imgs/boutique/frgz/halls/4-3.jpg
--- a/src/assets/imgs/boutique/frgz/halls/5-1.jpg
+++ b/src/assets/imgs/boutique/frgz/halls/5-1.jpg
--- a/src/assets/imgs/boutique/frgz/halls/5-2.jpg
+++ b/src/assets/imgs/boutique/frgz/halls/5-2.jpg
--- a/src/assets/imgs/boutique/frgz/halls/5-3.jpg
+++ b/src/assets/imgs/boutique/frgz/halls/5-3.jpg
--- a/src/assets/imgs/boutique/lphy/7th/title3.png
+++ b/src/assets/imgs/boutique/lphy/7th/title3.png
--- a/src/assets/imgs/boutique/lphy/7th/title3_bp.png
+++ b/src/assets/imgs/boutique/lphy/7th/title3_bp.png
--- a/src/assets/imgs/boutique/lphy/7th/title3_bp2.png
+++ b/src/assets/imgs/boutique/lphy/7th/title3_bp2.png
--- a/src/assets/imgs/boutique/lphy/7th/title4.png
+++ b/src/assets/imgs/boutique/lphy/7th/title4.png
--- a/src/assets/imgs/boutique/lphy/7th/title4_bp.png
+++ b/src/assets/imgs/boutique/lphy/7th/title4_bp.png
--- a/src/assets/imgs/boutique/lphy/7th/title4_bp2.png
+++ b/src/assets/imgs/boutique/lphy/7th/title4_bp2.png
--- a/src/assets/imgs/boutique/wmsh/4th/title.png
+++ b/src/assets/imgs/boutique/wmsh/4th/title.png
--- a/src/assets/imgs/boutique/wmsh/5th/zp3.png
+++ b/src/assets/imgs/boutique/wmsh/5th/zp3.png
--- a/src/assets/imgs/boutique/wmsh/5th/zp8.png
+++ b/src/assets/imgs/boutique/wmsh/5th/zp8.png
--- a/src/assets/imgs/boutique/wmsh/common/border_left1.png
+++ b/src/assets/imgs/boutique/wmsh/common/border_left1.png
--- a/src/assets/imgs/boutique/wmsh/common/border-right.png
+++ b/src/assets/imgs/boutique/wmsh/common/border-right.png
--- a/src/assets/imgs/boutique/wmsh/common/border_right1.png
+++ b/src/assets/imgs/boutique/wmsh/common/border_right1.png
--- a/src/components/MImage/index.vue
+++ b/src/components/MImage/index.vue
--- a/src/views/boutique/components/frgz/index.vue
+++ b/src/views/boutique/components/frgz/index.vue
--- a/src/views/boutique/components/gzgs/index.vue
+++ b/src/views/boutique/components/gzgs/index.vue
--- a/src/views/boutique/components/lphy/index.vue
+++ b/src/views/boutique/components/lphy/index.vue
--- a/src/views/boutique/components/wmsh/data.js
+++ b/src/views/boutique/components/wmsh/data.js
--- a/src/views/boutique/components/wmsh/index.vue
+++ b/src/views/boutique/components/wmsh/index.vue
--- a/src/views/boutique/components/wrf/index.vue
+++ b/src/views/boutique/components/wrf/index.vue
--- a/src/views/boutique/components/zs/index.vue
+++ b/src/views/boutique/components/zs/index.vue
--- a/vue.config.js
+++ b/vue.config.js