Browse Source

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

Aslee 3 years ago
parent
commit
3e1aba8b75
39 changed files with 511 additions and 445 deletions
  1. 8 8
      src/main/resources/config/dev/application-dev.yml
  2. 2 1
      src/main/resources/static/css/base/floor.css
  3. 0 1
      src/main/resources/static/css/index/index_new.pc.css
  4. 2 0
      src/main/resources/static/css/product/detail.pc.css
  5. 1 1
      src/main/resources/static/css/product/list.css
  6. 1 1
      src/main/resources/static/css/product/product-coupon.css
  7. 1 0
      src/main/resources/static/css/product/product-supporting.h5.css
  8. 1 2
      src/main/resources/static/css/supplier/index.css
  9. 12 1
      src/main/resources/static/css/user-center/collection/collection.css
  10. 1 0
      src/main/resources/static/js/account/bind.js
  11. 3 1
      src/main/resources/static/js/account/login.js
  12. 10 3
      src/main/resources/static/js/base.js
  13. 11 3
      src/main/resources/static/js/equipment/detail.js
  14. 11 2
      src/main/resources/static/js/index.js
  15. 13 3
      src/main/resources/static/js/product/detail.js
  16. 21 77
      src/main/resources/static/js/product/list.js
  17. 11 2
      src/main/resources/static/js/product/produce-list.js
  18. 11 2
      src/main/resources/static/js/product/product-supporting.js
  19. 1 1
      src/main/resources/static/js/shopping/confirm.js
  20. 13 4
      src/main/resources/static/js/supplier/index.js
  21. 14 1
      src/main/resources/static/js/user-center/collection/collection.js
  22. 14 2
      src/main/resources/static/js/user-center/member/memberProduct.js
  23. 12 12
      src/main/resources/templates/activity/activityTopic.html
  24. 2 2
      src/main/resources/templates/activity/beautyTopic.html
  25. 0 6
      src/main/resources/templates/components/footer.html
  26. 55 50
      src/main/resources/templates/equipment/detail.html
  27. 8 4
      src/main/resources/templates/index.html
  28. 1 1
      src/main/resources/templates/product/beautytopic.html
  29. 21 10
      src/main/resources/templates/product/detail.html
  30. 3 1
      src/main/resources/templates/product/instruelist.html
  31. 12 5
      src/main/resources/templates/product/instrument.html
  32. 155 198
      src/main/resources/templates/product/list.html
  33. 4 2
      src/main/resources/templates/product/product-coupon.html
  34. 8 4
      src/main/resources/templates/product/product-supporting.html
  35. 5 1
      src/main/resources/templates/product/promotions.html
  36. 8 8
      src/main/resources/templates/product/temporary.html
  37. 1 0
      src/main/resources/templates/shopping/cart.html
  38. 6 2
      src/main/resources/templates/supplier/index.html
  39. 48 23
      src/main/resources/templates/user-center/collection/collection.html

+ 8 - 8
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
@@ -55,8 +55,8 @@ caimei:
   siteEnv: 0 #网站环境,(2:正式环境,1:测试环境,0:开发环境)
   spiServer: http://192.168.2.68:8008
   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.68:18002
+#  coreServer: http://192.168.2.75:18002
   imageDomain: https://img-b.caimei365.com
   wwwDomain: http:localhost:8009
   destPath: classpath:/

+ 2 - 1
src/main/resources/static/css/base/floor.css

@@ -41,7 +41,8 @@
 .section_page .page_main_price .main_price_none{width:100%;height:24px;box-sizing:border-box;float:left;margin-top:2px}
 .section_page .page_main_price .main_price_none.sec{margin-top:25px}
 .section_page .page_main_price .main_price_none .listTag{margin:0}
-.section_page .page_main_price .price_grade,.section_page .page_main_price .price_grade_shop,.section_page .page_main_price .price_grade_club{float:left;margin:0;height:22px;line-height:22px;color:#4A4F58;font-style:normal;font-size:14px}
+.section_page .page_main_price .price_grade,.section_page .page_main_price .price_grade_shop{float:left;margin:0;height:22px;line-height:22px;color:#4A4F58;font-style:normal;font-size:14px}
+.section_page .page_main_price .price_grade_club{float:left;margin:0;height:22px;line-height:22px;color:#4A4F58;font-style:normal;font-size:14px;color: #f94b4b;}
 .section_page .page_main_price .price_grade{float: unset}
 .section_page .page_main_price .price_grade span,.section_page .page_main_price .price_grade_shop span,.section_page .page_main_price .price_grade_club span{display:inline-block;float:left}
 .section_page .page_main_price .icon:before{width:67px;height:22px}

+ 0 - 1
src/main/resources/static/css/index/index_new.pc.css

@@ -24,7 +24,6 @@ li{list-style:none;}
 .section_container{width:100%;height:auto;float:left}
 .section_container .inner{width:1184px;margin:0 auto}
 .section_left{width:900px;float:left}
-
 /*右边区域*/
 .section_right{width:284px;float:right;box-sizing:border-box;padding-top:103px}
 .section_right .section_right_item{width:284px;height:auto;background-color:#FFFFFF;float:left;margin-bottom:16px;padding:16px;box-sizing:border-box;border-radius:2px}

+ 2 - 0
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}

+ 1 - 1
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;}

+ 1 - 1
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;}

+ 1 - 0
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;}

+ 1 - 2
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;}

+ 12 - 1
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}

+ 1 - 0
src/main/resources/static/js/account/bind.js

