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

src/main/resources/static/js/index.js

@@ -23,11 +23,11 @@ var homeData = new Vue({
             //非会员
             if(!GLOBAL_VIP_FLAG === 1) return false;
             // 商品所有机构可见
-            if(pros.priceFlag === 0 ) return true;
+            if(pros.priceFlag === 0  && pros.svipProductFlag === 1 ) return true;
             // 商品价格仅资质机构可见
-            if(pros.priceFlag === 2 && GLOBAL_USER_IDENTITY === 2) return true;
+            if(pros.priceFlag === 2  && pros.svipProductFlag === 1 && GLOBAL_USER_IDENTITY === 2) return true;
             // 商品价格仅医美机构可见
-            if(pros.priceFlag === 3 && GLOBAL_USER_IDENTITY === 2 &&  GLOBAL_CLUB_TYPE == 1) return true;
+            if(pros.priceFlag === 3  && pros.svipProductFlag === 1 && GLOBAL_USER_IDENTITY === 2 &&  GLOBAL_CLUB_TYPE == 1) return true;
             // 其它
             return false;
         },

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

@@ -688,11 +688,11 @@ var productDetail = new Vue({
             //非会员
             if(!GLOBAL_VIP_FLAG === 1) return false;
             // 商品所有机构可见
-            if(pros.priceFlag === 0 ) return true;
+            if(pros.priceFlag === 0  && pros.svipProductFlag === 1 ) return true;
             // 商品价格仅资质机构可见
-            if(pros.priceFlag === 2 && GLOBAL_USER_IDENTITY === 2) return true;
+            if(pros.priceFlag === 2  && pros.svipProductFlag === 1 && GLOBAL_USER_IDENTITY === 2) return true;
             // 商品价格仅医美机构可见
-            if(pros.priceFlag === 3 && GLOBAL_USER_IDENTITY === 2 &&  GLOBAL_CLUB_TYPE == 1) return true;
+            if(pros.priceFlag === 3  && pros.svipProductFlag === 1 && GLOBAL_USER_IDENTITY === 2 &&  GLOBAL_CLUB_TYPE == 1) return true;
             // 其它
             return false;
         },

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

@@ -22,12 +22,19 @@
          }
      },
      methods:{
-        // 是否显示vip标签价格
-        showVipPriceTag: function(product){
-            console.log(product);
-            return (product.priceFlag !== 1 && product.svipProductFlag === 1 && ((GLOBAL_USER_IDENTITY === 4 && GLOBAL_VIP_FLAG === 1) || GLOBAL_USER_IDENTITY === 2));
-        },
-
+         // 是否显示vip标签价格
+         showVipPriceTag: function(pros){
+             //非会员
+             if(!GLOBAL_VIP_FLAG === 1) return false;
+             // 商品所有机构可见
+             if(pros.priceFlag === 0  && pros.svipProductFlag === 1 ) return true;
+             // 商品价格仅资质机构可见
+             if(pros.priceFlag === 2  && pros.svipProductFlag === 1 && GLOBAL_USER_IDENTITY === 2) return true;
+             // 商品价格仅医美机构可见
+             if(pros.priceFlag === 3  && pros.svipProductFlag === 1 && GLOBAL_USER_IDENTITY === 2 &&  GLOBAL_CLUB_TYPE == 1) return true;
+             // 其它
+             return false;
+         },
         closeup:function(){
             this.showflag = false;
             document.body.style.overflow='';

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

@@ -79,11 +79,11 @@ var productList = new Vue({
             //非会员
             if(!GLOBAL_VIP_FLAG === 1) return false;
             // 商品所有机构可见
-            if(pros.priceFlag === 0 ) return true;
+            if(pros.priceFlag === 0  && pros.svipProductFlag === 1 ) return true;
             // 商品价格仅资质机构可见
-            if(pros.priceFlag === 2 && GLOBAL_USER_IDENTITY === 2) return true;
+            if(pros.priceFlag === 2  && pros.svipProductFlag === 1 && GLOBAL_USER_IDENTITY === 2) return true;
             // 商品价格仅医美机构可见
-            if(pros.priceFlag === 3 && GLOBAL_USER_IDENTITY === 2 &&  GLOBAL_CLUB_TYPE == 1) return true;
+            if(pros.priceFlag === 3  && pros.svipProductFlag === 1 && GLOBAL_USER_IDENTITY === 2 &&  GLOBAL_CLUB_TYPE == 1) return true;
             // 其它
             return false;
         },
@@ -130,10 +130,8 @@ var productList = new Vue({
                 newFlag: this.params.newFlag, // 查询新品标记，默认0，新品1
                 promotionFlag: this.params.promotionFlag, // 查询促销标记，默认0，促销1
             },function (res) {
-                console.log(res);
                 if (res.code === 0 && res.data ) {
                     var result = JSON.parse(res.data);
-                    console.log(result.items);
                     _self.listRecord = result.total;
                     var resultData = setSearchProductList(result.items, _self.userId, function(){
                         _self.$forceUpdate();
@@ -163,7 +161,6 @@ var productList = new Vue({
         getCommoditySearchQUeryBrand:function() { // 查询筛选项品牌
             var _self = this;
             ProductApi.getCommoditySearchQUeryBrand(_self.brandParam,function (response) {
-                console.log(response);
                 if (response.code === 0 && response.data ) {
                     var data = response.data;
                     _self.defaultBrandLists = data.map((el, index) => {
@@ -251,7 +248,6 @@ var productList = new Vue({
         handleConfirmScreen:function(){
             this.params.num = 1;
             this.listData = [];
-            console.log('_self.params.brandIds',this.params.brandIds)
             this.getListByKeyword();
             this.isProductScreen = false;
         }
@@ -266,7 +262,6 @@ var productList = new Vue({
             if(this.hrefBrandId){
                 this.params.brandIds = this.hrefBrandId +',';
             }
-            console.log('hrefBrandId',this.hrefBrandId)
             if(this.params.promotionFlag == 1){
                 this.isActiviChecked = true;
             }else{

src/main/resources/static/js/product/produce-list.js

@@ -60,11 +60,11 @@ var productList = new Vue({
             //非会员
             if(!GLOBAL_VIP_FLAG === 1) return false;
             // 商品所有机构可见
-            if(pros.priceFlag === 0 ) return true;
+            if(pros.priceFlag === 0  && pros.svipProductFlag === 1 ) return true;
             // 商品价格仅资质机构可见
-            if(pros.priceFlag === 2 && GLOBAL_USER_IDENTITY === 2) return true;
+            if(pros.priceFlag === 2  && pros.svipProductFlag === 1 && GLOBAL_USER_IDENTITY === 2) return true;
             // 商品价格仅医美机构可见
-            if(pros.priceFlag === 3 && GLOBAL_USER_IDENTITY === 2 &&  GLOBAL_CLUB_TYPE == 1) return true;
+            if(pros.priceFlag === 3  && pros.svipProductFlag === 1 && GLOBAL_USER_IDENTITY === 2 &&  GLOBAL_CLUB_TYPE == 1) return true;
             // 其它
             return false;
         },

src/main/resources/static/js/product/product-coupon.js

@@ -31,8 +31,17 @@ var productList = new Vue({
     },
     methods: {
         // 是否显示vip标签价格
-        showVipPriceTag: function(product){
-            return (product.priceFlag !== 1 && product.svipProductFlag === 1 && ((GLOBAL_USER_IDENTITY === 4 && GLOBAL_VIP_FLAG === 1) || GLOBAL_USER_IDENTITY === 2));
+        showVipPriceTag: function(pros){
+            //非会员
+            if(!GLOBAL_VIP_FLAG === 1) return false;
+            // 商品所有机构可见
+            if(pros.priceFlag === 0  && pros.svipProductFlag === 1 ) return true;
+            // 商品价格仅资质机构可见
+            if(pros.priceFlag === 2  && pros.svipProductFlag === 1 && GLOBAL_USER_IDENTITY === 2) return true;
+            // 商品价格仅医美机构可见
+            if(pros.priceFlag === 3  && pros.svipProductFlag === 1 && GLOBAL_USER_IDENTITY === 2 &&  GLOBAL_CLUB_TYPE == 1) return true;
+            // 其它
+            return false;
         },
         getListByKeyword: function () {
             var _self = this;

src/main/resources/static/js/product/product-supporting.js

@@ -157,11 +157,11 @@ var supporting = new Vue({
             //非会员
             if(!GLOBAL_VIP_FLAG === 1) return false;
             // 商品所有机构可见
-            if(pros.priceFlag === 0 ) return true;
+            if(pros.priceFlag === 0  && pros.svipProductFlag === 1 ) return true;
             // 商品价格仅资质机构可见
-            if(pros.priceFlag === 2 && GLOBAL_USER_IDENTITY === 2) return true;
+            if(pros.priceFlag === 2  && pros.svipProductFlag === 1 && GLOBAL_USER_IDENTITY === 2) return true;
             // 商品价格仅医美机构可见
-            if(pros.priceFlag === 3 && GLOBAL_USER_IDENTITY === 2 &&  GLOBAL_CLUB_TYPE == 1) return true;
+            if(pros.priceFlag === 3  && pros.svipProductFlag === 1 && GLOBAL_USER_IDENTITY === 2 &&  GLOBAL_CLUB_TYPE == 1) return true;
             // 其它
             return false;
         },

src/main/resources/static/js/user-center/collection/collection.js

@@ -104,11 +104,11 @@ var orderPage = new Vue({
             //非会员
             if(!GLOBAL_VIP_FLAG === 1) return false;
             // 商品所有机构可见
-            if(pros.priceFlag === 0 ) return true;
+            if(pros.priceFlag === 0  && pros.svipProductFlag === 1 ) return true;
             // 商品价格仅资质机构可见
-            if(pros.priceFlag === 2 && GLOBAL_USER_IDENTITY === 2) return true;
+            if(pros.priceFlag === 2  && pros.svipProductFlag === 1 && GLOBAL_USER_IDENTITY === 2) return true;
             // 商品价格仅医美机构可见
-            if(pros.priceFlag === 3 && GLOBAL_USER_IDENTITY === 2 &&  GLOBAL_CLUB_TYPE == 1) return true;
+            if(pros.priceFlag === 3  && pros.svipProductFlag === 1 && GLOBAL_USER_IDENTITY === 2 &&  GLOBAL_CLUB_TYPE == 1) return true;
             // 其它
             return false;
         },

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

@@ -333,9 +333,12 @@ var memberPage = new Vue({
                 if (priceFlag === 1) {
                     return '￥价格未公开'
                 }
-                if ((priceFlag === 2 && GLOBAL_USER_IDENTITY !== 2) && GLOBAL_VIP_FLAG !== 1) {
+                if ((priceFlag === 2 && GLOBAL_USER_IDENTITY === 4) && GLOBAL_VIP_FLAG !== 1) {
                     return '￥会员可见'
                 }
+                if ((priceFlag === 3 && GLOBAL_USER_IDENTITY === 2 && GLOBAL_CLUB_TYPE!=1) || (priceFlag === 3 && GLOBAL_USER_IDENTITY === 4)) {
+                    return '￥仅医美机构可见'
+                }
                 // 价格可见
                 if ((priceFlag === 0 && userIdentity !== 3) || (GLOBAL_USER_IDENTITY === 2) || (userIdentity === 3 && GLOBAL_SHOP_ID === shopID) || GLOBAL_VIP_FLAG === 1) {
                     if (promotions || (svipProductFlag === 1 && GLOBAL_VIP_FLAG === 1)) {

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

@@ -117,7 +117,7 @@
                         </div>
                       </div>
                     </div>
-                    <div class="main_price_show" :class="PromotionsFormat(p.promotions) ? 'none' : ''">
+                    <div class="main_price_show" :class="{none: showVipPriceTag(p) || PromotionsFormat(p.promotions)}">
                       ￥{{ (PromotionsFormat(p.promotions) ? p.originalPrice : p.price ) | NumFormat }}
                     </div>
                   </template>