Merge remote-tracking branch 'origin/master' into master

landjj321

2021-03-23 12a0b08dd957dfc6ca02f708ca67588e64efc225

 src/views/home/components/ArtGlobal.vue

@@ -20,6 +20,7 @@
          <p class="font-bold">戏剧 STAGE</p>
        </div>
      </div>
	  
      <div class="info-view" :style="{'background-image': `url(${require(`@/assets/home/world/world_bg_img3.png`)})`}">
        <div class="info-title">
          <p class="font-bold">美术 ARTS</p>
@@ -30,11 +31,14 @@
          <p class="font-bold">文学 LITERATURE</p>
        </div>
      </div>
      <div class="info-view" :style="{'background-image': `url(${require(`@/assets/home/world/world_bg_img5.png`)})`}">
        <div class="info-title">
          <p class="font-bold">音乐 MUSIC</p>
        </div>
      </div>
	
     <router-link to="/music_world" class="info-view" :style="{'background-image': `url(${require(`@/assets/home/world/world_bg_img5.png`)})`}">
       <div class="info-title">
         <p class="font-bold">音乐 MUSIC</p>
       </div>
     </router-link>  
	
      
      <div class="info-view" :style="{'background-image': `url(${require(`@/assets/home/world/world_bg_img6.png`)})`}">
        <div class="info-title">
          <p class="font-bold">动漫 ANIME</p>