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

src/main/resources/static/js/product/detail.js

@@ -6,6 +6,7 @@ var productDetail = new Vue({
         userId: 0,
         number: 0,
         productStock: 0,
+        pcActType: 0,
         images: [],
         priceObj: {
             actStatus: 0,
@@ -111,8 +112,9 @@ var productDetail = new Vue({
             ProductApi.GetProductDdtails({userId:GLOBAL_USER_ID,productId:_self.productId},function (response) {
                 if(response.code == 0){
                     var product = response.data;
-                    _self.beautyActFlag = product.beautyActFlag
+                    _self.beautyActFlag = product.beautyActFlag;
                     _self.productTypeName = product.typeName;
+                    _self.pcActType = product.pcActType;
                     _self.recommendType = product.recommendType ? product.recommendType : 0;
                     if(product.productDetail.orderInfo!='' && product.productDetail.serviceInfo!=''){
                         _self.isServiceInfo = true;

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 && isPC">云上美博会</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">
                         <li class="swiper-slide mfc" v-for="img in images">
                             <img :src="img">
-                            <span class="cm-product-cover-tag" v-if="product.pcActType === 0 && !isPC">云上美博会</span>
+                            <span class="cm-product-cover-tag" v-if="pcActType === 0 && !isPC">云上美博会</span>
                         </li>
                     </ul>
                     <div class="swiper-pagination mfc"></div>