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

# Conflicts:
#	src/main/resources/static/js/product/detail.js
#	src/main/resources/templates/product/detail.html

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

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