医美机构价格可见度修改

商品详情仅对资质机构可见

src/main/resources/config/dev/application-dev.yml

@@ -4,13 +4,13 @@ spring:
   #数据源连接--start
   datasource:
     #本地连接数据库
-    url: jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
-    username: developer
-    password: 05bZ/OxTB:X+yd%1
+#    url: jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+#    username: developer
+#    password: 05bZ/OxTB:X+yd%1
     #测试连接数据库
-    #url: jdbc:mysql://120.79.25.27:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
-    #username: developer
-    #password: J5p3tgOVazNl4ydf
+    url: jdbc:mysql://120.79.25.27:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    username: developer
+    password: J5p3tgOVazNl4ydf
     #type: com.zaxxer.hikari.HikariDataSource
     hikari:
       minimum-idle: 5
@@ -54,9 +54,9 @@ logging:
 caimei:
   siteEnv: 0 #网站环境，（2：正式环境，1：测试环境，0：开发环境）
   spiServer: http://192.168.2.68:8008
-#  coreServer: https://core-b.caimei365.com
+  coreServer: https://core-b.caimei365.com
 #  coreServer: http://192.168.2.68:18002
-  coreServer: http://192.168.2.75:18002
+#  coreServer: http://192.168.2.75:18002
   imageDomain: https://img-b.caimei365.com
   wwwDomain: http:localhost:8009
   destPath: classpath:/

src/main/resources/static/css/product/detail.pc.css

