接口调用

src/main/resources/static/css/base/floor.css

@@ -58,7 +58,7 @@
 .section_page .page_main_price .price_text_tag .svip-tag{width:100%;height:22px;letter-spacing:0}
 .section_page .page_main_price .price_text_tag .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}
 .section_page .page_main_price .price_text_tag .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
-.section_page .page_main_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}
+.section_page .page_main_price .price_text_tag .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}
 .section_page .page_main_price .price_text_tag .svip-tag .svip-price span{color: #333}
 
 .section_page .section_page_more{width:100%;height:32px;margin-top:16px;float:left;display:none}

src/main/resources/static/css/shopping/shopping.css

@@ -235,7 +235,7 @@ li{list-style:none}
     .listWrap .cartItem .priceTag .svip-tag{width:100%;height:22px;letter-spacing:0}
     .listWrap .cartItem .priceTag .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}
     .listWrap .cartItem .priceTag .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
-    .listWrap .cartItem .priceTag .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:14px}
+    .listWrap .cartItem .priceTag .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:14px}
     .listWrap .cartItem .priceTag .svip-tag .svip-price span{color: #333}
 
 }

src/main/resources/static/css/user-center/member/member-page.css

@@ -53,7 +53,7 @@
 .goods-list .goods a:hover{color:unset}
 .goods-list .goods{width:173px}
 
