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

# Conflicts:
#	src/main/resources/templates/supplier/index.html

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

@@ -36,8 +36,8 @@ li{list-style:none}
     .listWrap .c2{float:left;width:400px}
     .listWrap .cartTit .c2{padding-left: 75px;}
     .listWrap .c3{float:left;width:200px}
-    .listWrap .c4{float:left;width:142px}
-    .listWrap .c5{float:left;width:185px}
+    .listWrap .c4{float:left;width:142px;}
+    .listWrap .c5{float:left;width:185px;position: relative}
     .listWrap .c6{float:left;width:142px}
     .listWrap .c7{float:right;width:118px}
     .listWrap .c10{float:left;width:495px}
@@ -93,6 +93,59 @@ li{list-style:none}
     }
     .colorprice{color: #9AA5B5}
     .gouxuan{background: url("/img/cart/gouxuan.png");}
+    .tips-text{
+        bottom:10px;
+        height: 24px;
+        line-height: 24px;
+        position: absolute;
+        color: #E15616;
+        font-size: 12px;
+        text-align: center;
+        width: 190px
+    }
+    .Boxtext{
+    text-align: left;
+    line-height: 25px;
+    color: #333333;
+    padding-bottom: 5px;
+}
+.item-tips{
+    width: 312px;
+    height: auto;
+    padding: 12px;
+    border: 1px solid rgba(225,86,22,0.30196078431372547);
+    background: #ffffff;
+    position: absolute;
+    top: 28px;
+    left: 93px;
+}
+.tip-tr{
+    width: 100%;
+    height: 42px;
+    border-bottom: 1px solid rgba(225,86,22,0.30196078431372547);
+}
+.tips-content{
+    width: 294px;
+    height: auto;
+    border: 1px solid rgba(225,86,22,0.30196078431372547);
+    border-radius: 5px;
+    margin: auto;
+}
+.tip-td{
+    width: 146px;
+    height: 100%;
+    float: left;
+    line-height: 42px;
+    font-size: 14px;
+    color: #E15616;
+    text-align: center;
+}
+.tip-tr:last-child{
+    border-bottom: none;
+}
+.tip-td:nth-child(1){
+    border-right: 1px solid rgba(225,86,22,0.30196078431372547);
+}
 
 
 }

src/main/resources/static/js/base.js

@@ -387,6 +387,7 @@ function setProductPrice(productList, productIds, userId, callback){
                     }
                 });
             });
+            console.log(productList)
         }
         return callback();
     }).fail(function(){
@@ -402,7 +403,7 @@ function toBeforePath(){
     window.location.href = beforePath;
 }
 function toLogin() {//去登录
-    window.location.href ='login.html';
+    window.location.href ='/login.html';
 }
 function  upgrade () { //升级会员
     window.location.href='';

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

@@ -264,14 +264,7 @@ var productDetail = new Vue({
                 }
             });
         },
-        activity:function () {
-           var _this = this;
-           _this.isShow = !_this.isShow;
-        },
-        activeBtn:function () {
-           var _this = this;
-            _this.isShow = false;
-        },
+
         promotionsProduct:function () {//赠品接口
             var _self = this;
             if(_self.promotionsId ===0){return;}
@@ -283,7 +276,15 @@ var productDetail = new Vue({
                     _self.giftData = r.data;
                 }
             });
-        }
+        },
+         activity:function () {
+           var _this = this;
+           _this.isShow = !_this.isShow;
+        },
+    activeBtn:function () {
+           var _this = this;
+            _this.isShow = false;
+        },
     },
     created: function () {
         this.productId = $("#productId").val();

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

@@ -146,7 +146,7 @@ var supplierHome = new Vue({
         }
          var userInfo = localStorage.getItem('userInfo');
             if(userInfo){
-                this.userId = JSON.parse(userInfo).userID;
+                this.userId = JSON.parse(userInfo).userId;
             }
         var _self = this;
         $('.supplierInfo').slide({

src/main/resources/templates/components/header.html

@@ -70,7 +70,7 @@
                 </div>
             </div>
             <div class="headCart">
-                <a href="javascript:void(0);" class="addBtn icon">购物车<em v-text="'('+headCart.cartCount+')'"></em></a>
+                <a href="/shopping/cart.html" class="addBtn icon">购物车<em v-text="'('+headCart.cartCount+')'"></em></a>
                 <div class="cartData">
                     <div v-if="headCart.cartCount>0">
                         <ul class="cartMain">

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

@@ -58,22 +58,28 @@
                                 </a>
                                 <div class="price mfhc">
                                     <template v-if="userId && userId>0">
-                                        <em v-if="p.priceFlag==1">未公开价格</em>
+                                        <em v-if="p.priceFlag==1">￥未公开价格</em>
+                                        <div class="btnBox " v-if="p.priceFlag==1" >
+                                              <a href="javascript:0" class="pricebox">价格未公开，请联系 0755-22907771</a>
+                                        </div>
                                         <template v-else>
                                             <em v-if="!p.priceLoaded">正在获取价格...</em>
-                                            <em v-else-if="p.priceFlag==2 && p.userIdentity!=2">价格仅会员可见</em>
+                                             <template v-else-if="p.priceFlag==2 && p.userIdentity!=2">
+                                                <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>
+                                                 </div>
+                                            </template>
                                             <em v-else class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
-                                            <div class="btnBox">
-                                                <a v-if="p.priceFlag==2 && p.userIdentity!=2" href="javascript:void(0)" class="btn">升级成为会员</a>
-                                                <a v-else href="javascript:void(0)" class="btn add">加入购物车</a>
-                                            </div>
                                         </template>
                                     </template>
                                     <template v-else>
-                                        <em>价格：<i class="icon mIcon" v-for="i in 5">
-                                                <i v-if="i==1||p.priceGrade>=i" class="icon mIcon on"></i>
-                                        </i></em>
-                                        <div class="btnBox"><a href="javascript:void(0)" class="btn add toLogin">加入购物车</a></div>
+                                        <em><span class="moneyicon">￥</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>
+                                        </div>
                                     </template>
                                 </div>
                             </div>
@@ -95,20 +101,30 @@
                                 </a>
                                 <div class="price mfhc">
                                     <template v-if="userId && userId>0">
-                                        <em v-if="p.priceFlag==1">未公开价格</em>
+                                        <em v-if="p.priceFlag==1">价格未公开￥</em>
+                                        <div class="btnBox " v-if="p.priceFlag==1" >
+                                              <a href="javascript:0" class="pricebox">价格未公开，请联系 0755-22907771</a>
+                                        </div>
                                         <template v-else>
                                             <em v-if="!p.priceLoaded">正在获取价格...</em>
-                                            <em v-else-if="p.priceFlag==2 && p.userIdentity!=2">价格仅会员可见</em>
+                                            <template v-else-if="p.priceFlag==2 && p.userIdentity!=2">
+                                                <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>
+                                                 </div>
+                                            </template>
                                             <em v-else class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
-                                            <div class="btnBox">
-                                                <a v-if="p.priceFlag==2 && p.userIdentity!=2" href="javascript:void(0)" class="btn">升级成为会员</a>
-                                                <a v-else href="javascript:void(0)" class="btn add">加入购物车</a>
-                                            </div>
                                         </template>
                                     </template>
                                     <template v-else>
                                         <em><span class="moneyicon">￥</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="moneyicon">￥</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>
+                                        </div>
                                     </template>
                                 </div>
                             </div>