@@ -38,6 +38,7 @@ li{list-style:none;}
 .productBox .detailBox .row .l:after{content:'';display:inline-block;width:100%}
 .productBox .detailBox .row>i{font-style:normal;}
 .productBox .detailBox .row>em{font-style:normal;color:#333333;margin-left: 15px}
+.productBox .detailBox .row>em.red {color: #f94b4b;}
 .productBox .detailBox .row>em del{color: #93979F}
 .productBox .detailBox .row>em.p{font-weight:bold;}
 .productBox .detailBox .row>em.ser{color:#93979F;display:inline-block;margin-right:20px;}
@@ -57,6 +58,7 @@ li{list-style:none;}
 .productBox .detailBox .price .icon.i5:before{background-position:-295px -276px}
 .productBox .detailBox .priceTag {position:absolute;top:0px;left:88px;}
 
+
 /*会员标签*/
 .productBox .detailBox .price .svip-tag{width:100%;height:22px;letter-spacing:0;display: inline;margin-left: 10px}
 .productBox .detailBox .price .svip-tag .svip-icon{position:relative;z-index:9;display:inline-block;width:36px;height:22px;text-align:center;line-height:22px;font-size:12px;font-weight:400;color:#F0CB72;opacity:1;background:#333333}

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

@@ -57,7 +57,7 @@ li{list-style:none}
     .productItem .price .price_text_tag{width: 100%;height: 22px;box-sizing: border-box;float: left;margin-top: 3px;}
     .productItem .price .price_text_tag .listTag{margin: 0;float: left}
     .productItem .price .price_text_tag .couponTag{margin: 0 4px 0 0;float: left}
-    .productItem .price .main_price_unde { width: 100%;height: 31px;line-height: 31px;font-size: 14px;color: #4a4f58;text-align: left;float: left;}
+    .productItem .price .main_price_unde { width: 100%;height: 31px;line-height: 31px;font-size: 14px;color: #f94b4b;text-align: left;float: left;}
     .productItem .price .main_price_show { width: 100%;height: 30px;line-height: 30px;font-size: 14px;color: #f94b4b;text-align: left;float: left;}
     .productItem .price .main_price_show.none { color: #999999; text-decoration: line-through;}
     .productItem .name .tag{width: 44px;height: 18px;line-height: 18px;font-size: 12px;display: inline-block;margin-right: 5px;text-align: center;color: #FFFFFF !important;background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);border-radius: 0px 10px 0px 0px;}

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

@@ -25,7 +25,7 @@ li{list-style:none}
     .productItem .price .price_text_tag{width: 100%;height: 22px;box-sizing: border-box;float: left;margin-top: 3px;}
     .productItem .price .price_text_tag .listTag{margin: 0;float: left}
     .productItem .price .price_text_tag .couponTag{margin: 0 4px 0 0;float: left}
-    .productItem .price .main_price_unde { width: 100%;height: 31px;line-height: 31px;font-size: 14px;color: #4a4f58;text-align: left;float: left;}
+    .productItem .price .main_price_unde { width: 100%;height: 31px;line-height: 31px;font-size: 14px;color: #f94b4b;text-align: left;float: left;}
     .productItem .price .main_price_show { width: 100%;height: 30px;line-height: 30px;font-size: 14px;color: #f94b4b;text-align: left;float: left;}
     .productItem .price .main_price_show.none { color: #999999; text-decoration: line-through;}
     .productItem .name .tag{width: 44px;height: 18px;line-height: 18px;font-size: 12px;display: inline-block;margin-right: 5px;text-align: center;color: #FFFFFF !important;background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);border-radius: 0px 10px 0px 0px;}

src/main/resources/static/css/product/product-supporting.h5.css

@@ -18,6 +18,7 @@
     .supporting-list .list-info .list-unit{width: 100%;line-height: 5vw;height: 5vw;font-size: 2.8vw;color: #627386;}
     .supporting-list .list-info .list-price{width: 100%;line-height: 5vw;height: 5vw;font-size: 2.8vw;margin-bottom: 1.5vw;}
     .supporting-list .list-info .list-price .price-box{float: left;line-height: 5vw;}
+    .supporting-list .list-info .list-price .price-box .main_price_unde{color: #f94b4b;}
 
     .supporting-list .list-info .list-price .price-box .main_price_show{color: #F94B4B;font-size: 3.6vw;line-height: 5vw;}
     .supporting-list .list-info .list-price .price-box .main_price_show.none{text-decoration: line-through;color: #999999;}

src/main/resources/static/css/supplier/index.css

@@ -82,8 +82,7 @@ li{list-style:none}
     .productItem .price .price_text_tag .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
     .productItem .price .price_text_tag .svip-tag .svip-price{z-index:1;position:relative;display:inline-block;padding-left:22px;padding-right:4px;margin-left:-27px;line-height:22px;background:#F0CB72;opacity:1;border-radius:2px;font-size:12px}
     .productItem .price .price_text_tag .svip-tag .svip-price span{color: #333}
-
-    .productItem .price .main_price_unde { width: 100%;height: 31px;line-height: 31px;font-size: 14px;color: #4a4f58;text-align: left;float: left;}
+    .productItem .price .main_price_unde { width: 100%;height: 31px;line-height: 31px;font-size: 14px;color: #f94b4b;text-align: left;float: left;}
     .productItem .price .main_price_show { width: 100%;height: 30px;line-height: 30px;font-size: 14px;color: #f94b4b;text-align: left;float: left;}
     .productItem .price .main_price_show.none { color: #999999; text-decoration: line-through;}
     .productItem .name .tag{width: 44px;height: 18px;line-height: 18px;font-size: 12px;display: inline-block;margin-right: 5px;text-align: center;color: #FFFFFF !important;background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);border-radius: 0px 10px 0px 0px;}

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

@@ -45,8 +45,13 @@ li{list-style:none}
     .productItem .price em.bold{font-weight: bold}
     .productItem .price .price_text_tag{width: 100%;height: 22px;box-sizing: border-box;float: left;margin-top: 3px;}
     .productItem .price .price_text_tag .listTag{margin: 0;float: left}
+    .productItem .price .svip-tag{width:100%;height:22px;letter-spacing:0}
+    .productItem .price .svip-tag .svip-icon{position:relative;z-index:9;display:inline-block;width:30px;height:22px;text-align:center;line-height:22px;font-size:12px;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
+    .productItem .price .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
+    .productItem .price .svip-tag .svip-price{z-index:1;position:relative;display:inline-block;padding-left:24px;padding-right:2px;margin-left:-27px;line-height:22px;background:#F0CB72;opacity:1;border-radius:2px;font-size:12px}
+    .productItem .price .svip-tag .svip-price span{color: #333}
     .productItem .price .price_text_tag .couponTag{margin: 0 8px 0 0;float: left}
-    .productItem .price .main_price_unde { width: 100%;height: 31px;line-height: 31px;font-size: 14px;color: #4a4f58;text-align: left;float: left;}
+    .productItem .price .main_price_unde { width: 100%;height: 31px;line-height: 31px;font-size: 14px;color: #f94b4b;text-align: left;float: left;}
     .productItem .price .main_price_show { width: 100%;height: 30px;line-height: 30px;font-size: 14px;color: #f94b4b;text-align: left;float: left;}
     .productItem .price .main_price_show.none { color: #999999; text-decoration: line-through;}
     .productItem .name .tag{width: 44px;height: 18px;line-height: 18px;font-size: 12px;display: inline-block;margin-right: 5px;text-align: center;color: #FFFFFF !important;background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);border-radius: 0px 10px 0px 0px;}
@@ -101,6 +106,12 @@ li{list-style:none}
     .couponTag{padding:0 2vw;border:.27vw solid #f94b4b;background:#fff1eb;font-size:2.8vw;float:left;height:4.2vw;line-height:4.2vw;color: #f94b4b;border-radius: 0.2vw;margin-right: 1vw;}
     .listTag{padding:0 2vw;border:.27vw solid #ffe6dc;background:none;font-size:2.8vw;float:left;height:4.2vw;line-height:4.2vw;border-radius: 0.2vw;}
     .price_grade{width: 100%;float: left;margin-top: 2vw;}
+    .productItem .price .svip-tag{float: left; height:4.74vw;letter-spacing:0;overflow: hidden}
+    .productItem .price .svip-tag .svip-icon{position:relative;z-index:9;float: left; width:9.8vw;height:4.74vw;text-align:center;line-height:4.74vw;font-size:2.8vw;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
+    .productItem .price .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
+    .productItem .price .svip-tag .svip-price{z-index:1;position:relative;float: left;padding-left:5.4vw;padding-right:0.6vw;margin-left:-6vw;line-height:4.74vw;height: 4.74vw; background:#F0CB72;opacity:1;border-radius:2px;font-size:2.8vw}
+    .productItem .price .svip-tag .svip-price span{color: #333}
+    .productItem .price .svip-tag .svip-price span:nth-child(2){margin-left: -0.4vw}
     .productItem .price .main_price_unde {width: 100%;height: 6.5vw;line-height: 6.5vw;font-size: 3.4vw;color: #4a4f58;text-align: left;float: left;}
     .productItem .price .price_text_tag {width: 100%;box-sizing: border-box;}
     .productItem .price .main_price_show{color: #f94b4b}

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

@@ -74,8 +74,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 ) return true;
+            // 商品价格仅资质机构可见
+            if(pros.priceFlag === 2 && GLOBAL_USER_IDENTITY === 2) return true;
+            // 商品价格仅医美机构可见
+            if(pros.priceFlag === 3 && GLOBAL_USER_IDENTITY === 2 &&  GLOBAL_CLUB_TYPE == 1) return true;
+            // 其它
+            return false;
         },
         toPagination: function (pageNum) {
             if (pageNum <= this.pageTotal) {

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

@@ -56,8 +56,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 ) return true;
+            // 商品价格仅资质机构可见
+            if(pros.priceFlag === 2 && GLOBAL_USER_IDENTITY === 2) return true;
+            // 商品价格仅医美机构可见
+            if(pros.priceFlag === 3 && GLOBAL_USER_IDENTITY === 2 &&  GLOBAL_CLUB_TYPE == 1) return true;
+            // 其它
+            return false;
         },
         getproductList:function(){//商品列表
            var _self=this;

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

@@ -153,8 +153,17 @@ var supporting = new Vue({
             _self.calculatetTtalPrice();
         },
         // 是否显示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 ) return true;
+            // 商品价格仅资质机构可见
+            if(pros.priceFlag === 2 && GLOBAL_USER_IDENTITY === 2) return true;
+            // 商品价格仅医美机构可见
+            if(pros.priceFlag === 3 && GLOBAL_USER_IDENTITY === 2 &&  GLOBAL_CLUB_TYPE == 1) return true;
+            // 其它
+            return false;
         },
         PromotionsFormat:function(promo){//促销活动类型数据处理
             if(promo!=null){

src/main/resources/static/js/shopping/confirm.js

@@ -171,7 +171,7 @@ var shoppingConfirm = new Vue({
                 if (response.code === 0 ) {
                     _self.setCreatDataInfo(response.data)
                 }else{
-                    CAIMEI.Alert(r.msg, '确定', false);
+                    CAIMEI.Alert(response.msg, '确定', false);
                 }
             });
         },

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

@@ -41,8 +41,17 @@ var supplierHome = 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 ) return true;
+            // 商品价格仅资质机构可见
+            if(pros.priceFlag === 2 && GLOBAL_USER_IDENTITY === 2) return true;
+            // 商品价格仅医美机构可见
+            if(pros.priceFlag === 3 && GLOBAL_USER_IDENTITY === 2 &&  GLOBAL_CLUB_TYPE == 1) return true;
+            // 其它
+            return false;
         },
         getShopInfo: function(){
             var _self = this;

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

@@ -99,6 +99,19 @@ var orderPage = new Vue({
             }
             return false
         },
+        // 是否显示vip标签价格
+        showVipPriceTag: function(pros){
+            //非会员
+            if(!GLOBAL_VIP_FLAG === 1) return false;
+            // 商品所有机构可见
+            if(pros.priceFlag === 0 ) return true;
+            // 商品价格仅资质机构可见
+            if(pros.priceFlag === 2 && GLOBAL_USER_IDENTITY === 2) return true;
+            // 商品价格仅医美机构可见
+            if(pros.priceFlag === 3 && GLOBAL_USER_IDENTITY === 2 &&  GLOBAL_CLUB_TYPE == 1) return true;
+            // 其它
+            return false;
+        },
         shoppingCart:function (pros) {// 加入购物车
             var _self = this;
             ShoppingApi.ShoppingAddCart(
@@ -145,7 +158,7 @@ var orderPage = new Vue({
             if(type == 1) {
                 _self.shoppingCart(pros);
             }else{
-                window.open('/shopping/confirm.html?type=2&id='+pros.productId+'&count='+pros.priceGrade);
+                window.open('/shopping/confirm.html?type=2&productId='+pros.productId+'&count='+pros.minBuyNumber);
             }
         },
         hanldAllAddCart:function () {// 批量加入购物车

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

@@ -38,8 +38,17 @@ var memberProduct = 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 ) return true;
+            // 商品价格仅资质机构可见
+            if(pros.priceFlag === 2 && GLOBAL_USER_IDENTITY === 2) return true;
+            // 商品价格仅医美机构可见
+            if(pros.priceFlag === 3 && GLOBAL_USER_IDENTITY === 2 &&  GLOBAL_CLUB_TYPE == 1) return true;
+            // 其它
+            return false;
         },
         // 获取商品列表
         getSvipProductList() {
@@ -91,6 +100,9 @@ var memberProduct = new Vue({
                 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/product/detail.html

@@ -70,6 +70,10 @@
                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                             <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                             <em v-if="priceObj.priceFlag==1" v-text="'￥价格未公开'"></em>
+                            <!--仅会员可见 -->
+                            <em v-else-if="priceObj.priceFlag==2 && priceObj.userIdentity==4" class="red" v-text="'￥会员可见'"></em>
+                            <!--仅医美机构可见 -->
+                            <em v-else-if="priceObj.priceFlag==3 && (GLOBAL_CLUB_TYPE !=1)" class="red" v-text="'￥仅医美机构可见'"></em>
                             <!--SVIP时的划线价格-->
                             <!--满足条件：只有开通会员才显示划线价格-->
                             <em v-else-if="GLOBAL_VIP_FLAG === 1 && priceObj.svipProductFlag === 1">
@@ -82,10 +86,6 @@
                                 </em>
                                 <em v-else class="p" v-text="'￥'+parseFloat(priceObj.price).toFixed(2)"></em>
                             </template>
-                            <!--仅会员可见 -->
-                            <em v-else-if="priceObj.priceFlag==2 && priceObj.userIdentity==4" v-text="'￥会员可见'"></em>
-                            <!--仅医美机构可见 -->
-                            <em v-else-if="priceObj.priceFlag==3 && priceObj.userIdentity==4" v-text="'￥仅医美机构可见'"></em>
                             <!--隐藏价格 -->
                             <em v-else>￥<i th:attr="class=${'icon mIcon i'+product.priceGrade}"></i></em>
                             <!--SVIP会员标签-->
@@ -447,11 +447,17 @@
             </div>
             <div class="tabCon">
                 <div class="item" v-if="tabsIndex == 0">
-                    <template v-if="isNoneDisabled">
-                        <p>暂无商品信息</p>
+                    <template v-if="(GLOBAL_USER_ID>0 && GLOBAL_USER_IDENTITY == 2) || (GLOBAL_USER_ID>0 && GLOBAL_USER_IDENTITY == 3)">
+                        <template v-if="isNoneDisabled">
+                            <p>暂无商品信息</p>
+                        </template>
+                        <template v-else>
+                            <div th:utext="${product.detailInfo}"></div>
+                        </template>
                     </template>
                     <template v-else>
-                        <div th:utext="${product.detailInfo}"></div>
+                        <p>请电话联系采美客服或扫码添加客服微信好友咨询商品详细信息。</p>
+                        <p style="font-weight: bold;color: #333333;">请大家提高紧惕，防范虚假产品宣传。</p>
                     </template>
                 </div>
                 <div class="item" v-if="tabsIndex == 1">

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

@@ -212,7 +212,7 @@
                                     <!--会员可见-->
                                     <div class="main_price_unde" v-else-if="p.priceFlag==2 && GLOBAL_USER_IDENTITY === 4">￥会员可见</div>
                                     <!--仅医美机构可见-->
-                                    <div class="main_price_unde" v-else-if="p.priceFlag==3 && GLOBAL_USER_IDENTITY === 4">￥仅医美机构可见</div>
+                                    <div class="main_price_unde" v-else-if="p.priceFlag==3 && (GLOBAL_CLUB_TYPE !=1)">￥仅医美机构可见</div>
                                     <!--其他-->
                                     <div class="price_grade" v-else><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                                 </template>

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

@@ -144,13 +144,6 @@
                                                 <div class="main_price_login">
                                                     <!--0公开价格 1不公开价格 2仅对会员机构公开-->
                                                     <em class="price_grade" v-if="pros.product.priceFlag == 1"><span>￥</span>价格未公开</em>
-                                                    <template v-else-if="GLOBAL_USER_IDENTITY === 2 || (pros.product.priceFlag === 0 && GLOBAL_USER_IDENTITY === 4) || (GLOBAL_USER_IDENTITY === 3 && pros.product.shopId === GLOBAL_SHOP_ID) || GLOBAL_VIP_FLAG === 1">
-                                                        <!--机构价-->
-                                                        <div class="main_price_show" :class="{none: PromotionsFormat(pros.product.promotions) || showVipPriceTag(pros.product) }">
-                                                            ￥<span class="price_num" v-if="showVipPriceTag(pros.product) || PromotionsFormat(pros.product.promotions)">{{ pros.product.originalPrice | NumFormat }}</span>
-                                                              <span class="price_num" v-else>{{ pros.product.price | NumFormat }}</span>
-                                                        </div>
-                                                    </template>
                                                     <!--会员可见-->
                                                     <template v-else-if="pros.product.priceFlag === 2 && GLOBAL_USER_IDENTITY === 4">
                                                         <em class="price_grade_club">
@@ -158,11 +151,18 @@
                                                         </em>
                                                     </template>
                                                     <!--仅医美机构可见-->
-                                                    <template v-else-if="pros.product.priceFlag ===3 && GLOBAL_USER_IDENTITY === 4">
+                                                    <template v-else-if="pros.product.priceFlag ===3 && (GLOBAL_CLUB_TYPE !=1)">
                                                         <em class="price_grade_club">
                                                             <span>￥</span>仅医美机构可见
                                                         </em>
                                                     </template>
+                                                    <template v-else-if="GLOBAL_USER_IDENTITY === 2 || (pros.product.priceFlag === 0 && GLOBAL_USER_IDENTITY === 4) || (GLOBAL_USER_IDENTITY === 3 && pros.product.shopId === GLOBAL_SHOP_ID) || GLOBAL_VIP_FLAG === 1">
+                                                        <!--机构价-->
+                                                        <div class="main_price_show" :class="{none: PromotionsFormat(pros.product.promotions) || showVipPriceTag(pros.product) }">
+                                                            ￥<span class="price_num" v-if="showVipPriceTag(pros.product) || PromotionsFormat(pros.product.promotions)">{{ pros.product.originalPrice | NumFormat }}</span>
+                                                              <span class="price_num" v-else>{{ pros.product.price | NumFormat }}</span>
+                                                        </div>
+                                                    </template>
                                                     <template v-else>
                                                         <!--供应商除自己的商品外，也显示价格等级-->
                                                         <em class="price_grade_shop">

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

@@ -202,6 +202,14 @@
                             </div>
                             <!--0公开价格 1不公开价格 2仅对会员机构公开-->
                             <div class="main_price_unde" v-if="p.priceFlag==1">￥价格未公开</div>
+                            <!--机构价仅会员可见 && 用户是普通机构-->
+                            <div class="main_price_unde" v-else-if="p.priceFlag==2 && GLOBAL_USER_IDENTITY === 4">
+                                ￥会员可见
+                            </div>
+                            <!--机构价仅会员可见 && 用户是普通机构-->
+                            <div class="main_price_unde" v-else-if="p.priceFlag==3 && (GLOBAL_CLUB_TYPE !=1)">
+                                ￥仅医美机构可见
+                            </div>
                             <!-- 资质机构 || (价格全部机构可见 && 普通机构) || (供应商 && 商品为供应商下的商品) || 超级会员用户 -->
                             <template
                                     v-else-if="GLOBAL_USER_IDENTITY === 2 || (p.priceFlag === 0 && GLOBAL_USER_IDENTITY === 4) || (GLOBAL_USER_IDENTITY === 3 && p.shopId === GLOBAL_SHOP_ID) || GLOBAL_VIP_FLAG === 1">
@@ -211,14 +219,6 @@
                                     p.price ) | NumFormat }}
                                 </div>
                             </template>
-                            <!--机构价仅会员可见 && 用户是普通机构-->
-                            <div class="main_price_unde" v-else-if="p.priceFlag==2 && GLOBAL_USER_IDENTITY === 4">
-                                ￥会员可见
-                            </div>
-                            <!--机构价仅会员可见 && 用户是普通机构-->
-                            <div class="main_price_unde" v-else-if="p.priceFlag==3 && (GLOBAL_CLUB_TYPE !=1)">
-                                ￥仅医美机构可见
-                            </div>
                             <!--供应商除自己的商品外，也显示价格等级-->
                             <div class="price_grade" v-else><span class="bold">￥</span><i
                                     :class="'icon mIcon i'+p.priceGrade"></i></div>

src/main/resources/templates/product/product-coupon.html

@@ -55,6 +55,10 @@
                                 </div>
                                 <!--0公开价格 1不公开价格 2仅对会员机构公开-->
                                 <div class="main_price_unde" v-if="p.priceFlag==1">￥价格未公开</div>
+                                <!--机构价仅会员可见 && 用户是普通机构-->
+                                <div class="main_price_unde" v-else-if="p.priceFlag==2 && GLOBAL_USER_IDENTITY === 4">￥会员可见</div>
+                                <!--仅医美机构可见-->
+                                <div class="main_price_unde" v-else-if="p.priceFlag==3 && (GLOBAL_CLUB_TYPE !=1)">￥仅医美机构可见</div>
                                 <!-- 资质机构 || (价格全部机构可见 && 普通机构) || (供应商 && 商品为供应商下的商品) || 超级会员用户 -->
                                 <template v-else-if="GLOBAL_USER_IDENTITY === 2 || (p.priceFlag === 0 && GLOBAL_USER_IDENTITY === 4) || (GLOBAL_USER_IDENTITY === 3 && p.shopId === GLOBAL_SHOP_ID) || GLOBAL_VIP_FLAG === 1">
                                     <div class="main_price_show"
@@ -62,10 +66,6 @@
                                         ￥{{ (PromotionsFormat(p.promotions) || showVipPriceTag(p) ? p.originalPrice : p.price ) | NumFormat }}
                                     </div>
                                 </template>
-                                <!--机构价仅会员可见 && 用户是普通机构-->
-                                <div class="main_price_unde" v-else-if="p.priceFlag==2 && GLOBAL_USER_IDENTITY === 4">￥会员可见</div>
-                                <!--仅医美机构可见-->
-                                <div class="main_price_unde" v-else-if="p.priceFlag==2 && GLOBAL_USER_IDENTITY === 4">￥仅医美机构可见</div>
                                 <!--供应商除自己的商品外，也显示价格等级-->
                                 <div class="price_grade" v-else><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                             </template>

src/main/resources/templates/product/product-supporting.html

@@ -44,6 +44,14 @@
                             <div class="price-box">
                                 <!--0公开价格 1不公开价格 2仅对会员机构公开-->
                                 <div class="main_price_unde" v-if="pros.priceFlag==1">￥价格未公开</div>
+                                <!--机构价仅会员可见 && 用户是普通机构-->
+                                <div class="main_price_unde" v-else-if="pros.priceFlag==2 && GLOBAL_USER_IDENTITY === 4">
+                                    ￥会员可见
+                                </div>
+                                <!--仅医美机构可见-->
+                                <div class="main_price_unde" v-else-if="pros.priceFlag==3 && (GLOBAL_CLUB_TYPE !=1)">
+                                    ￥仅医美机构可见
+                                </div>
                                 <!-- 资质机构 || (价格全部机构可见 && 普通机构) || (供应商 && 商品为供应商下的商品) || 超级会员用户 -->
                                 <template
                                         v-else-if="GLOBAL_USER_IDENTITY === 2 || (pros.priceFlag === 0 && GLOBAL_USER_IDENTITY === 4) || (GLOBAL_USER_IDENTITY === 3 && pros.shopId === GLOBAL_SHOP_ID) || GLOBAL_VIP_FLAG === 1">
@@ -53,14 +61,6 @@
                                         pros.price ) | NumFormat }}
                                     </div>
                                 </template>
-                                <!--机构价仅会员可见 && 用户是普通机构-->
-                                <div class="main_price_unde" v-else-if="pros.priceFlag==2 && GLOBAL_USER_IDENTITY === 4">
-                                    ￥会员可见
-                                </div>
-                                <!--仅医美机构可见-->
-                                <div class="main_price_unde" v-else-if="pros.priceFlag==3 && GLOBAL_USER_IDENTITY === 4">
-                                    ￥仅医美机构可见
-                                </div>
                                 <!--供应商除自己的商品外，也显示价格等级-->
                                 <div class="price_grade" v-else><span class="bold">￥</span><i :class="'icon mIcon i'+pros.priceGrade"></i></div>
                             </div>

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

@@ -64,6 +64,10 @@
                                         <a href="/user/setting/upgrade.html" class="btn">升级会员查看价格</a>
                                     </div>
                                 </template>
+                                <template v-else-if="p.priceFlag==3 && (GLOBAL_CLUB_TYPE !=1)">
+                                    <em>￥仅医美机构可见</em>
+                                    <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                                </template>
                                 <template v-else>
                                     <em>￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
                                     <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>

src/main/resources/templates/supplier/index.html

@@ -85,14 +85,18 @@
                                                 </template>
                                             </div>
                                             <div class="main_price_unde" v-if="p.priceFlag == 1">￥价格未公开</div>
+                                            <!--机构价仅会员可见 && 用户是普通机构-->
+                                            <div class="main_price_unde" v-else-if="p.priceFlag==2 && GLOBAL_USER_IDENTITY === 4">￥会员可见</div>
+                                            <!--仅医美机构可见-->
+                                            <div class="main_price_unde" v-else-if="p.priceFlag==3 && (GLOBAL_CLUB_TYPE !=1)">
+                                                ￥仅医美机构可见
+                                            </div>
                                             <!--机构价格-->
                                             <template v-else-if="GLOBAL_USER_IDENTITY === 2 || (p.priceFlag === 0 && GLOBAL_USER_IDENTITY === 4) || (GLOBAL_USER_IDENTITY === 3 && p.shopId === GLOBAL_SHOP_ID) || GLOBAL_VIP_FLAG === 1">
                                                 <div class="main_price_show" :class="{none: PromotionsFormat(p.promotions) || showVipPriceTag(p)}">
                                                     ￥{{ (PromotionsFormat(p.promotions) || showVipPriceTag(p) ? p.originalPrice : p.price ) | NumFormat }}
                                                 </div>
                                             </template>
-                                            <!--机构价仅会员可见 && 用户是普通机构-->
-                                            <div class="main_price_unde" v-else-if="p.priceFlag==2 && GLOBAL_USER_IDENTITY === 4">￥会员可见</div>
                                             <!--供应商除自己的商品外，也显示价格等级-->
                                             <div class="price_grade" v-else><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                                         </template>

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

@@ -48,10 +48,12 @@
       <ul class="productList clear mfw" v-if="isListEmpty">
         <li class="productItem " v-for="p in listData">
           <div class="product-cancel" @click="hanldCancel(p)" v-if="!isHandle">取消收藏</div>
-          <div class="product-button" v-if="!isHandle">
-            <div class="coll-btn add" @click="hanldBuyCart(p,1)">加入购物车</div>
-            <div class="coll-btn buy" @click="hanldBuyCart(p,2)">立即购买</div>
-          </div>
+          <template v-if="(p.priceFlag==0 && GLOBAL_USER_IDENTITY==4) || (p.priceFlag!=3 && GLOBAL_USER_IDENTITY == 2)">
+              <div class="product-button" v-if="!isHandle">
+                <div class="coll-btn add" @click="hanldBuyCart(p,1)">加入购物车</div>
+                <div class="coll-btn buy" @click="hanldBuyCart(p,2)">立即购买</div>
+              </div>
+          </template>
           <div class="product-mask" v-if="isHandle"  @click="checkedSoperv(p)">
             <span class="mask-checked" :class="[p.isChecked ?'checked':'']"></span>
           </div>
@@ -60,50 +62,73 @@
             <p class="name" v-html="p.name" v-if="p.beautyActFlag==1"></p>
             <p class="name" v-html="p.name" v-else></p>
             <div class="price">
-              <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                 <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                 <template v-if="p.priceFlag==1">
                   <div class="price_text_tag">
+                    <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
                     <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                    <div class="svip-tag" v-if="p.svipProductFlag === 1">
+                      <div class="svip-icon">SVIP</div>
+                      <div class="svip-price" v-if="showVipPriceTag(p)">
+                        <span v-html="p.svipPriceTag"></span>
+                      </div>
+                    </div>
                   </div>
                   <div class="main_price_unde">￥价格未公开</div>
                 </template>
+                <template v-else-if="p.priceFlag==2 && GLOBAL_USER_IDENTITY==4">
+                  <div class="price_text_tag">
+                    <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
+                    <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                    <div class="svip-tag" v-if="p.svipProductFlag === 1">
+                      <div class="svip-icon">SVIP</div>
+                      <div class="svip-price" v-if="showVipPriceTag(p)">
+                        <span v-html="p.svipPriceTag"></span>
+                      </div>
+                    </div>
+                  </div>
+                  <div class="main_price_unde">￥会员可见</div>
+                </template>
+                <template v-else-if="p.priceFlag==3 && (GLOBAL_CLUB_TYPE !=1)">
+                  <div class="price_text_tag">
+                    <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
+                    <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                    <div class="svip-tag" v-if="p.svipProductFlag === 1">
+                      <div class="svip-icon">SVIP</div>
+                      <div class="svip-price" v-if="showVipPriceTag(p)">
+                        <span v-html="p.svipPriceTag"></span>
+                      </div>
+                    </div>
+                  </div>
+                  <div class="main_price_unde">￥仅医美机构可见</div>
+                </template>
                 <template v-else>
-                  <template v-if="(p.priceFlag==0 && p.userIdentity!=3) || p.userIdentity==2 || p.userIdentity==3">
+                  <template v-if="(p.priceFlag==0 && GLOBAL_USER_IDENTITY==4) || GLOBAL_USER_IDENTITY == 2">
                     <div class="price_text_tag">
-                <!--<p class="couponTag" v-if="p.couponsLogo">优惠券</p>-->
+                      <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
                       <p class="listTag" v-if="p.actStatus==1">
                         {{p.promotions.name}}
                         <span v-if="p.priceFlag != 1 && PromotionsFormat(p.promotions)">:￥{{p.price | NumFormat}}</span>
                       </p>
+                      <div class="svip-tag" v-if="p.svipProductFlag === 1">
+                        <div class="svip-icon">SVIP</div>
+                        <div class="svip-price" v-if="showVipPriceTag(p)">
+                          <span v-html="p.svipPriceTag"></span>
+                        </div>
+                      </div>
                     </div>
                     <div class="main_price_show" :class="PromotionsFormat(p.promotions) ? 'none' : ''">
                       ￥{{ (PromotionsFormat(p.promotions) ? p.originalPrice : p.price ) | NumFormat }}
                     </div>
                   </template>
-                  <template v-else-if="p.priceFlag==2 && p.userIdentity==4">
-                    <div class="price_text_tag">
-                      <!-- <p class="couponTag" v-if="p.couponsLogo">优惠券</p>-->
-                      <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
-                    </div>
-                    <div class="main_price_unde">￥会员可见</div>
-                  </template>
                   <template v-else>
                     <div class="price_text_tag">
-                  <!-- <p class="couponTag" v-if="p.couponsLogo">优惠券</p>-->
+                      <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
                       <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
                     </div>
                     <div class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                   </template>
                 </template>
-              </template>
-              <template v-else>
-                <div class="price_text_tag ">
-                  <!--<p class="couponTag" v-if="p.couponsLogo">优惠券</p>-->
-                  <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
-                </div>
-                <div class="price_grade "><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
-              </template>
             </div>
           </a>
         </li>