Merge remote-tracking branch 'remotes/origin/developerA' into developer

src/main/resources/templates/product/detail.html

@@ -23,13 +23,13 @@
                 <div v-if="isPC" class="bigImage">
                     <img :src="images[0]">
                     <span class="mask"></span>
-                    <span class="cm-product-cover-tag" v-if="product.pcActType === 1">云上美博会</span>
+                    <span class="cm-product-cover-tag" >云上美博会</span>
                 </div>
                 <div id="swiperImage" class="smallImage swiper-container">
                     <ul class="swiper-wrapper clear">
                         <li class="swiper-slide mfc" v-for="img in images">
                             <img :src="img">
-                            <span class="cm-product-cover-tag" v-if="!isPC && product.pcActType === 1">云上美博会</span>
+                            <span class="cm-product-cover-tag" v-if="!isPC">云上美博会</span>
                         </li>
                     </ul>
                     <div class="swiper-pagination mfc"></div>