@@ -51,6 +51,7 @@ var bindPage = new Vue({
                             clubId: response.data.clubId,
                             shopId: response.data.shopId,
                             userIdentity: response.data.userIdentity,
+                            firstClubType: response.data.firstClubType,
                             permission: response.data.userPermission,
                             token: response.data.token
                         };

+ 3 - 1
src/main/resources/static/js/account/login.js

@@ -105,6 +105,7 @@ var loginPage = new Vue({
                             permission: response.data.userPermission,
                             token: response.data.token,
                             unionId:response.data.unionId,
+                            firstClubType:response.data.firstClubType,
                             vipFlag: response.data.vipFlag
                         };
                         _self.setStorages( _self.userData);
@@ -215,7 +216,8 @@ var loginPage = new Vue({
                             userIdentity: response.data.userIdentity,
                             permission: response.data.userPermission,
                             token: response.data.token,
-                            vipFlag: response.data.vipFlag
+                            vipFlag: response.data.vipFlag,
+                            firstClubType: response.data.firstClubType
                         };
                         _self.setStorages( _self.userData);
                         // 登录成功页面跳转

+ 10 - 3
src/main/resources/static/js/base.js

@@ -2,19 +2,26 @@ var coreServer = $("#coreServer").val();
 var isPC = ($(window).width()>768);
 var globalUserData = '';
 var GLOBAL_TOKEN = 'X-Token';
-var GLOBAL_USER_ID = 0;
+var GLOBAL_USER_ID = 0;  //  用户Id
 var GLOBAL_USER_IDENTITY = 0;//2-会员机构;3-供应商;4-普通机构
-var GLOBAL_SHOP_ID = 0;
-var GLOBAL_VIP_FLAG = 0;
+var GLOBAL_SHOP_ID = 0;  // 供应商Id
+var GLOBAL_VIP_FLAG = 0; // 超级会员标记
+var GLOBAL_CLUB_TYPE = 0; // 会员类型 1 医美机构  2 胜美机构
+var IDENTITY = 0; // 用户标记
 if(localStorage.getItem('userInfo')){
     globalUserData = JSON.parse(localStorage.getItem('userInfo'));
     GLOBAL_TOKEN = globalUserData.token;
     GLOBAL_USER_ID = globalUserData.userId*1;
     GLOBAL_USER_IDENTITY = globalUserData.userIdentity*1;
+    IDENTITY = globalUserData.userIdentity*1;
     GLOBAL_VIP_FLAG = globalUserData.vipFlag;
     GLOBAL_SHOP_ID = globalUserData.shopId*1;
+    GLOBAL_CLUB_TYPE = globalUserData.firstClubType ? globalUserData.firstClubType : null;
     if (GLOBAL_USER_ID === 5261 || GLOBAL_USER_ID === 10947 || GLOBAL_USER_ID === 11579) {
         GLOBAL_USER_IDENTITY = 1;
+        IDENTITY = 1;
+    }else if(GLOBAL_CLUB_TYPE == 1){
+        IDENTITY = 5;
     }
 } else {
     var pathname = window.location.pathname;

+ 11 - 3
src/main/resources/static/js/equipment/detail.js

@@ -4,16 +4,24 @@ var equipmentDetail = new Vue({
         equipmentId: 0,
         userId: 6,
         userIdentity: '',
-        recommends: []
+        recommends: [],
+        listLoading:true
     },
     computed: {},
     methods: {
         getRecommendById: function(){
             var _self = this;
             if(this.equipmentId ===0){return;}
-            ProductApi.GetEquipmentDdtailsRecommend({ equipmentId: this.equipmentId},function (response) {
+            ProductApi.GetEquipmentDdtailsRecommend({ equipmentId: this.equipmentId,userId:_self.userId},function (response) {
                 if (response.code === 0 && response.data) {
-                    _self.recommends = r.data;
+                    _self.recommends = response.data;
+                    _self.listLoading = false;
+                }else if(response.code === 1){
+                    window.location.href = "/404.html?error=未查询到该项目仪器";
+                }else{
+                    CAIMEI.Alert(response.msg, '确定', true,function(){
+                        window.location.href = "/equipment/list.html?keyword=";
+                    });
                 }
             });
         }

+ 11 - 2
src/main/resources/static/js/index.js

@@ -19,8 +19,17 @@ var homeData = 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;
         },
         popupPage:function(){  // 弹窗点击跳转链接
             var _self = this;

+ 13 - 3
src/main/resources/static/js/product/detail.js

@@ -235,7 +235,8 @@ var productDetail = new Vue({
                         _self.promotions = response.data.promotions;
                         _self.promotionsId = response.data.promotions.id;
                     }
-                    if(_self.userId == 0 || _self.priceObj.userIdentity == 2 || _self.priceObj.userIdentity == 4){
+                    console.log('userIdentity',_self.priceObj.userIdentity)
+                    if(_self.userId === 0 || GLOBAL_USER_IDENTITY === 2 || GLOBAL_USER_IDENTITY === 4){
                         _self.isShowSupportingList = true;
                     }
                 }
@@ -683,8 +684,17 @@ var productDetail = new Vue({
             _self.defaultSupportingList = _self.supportingList;
         },
         // 是否显示vip标签价格
-        showVipPriceTag(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;
         },
     },
     created: function () {

+ 21 - 77
src/main/resources/static/js/product/list.js

@@ -45,7 +45,8 @@ var productList = new Vue({
         isActiviChecked:false,
         isNewsChecked:false,
         isShowAllBrands:false,
-        isAllcheckedBrand:false
+        isAllcheckedBrand:false,
+        isListEmpty:false,
     },
     filters: {
         NumFormat:function(value) {
@@ -74,8 +75,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) {
@@ -111,7 +121,7 @@ var productList = new Vue({
             var _self = this;
             ProductApi.GetProductSearchList({
                 keyword: this.params.keyword,
-                identity: GLOBAL_USER_IDENTITY,
+                identity: IDENTITY,
                 pageSize: this.params.size,
                 pageNum: this.params.num,
                 sortField: this.params.sortField,
@@ -137,11 +147,16 @@ var productList = new Vue({
                     }else{
                         _self.listData = _self.listData.concat(resultData);
                     }
-                    console.log(_self.listData)
+                    if( _self.listData.length>0){
+                        _self.isListEmpty = false;
+                    }else{
+                        _self.isListEmpty = true;
+                    }
                     _self.listLoading = false;
                     _self.requestFlag = true;
                 }else {
-                    CAIMEI.Alert(res.msg, '确定');
+                    _self.listLoading = false;
+                    _self.isListEmpty = true;
                 }
             });
         },
@@ -240,37 +255,6 @@ var productList = new Vue({
             this.getListByKeyword();
             this.isProductScreen = false;
         }
-        // getListByCategory: function (path, categoryId) {
-        //     var _self = this;
-        //     $.getJSON(spiServer+"/search/query/product/"+ path ,{
-        //         id: categoryId,
-        //         identity: GLOBAL_USER_IDENTITY,
-        //         pageSize: this.params.size,
-        //         pageNum: this.params.num,
-        //         sortField: this.params.sortField,
-        //         sortType: this.params.sortType
-        //     }, function (r) {
-        //         if (r.code === 0 && r.data) {
-        //             var result = JSON.parse(r.data);
-        //             _self.listRecord = result.total;
-        //             var resultData = setSearchProductList(result.items, _self.userId, function(){
-        //                 _self.$forceUpdate();
-        //                 setTimeout(function(){
-        //                     // 图片懒加载
-        //                     $("img[data-original]").lazyload();
-        //                 },500);
-        //             });
-        //             if(isPC){
-        //                 _self.listData = resultData;
-        //             }else{
-        //                 _self.listData = _self.listData.concat(resultData);
-        //             }
-        //             console.log(_self.listData)
-        //         }
-        //         _self.listLoading = false;
-        //         _self.requestFlag = true;
-        //     })
-        // }
     },
     created: function () {
         if(isPC){
@@ -319,32 +303,6 @@ var productList = new Vue({
         this.getListByKeyword();
         // 获取对应品牌列表
         this.getCommoditySearchQUeryBrand();
-        // if (this.searchFlag) {
-        //     // 获取列表数据
-        //     this.getListByKeyword();
-        // } else {
-        //     // category=1000-1001-1005
-        //     if (!getUrlParam("category")) {
-        //         this.listLoading = false;
-        //         return false;
-        //     }
-        //     var category = getUrlParam("category").split("-");
-        //     this.params.bid = category[0];
-        //     this.params.sid = category[1];
-        //     this.params.tid = category[2];
-        //     // 根据分类获取数据
-        //     if (this.params.tid && this.params.tid>0) {
-        //         this.getListByCategory("tinyType", this.params.tid);
-        //     } else if (this.params.sid && this.params.sid>0){
-        //         this.getListByCategory("smallType", this.params.sid);
-        //     } else if (this.params.bid && this.params.bid>0) {
-        //         this.getListByCategory("bigType", this.params.bid);
-        //     } else {
-        //         alertInfo("URL参数异常!", function(){
-        //             window.location.href = "/";
-        //         });
-        //     }
-        // }
     },
     mounted: function () {
         var _self = this;
@@ -364,20 +322,6 @@ var productList = new Vue({
                             _self.params.num = next;
                             // 获取列表数据
                             _self.getListByKeyword();
-
-                            // if (_self.searchFlag) {
-                            //     // 获取列表数据
-                            //     _self.getListByKeyword();
-                            // } else {
-                            //     // 根据分类获取数据
-                            //     if (_self.params.tid && _self.params.tid>0) {
-                            //         _self.getListByCategory("tinyType", _self.params.tid);
-                            //     } else if (_self.params.sid && _self.params.sid>0){
-                            //         _self.getListByCategory("smallType", _self.params.sid);
-                            //     } else if (_self.params.bid && _self.params.bid>0) {
-                            //         _self.getListByCategory("bigType", _self.params.bid);
-                            //     }
-                            // }
                         }
                         _self.requestFlag = false;
                     }else{

+ 11 - 2
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;

+ 11 - 2
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){

+ 1 - 1
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);
                 }
             });
         },

+ 13 - 4
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;
@@ -97,7 +106,7 @@ var supplierHome = new Vue({
             SupplierApi.GetShopProductMain(
                 {
                     shopId: _self.params.id,
-                    identity: GLOBAL_USER_IDENTITY
+                    identity: IDENTITY
                 },
                 function (res) {
                     if (res.code === 0 && res.data) {
@@ -131,7 +140,7 @@ var supplierHome = new Vue({
                     keyword: _self.params.keyword,
                     pageSize: _self.params.size,
                     pageNum: _self.params.num,
-                    identity: GLOBAL_USER_IDENTITY,
+                    identity: IDENTITY,
                     id:_self.params.id
                 },
                 function (res) {

+ 14 - 1
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 () {// 批量加入购物车

+ 14 - 2
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)) {

+ 12 - 12
src/main/resources/templates/activity/activityTopic.html

@@ -420,7 +420,7 @@
                               </div>
                             </template>
                             <!-- 样式3 -->
-                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
+                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4 && GLOBAL_VIP_FLAG!=1">
                               <div class="price-tag" v-if="pros.product.actStatus==1">
 <!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
@@ -542,7 +542,7 @@
                               </div>
                             </template>
                             <!-- 样式3 -->
-                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
+                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4 && GLOBAL_VIP_FLAG!=1">
                               <div class="price-tag" v-if="pros.product.actStatus==1">
 <!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
@@ -675,7 +675,7 @@
                               </div>
                             </template>
                             <!-- 样式3 -->
-                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
+                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4 && GLOBAL_VIP_FLAG!=1">
                               <div class="price-tag" v-if="pros.product.actStatus==1">
 <!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
@@ -781,7 +781,7 @@
                               </div>
                             </template>
                             <!-- 样式3 -->
-                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
+                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4 && GLOBAL_VIP_FLAG!=1">
                               <div class="price-tag" v-if="pros.product.actStatus==1">
 <!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
@@ -904,7 +904,7 @@
                               </div>
                             </template>
                             <!-- 样式3 -->
-                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
+                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4 && GLOBAL_VIP_FLAG!=1">
                               <div class="price-tag" v-if="pros.product.actStatus==1">
 <!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
@@ -1021,7 +1021,7 @@
                               </div>
                             </template>
                             <!-- 样式3 -->
-                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
+                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4 && GLOBAL_VIP_FLAG!=1">
                               <div class="price-tag" v-if="pros.product.actStatus==1">
 <!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
@@ -1138,7 +1138,7 @@
                               </div>
                             </template>
                             <!-- 样式3 -->
-                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
+                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4 && GLOBAL_VIP_FLAG!=1">
                               <div class="price-tag" v-if="pros.product.actStatus==1">
 <!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
@@ -1250,7 +1250,7 @@
                               </div>
                             </template>
                             <!-- 样式3 -->
-                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
+                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4 && GLOBAL_VIP_FLAG!=1">
                               <div class="price-tag" v-if="pros.product.actStatus==1">
 <!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
@@ -1363,7 +1363,7 @@
                               </div>
                             </template>
                             <!-- 样式3 -->
-                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
+                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4 && GLOBAL_VIP_FLAG!=1">
                               <div class="price-tag" v-if="pros.product.actStatus==1">
 <!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
@@ -1469,7 +1469,7 @@
                               </div>
                             </template>
                             <!-- 样式3 -->
-                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
+                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4 && GLOBAL_VIP_FLAG!=1">
                               <div class="price-tag" v-if="pros.product.actStatus==1">
 <!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
@@ -1586,7 +1586,7 @@
                                     </div>
                                   </template>
                                   <!-- 样式3 -->
-                                  <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
+                                  <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4 && GLOBAL_VIP_FLAG!=1">
                                     <div class="price-tag" v-if="pros.product.actStatus==1">
 <!--                                      <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                       <span class="tag">{{pros.product.promotions.name}}</span>
@@ -1695,7 +1695,7 @@
                                     </div>
                                   </template>
                                   <!-- 样式3 -->
-                                  <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
+                                  <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4 && GLOBAL_VIP_FLAG!=1">
                                     <div class="price-tag" v-if="pros.product.actStatus==1">
 <!--                                      <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                       <span class="tag">{{pros.product.promotions.name}}</span>

+ 2 - 2
src/main/resources/templates/activity/beautyTopic.html

@@ -127,7 +127,7 @@
                                                                         </template>
                                                                         <!-- 样式3 -->
                                                                         <template
-                                                                                v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
+                                                                                v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4 && GLOBAL_VIP_FLAG!=1">
                                                                             <div class="price-tag cm-left"
                                                                                  v-if="pros.product.actStatus==1">
                                                                                 <span class="tag">{{pros.product.promotions.name}}</span>
@@ -284,7 +284,7 @@
                                                                     </template>
                                                                     <!-- 样式3 -->
                                                                     <template
-                                                                            v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
+                                                                            v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4 && GLOBAL_VIP_FLAG!=1">
                                                                         <div class="price-tag cm-left"
                                                                              v-if="pros.product.actStatus==1">
                                                                             <span class="tag">{{pros.product.promotions.name}}</span>

+ 0 - 6
src/main/resources/templates/components/footer.html

@@ -16,12 +16,6 @@
                     <a th:each="page: ${type.linkList}" th:href="'/help/'+${page.id}+'.html'" th:text="${page.name}" rel="nofollow"></a>
                 </div>
             </div>
-            <div class="list">
-                <span class="tab">友情链接</span>
-                <div class="con">
-                    <a th:each="friend: ${friendLinks}" th:href="${friend.link}" th:text="${friend.name}"></a>
-                </div>
-            </div>
         </div>
         <!--二维码-->
         <div class="footContact wrap">

+ 55 - 50
src/main/resources/templates/equipment/detail.html

@@ -16,63 +16,68 @@
 
 <!-- 项目仪器详情 -->
 <div id="equipmentDetail">
-    <div class="wrap">
-        <div class="equipmentBox clear">
-            <div class="imageBox"><img th:src="${equipment.image}"></div>
-            <div class="infoBox">
-                <p class="row" th:each="item: ${equipment.pageContents}" th:if="${item.type}==1">
-                    <span class="l" th:text="${item.name}"></span><i>:</i><em th:text="${item.content}"></em>
-                </p>
-                <hr>
-                <p class="tit" th:each="item,status : ${equipment.pageContents}" th:if="${item.type}==2 and ${status.index}==4">
-                    <span th:text="${item.name}"></span>
-                </p>
-                <p class="row" th:each="item,status : ${equipment.pageContents}" th:if="${item.type}==2 and ${status.index}>4">
-                    <span class="l" th:text="${item.name}"></span><i>:</i><em th:text="${item.content}"></em>
-                </p>
-                <a href="javascript:void(0);" class="share" title="手机扫一扫分享">分享<i class="icon"></i>
-                <div class="code"></div>
-                </a>
-<!--                <a href="javascript:void(0);" class="buy">点击购买</a>-->
-            </div>
-        </div>
+    <div v-if="listLoading" class="loading">
+        <img src="/img/base/loading.gif">
     </div>
-    <div class="wrap">
-        <div class="detailInfo">
-            <div class="tabTit">
-                <!--<span class="on">项目详情</span>-->
-                <span th:each="item,status : ${equipment.pageContents}"
-                      th:if="${item.type}==3 and (${status.index}==10 or ${status.index}==11 or ${status.index}==12)"
-                      th:text="${item.name}"></span>
+    <template v-else>
+        <div class="wrap" >
+            <div class="equipmentBox clear">
+                <div class="imageBox"><img th:src="${equipment.image}"></div>
+                <div class="infoBox">
+                    <p class="row" th:each="item: ${equipment.pageContents}" th:if="${item.type}==1">
+                        <span class="l" th:text="${item.name}"></span><i>:</i><em th:text="${item.content}"></em>
+                    </p>
+                    <hr>
+                    <p class="tit" th:each="item,status : ${equipment.pageContents}" th:if="${item.type}==2 and ${status.index}==4">
+                        <span th:text="${item.name}"></span>
+                    </p>
+                    <p class="row" th:each="item,status : ${equipment.pageContents}" th:if="${item.type}==2 and ${status.index}>4">
+                        <span class="l" th:text="${item.name}"></span><i>:</i><em th:text="${item.content}"></em>
+                    </p>
+                    <a href="javascript:void(0);" class="share" title="手机扫一扫分享">分享<i class="icon"></i>
+                        <div class="code"></div>
+                    </a>
+                    <!--                <a href="javascript:void(0);" class="buy">点击购买</a>-->
+                </div>
             </div>
-            <div class="tabCon">
-                <div th:each="item,status : ${equipment.pageContents}"
-                     th:if="${item.type}==3 and (${status.index}==10 or ${status.index}==11 or ${status.index}==12)"
-                     th:utext="${item.content}" class="item">
+        </div>
+        <div class="wrap">
+            <div class="detailInfo">
+                <div class="tabTit">
+                    <!--<span class="on">项目详情</span>-->
+                    <span th:each="item,status : ${equipment.pageContents}"
+                          th:if="${item.type}==3 and (${status.index}==10 or ${status.index}==11 or ${status.index}==12)"
+                          th:text="${item.name}"></span>
+                </div>
+                <div class="tabCon">
+                    <div th:each="item,status : ${equipment.pageContents}"
+                         th:if="${item.type}==3 and (${status.index}==10 or ${status.index}==11 or ${status.index}==12)"
+                         th:utext="${item.content}" class="item">
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
-    <div class="wrap">
-        <div class="pageFloor" v-for="floor in recommends">
-            <div class="title" v-text="floor.title"></div>
-            <ul class="content clear">
-                <li v-for="item in floor.floorData">
-                    <a :href="item.link">
-                        <img :src="item.image">
-                        <span v-text="item.title"></span>
-                    </a>
-                </li>
-            </ul>
+        <div class="wrap">
+            <div class="pageFloor" v-for="floor in recommends.floorList">
+                <div class="title" v-text="floor.title"></div>
+                <ul class="content clear">
+                    <li v-for="item in floor.floorData">
+                        <a :href="item.link">
+                            <img :src="item.image">
+                            <span v-text="item.title"></span>
+                        </a>
+                    </li>
+                </ul>
+            </div>
         </div>
-    </div>
-    <div class="contactBox">
-        <div class="tit"><span>咨询 · 购买</span></div>
-        <div class="cont">
-            <span class="icon mIcon call">0755-22907771转806<br>15338851365</span>
-            <span class="icon mIcon phone">产品设备:18948339365<br>商务合作:17318032647</span>
+        <div class="contactBox">
+            <div class="tit"><span>咨询 · 购买</span></div>
+            <div class="cont">
+                <span class="icon mIcon call">0755-22907771转806<br>15338851365</span>
+                <span class="icon mIcon phone">产品设备:18948339365<br>商务合作:17318032647</span>
+            </div>
         </div>
-    </div>
+    </template>
 </div>
 
 <!-- 引入底部 -->

+ 8 - 4
src/main/resources/templates/index.html

@@ -193,6 +193,14 @@
                                                         <template v-if="pros.product.priceFlag == 1">
                                                             <em class="price_grade"><span>¥</span>价格未公开</em>
                                                         </template>
+                                                        <!--机构价仅会员可见 && 用户是普通机构-->
+                                                        <template v-else-if="pros.product.priceFlag==2 && GLOBAL_USER_IDENTITY === 4 && GLOBAL_VIP_FLAG!=1">
+                                                            <em class="price_grade_club"><span>¥</span>会员可见</em>
+                                                        </template>
+                                                        <!--机构价仅医美机构可见-->
+                                                        <template v-else-if="pros.product.priceFlag==3 && (GLOBAL_CLUB_TYPE !=1)">
+                                                            <em class="price_grade_club red"><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: showVipPriceTag(pros.product) || PromotionsFormat(pros.product.promotions)}">
@@ -200,10 +208,6 @@
                                                                 <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"><span>¥</span>会员可见</em>
-                                                        </template>
                                                         <template v-else>
                                                             <!--供应商除自己的商品外,也显示价格等级-->
                                                             <em class="price_grade_shop">

+ 1 - 1
src/main/resources/templates/product/beautytopic.html

@@ -124,7 +124,7 @@
                                                         </div>
                                                     </template>
                                                     <!--仅会员机构可见-->
-                                                    <template v-else-if="pros.priceFlag==2 && pros.userIdentity==4">
+                                                    <template v-else-if="pros.priceFlag==2 && pros.userIdentity==4 && GLOBAL_VIP_FLAG!=1">
                                                         <div class="main_price_text">
                                                             <div class="price_text_tag">
 <!--																<p class="couponTag" v-if="pros.couponsLogo">优惠券</p>-->

+ 21 - 10
src/main/resources/templates/product/detail.html

@@ -70,20 +70,22 @@
                         <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 && GLOBAL_USER_IDENTITY == 4 && GLOBAL_VIP_FLAG!=1" 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">
                                 <del v-text="'¥'+parseFloat(priceObj.originalPrice).toFixed(2)"></del>
                             </em>
                             <!--可见价格 -->
-                            <template v-else-if="(priceObj.priceFlag==0 && priceObj.userIdentity!=3) || priceObj.userIdentity==2 || (priceObj.userIdentity==3 && priceObj.shopId==GLOBAL_SHOP_ID) || GLOBAL_VIP_FLAG === 1">
+                            <template v-else-if="(priceObj.priceFlag==0 && GLOBAL_USER_IDENTITY!=3) || GLOBAL_USER_IDENTITY ==2 || (GLOBAL_USER_IDENTITY==3 && priceObj.shopId==GLOBAL_SHOP_ID) || GLOBAL_VIP_FLAG === 1">
                                 <em v-if="priceObj.actStatus==1 && promotions && promotions.type==1 && promotions.mode==1" class="p">
                                     <del v-text="'¥'+parseFloat(priceObj.originalPrice).toFixed(2)"></del>
                                 </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>¥<i th:attr="class=${'icon mIcon i'+product.priceGrade}"></i></em>
                             <!--SVIP会员标签-->
@@ -294,6 +296,14 @@
                                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                             <!--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 && GLOBAL_VIP_FLAG!=1">
+                                                ¥会员可见
+                                            </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">
@@ -303,10 +313,6 @@
                                                     pros.price ) | NumFormat }}
                                                 </div>
                                             </template>
-                                            <!--机构价仅会员可见 && 用户是普通机构-->
-                                            <div class="main_price_unde" v-else-if="pros.priceFlag==2 && GLOBAL_USER_IDENTITY === 4">
-                                                ¥会员可见
-                                            </div>
                                             <!--供应商除自己的商品外,也显示价格等级-->
                                             <div class="price_grade" v-else><span class="bold">¥</span><i
                                                     :class="'icon mIcon i'+pros.priceGrade"></i></div>
@@ -445,11 +451,16 @@
             </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_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 style="text-align: left;">若要查看更多产品信息,请注册机构会员,如有疑问请联系客服。</p>
                     </template>
                 </div>
                 <div class="item" v-if="tabsIndex == 1">

+ 3 - 1
src/main/resources/templates/product/instruelist.html

@@ -210,7 +210,9 @@
                                         </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 && GLOBAL_VIP_FLAG!=1">¥会员可见</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>

+ 12 - 5
src/main/resources/templates/product/instrument.html

@@ -144,6 +144,18 @@
                                                 <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="pros.product.priceFlag === 2 && GLOBAL_USER_IDENTITY === 4 && GLOBAL_VIP_FLAG!=1">
+                                                        <em class="price_grade_club">
+                                                            <span>¥</span>会员可见
+                                                        </em>
+                                                    </template>
+                                                    <!--仅医美机构可见-->
+                                                    <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) }">
@@ -151,11 +163,6 @@
                                                               <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">
-                                                            <span>¥</span>会员可见
-                                                        </em>
-                                                    </template>
                                                     <template v-else>
                                                         <!--供应商除自己的商品外,也显示价格等级-->
                                                         <em class="price_grade_shop">

+ 155 - 198
src/main/resources/templates/product/list.html

@@ -18,226 +18,183 @@
         <span>搜索结果</span>
         <span>&gt;</span> <a href="javascript:void(0);" @click="toPagination(1)" v-text="params.keyword"></a>
     </div>
-
-    <!--    <template v-if="isPC && listData && listData.length>0">-->
-    <!--        &lt;!&ndash; 面包屑 &ndash;&gt;-->
-    <!--        <div v-if="searchFlag" class="crumbs">-->
-    <!--            <span>搜索结果</span>-->
-    <!--            <span>&gt;</span> <a href="javascript:void(0);" @click="toPagination(1)" v-text="params.keyword"></a>-->
-    <!--        </div>-->
-    <!--        <div v-else class="crumbs">-->
-    <!--            <a href="/">首页</a>-->
-    <!--            <template v-if="params.bid && params.bid>0">-->
-    <!--                <template v-if="params.sid && params.sid>0">-->
-    <!--                    <span>&gt;</span> <a :href="'/product/list.html?category='+params.bid+'-0-0'" v-text="bigType"></a>-->
-    <!--                    <template v-if="params.tid && params.tid>0">-->
-    <!--                        <span>&gt;</span> <a :href="'/product/list.html?category='+params.bid+'-'+params.sid+'-0'" v-text="smallType"></a>-->
-    <!--                        <span>&gt;</span> <span v-text="tinyType"></span>-->
-    <!--                    </template>-->
-    <!--                    <template v-else>-->
-    <!--                        <span>&gt;</span> <span v-text="smallType"></span>-->
-    <!--                    </template>-->
-    <!--                </template>-->
-    <!--                <template v-else>-->
-    <!--                    <span>&gt;</span> <span v-text="bigType"></span>-->
-    <!--                </template>-->
-    <!--            </template>-->
-    <!--        </div>-->
-    <!--        &lt;!&ndash;分类&ndash;&gt;-->
-    <!--        <div v-if="(!searchFlag)" id="listClassify" class="classifyBox">-->
-    <!--            <div class="clsTab">-->
-    <!--                <template v-for="(big,i) in classify">-->
-    <!--                    <a :class="{'on': params.bid==big.bigTypeID}" v-if="big.validFlag==1" href="javascript:void(0);" v-text="big.name"></a>-->
-    <!--                </template>-->
-    <!--            </div>-->
-    <!--            <div class="clsCon">-->
-    <!--                <div class="tabItem" v-for="big in classify" :bid="big.bigTypeID" style="display: none;">-->
-    <!--                    <div class="line" :class="{'on': params.sid==small.smallTypeID}" v-for="small in big.smalltypeList" v-if="small.validFlag==1">-->
-    <!--                        <div class="lft" :class="{'on': params.sid==small.smallTypeID}">-->
-    <!--                            <a :href="'/product/list.html?category='+big.bigTypeID+'-'+small.smallTypeID+'-0'" v-text="small.name"></a>-->
-    <!--                        </div>-->
-    <!--                        <div class="rgt">-->
-    <!--                            <template v-for="tiny in small.tinytypeList">-->
-    <!--                                <a v-if="tiny.validFlag==1" :class="{'on': params.tid==tiny.tinyTypeID}" :href="'/product/list.html?category='+big.bigTypeID+'-'+small.smallTypeID+'-'+tiny.tinyTypeID" v-text="tiny.name"></a>-->
-    <!--                            </template>-->
-    <!--                        </div>-->
-    <!--                    </div>-->
-    <!--                </div>-->
-    <!--            </div>-->
-    <!--        </div>-->
-    <!--    </template>-->
-    <!--loading-->
     <div v-if="listLoading" class="loading">
         <img src="/img/base/loading.gif">
     </div>
-    <!--数据为空-->
-    <div v-else-if="!listLoading && (!listData || listData.length==0)" class="empty">
-        <img src="/img/common/empty.png">
-        <div class="msg">
-            <p>暂未找到你搜索的商品,去<a href="/">商城</a>,逛逛吧~</p>
-        </div>
-    </div>
     <template v-else>
-        <!--品牌选择-->
-        <template v-if="isPC">
-            <div class="product-brand clear">
-                <div class="product-brand-name" :class="isShowAllBrands ? 'show' : ''">
-                    <p class="title">品牌</p>
-                </div>
-                <div class="product-brand-list" :class="isShowAllBrands ? 'show' : ''">
-                    <div class="brand-list" @click="choiceBrandAllHref" :class="hrefBrandId ? '' : 'checked'"><a href="javascript:void(0)">全部</a></div>
-                    <div class="brand-list" @click="choiceBrandHref(brand, index)" v-for="(brand,index) in brandLists"
-                         :key="index" :class="brand.isChecked ? 'checked' : ''">
-                        <a href="javascript:void(0)" :title="brand.name" v-html="brand.name"></a>
-                    </div>
-                </div>
-                <div class="product-brand-more" v-if="defaultBrandLists.length>8" :class="isShowAllBrands ? 'show' : ''"
-                     @click="showMoreItem">{{
-                    isShowAllBrands ? '收起' : '更多' }} <i class="icon mIcon"></i></div>
+        <!--数据为空-->
+        <div v-if="isListEmpty" class="empty">
+            <img src="/img/common/empty.png">
+            <div class="msg">
+                <p>暂未找到你搜索的商品,去<a href="/">商城</a>,逛逛吧~</p>
             </div>
-        </template>
+        </div>
         <template v-else>
-            <div class="product-brand-fiexd" v-if="isProductScreen">
+            <!--品牌选择-->
+            <template v-if="isPC">
                 <div class="product-brand clear">
-                    <div class="product-screen">
-                        <div class="sortBox-new" @click="hanldCheckedActivi">
-                            <span>促销商品</span>
-                            <span class="coll-checked" :class="[isActiviChecked ? 'checked': '']"></span>
-                        </div>
-                        <div class="sortBox-new" @click="hanldCheckedNews">
-                            <span>新品</span>
-                            <span class="coll-checked" :class="[isNewsChecked ? 'checked': '']"></span>
-                        </div>
-                    </div>
                     <div class="product-brand-name" :class="isShowAllBrands ? 'show' : ''">
                         <p class="title">品牌</p>
-                        <p v-if="!isPC" class="num">已选中<span>{{ checkedBrandLength }}</span>个品牌</p>
                     </div>
                     <div class="product-brand-list" :class="isShowAllBrands ? 'show' : ''">
-                        <div class="brand-list" @click="choiceBrandAll" :class="isAllcheckedBrand ? 'checked' : ''"><a href="javascript:void(0)">全部</a></div>
-                        <div class="brand-list" v-for="(brand,index) in brandLists" :key="index"
-                             @click="choiceBrand(brand, index)" :class="brand.isChecked ? 'checked' : ''">
+                        <div class="brand-list" @click="choiceBrandAllHref" :class="hrefBrandId ? '' : 'checked'"><a href="javascript:void(0)">全部</a></div>
+                        <div class="brand-list" @click="choiceBrandHref(brand, index)" v-for="(brand,index) in brandLists"
+                             :key="index" :class="brand.isChecked ? 'checked' : ''">
                             <a href="javascript:void(0)" :title="brand.name" v-html="brand.name"></a>
                         </div>
                     </div>
-                    <div class="product-brand-more" v-if="defaultBrandLists.length>8" :class="isShowAllBrands ? 'show' : ''" @click="showMoreItem">{{
-                        isShowAllBrands ? '收起' : '查看全部' }} <i
-                                class="icon mIcon"></i></div>
-                    <div class="product-screen-btn" @click="handleConfirmScreen">
-                        <div class="sub-button">确定</div>
-                    </div>
+                    <div class="product-brand-more" v-if="defaultBrandLists.length>8" :class="isShowAllBrands ? 'show' : ''"
+                         @click="showMoreItem">{{
+                        isShowAllBrands ? '收起' : '更多' }} <i class="icon mIcon"></i></div>
                 </div>
-            </div>
-        </template>
-        <!--排序-->
-        <div class="sortBox">
-            <ul class="mfc clear">
-                <li :class="{'on':params.sortField == ''}" @click="toSortList('',1)">综合</li>
-                <template>
-                    <li v-if="params.sortField == 'sales' && params.sortType == 1" class="down"
-                        @click="toSortList('sales',0)"><span>销量</span></li>
-                    <li v-else-if="params.sortField == 'sales' && params.sortType == 0" class="up"
-                        @click="toSortList('sales',1)"><span>销量</span></li>
-                    <li v-else @click="toSortList('sales',0)"><span>销量</span></li>
-                </template>
-                <template>
-                    <li v-if="params.sortField == 'favorite' && params.sortType == 1" class="down"
-                        @click="toSortList('favorite',0)"><span>人气</span></li>
-                    <li v-else-if="params.sortField == 'favorite' && params.sortType == 0" class="up"
-                        @click="toSortList('favorite',1)"><span>人气</span></li>
-                    <li v-else @click="toSortList('favorite',0)"><span>人气</span></li>
-                </template>
-                <template>
-                    <li v-if="params.sortField == 'price' && params.sortType == 1" class="down"
-                        @click="toSortList('price',0)"><span>价格</span></li>
-                    <li v-else-if="params.sortField == 'price' && params.sortType == 0" class="up"
-                        @click="toSortList('price',1)"><span>价格</span></li>
-                    <li v-else @click="toSortList('price',0)"><span>价格</span></li>
-                </template>
-                <template v-if="!isPC">
-                    <li class="screen" @click="showIsProductScreen">
-                        <span>筛选</span>
-                        <i class="mIcon"></i>
-                    </li>
-                </template>
-            </ul>
-            <div class="sortBox-checked" v-if="isPC">
-                <div class="sortBox-new" @click="hanldCheckedActiviHref">
-                    <span class="coll-checked" :class="[isActiviChecked ? 'checked': '']"></span>
-                    <span>促销商品</span>
+            </template>
+            <template v-else>
+                <div class="product-brand-fiexd" v-if="isProductScreen">
+                    <div class="product-brand clear">
+                        <div class="product-screen">
+                            <div class="sortBox-new" @click="hanldCheckedActivi">
+                                <span>促销商品</span>
+                                <span class="coll-checked" :class="[isActiviChecked ? 'checked': '']"></span>
+                            </div>
+                            <div class="sortBox-new" @click="hanldCheckedNews">
+                                <span>新品</span>
+                                <span class="coll-checked" :class="[isNewsChecked ? 'checked': '']"></span>
+                            </div>
+                        </div>
+                        <div class="product-brand-name" :class="isShowAllBrands ? 'show' : ''">
+                            <p class="title">品牌</p>
+                            <p v-if="!isPC" class="num">已选中<span>{{ checkedBrandLength }}</span>个品牌</p>
+                        </div>
+                        <div class="product-brand-list" :class="isShowAllBrands ? 'show' : ''">
+                            <div class="brand-list" @click="choiceBrandAll" :class="isAllcheckedBrand ? 'checked' : ''"><a href="javascript:void(0)">全部</a></div>
+                            <div class="brand-list" v-for="(brand,index) in brandLists" :key="index"
+                                 @click="choiceBrand(brand, index)" :class="brand.isChecked ? 'checked' : ''">
+                                <a href="javascript:void(0)" :title="brand.name" v-html="brand.name"></a>
+                            </div>
+                        </div>
+                        <div class="product-brand-more" v-if="defaultBrandLists.length>8" :class="isShowAllBrands ? 'show' : ''" @click="showMoreItem">{{
+                            isShowAllBrands ? '收起' : '查看全部' }} <i
+                                    class="icon mIcon"></i></div>
+                        <div class="product-screen-btn" @click="handleConfirmScreen">
+                            <div class="sub-button">确定</div>
+                        </div>
+                    </div>
                 </div>
-                <div class="sortBox-new" @click="hanldCheckedNewsHref">
-                    <span class="coll-checked" :class="[isNewsChecked ? 'checked': '']"></span>
-                    <span>新品</span>
+            </template>
+            <!--排序-->
+            <div class="sortBox">
+                <ul class="mfc clear">
+                    <li :class="{'on':params.sortField == ''}" @click="toSortList('',1)">综合</li>
+                    <template>
+                        <li v-if="params.sortField == 'sales' && params.sortType == 1" class="down"
+                            @click="toSortList('sales',0)"><span>销量</span></li>
+                        <li v-else-if="params.sortField == 'sales' && params.sortType == 0" class="up"
+                            @click="toSortList('sales',1)"><span>销量</span></li>
+                        <li v-else @click="toSortList('sales',0)"><span>销量</span></li>
+                    </template>
+                    <template>
+                        <li v-if="params.sortField == 'favorite' && params.sortType == 1" class="down"
+                            @click="toSortList('favorite',0)"><span>人气</span></li>
+                        <li v-else-if="params.sortField == 'favorite' && params.sortType == 0" class="up"
+                            @click="toSortList('favorite',1)"><span>人气</span></li>
+                        <li v-else @click="toSortList('favorite',0)"><span>人气</span></li>
+                    </template>
+                    <template>
+                        <li v-if="params.sortField == 'price' && params.sortType == 1" class="down"
+                            @click="toSortList('price',0)"><span>价格</span></li>
+                        <li v-else-if="params.sortField == 'price' && params.sortType == 0" class="up"
+                            @click="toSortList('price',1)"><span>价格</span></li>
+                        <li v-else @click="toSortList('price',0)"><span>价格</span></li>
+                    </template>
+                    <template v-if="!isPC">
+                        <li class="screen" @click="showIsProductScreen">
+                            <span>筛选</span>
+                            <i class="mIcon"></i>
+                        </li>
+                    </template>
+                </ul>
+                <div class="sortBox-checked" v-if="isPC">
+                    <div class="sortBox-new" @click="hanldCheckedActiviHref">
+                        <span class="coll-checked" :class="[isActiviChecked ? 'checked': '']"></span>
+                        <span>促销商品</span>
+                    </div>
+                    <div class="sortBox-new" @click="hanldCheckedNewsHref">
+                        <span class="coll-checked" :class="[isNewsChecked ? 'checked': '']"></span>
+                        <span>新品</span>
+                    </div>
                 </div>
             </div>
-        </div>
-        <!--商品列表-->
-        <ul class="productList clear mfw">
-            <li class="productItem " v-for="p in listData">
-                <a class="image" :href="'/product-'+p.productId+'.html'">
-                    <img src="/img/base/placeholder.png" :data-original="p.image" :alt="p.name">
-                    <p class="name" v-html="addhtml + p.name" v-if="p.beautyActFlag==1"></p>
-                    <p class="name" v-html="p.name" v-else></p>
-                    <div class="price">
-                        <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
-                        <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
-                            <div class="price_text_tag clear">
-                                <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
-                                <template v-if="p.svipProductFlag === 1">
-                                    <div class="svip-tag">
-                                        <div class="svip-icon">SVIP</div>
-                                        <template v-if="showVipPriceTag(p)">
-                                            <div class="svip-price">
-                                                <span v-html="p.svipPriceTag"></span>
-                                            </div>
-                                        </template>
+            <!--商品列表-->
+            <ul class="productList clear mfw">
+                <li class="productItem " v-for="p in listData">
+                    <a class="image" :href="'/product-'+p.productId+'.html'">
+                        <img src="/img/base/placeholder.png" :data-original="p.image" :alt="p.name">
+                        <p class="name" v-html="addhtml + p.name" v-if="p.beautyActFlag==1"></p>
+                        <p class="name" v-html="p.name" v-else></p>
+                        <div class="price">
+                            <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
+                            <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
+                                <div class="price_text_tag clear">
+                                    <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
+                                    <template v-if="p.svipProductFlag === 1">
+                                        <div class="svip-tag">
+                                            <div class="svip-icon">SVIP</div>
+                                            <template v-if="showVipPriceTag(p)">
+                                                <div class="svip-price">
+                                                    <span v-html="p.svipPriceTag"></span>
+                                                </div>
+                                            </template>
+                                        </div>
+                                    </template>
+                                    <template v-else>
+                                        <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>
+                                    </template>
+                                </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 && GLOBAL_VIP_FLAG!=1">
+                                    ¥会员可见
+                                </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) || (p.svipProductFlag === 1 && showVipPriceTag(p))}">
+                                        ¥{{ (PromotionsFormat(p.promotions) || showVipPriceTag(p) ? p.originalPrice :
+                                        p.price ) | NumFormat }}
                                     </div>
                                 </template>
-                                <template v-else>
-                                    <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>
-                                </template>
-                            </div>
-                            <!--0公开价格 1不公开价格 2仅对会员机构公开-->
-                            <div class="main_price_unde" v-if="p.priceFlag==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) || (p.svipProductFlag === 1 && showVipPriceTag(p))}">
-                                    ¥{{ (PromotionsFormat(p.promotions) || showVipPriceTag(p) ? p.originalPrice :
-                                    p.price ) | NumFormat }}
+                                <!--供应商除自己的商品外,也显示价格等级-->
+                                <div class="price_grade" v-else><span class="bold">¥</span><i
+                                        :class="'icon mIcon i'+p.priceGrade"></i></div>
+                            </template>
+                            <template v-else>
+                                <div class="price_text_tag">
+                                    <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
+                                    <template v-if="p.svipProductFlag === 1">
+                                        <div class="svip-tag">
+                                            <div class="svip-icon">SVIP</div>
+                                        </div>
+                                    </template>
+                                    <template v-else>
+                                        <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                    </template>
                                 </div>
+                                <div class="price_grade"><span class="bold">¥</span><i
+                                        :class="'icon mIcon i'+p.priceGrade"></i></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>
-                        <template v-else>
-                            <div class="price_text_tag">
-                                <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
-                                <template v-if="p.svipProductFlag === 1">
-                                    <div class="svip-tag">
-                                        <div class="svip-icon">SVIP</div>
-                                    </div>
-                                </template>
-                                <template v-else>
-                                    <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
-                                </template>
-                            </div>
-                            <div class="price_grade"><span class="bold">¥</span><i
-                                    :class="'icon mIcon i'+p.priceGrade"></i></div>
-                        </template>
-                    </div>
-                </a>
-            </li>
-        </ul>
+                        </div>
+                    </a>
+                </li>
+            </ul>
+        </template>
     </template>
     <!--分页-->
     <div v-if="(!isPC) && noMore" class="noMore">---- 没有更多了 ----</div>

+ 4 - 2
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 && GLOBAL_VIP_FLAG!=1">¥会员可见</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,8 +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="price_grade" v-else><span class="bold">¥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                             </template>

+ 8 - 4
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 && GLOBAL_VIP_FLAG!=1">
+                                    ¥会员可见
+                                </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,10 +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="price_grade" v-else><span class="bold">¥</span><i :class="'icon mIcon i'+pros.priceGrade"></i></div>
                             </div>

+ 5 - 1
src/main/resources/templates/product/promotions.html

@@ -57,13 +57,17 @@
                                     <em class="p" v-text="'¥'+parseFloat(p.price).toFixed(2)"></em>
                                     <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                 </template>
-                                <template v-else-if="p.priceFlag==2 && p.userIdentity==4">
+                                <template v-else-if="p.priceFlag==2 && p.userIdentity==4 && GLOBAL_VIP_FLAG!=1">
                                     <em>¥会员可见</em>
                                     <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                     <div class="btnBox">
                                         <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>

+ 8 - 8
src/main/resources/templates/product/temporary.html

@@ -103,7 +103,7 @@
                                                             </div>
                                                         </template>
                                                         <template
-                                                                v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
+                                                                v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4 && GLOBAL_VIP_FLAG!=1">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}</p>
@@ -200,7 +200,7 @@
                                                             </div>
                                                         </template>
                                                         <template
-                                                                v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
+                                                                v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4 && GLOBAL_VIP_FLAG!=1">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}</p>
@@ -299,7 +299,7 @@
                                                             </div>
                                                         </template>
                                                         <template
-                                                                v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
+                                                                v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4 && GLOBAL_VIP_FLAG!=1">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}</p>
@@ -402,7 +402,7 @@
                                                             </div>
                                                         </template>
                                                         <template
-                                                                v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
+                                                                v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4 && GLOBAL_VIP_FLAG!=1">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}</p>
@@ -494,7 +494,7 @@
                                                             </div>
                                                         </template>
                                                         <template
-                                                                v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
+                                                                v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4 && GLOBAL_VIP_FLAG!=1">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}</p>
@@ -585,7 +585,7 @@
                                                             </div>
                                                         </template>
                                                         <template
-                                                                v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
+                                                                v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4 && GLOBAL_VIP_FLAG!=1">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}</p>
@@ -677,7 +677,7 @@
                                                             </div>
                                                         </template>
                                                         <template
-                                                                v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
+                                                                v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4 && GLOBAL_VIP_FLAG!=1">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}</p>
@@ -767,7 +767,7 @@
                                                             </div>
                                                         </template>
                                                         <template
-                                                                v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
+                                                                v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4 && GLOBAL_VIP_FLAG!=1">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}</p>

+ 1 - 0
src/main/resources/templates/shopping/cart.html

@@ -195,6 +195,7 @@
                         <em v-else-if="cart.status==5">价格仅会员可见,您不能购买</em>
                         <em v-else-if="cart.status==6">未公开价格</em>
                         <em v-else-if="cart.status==7">库存不足</em>
+                        <em v-else-if="cart.status==8">价格仅医美机构可见</em>
                         <em v-else>商品已失效</em>
                     </div>
                     <div v-if="isPC" class="c6"><span class="del" @click="deleteCartOne(cart.productId)">×<em class="tips">删除</em></span></div>

+ 6 - 2
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 && GLOBAL_VIP_FLAG!=1">¥会员可见</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>

+ 48 - 23
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 && GLOBAL_VIP_FLAG!=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==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>