-.goods-list .goods img{display:block;width:184px;height:184px;-webkit-box-sizing:border-box;box-sizing:border-box}
+.goods-list .goods img{display:block;width:184px;height:184px;-webkit-box-sizing:border-box;box-sizing:border-box;border: 1px dashed #f1f1f1;}
 .goods-list .goods .goods-price,
 .goods-list .goods .goods-title,
 .goods-list .goods .goods-tag{padding: 0 8px;}
@@ -151,7 +151,7 @@
 .goods-list .goods{display:inline-block;width:34.9vw;margin-right:2.4vw}
 .goods-list .goods:first-child{margin-left:3.3vw}
 
-.goods-list .goods img{border: 1px dashed #d4d4d4; box-sizing: border-box;}
+.goods-list .goods img{border: 1px dashed #f1f1f1; box-sizing: border-box;}
 
 .goods-list .goods .goods-title{white-space:pre-wrap;height:9.2vw;margin-top:0.8vw;font-size:3.4vw;font-weight:400;line-height:4.7vw;color:#627386}
 .goods-list .goods .goods-tag{margin:1.6vw 0}

src/main/resources/static/css/user-center/order/detail.css

@@ -52,7 +52,7 @@ li{list-style:none}
     .order-container .section-shopinfo .product-t .info>.col .svip-tag{width:100%;height:22px;letter-spacing:0;display: inline;margin-left: 10px;}
     .order-container .section-shopinfo .product-t .info>.col .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}
     .order-container .section-shopinfo .product-t .info>.col .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
-    .order-container .section-shopinfo .product-t .info>.col .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:14px}
+    .order-container .section-shopinfo .product-t .info>.col .svip-tag .svip-price{z-index:1;position:relative;display:inline-block;padding-left:25px;padding-right:4px;margin-left:-27px;line-height:22px;background:#F0CB72;opacity:1;border-radius:2px;font-size:14px}
     .order-container .section-shopinfo .product-t .info>.col .svip-tag .svip-price span{color: #333}
 
     .order-container .section-shopinfo .product-t .price>p{line-height:24px;font-size:14px;color:#627386;text-align:left;display:inline-block;width:30%}

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

@@ -20,7 +20,7 @@ var homeData = new Vue({
     methods: {
         // 是否显示vip标签价格
         showVipPriceTag: function(product){
-            return (product.priceFlag !== 1 && ((GLOBAL_USER_IDENTITY === 4 && GLOBAL_VIP_FLAG === 1) || GLOBAL_USER_IDENTITY === 2));
+            return (product.priceFlag !== 1 && product.svipProductFlag === 1 && ((GLOBAL_USER_IDENTITY === 4 && GLOBAL_VIP_FLAG === 1) || GLOBAL_USER_IDENTITY === 2));
         },
         popupPage:function(){  // 弹窗点击跳转链接
             var _self = this;

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

@@ -24,7 +24,7 @@
      methods:{
         // 是否显示vip标签价格
         showVipPriceTag: function(product){
-            return (product.priceFlag !== 1 && ((GLOBAL_USER_IDENTITY === 4 && GLOBAL_VIP_FLAG === 1) || GLOBAL_USER_IDENTITY === 2));
+            return (product.priceFlag !== 1 && product.svipProductFlag === 1 && ((GLOBAL_USER_IDENTITY === 4 && GLOBAL_VIP_FLAG === 1) || GLOBAL_USER_IDENTITY === 2));
         },
 
         closeup:function(){

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

@@ -56,7 +56,7 @@ var productList = new Vue({
     methods: {
         // 是否显示vip标签价格
         showVipPriceTag: function(product){
-            return (product.priceFlag !== 1 && ((GLOBAL_USER_IDENTITY === 4 && GLOBAL_VIP_FLAG === 1) || GLOBAL_USER_IDENTITY === 2));
+            return (product.priceFlag !== 1 && product.svipProductFlag === 1 && ((GLOBAL_USER_IDENTITY === 4 && GLOBAL_VIP_FLAG === 1) || GLOBAL_USER_IDENTITY === 2));
         },
         toPagination: function (pageNum) {
             if (pageNum <= this.pageTotal) {

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

@@ -38,7 +38,7 @@ var productList = new Vue({
     methods:{
         // 是否显示vip标签价格
         showVipPriceTag: function(product){
-            return (product.priceFlag !== 1 && ((GLOBAL_USER_IDENTITY === 4 && GLOBAL_VIP_FLAG === 1) || GLOBAL_USER_IDENTITY === 2));
+            return (product.priceFlag !== 1 && product.svipProductFlag === 1 && ((GLOBAL_USER_IDENTITY === 4 && GLOBAL_VIP_FLAG === 1) || GLOBAL_USER_IDENTITY === 2));
         },
         getproductList:function(){//商品列表
            var _self=this;

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

@@ -25,6 +25,10 @@ var supplierHome = new Vue({
         }
     },
     methods: {
+        // 是否显示vip标签价格
+        showVipPriceTag: function(product){
+            return (product.priceFlag !== 1 && ((GLOBAL_USER_IDENTITY === 4 && GLOBAL_VIP_FLAG === 1) || GLOBAL_USER_IDENTITY === 2));
+        },
         getShopInfo: function(){
             var _self = this;
             $.getJSON(spiServer + "/supplier/home/detail",{supplierId: this.params.id}).done(function (r) {

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

@@ -128,6 +128,7 @@ var memberPage = new Vue({
                 if (res.code === 0) {
                     _self.vipInfo = res.data.vip;
                     window.localStorage.setItem('vipInfo', JSON.stringify(_self.vipInfo));
+                    _self.couponList = res.data
                 } else {
                     CAIMEI.Alert(response.msg, '确定', false);
                     _self.isRequset = false;
@@ -202,6 +203,12 @@ var memberPage = new Vue({
                 }
             })
         },
+        // 领取专属优惠券
+        receiveCoupon: function(id){
+           ProductApi.ReceiveCoupon({},function(response){
+
+           })
+        },
         // 续费弹窗
         handleShowRenewPopup: function(){
             this.fetchSuperPackage();
@@ -256,11 +263,11 @@ var memberPage = new Vue({
                 if (priceFlag === 1) {
                     return '￥价格未公开'
                 }
-                if (priceFlag === 2 && GLOBAL_USER_IDENTITY !== 2) {
+                if ((priceFlag === 2 && GLOBAL_USER_IDENTITY !== 2) && GLOBAL_VIP_FLAG !== 1) {
                     return '￥会员可见'
                 }
                 // 价格可见
-                if ((priceFlag === 0 && userIdentity !== 3) || (GLOBAL_USER_IDENTITY === 2) || (userIdentity === 3 && GLOBAL_SHOP_ID === shopID)) {
+                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)) {
                         return '<del>￥' + originalPrice + '</del>'
                     }

src/main/resources/templates/index.html

@@ -169,7 +169,7 @@
                                                         <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
                                                         <template v-if="pros.product.svipProductFlag === 1">
                                                             <div class="svip-tag">
-                                                                <div class="svip-icon" :class="{ btr: showVipPriceTag(pros.product) }">SVIP</div>
+                                                                <div class="svip-icon">SVIP</div>
                                                                 <!-- 公开价格 && (个人机构 || 资质机构) && 开通SVIP 可查看价格-->
                                                                 <template v-if="showVipPriceTag(pros.product)">
                                                                     <div class="svip-price">
@@ -189,36 +189,26 @@
                                                         </template>
                                                     </div>
                                                     <div class="main_price_login">
-                                                        <!--0公开价格 1不公开价格 2仅对会员机构公开-->
+                                                        <!--priceFlag 0公开价格 1不公开价格 2仅对会员机构公开-->
                                                         <template v-if="pros.product.priceFlag == 1">
                                                             <em class="price_grade"><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)}">
+                                                                ￥<span class="price_num" v-if="showVipPriceTag(pros.product)">{{ pros.product.originalPrice | NumFormat }}</span>
+                                                                <span class="price_num" v-else>{{ pros.product.price | NumFormat }}</span>
+                                                            </div>
+                                                        </template>
+                                                        <!--机构价仅会员可见 && 用户是普通机构-->
+                                                        <template v-else-if="pros.product.priceFlag==2 && GLOBAL_USER_IDENTITY === 4">
+                                                            <em class="price_grade_club"><span>￥</span>会员可见</em>
+                                                        </template>
                                                         <template v-else>
-                                                            <template v-if="PromotionsFormat(pros.product.promotions)">
-                                                                <!--单品优惠时的划线价-->
-                                                                <div class="main_price_show none">
-                                                                    ￥<span class="price_o_num">{{ pros.product.originalPrice | NumFormat }}</span>
-                                                                </div>
-                                                            </template>
-                                                            <!-- 资质机构 || (价格全部机构可见 && 用户为普通机构) || (用户为供应商 && 商品为供应商下的商品) -->
-                                                            <template v-else-if="GLOBAL_USER_IDENTITY === 2 || (pros.product.priceFlag === 2 && pros.product.userIdentity === 4) || (pros.product.userIdentity === 3 && pros.product.shopID==GLOBAL_SHOP_ID)">
-                                                                <!--机构价划线：商品有超级会员优惠价格 && 用户开通了超级会员-->
-                                                                <div class="main_price_show" :class="{none:pros.product.svipProductFlag == 1 && GLOBAL_VIP_FLAG === 1}">
-                                                                    ￥<span class="price_num">{{ pros.product.price | NumFormat }}</span>
-                                                                </div>
-                                                            </template>
-                                                            <!--机构价仅会员可见 && 用户是普通机构-->
-                                                            <template v-else-if="pros.product.priceFlag==2 && GLOBAL_USER_IDENTITY !== 2">
-                                                                <em class="price_grade_club">
-                                                                    <span>￥</span>会员可见
-                                                                </em>
-                                                            </template>
-                                                            <template v-else>
-                                                                <!--供应商除自己的商品外，也显示价格等级-->
-                                                                <em class="price_grade_shop">
-                                                                    <span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.priceGrade"></i>
-                                                                </em>
-                                                            </template>
+                                                            <!--供应商除自己的商品外，也显示价格等级-->
+                                                            <em class="price_grade_shop">
+                                                                <span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.priceGrade"></i>
+                                                            </em>
                                                         </template>
                                                     </div>
                                                 </template>

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

@@ -127,7 +127,7 @@
                                         <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 && p.shopId==GLOBAL_SHOP_ID)">
+                                        <template v-if="(p.priceFlag==0 && p.userIdentity!=3) || p.userIdentity==2 || (p.userIdentity==3 && p.shopId==GLOBAL_SHOP_ID) || GLOBAL_VIP_FLAG === 1">
                                            <div class="price_text_tag">
                                                 <p class="couponTag"v-if="p.couponsLogo">优惠券</p>
                                                 <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
@@ -150,8 +150,8 @@
                                                 </template>
                                             </div>
                                             <div class="main_price_show"
-                                                :class="{none: PromotionsFormat(p.promotions) || ([2, 4].includes(p.userIdentity) && true)}">
-                                                ￥{{ (PromotionsFormat(p.promotions) ? p.originalPrice : p.price ) | NumFormat }}
+                                                :class="{none: PromotionsFormat(p.promotions) || (p.svipProductFlag === 1 && showVipPriceTag(p))}">
+                                                <span>￥{{ (PromotionsFormat(p.promotions) ? p.originalPrice : p.price ) | NumFormat }}</span>
                                             </div>
                                         </template>
                                         <template v-else-if="p.priceFlag==2 && p.userIdentity==4">

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

@@ -122,9 +122,9 @@
                                                     <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
                                                     <template v-if="pros.product.svipProductFlag === 1">
                                                         <div class="svip-tag">
-                                                            <div class="svip-icon" :class="{ btr: showVipPriceTag(pros) }">SVIP</div>
+                                                            <div class="svip-icon">SVIP</div>
                                                             <!-- !价格未公开 && ((个人机构 + SVIP) || 资质机构 ) 可查看价格 -->
-                                                            <template v-if="showVipPriceTag(pros)">
+                                                            <template v-if="showVipPriceTag(pros.product)">
                                                                 <div class="svip-price">
                                                                     <span v-html="pros.product.svipPriceTag"></span>
                                                                 </div>
@@ -143,31 +143,24 @@
                                                 </div>
                                                 <div class="main_price_login">
                                                     <!--0公开价格 1不公开价格 2仅对会员机构公开-->
-                                                    <template v-if="pros.product.priceFlag == 1">
-                                                        <em class="price_grade"><span>￥</span>价格未公开</em>
+                                                    <em class="price_grade" v-if="pros.product.priceFlag == 1"><span>￥</span>价格未公开</em>
+                                                    <template v-else-if="GLOBAL_USER_IDENTITY === 2 || (pros.product.priceFlag === 0 && GLOBAL_USER_IDENTITY === 4) || (GLOBAL_USER_IDENTITY === 3 && pros.product.shopId === GLOBAL_SHOP_ID) || GLOBAL_VIP_FLAG === 1">
+                                                        <!--机构价-->
+                                                        <div class="main_price_show" :class="{none: PromotionsFormat(pros.product.promotions) || showVipPriceTag(pros.product) }">
+                                                            ￥<span class="price_num" v-if="showVipPriceTag(pros.product)">{{ pros.product.originalPrice | NumFormat }}</span>
+                                                              <span class="price_num" v-else>{{ pros.product.price | NumFormat }}</span>
+                                                        </div>
+                                                    </template>
+                                                    <template v-else-if="pros.product.priceFlag === 2 && GLOBAL_USER_IDENTITY === 4">
+                                                        <em class="price_grade_club">
+                                                            <span>￥</span>会员可见
+                                                        </em>
                                                     </template>
                                                     <template v-else>
-                                                        <template v-if="PromotionsFormat(pros.product.promotions)">
-                                                            <!--单品优惠时的划线价-->
-                                                            <div class="main_price_show none">
-                                                                ￥<span class="price_o_num">{{ pros.product.originalPrice | NumFormat }}</span>
-                                                            </div>
-                                                        </template>
-                                                        <template v-else-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
-                                                            <!--机构价-->
-                                                            <div class="main_price_show" :class="{none:pros.product.svipProductFlag == 1}">￥<span class="price_num">{{ pros.product.price | NumFormat }}</span></div>
-                                                        </template>
-                                                        <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
-                                                            <em class="price_grade_club">
-                                                                <span>￥</span>会员可见
-                                                            </em>
-                                                        </template>
-                                                        <template v-else>
-                                                            <!--供应商除自己的商品外，也显示价格等级-->
-                                                            <em class="price_grade_shop">
-                                                                <span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.priceGrade"></i>
-                                                            </em>
-                                                        </template>
+                                                        <!--供应商除自己的商品外，也显示价格等级-->
+                                                        <em class="price_grade_shop">
+                                                            <span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.priceGrade"></i>
+                                                        </em>
                                                     </template>
                                                 </div>
                                             </template>

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

@@ -113,89 +113,47 @@
                     <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">
-                        <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
-                            <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
-                            <!--0公开价格 1不公开价格 2仅对会员机构公开-->
-                            <template v-if="p.priceFlag==1">
-                                <div class="price_text_tag clear">
-                                    <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
-                                    <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
-                                    <template v-if="p.svipProductFlag === 1">
-                                        <div class="svip-tag">
-                                            <div class="svip-icon">SVIP</div>
+                        <div class="price_text_tag clear">
+                            <!--优惠券-->
+                            <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
+                            <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
+                            <template v-if="p.svipProductFlag === 1">
+                                <div class="svip-tag">
+                                    <div class="svip-icon">SVIP</div>
+                                    <!-- !价格未公开 && ((个人机构 + SVIP) || 资质机构 ) 可查看价格 -->
+                                    <template v-if="showVipPriceTag(p)">
+                                        <div class="svip-price">
+                                            <span v-html="p.svipPriceTag"></span>
                                         </div>
                                     </template>
-                                    <template v-else>
-                                        <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
-                                    </template>
                                 </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 && p.shopId==GLOBAL_SHOP_ID)">
-                                    <div class="price_text_tag clear">
-                                        <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
-                                        <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
-                                        <template v-if="p.svipProductFlag === 1">
-                                            <div class="svip-tag">
-                                                <div class="svip-icon" :class="{ btr: showVipPriceTag(p) }">SVIP</div>
-                                                <!-- !价格未公开 && ((个人机构 + SVIP) || 资质机构 ) 可查看价格 -->
-                                                <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>
-                                    <div class="main_price_show"
-                                        :class="{none: PromotionsFormat(p.promotions) || ([2, 4].includes(p.userIdentity) && true)}">
-                                        ￥{{ (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 clear">
-                                        <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
-                                        <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
-                                        <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="main_price_unde">￥会员可见</div>
-                                </template>
-                                <template v-else>
-                                    <div class="price_text_tag clear">
-                                        <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
-                                        <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
-                                        <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>
+                                <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、会员机构 3、供应商 4,普通机构-->
+                        <!--0公开价格 1不公开价格 2仅对会员机构公开-->
+                        <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
+                            <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) ? 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>
                         <template v-else>
-                            <div class="price_text_tag clear ">
+                            <div class="price_text_tag ">
                                 <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
-                                <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
-                                <template v-if="p.svipProductFlag === 1">
+                                <template v-if="true">
                                     <div class="svip-tag">
                                         <div class="svip-icon">SVIP</div>
                                     </div>
@@ -204,7 +162,7 @@
                                     <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>
+                            <div class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                         </template>
                     </div>
                 </a>

src/main/resources/templates/shopping/cart.html

@@ -106,7 +106,7 @@
                                 <div class="priceTag">
                                     <!--超级会员价格标签-->
                                     <div class="svip-tag">
-                                        <div class="svip-icon btr">SVIP</div>
+                                        <div class="svip-icon">SVIP</div>
                                         <div class="svip-price">
                                             <span v-html="cart.svipPriceTag"></span>
                                         </div>

src/main/resources/templates/shopping/confirm.html

@@ -152,7 +152,7 @@
                                 <div class="priceTag" v-if="cart.svipProductFlag == 1 && GLOBAL_VIP_FLAG === 1">
                                     <!--超级会员价格标签-->
                                     <div class="svip-tag">
-                                        <div class="svip-icon btr">SVIP</div>
+                                        <div class="svip-icon">SVIP</div>
                                         <div class="svip-price">
                                             <span v-html="cart.svipPriceTag"></span>
                                         </div>

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

@@ -65,71 +65,41 @@
                                 <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="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
-                                            </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 && p.shopId==GLOBAL_SHOP_ID)">
-                                                <div class="price_text_tag">
-                                                    <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
-                                                    <template v-if="true">
-                                                        <div class="svip-tag">
-                                                            <div class="svip-icon btr">SVIP</div>
-                                                            <div class="svip-price">
-                                                                <span>￥</span><span>9999999.00</span>
-                                                            </div>
-                                                        </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>
-                                                <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>
-                                                    <template v-if="true">
-                                                        <div class="svip-tag">
-                                                            <div class="svip-icon btr">SVIP</div>
-                                                        </div>
-                                                    </template>
-                                                    <template v-else>
-                                                        <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
-                                                    </template>
+                                        <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 class="svip-price" v-if="showVipPriceTag(p)">
+                                                        <span>￥</span><span v-html="p.svipPriceTag"></span>
+                                                    </div>
                                                 </div>
-                                                <div class="main_price_unde">￥会员可见</div>
                                             </template>
                                             <template v-else>
-                                                <div class="price_text_tag">
-                                                    <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
-                                                    <template v-if="true">
-                                                        <div class="svip-tag">
-                                                            <div class="svip-icon btr">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>
+                                                <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>
+                                        <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) || showVipPriceTag(p)}">
+                                                ￥{{ (PromotionsFormat(p.promotions) ? 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>
                                     <template v-else>
                                         <div class="price_text_tag ">
                                             <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
                                             <template v-if="true">
                                                 <div class="svip-tag">
-                                                    <div class="svip-icon btr">SVIP</div>
+                                                    <div class="svip-icon">SVIP</div>
                                                 </div>
                                             </template>
                                             <template v-else>

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

@@ -25,7 +25,7 @@
                     <div class="svip-tag">
                         <div class="svip-icon " :class="{ btr: product.priceFlag != 1 && product.userIdentity === 2 }">SVIP</div>
                         <!-- 公开价格 && (个人机构 || 资质机构) && 开通SVIP 可查看价格-->
-                        <template v-if="product.priceFlag != 1 && (product.userIdentity === 4 && GLOBAL_VIP_FLAG === 1) || product.userIdentity === 2">
+                        <template v-if="GLOBAL_USER_IDENTITY === 2 || (product.priceFlag === 0 && GLOBAL_USER_IDENTITY === 4) || (GLOBAL_USER_IDENTITY === 3 && product.shopID==GLOBAL_SHOP_ID) || GLOBAL_VIP_FLAG === 1">
                             <div class="svip-price">
                                 <span v-html="product.svipPriceTag"></span>
                             </div>

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

@@ -103,9 +103,9 @@
                                 <div class="goods-tag">
                                     <span class="tag styl1" v-if="true">优惠券</span>
                                     <div class="svip-tag">
-                                        <div class="svip-icon " :class="{ btr: product.priceFlag != 1 && product.userIdentity === 2 }">SVIP</div>
+                                        <div class="svip-icon ">SVIP</div>
                                         <!-- 公开价格 && (个人机构 || 资质机构) && 开通SVIP 可查看价格-->
-                                        <template v-if="product.priceFlag != 1 && (product.userIdentity === 4 && GLOBAL_VIP_FLAG === 1) || product.userIdentity === 2">
+                                        <template v-if="GLOBAL_USER_IDENTITY === 2 || (product.priceFlag === 0 && GLOBAL_USER_IDENTITY === 4) || (GLOBAL_USER_IDENTITY === 3 && product.shopID==GLOBAL_SHOP_ID) || GLOBAL_VIP_FLAG === 1">
                                             <div class="svip-price">
                                                 <span v-html="product.svipPriceTag"></span>
                                             </div>

src/main/resources/templates/user-center/order/detail.html

@@ -73,6 +73,7 @@
                                     <p v-if="orderInfo.discountFee>0">经理折扣：<span class="none">￥{{orderInfo.discountFee | NumFormat}}</span> </p>
                                     <p v-if="orderInfo.promotionFullReduction>0">促销满减：<span class="red">￥{{orderInfo.promotionFullReduction | NumFormat}}</span> </p>
                                     <p>优惠券：<span class="red">￥{{orderInfo.couponAmount | NumFormat}}</span> </p>
+                                    <p v-if="orderInfo.svipFullReduction">超级会员优惠：<span class="red">￥{{orderInfo.svipFullReduction | NumFormat}}</span> </p>
                                     <p v-if="orderInfo.presentCount>0">赠品数：<span class="none">{{orderInfo.presentCount}}</span></p>
                                 </div>
                             </div>
@@ -115,8 +116,8 @@
                                                             <span class="none"><del>￥{{pros.price | NumFormat}}</del></span>
                                                             <!--超级会员价格标签-->
                                                             <div class="svip-tag" >
-                                                                <div class="svip-icon btr">SVIP</div>
-                                                                <div class="svip-price" v-if="pros.svipPriceType === 2">
+                                                                <div class="svip-icon">SVIP</div>
+                                                                <div class="svip-price">
                                                                     <span v-html="pros.svipPriceTag"></span>
                                                                 </div>
                                                             </div>
@@ -124,7 +125,7 @@
                                                         <p v-else>单价： <span class="none">￥{{pros.price | NumFormat}}</span></p>
                                                     </div>
                                                     <p class="col">税率：<span class="none">{{pros.taxRate}}%</span></p>
-                                                    <p class="col">折扣：<span class="none">{{pros.discount == null ? '0' : pros.discount}}%</span></p>
+                                                    <p class="col" v-if="pros.svipPriceType === 2">折扣：<span class="none">{{pros.discount == null ? '0' : pros.discount}}%</span></p>
                                                     <p class="col">折后单价：<span class="none">￥{{pros.discountPrice | NumFormat}}</span></p>
                                                     <!-- 促销活动 -->
                                                     <div v-if="pros.productPromotion && pros.productPromotion.type !=3" class="priceTag">