标签修改/bug修改

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

@@ -43,7 +43,7 @@
     .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 .price_text_tag .couponTag{margin: 0 8px 0 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_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;}

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

@@ -37,7 +37,7 @@ 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 .price_text_tag .couponTag{margin: 0 8px 0 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_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;}

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

@@ -24,7 +24,7 @@ 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 .price_text_tag .couponTag{margin: 0 8px 0 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_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;}
@@ -35,6 +35,15 @@ li{list-style:none}
     .listTitle p{text-indent:1em;line-height:36px;font-size:16px}
     .listTitle p em{color:#e15616;font-style:normal;display:inline-block;height:24px;line-height:24px;padding:0 10px;background:#FFF}
     .productItem .name span.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;margin-top: 2px;}
+    /*会员标签*/
+    .productItem .price .price_text_tag {-webkit-transform: scale(0.8) translateX(-18px);-ms-transform: scale(0.8) translateX(-18px);transform: scale(0.8) translateX(-18px)}
+    .productItem .price .price_text_tag .svip-tag,
+    .productItem .price .price_text_tag .listTag{-webkit-transform: translateX(4px);-ms-transform: translateX(4px);transform: translateX(4px)}
+    .productItem .price .price_text_tag .svip-tag{width:100%;height:22px;letter-spacing:0}
+    .productItem .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}
+    .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:24px;padding-right:2px;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}
 
 }
 /**

src/main/resources/static/js/pay/caimei-paycash.js

@@ -127,8 +127,9 @@ var payContainer = new Vue({
         },
         PayMobileSubmitFn:function(){//点击移动支付方式
             var _self = this;
-            if(_self.pageType === '2'){
-                return _self.PayOrderOnLineSwitch();
+            if(_self.isPaySwitch && _self.pageType === '2'){
+                CAIMEI.dialog('支付系统遇到点小问题，请稍后重试', false);
+                return;
             }
             if(_self.invoiceStatus){
                 _self.layerConfirm();
@@ -246,6 +247,10 @@ var payContainer = new Vue({
         },
         PaySubmitFn:function(){//点击网银支付方式
             var _self = this;
+            if(_self.isPaySwitch && _self.pageType === '2'){
+                CAIMEI.dialog('支付系统遇到点小问题，请稍后重试', false);
+                return;
+            }
             if(_self.invoiceStatus){
                 _self.layerConfirm();
             }else{
@@ -420,6 +425,10 @@ var payContainer = new Vue({
         },
         copyLinkPaySubmitFn:function(){//复制网银支付链接
             var _self = this;
+            if(_self.isPaySwitch && _self.pageType === '2'){
+                CAIMEI.dialog('支付系统遇到点小问题，请稍后重试', false);
+                return;
+            }
             if(_self.invoiceStatus){
                 _self.layerConfirm();
             }else{

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

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

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

@@ -30,6 +30,10 @@ 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));
+        },
         getListByKeyword: function () {
             var _self = this;
             ProductApi.QueryCouponActivityList(_self.listQuery,function (response) {

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

@@ -282,7 +282,7 @@ var memberPage = new Vue({
                 return CAIMEI.dialog('暂无可选套餐~', false);
             }
             this.fetchSuperPackage();
-            this.currentIndex = 1;
+            this.currentIndex = 0;
             this.showMask = true;
             this.showRenewPopup = true;
         },

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

@@ -137,7 +137,7 @@
                                     <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)}">
-                                            <span>￥{{ (PromotionsFormat(p.promotions) ? p.originalPrice : p.price ) | NumFormat }}</span>
+                                            <span>￥{{ (PromotionsFormat(p.promotions) || showVipPriceTag(p) ? p.originalPrice : p.price ) | NumFormat }}</span>
                                         </div>
                                     </template>
                                     <!--会员可见-->

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

@@ -147,7 +147,7 @@
                                                     <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-if="showVipPriceTag(pros.product) || PromotionsFormat(pros.product.promotions)">{{ pros.product.originalPrice | NumFormat }}</span>
                                                               <span class="price_num" v-else>{{ pros.product.price | NumFormat }}</span>
                                                         </div>
                                                     </template>

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

@@ -139,7 +139,7 @@
                             <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 }}
+                                    ￥{{ (PromotionsFormat(p.promotions) || showVipPriceTag(p) ? p.originalPrice : p.price ) | NumFormat }}
                                 </div>
                             </template>
                             <!--机构价仅会员可见 && 用户是普通机构-->

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

@@ -18,7 +18,7 @@
     </div>
     <template v-else>
         <!--banner图-->
-        <div class="coupon-banner">
+        <div class="coupon-banner" v-if="appletsBanner">
             <a href='javascript:void(0)'>
                 <img :src="pcBanner" v-if="isPC">
                 <img :src="appletsBanner" v-else>
@@ -35,45 +35,49 @@
                         <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">
-                                        <div class="price_text_tag">
-<!--                                            <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>
-                                        <div class="main_price_show" :class="PromotionsFormat(p.promotions) ? 'none' : ''">
-                                            ￥{{ (PromotionsFormat(p.promotions) ? p.originalPrice : p.price ) | NumFormat }}
+                                <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-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="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>
+                                        <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>
                                 </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>-->
-                                    <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                <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>

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

@@ -88,7 +88,7 @@
                                             <!--机构价格-->
                                             <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 }}
+                                                    ￥{{ (PromotionsFormat(p.promotions) || showVipPriceTag(p) ? p.originalPrice : p.price ) | NumFormat }}
                                                 </div>
                                             </template>
                                             <!--机构价仅会员可见 && 用户是普通机构-->

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

@@ -57,7 +57,7 @@
                                 </div>
                                 <div class="pay-btn plain" onclick="_czc.push(['_trackEvent','开通超级会员','超级会员','采美豆抵扣1','','Um_Event_RegisterSuperByBeansOne'])">
                                     <a href="javascript:void(0);" @click="payAction(2, 1)">
-                                        抵扣{{ comboInfo[currentIndex].price * comboInfo[currentIndex].proportion }}个采美豆开通
+                                        或抵扣{{ comboInfo[currentIndex].price * comboInfo[currentIndex].proportion }}个采美豆开通
                                     </a>
                                 </div>
                             </div>
@@ -166,7 +166,7 @@
                     </div>
                     <div class="pay-btn plain" onclick="_czc.push(['_trackEvent','续费超级会员','超级会员','采美豆抵扣','','Um_Event_RenewSuperPayByBeans'])">
                         <a href="javascript:void(0);" @click="payAction(2, 3)">
-                            抵扣{{ comboInfo[currentIndex].price * comboInfo[currentIndex].proportion }}个采美豆开通
+                            或抵扣{{ comboInfo[currentIndex].price * comboInfo[currentIndex].proportion }}个采美豆开通
                         </a>
                     </div>
                 </div>