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

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

@@ -718,6 +718,7 @@ var productDetail = new Vue({
         this.getParameters();
         this.queryProductDetilsCoupons();
         this.getCommodityCombinationList();
+        console.log('GLOBAL_CLUB_TYPE',GLOBAL_CLUB_TYPE)
         // $('.productInfo').slide({
         //     mainCell:".tabCon"
         //     ,titCell:".tabTit span"

src/main/resources/static/js/user-center/member/memberPage.js

@@ -2,34 +2,51 @@
 var serviceList = [
     {
         name: '优惠商品',
-        subTitle: '超级会员专享'
+        subTitle: '超级会员专享',
+        pcIcon:'/img/member/pc-cm-svip-icon1.png',
+        h5Icon:'/img/member/h5-cm-svip-icon1.png'
     },
     {
         name: '专属优惠券',
-        subTitle: '每月可领'
+        subTitle: '每月可领',
+        pcIcon:'/img/member/pc-cm-svip-icon2.png',
+        h5Icon:'/img/member/h5-cm-svip-icon2.png'
+    },
+    {
+        name: '免运费',
+        subTitle: '下单全包邮',
+        pcIcon:'/img/member/pc-cm-svip-icon8.png',
+        h5Icon:'/img/member/h5-cm-svip-icon8.png'
     },
     {
         name: '采美豆翻倍',
-        subTitle: '下单返采美豆'
+        subTitle: '下单返采美豆',
+        pcIcon:'/img/member/pc-cm-svip-icon3.png',
+        h5Icon:'/img/member/h5-cm-svip-icon3.png'
     },
     {
         name: '专属客服',
-        subTitle: '一对一'
+        subTitle: '一对一',
+        pcIcon:'/img/member/pc-cm-svip-icon4.png',
+        h5Icon:'/img/member/h5-cm-svip-icon4.png'
     },
     {
         name: '专属销售顾问',
-        subTitle: '一对一'
+        subTitle: '一对一',
+        pcIcon:'/img/member/pc-cm-svip-icon5.png',
+        h5Icon:'/img/member/h5-cm-svip-icon5.png'
     },
     {
         name: '快速发货',
-        subTitle: '会员加速'
+        subTitle: '会员加速',
+        pcIcon:'/img/member/pc-cm-svip-icon6.png',
+        h5Icon:'/img/member/h5-cm-svip-icon6.png'
     },
     {
         name: '售后服务',
-        subTitle: '会员加速'
-    }, {
-        name: '敬请期待',
-        subTitle: '更多特权'
+        subTitle: '会员加速',
+        pcIcon:'/img/member/pc-cm-svip-icon7.png',
+        h5Icon:'/img/member/h5-cm-svip-icon7.png'
     }
 ];
 var memberPage = new Vue({

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

@@ -245,7 +245,11 @@
                            onclick="_czc.push(['_trackEvent','商品详情','点击','升级查看价格','','Um_Event_ProductUpgrade'])">升级会员查看价格</a>
                     </div>
                     <div class="btnBox"
-                         v-else-if="(priceObj.priceFlag==0 && priceObj.userIdentity!=3) || (priceObj.priceFlag==2 && priceObj.userIdentity==2) || (priceObj.priceFlag==2&&GLOBAL_VIP_FLAG === 1)">
+                         v-else-if="(priceObj.priceFlag==0 && priceObj.userIdentity!=3) ||
+                                    (priceObj.priceFlag==2 && priceObj.userIdentity==2) ||
+                                    (priceObj.priceFlag==2 && GLOBAL_VIP_FLAG === 1) ||
+                                    (priceObj.priceFlag==3 && GLOBAL_CLUB_TYPE === 1)">
+
                         <a href="javascript:void(0);" class="cart icon" @click='addShopCart()' v-if="!isNoneDisabled"
                            onclick="_czc.push(['_trackEvent','商品详情','点击','加入购物车','','Um_Event_ProductAddCart'])">加入购物车</a>
                         <a href="javascript:void(0);" class="buy" @click="buyNowSubmit()" v-if="!isNoneDisabled"

src/main/resources/templates/user-center/member/member.html

@@ -70,9 +70,9 @@
                     <div class="section-title">专属特权</div>
                     <div class="content service-list">
                         <div v-for="(item, index) in serviceList" :key="index">
-                            <img :src="'/img/member/pc-cm-svip-icon' + (index + 1) + '.png'"
+                            <img :src="item.pcIcon"
                                  v-if="isPC"/>
-                            <img :src="'/img/member/h5-cm-svip-icon' + (index + 1) + '.png'"
+                            <img :src="item.h5Icon"
                                  v-else/>
                             <span class="tit" v-html="item.name"></span>
                             <span class="sub-tit" v-html="item.subTitle"></span>