促销

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

@@ -107,7 +107,7 @@
 .productItem .item .name em{font-style: normal;color: #e15616;}
 .productItem .item .price{height:21vw;text-align:center}
 .productItem .item .price em{display:block;height:7vw;line-height:7vw;color:#4A4F58;font-style:normal;}
-.productItem .item .price em.p{color:#F55C5C}
+/*.productItem .item .price em.p{color:#F55C5C}*/
 .productItem .item .price .icon{display:inline-block;font-size:0;height:5vw;line-height:5vw;vertical-align:text-bottom;}
 .productItem .item .price .icon:before{width:11vw;height:5vw;}
 .productItem .item .price .icon.i0:before{background-position:0 -23.2vw}
@@ -148,4 +148,83 @@
     .mIcon.three{background-image: url(/img/base/baseH5/Grade3.png)}
     .mIcon.four{background-image: url(/img/base/baseH5/Grade4.png)}
     .mIcon.five{background-image: url(/img/base/baseH5/Grade5.png)}
-
+ .activity{
+    text-align: center;
+    display: inline-block;
+    height: 6vw;
+    border: 0.25vw solid rgba(225,86,22,0.30196078431372547);
+    opacity: 1;
+    border-radius: .2vw;
+    font-size: 3vw;
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    line-height: 6vw;
+    color: rgba(225,86,22,1) !important;
+    position: relative;
+    z-index: 1;
+    cursor: pointer;
+    background: #fff;
+    padding: 0px 5vw 0 1.25vw;
+ }
+.activity .icon {
+    width: 3.7vw;
+    height: 3.7vw;
+    position: absolute;
+    top: 2.5vw;
+    background: transparent url(/img/base/tubiao@2x.png) no-repeat no-repeat scroll right 1.25vw center;
+    background-position: -168px -48px;
+    right: 0
+}
+.activity  .activeicon{
+    background-position: -207px -46px;
+        top: 8px;
+}
+.activityBox{
+    border: .25vw solid rgba(225,86,22,0.30196078431372547);
+    border-radius: 0px 2px 2px 2px;
+    position: absolute;
+    background: #fff;
+    left: 0;
+    font-size: 3vw;
+    text-align: center;
+    top: 7vw;
+    padding: 2vw;
+    max-height: 31.9vw;
+    overflow: auto
+}
+.activeBtn{
+    width: 57px;
+    height: 24px;
+    background: #E15616;
+    color: #fff;
+    border-radius: 2px;
+    float: right;
+    margin-top: 10px;
+    cursor: pointer;
+}
+.btnBox a {
+    color: #fff;
+    font-size: 3vw;
+    text-align: center;
+}
+.pricebox{
+    background: #e15616;
+    width: 42.5vw;
+    height: 10.5vw;
+    line-height: 5vw;
+    display: block;
+    font-size: 3vw
+}
+.productItem .price em {
+    font-weight: bold;
+}
+.login-btn{
+    width: 14vw;
+    height: 5vw;
+    background: #FBEDE6;
+    text-align: center;
+    line-height: 5vw;
+    font-size: 3vw;
+    color: #e15616;
+    padding: 0.5vw 1.25vw
+}

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

@@ -193,7 +193,8 @@ header{box-shadow: 0 2px 10px #ebecef;}
 .productItem .price .icon.i3:before{background-position:-295px -208px}
 .productItem .price .icon.i4:before{background-position:-295px -242px}
 .productItem .price .icon.i5:before{background-position:-295px -276px}
-.productItem .btnBox{display:none;position:absolute;width:284px;height:55px;background:#E15616;text-align:center;bottom:0;left:0}
+.productItem .btnBox{display:none;position:absolute;width:284px;height:68px;background:#fef6f3;text-align:center;bottom:0;left:0}
+.btnBox a {color: #fff;font-size:12px;text-align:center;}
 .productItem .item:hover .btnBox{display:block}
 .productItem .item:hover .name span{color: #e15616;}
 .productItem .item:hover{box-shadow:0px 2px 6px #dedede;-moz-transition: all 0.5s;-webkit-transition:all 0.5s;transition:all 0.3s;-webkit-transform:translate3d(0,-2px,0);transform:translate3d(0,-2px,0);}
@@ -231,9 +232,6 @@ header{box-shadow: 0 2px 10px #ebecef;}
 #scrollTop .item .phoneHover span{color:#93979F;margin-top:10px}
 #scrollTop .item .phoneHover a:hover{text-decoration:underline}
 #scrollTop .item:hover .phoneHover{display:block}
-
-
-     a.pricebox{color: #fff;width: 100%;height: 100%;position: absolute;left: 0;line-height: 55px;font-size: 14px}
     .login-btn{float:right;
     margin:10px 10px 0 0;
     padding:2px 5px;
@@ -243,7 +241,15 @@ header{box-shadow: 0 2px 10px #ebecef;}
     height: 24px;
     line-height: 24px;
     }
-
+    .pricebox{
+    background: #e15616;
+    width: 244px;
+    height: 44px;
+    line-height: 44px;
+    display: block;
+    text-align: center;
+    margin: 12px auto
+    }
     .activity{
     text-align: center;
     display: inline-block;

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

@@ -50,7 +50,7 @@ li{list-style:none;}
 .floorTit a.more{position:absolute;right:0;top:2.6vw;height:4.6vw;line-height:4.6vw;text-decoration: underline;font-size:3vw;}
 .floorTit a.more:after{margin-left:4px;content:'\276F'}
 .floorCon{width:94vw;margin:0 auto;}
-.floorCon a{display:block;width:100%;height:100%}
+/*.floorCon a{display:block;width:100%;height:100%}*/
 .floorList{width:96vw;margin-left:-1.3vw;}
 .floorList>li{position:relative;margin:0 1.3vw 2.6vw 1.3vw;width:29.4vw;height:39.2vw;background:#FFF}
 .floorList>li:nth-of-type(1),.floorList>li:nth-of-type(2){width:45.4vw;height:55.2vw}

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

@@ -12,7 +12,7 @@ li{list-style:none}
 .productBox .detailBox .crumbs a{color:#93979F}
 .productBox .detailBox .title{font-size:4.2vw;font-weight:bold;line-height:6.4vw;color:#4A4F58;margin-bottom:3.5vw}
 .productBox .detailBox .tags span{display:inline-block;height:4.2vw;line-height:4.2vw;padding:0 1vw;font-size:2.6vw;color:#FFF;background:#86B2FF;border-radius:2px;margin-right:2.7vw}
-.productBox .detailBox .detail{box-sizing:border-box;padding:2.8vw;font-size:3.4vw;line-height:7.5vw;color:#93979F;background:#FDF8F6;border-radius:2px;position:relative;margin:3.5vw 0}
+.productBox .detailBox .detail{box-sizing:border-box;padding:2.8vw;font-size:3.4vw;line-height:7.5vw;color:#93979F;background:#f3f7fe;border-radius:2px;position:relative;margin:3.5vw 0}
 .productBox .detailBox .detail hr{border:none;border-top:1px dashed #BEC2C9;margin:2vw 0}
 .productBox .detailBox .row>i{font-style:normal;margin-right:2vw}
 .productBox .detailBox .row em{font-style:normal;color:#4A4F58}
@@ -63,3 +63,21 @@ li{list-style:none}
 .productInfo .tabCon td:nth-of-type(1){width:20%;color:#93979F}
 .productInfo .tabCon td:nth-of-type(2){width:80%;color:#4A4F58}
 .productInfo .comment{color:#93979F;padding:5vw 0}
+a.upgrade{
+    width: 40vw;
+    height: 9vw;
+    background: #F94B4B;
+    opacity: 1;
+    border-radius: 2px;
+    display: inline-block;
+    text-align: center;
+    line-height: 36px;
+    color: #FFFFFF;
+    margin: 1.7vw 1.1vw
+}
+.productBox .detailBox .row .l{
+    display: inline-block;
+    min-width: 14.5vw;
+    text-align-last: justify;
+    vertical-align: top
+}

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

@@ -23,7 +23,7 @@ li{list-style:none;}
 .productBox .detailBox .title{font-size:18px;font-weight:bold;line-height:24px;padding:5px 0;color:#4A4F58}
 .productBox .detailBox .tags{padding:2px 0}
 .productBox .detailBox .tags span{display:inline-block;line-height:16px;padding: 3px 6px;font-size:12px;color: #999999;border-radius:2px;margin-right:10px;border: 1px solid #EDEDED;}
-.productBox .detailBox .detail{box-sizing:border-box;padding:14px 20px;font-size:14px;color:#999999;background:#FDF8F6;border-radius:2px;margin:10px 0;position:relative;}
+.productBox .detailBox .detail{box-sizing:border-box;padding:14px 20px;font-size:14px;color:#93979f;background:#f3f7fe;border-radius:2px;margin:10px 0;position:relative;}
 .productBox .detailBox .detail hr{border:none;border-top:1px dashed #F9DDD0;margin:12px 0}
 .productBox .detailBox .row{padding:3px 0 3px 80px;line-height:24px}
 .productBox .detailBox .row .l{display:inline-block;min-width:60px;height:24px;text-align:justify;vertical-align:top;margin-left:-80px;}
@@ -165,13 +165,13 @@ a.member-detail{
 a.upgrade{
     width: 154px;
     height: 36px;
-    background: rgba(225,86,22,1);
+    background: #F94B4B;
     opacity: 1;
     border-radius: 2px;
     display: inline-block;
     text-align: center;
     line-height: 36px;
-    color: #fff
+    color: #FFFFFF;
 }
 .activepro{
     width: 312px;

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

@@ -21,9 +21,7 @@ li{list-style:none}
     .empty a{color:#E15616;}
     .productList{width:1200px;margin:0 auto;box-sizing:border-box}
     .productList .productItem{margin-bottom:16px}
-
 }
-
 /**
 * 移动端
 */
@@ -45,6 +43,8 @@ li{list-style:none}
     .empty img{width:40vw;height:40vw;}
     .empty a{color:#E15616;}
     .productList{width:96.6vw;margin:1.3vw auto;box-sizing:border-box}
-
+    .original-price{
+    text-decoration:line-through;
+}
 }
 

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

@@ -146,6 +146,9 @@ li{list-style:none}
 .tip-td:nth-child(1){
     border-right: 1px solid rgba(225,86,22,0.30196078431372547);
 }
+.active{
+    display: block;
+}
 
 
 }

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

@@ -219,7 +219,7 @@ var productDetail = new Vue({
                         _self.recommends = r.data;
                         _self.recommde =true;
                     }else {
-                       _self.recommde =false;
+                        _self.recommde =false;
                     }
                     if(r.data.length<7){
                         var length = 7-r.data.length;

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

@@ -15,6 +15,11 @@ var shoppingCart = new Vue({
         isCheckAll:false,
         isStock:'',
         allPrice:0,//每个店铺下的总价
+        tipsName:false,
+        fromMessage:'',//提示文字
+        isShow:false,
+        ladderPriceslist:[],//阶梯价
+        showIndex:''
 
     },
     computed: {
@@ -32,12 +37,22 @@ var shoppingCart = new Vue({
                     _self.totalCount = r.data.totalCount;
                     _self.totalPrice = r.data.totalPrice;
                     var  prosPrice =0;
+                    var productIdArr = [];
+                    var newArr=[]
                     _self.listData.forEach(function(item,index){
 				       _self.cartList=item.cartList;
 				         if(item.count==item.cartList.length){
 				               _self.totalPeice(item);
 				         }
-			           })
+				        //  _self.cartList.map(function (pros) {
+                        //     // 0公开价格 1不公开价格 2仅对会员机构公开
+                        //     if (pros.priceFlag !== 1) {
+                        //         productIdArr.push(pros.id);
+                        //         newArr.push(pros)
+                        //     }
+                        // });
+			          })
+			            // setProductPrice(newArr, productIdArr.join(","), _self.userId, function () {});
 
                 }
                 _self.listLoading = false;
@@ -72,15 +87,20 @@ var shoppingCart = new Vue({
 		        var _this = this;
 				if(pros.number<=pros.min){
 					pros.number= pros.min;
-					alert('该商品最小起订量为'+pros.min);
+					_this.tipsName = true;
+					_this.fromMessage = '该商品最小起批量为'+pros.min;
+					 setTimeout(function(){
+                         _this.tipsName = false;
+                    },1000);
 					return
 				}else{
 					if(pros.step === 2){
-						pros.isStep = false
+						pros.isStep = false;
 						pros.number -= pros.min
 					}else{
 						pros.number--
 					}
+					 _this.tipsName = false;
 					 _this.totalPeice(item)
 				}
 			},
@@ -95,13 +115,17 @@ var shoppingCart = new Vue({
 	changeNnmber:function($event,item,pros){//输入商品数量更新
 				var _value = event.target.value;
 				var _this = this;
-				console.log(_value)
 				if(!_value){
 					pros.number = pros.min;
 				}else if(_value < pros.min){
-					alert('该商品最小起订量为'+pros.min);
+				    _this.tipsName = true;
+					_this.fromMessage = '该商品最小起批量为'+pros.min;
+					setTimeout(function(){
+                     _this.tipsName = false;
+                },1000);
 					pros.number = pros.min;
 				}else{
+				    _this.tipsName = false;
 					pros.number = parseInt(_value)
 				}
 				_this.totalPeice(item)
@@ -138,6 +162,20 @@ var shoppingCart = new Vue({
 				_this.isCheckAll = goodsCheckedLength === goodsList.length - disabledListLength;
 				console.log(_this.isCheckAll)
 			},
+     showladder:function(index){
+         var _this = this;
+         _this.showIndex = index;
+         console.log(index)
+          _this.isShow = !_this.isShow;
+     },
+	 activity:function () {
+           var _this = this;
+           _this.isShow = !_this.isShow;
+        },
+    activeBtn:function () {
+           var _this = this;
+            _this.isShow = false;
+        },
 
     },
     created: function () {

src/main/resources/templates/index.html

@@ -68,7 +68,7 @@
                                     <template v-if="userId && userId>0">
                                         <template v-if="p.priceFlag==1">
                                             <em >￥价格未公开</em>
-                                             <div class="btnBox " >
+                                             <div class="btnBox" v-if="isPC">
                                                 <a href="javascript:0" class="pricebox">价格未公开，请联系 0755-22907771</a>
                                             </div>
                                         </template>
@@ -76,8 +76,8 @@
 <!--                                            <em v-if="!p.priceLoaded">正在获取价格...</em>-->
                                             <template v-if="p.priceFlag==2 && p.userIdentity!=2">
                                                 <em>￥会员可见</em>
-                                                <div class="btnBox">
-                                                    <a href="javascript:void(0)" class="pricebox" @click="upgrade">升级成为会员</a>
+                                                <div class="btnBox" v-if="isPC">
+                                                    <a href="javascript:void(0)" class="btn add" @click="upgrade">升级会员查看价格</a>
                                                 </div>
                                             </template>
                                             <em v-else class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
@@ -98,8 +98,8 @@
                                              <i :class="'icon mIcon i'+p.priceGrade"></i>
                                         </em>
                                         <a href="javascript:void(0);" class="login-btn" v-if="p.actStatus==1">{{p.promotions.name}}</a>
-                                        <div class="btnBox">
-                                            <a href="/login.html" class="pricebox" @click="toLogin">登录查看价格</a>
+                                         <div class="btnBox">
+                                            <a href="javascript:void(0);" class=" btn add" @click="toLogin">登录查看价格</a>
                                         </div>
                                     </template>
                                 </div>

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

@@ -234,8 +234,10 @@
                     </p>
                 </div>
                <template v-if="userId && userId>0">
-                <a v-if="priceFlag==2 && userIdentity!=2" class="upgrade" @click="clubupgrade" href="javascript:0">升级会员查看价格</a>
-                    <div class="btnBox" v-if="priceFlag==0">
+               <div  class="btnBox" v-if="priceFlag==2 && userIdentity!=2">
+                  <a class="upgrade" @click="clubupgrade" href="javascript:0">升级会员查看价格</a>
+               </div>
+                    <div class="btnBox" v-else-if="priceFlag==0">
                         <a href="javascript:void(0);" class="cart icon" @click='addShopCart'>加入购物车</a>
                         <a href="javascript:void(0);" class="buy" @click="buyShopCart">立即购买</a>
                     </div>
@@ -246,7 +248,7 @@
             </div>
         </div>
 
-        <div class="recommendBox">
+        <div class="recommendBox" v-if="recommde">
             <div class="hd">相关推荐</div>
             <div id="productRecommend" class="swiper-container">
                 <ul class="swiper-wrapper" v-cloak>

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

@@ -112,7 +112,7 @@
                         <template v-if="userId && userId>0">
                             <template v-if="p.priceFlag==1">
                                 <em >￥价格未公开</em>
-                                 <div class="btnBox " >
+                                 <div class="btnBox " v-if="isPC">
                                     <a href="javascript:0" class="pricebox">价格未公开，请联系 0755-22907771</a>
                                 </div>
                             </template>
@@ -120,11 +120,11 @@
                                 <em v-if="!p.priceLoaded">正在获取价格...</em>
                                 <template v-else-if="p.priceFlag ==2 && p.userIdentity!=2">
                                     <em>￥会员可见</em>
-                                    <div class="btnBox">
-                                        <a href="javascript:void(0)" class="pricebox" @click="upgrade">升级成为会员</a>
+                                    <div class="btnBox" v-if="isPC">
+                                        <a href="javascript:void(0)" class="btn add" @click="upgrade">升级会员查看价格</a>
                                     </div>
                                 </template>
-                                <em v-else class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
+                                <em v-else class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)" ></em>
                                 <a href="javascript:void(0);" class="login-btn" v-if="p.actStatus==1">{{p.promotions.name}}</a>
                                 <a href="javascript:void(0);" class="login-btn" v-else-if="p.ladderPriceFlag==1">阶梯价格</a>
                                  <template  v-else-if="p.userIdentity==3">
@@ -143,7 +143,7 @@
                             </em>
                              <a href="javascript:void(0);" class="login-btn" v-if="p.actStatus==1">{{p.promotions.name}}</a>
                             <div class="btnBox">
-                                <a href="/login.jsp" class="pricebox">登录查看价格</a>
+                              <a href="javascript:void(0)" @click="toLogin" class="btn add">登录查看价格</a>
                             </div>
                         </template>
                     </div>

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

@@ -40,13 +40,12 @@
                 <div class="c0"><input class="check" type="checkbox"></div>
                 <div class="c1">全选</div>
                 <div class="c2">商品信息</div>
-<!--                <div class="c3">包装规格</div>-->
                 <div class="c4">单价（元）</div>
                 <div class="c5">数量</div>
                 <div class="c6">小计（元）</div>
                 <div class="c7">操作</div>
             </div>
-            <div class="supplierItem" v-for="supplier in listData">
+            <div class="supplierItem" v-for="supplier,index in listData">
                 <div  class="supplierInfo  top">
                     <div v-if="isPC" class="c0"><input class="check"  type="checkbox" @click.stop="checkShop(supplier)" ></div>
                     <div v-if="isPC" class="c2"><a class="name" :href="'/supplier/index.shtml?id='+supplier.id" v-text="supplier.name" target="_blank"></a></div>
@@ -58,36 +57,58 @@
                         <span class="name" v-text="supplier.name"></span>
                     </a>
                 </div>
-                <div class="cartItem clear"  v-for="cart in supplier.cartList">
+                <div class="cartItem clear"  v-for="cart in supplier.cartList" >
                     <div class="c0"><input class="check" type="checkbox" name="cartList"></div>
                     <div class="c1"><a :href="'/product/detail.html?id='+cart.productId" target="_blank">
                         <img class="image" :src="cart.image">
                     </a></div>
                     <div class="c2">
                         <a class="name" :href="'/product/detail.html?id='+cart.productId" target="_blank">
-                            <i v-if="cart.ladderFlag" class="priTag">阶梯价格</i>
                             <span v-text="cart.name"></span>
                         </a>
                     </div>
-<!--                    <div class="c3"><span v-if="!isPC">包装规格：</span><span class="unit" v-text="cart.unit"></span></div>-->
                     <div class="c4">
                         <span class="price">
                             <em v-text="'¥'+toFloat(cart.price)"></em>
-                            <span v-if="cart.ladderFlag" class="info">
-                                <i v-if="isPC" class="tag">阶梯价格</i>
-                                <i class="i" @click="showThisLadder($event)">?</i>
-                                <span class="ladder mFixed">
-                                    <span>
-                                        <em class="t"><i>价格</i><i>批量</i></em>
-                                        <em v-for="l in cart.ladderPrices">
-                                            <i class="p">¥{{toFloat(l.buyPrice)}}</i>
-                                            <i v-if="l.maxNum>0">{{l.buyNum+' ~ '+l.maxNum}}</i>
-                                            <i v-else>≥ {{l.buyNum}}</i>
-                                        </em>
-                                        <em v-if="!isPC" @click="hideThisLadder($event)" class="close">了解</em>
-                                    </span>
-                                </span>
-                            </span>
+                            <template v-if="cart.actStatus==1">
+                                 <span class="activity" style="margin: auto;" @click="activity" :class="isShow?'activitystyle':''" >{{cart.promotions.name}}<i class="icon" :class="isShow?'activeicon':''"></i>
+                           </span>
+                            </template>
+                            <!-- 阶梯价-->
+                            <span v-else-if="cart.ladderFlag" class="info" >
+                             <span v-if="isPC" class="activity" style="margin: auto;" @click="showladder(index)"  :class="showIndex==index?'activitystyle':''" >阶梯价格<i class="icon" :class="isShow?'activeicon':''"></i>
+                                  <div class="activityBox" v-if="showIndex==index?isShow:''" >
+                                       <div class="tips-content">
+                                             <div class="tip-tr">
+                                                <div class="tip-td">起订量</div>
+                                                <div class="tip-td">价格</div>
+                                             </div>
+                                       <div class="tip-ul">
+                                             <ul class="tip-ul">
+                                                <li class="tip-tr ladderPriceList"  v-for="l in cart.ladderPrices">
+                                                    <div class="tip-td buyNumRangeShow">{{l.buyNum+' ~ '+l.maxNum}}</div>
+                                                    <div class="tip-td buyPrice">￥{{toFloat(l.buyPrice)}}</div>
+                                                </li>
+                                             </ul>
+                                       </div>
+                                     </div>
+                                  <button class="activeBtn" @click="activeBtn" >了解</button>
+                               </div>
+                              </span>
+<!--                                <i v-if="isPC" class="tag">阶梯价格</i>-->
+<!--                                <i class="i" @click="showThisLadder($event)">?</i>-->
+<!--                                <span class="ladder mFixed">-->
+<!--                                    <span>-->
+<!--                                        <em class="t"><i>价格</i><i>批量</i></em>-->
+<!--                                        <em v-for="l in cart.ladderPrices">-->
+<!--                                            <i class="p">¥{{toFloat(l.buyPrice)}}</i>-->
+<!--                                            <i v-if="l.maxNum>0">{{l.buyNum+' ~ '+l.maxNum}}</i>-->
+<!--                                            <i v-else>≥ {{l.buyNum}}</i>-->
+<!--                                        </em>-->
+<!--                                        <em v-if="!isPC" @click="hideThisLadder($event)" class="close">了解</em>-->
+<!--                                    </span>-->
+<!--                                </span>-->
+<!--                            </span>-->
                         </span>
                     </div>
                     <div class="c5">
@@ -96,9 +117,10 @@
                             <input type="number" :value="cart.number" v-model="cart.number" @blur="changeNnmber($event,supplier,cart)">
                             <em class="add" @click="changeCountAdd(supplier,cart)">+</em>
                         </span>
+                        <p class="tips-text" v-if="tipsName">{{fromMessage}}</p>
                         <input type="hidden" :value="cart.step"></div>
-                    <div v-if="isPC" class="c6"><span v-text="'¥'+toFloat(cart.price*cart.number)"></span></div>
-                    <div v-if="isPC" class="c7"><span class="del">×<em class="tips">删除</em></span></div>
+                        <div v-if="isPC" class="c6"><span v-text="'¥'+toFloat(cart.price*cart.number)"></span></div>
+                        <div v-if="isPC" class="c7"><span class="del">×<em class="tips">删除</em></span></div>
                 </div>
                 <div class="supplierInfo">
                     <div class="c7"style="width: 100%;text-align: right"><span>合计：<em v-text="'¥'+toFloat(supplier.allPrice)"></em></span></div>

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

@@ -68,7 +68,7 @@
                                                 <em >￥会员可见</em>
                                                 <a href="javascript:void(0);" class="login-btn" v-if="p.actStatus==1">{{p.promotions.name}}</a>
                                                 <div class="btnBox">
-                                                       <a href="javascript:void(0)" class="pricebox " @click="upgrade">升级成为会员</a>
+                                                       <a href="javascript:void(0)" class="btn add" @click="upgrade">升级会员查看价格</a>
                                                  </div>
                                             </template>
                                             <em v-else class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
@@ -78,7 +78,7 @@
                                         <em><span class="rmb">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></em>
                                         <a href="javascript:void(0);" class="login-btn" v-if="p.actStatus==1">{{p.promotions.name}}</a>
                                         <div class="btnBox">
-                                            <a href="javascript:void(0);" class="pricebox"  @click="toLogin">登录查看价格</a>
+                                            <a href="javascript:void(0)" @click="toLogin" class="btn add">登录查看价格</a>
                                         </div>
                                     </template>
                                 </div>
@@ -111,19 +111,17 @@
                                                 <em >￥会员可见</em>
                                                 <a href="javascript:void(0);" class="login-btn" v-if="p.actStatus==1">{{p.promotions.name}}</a>
                                                 <div class="btnBox">
-                                                       <a href="javascript:void(0)" class="pricebox " @click="upgrade">升级成为会员</a>
+                                                       <a href="javascript:void(0)" class="btn add" @click="upgrade">升级会员查看价格</a>
                                                  </div>
                                             </template>
                                             <em v-else class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
                                         </template>
                                     </template>
                                     <template v-else>
-                                        <em><span class="rmb">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></em>
-                                        <div class="btnBox"><a href="javascript:void(0)" class="btn add toLogin">加入购物车</a></div>
                                         <em><span class="rmb">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></em>
                                         <a href="javascript:void(0);" class="login-btn" v-if="p.actStatus==1">{{p.promotions.name}}</a>
                                         <div class="btnBox">
-                                            <a href="javascript:void(0);" class="pricebox" @click="toLogin">登录查看价格</a>
+                                            <a href="javascript:void(0);" class=" btn add" @click="toLogin">登录查看价格</a>
                                         </div>
                                     </template>
                                 </div>