详情页地步新增品牌店铺

@@ -686,11 +686,21 @@ let _detailDataPkgAsync = (origin, uid, vipLevel, ua) => {
     let preSale = (origin.status === 0 && origin.advance_shelve_time > 0);
     let preSale = (origin.status === 0 && origin.advance_shelve_time > 0);
 
 
     return new Promise((resolve) => {
     return new Promise((resolve) => {
+        // 悬浮的购物车信息新增品牌店铺选项storeUrl字段
+        let storeUrl = '';
+
+        if (origin.shop_id) {
+            storeUrl = helpers.urlFormat('/product/index/brand', {
+                shop_id: origin.shop_id
+            });
+        }
+
         // 悬浮的购物车信息
         // 悬浮的购物车信息
         dest.cartInfo = {
         dest.cartInfo = {
             cartUrl: helpers.urlFormat('/cart/index/index'),
             cartUrl: helpers.urlFormat('/cart/index/index'),
             numInCart: 0,
             numInCart: 0,
-            goodsInstore: origin.storage_sum
+            goodsInstore: origin.storage_sum,
+            storeUrl: storeUrl
         };
         };
 
 
         // 显示加入购物车链接
         // 显示加入购物车链接

@@ -86,9 +86,22 @@
     {{!--占位: 购物车部分--}}
     {{!--占位: 购物车部分--}}
     <div id="placeholder-infodata">
     <div id="placeholder-infodata">
         <div class="cart-bar">
         <div class="cart-bar">
-            <a href="javascript:;" class="num-incart iconfont">&#xe62c;</a>
+            <a href="javascript:;" class="new-foot-ico">
+                <div class="num-incart iconfont">
+                    <span class="num-tag {{#unless @root.cartCount}}hide{{/unless}}">{{@root.cartCount}}</span>
+                    &#xe62c;
+                </div>
+                <div class="tip">购物车</div>
+            </a>
+            <a href="javascript:;" class="new-foot-ico store opa">
+                <div class="iconfont"></div>
+                <div class="tip">品牌店铺</div>
+            </a>
+            <a href="javascript:;" class="new-foot-ico fav">
+                <div id="likeBtn" class="favorite iconfont {{#if @root.isCollect}}liked{{/if}}">&#xe605;</div>
+                <div class="tip">收藏</div>
+            </a>
             <a href="javascript:;" class="addto-cart add-to-cart-url">加入购物车</a>
             <a href="javascript:;" class="addto-cart add-to-cart-url">加入购物车</a>
-            <a href="javascript:;" class="favorite iconfont">&#xe605;</a>
         </div>
         </div>
     </div>
     </div>
 
 

@@ -3,7 +3,21 @@
     {{#unless @root.wap.common.removeCartCount}}
     {{#unless @root.wap.common.removeCartCount}}
         <input type="hidden" id="remove-cart-count" value="1">
         <input type="hidden" id="remove-cart-count" value="1">
     {{/unless}}
     {{/unless}}
-    <a href="{{cartUrl}}" class="num-incart iconfont"><span class="num-tag {{#unless @root.cartCount}}hide{{/unless}}">{{@root.cartCount}}</span>&#xe62c;</a>
+    <a class="new-foot-ico" href="{{cartUrl}}">
+        <div class="num-incart iconfont">
+            <span class="num-tag {{#unless @root.cartCount}}hide{{/unless}}">{{@root.cartCount}}</span>
+            &#xe62c;
+        </div>
+        <div class="tip">购物车</div>
+    </a>
+    <a class="new-foot-ico store{{#unless storeUrl}} opa{{/unless}}"{{#if storeUrl}} href="{{storeUrl}}"{{/if}}>
+        <div class="iconfont"></div>
+        <div class="tip">品牌店铺</div>
+    </a>
+    <a href="javascript:;" class="new-foot-ico fav">
+        <div id="likeBtn" class="favorite iconfont {{#if @root.isCollect}}liked{{/if}}">&#xe605;</div>
+        <div class="tip">收藏</div>
+    </a>
     {{#if addToCartUrl}}
     {{#if addToCartUrl}}
         <a id="addtoCart" href="javascript:;" class="addto-cart add-to-cart-url">{{#if tickets}}立即购买{{else}}加入购物车{{/if}}</a>
         <a id="addtoCart" href="javascript:;" class="addto-cart add-to-cart-url">{{#if tickets}}立即购买{{else}}加入购物车{{/if}}</a>
     {{/if}}
     {{/if}}
@@ -34,7 +48,6 @@
     {{#if limitProductCode}}
     {{#if limitProductCode}}
         <input type="hidden" id="limitProductCode" name="limitProductCode" value="{{limitProductCode}}">
         <input type="hidden" id="limitProductCode" name="limitProductCode" value="{{limitProductCode}}">
     {{/if}}
     {{/if}}
-    <a href="javascript:;" id="likeBtn" class="favorite iconfont {{#if @root.isCollect}}liked{{/if}}">&#xe605;</a>
 </div>
 </div>
 {{/ cartInfo}}
 {{/ cartInfo}}
 
 

@@ -1039,7 +1039,6 @@ $basicBtnC: #eb0313;
         height: 120px;
         height: 120px;
         border-top: 1px solid $borderC;
         border-top: 1px solid $borderC;
         background-color: #fff;
         background-color: #fff;
-        text-align: center;
 
 
         a {
         a {
             display: inline-block;
             display: inline-block;
@@ -1051,6 +1050,42 @@ $basicBtnC: #eb0313;
             font-size: 47px;
             font-size: 47px;
         }
         }
 
 
+        .new-foot-ico {
+            width: 100px;
+            text-align: center;
+            vertical-align: middle;
+
+            .iconfont {
+                color: #444;
+                font-size: 40px;
+                line-height: 40px;
+            }
+
+            .tip {
+                color: #444;
+                font-size: 15px;
+            }
+
+            &.fav {
+                .favorite {
+                    color: #ccc;
+                }
+            }
+
+            &.store {
+                .iconfont {
+                    width: 42px;
+                    height: 40px;
+                    margin: 0 auto;
+                    background: url("/product/store-ico.png") no-repeat;
+                }
+            }
+
+            &.opa {
+                opacity: 0.3;
+            }
+        }
+
         .favorite {
         .favorite {
             color: #ccc;
             color: #ccc;
             font-size: 34px;
             font-size: 34px;
@@ -1058,12 +1093,11 @@ $basicBtnC: #eb0313;
         }
         }
 
 
         .favorite.liked {
         .favorite.liked {
-            color: $basicBtnC;
+            color: $basicBtnC !important;
         }
         }
 
 
         .addto-cart,
         .addto-cart,
         .sold-out {
         .sold-out {
-            margin: 0 100px 0 115px;
             width: 260px;
             width: 260px;
             height: 80px;
             height: 80px;
             background-color: $basicBtnC;
             background-color: $basicBtnC;
@@ -1083,8 +1117,8 @@ $basicBtnC: #eb0313;
 
 
         .num-tag {
         .num-tag {
             position: absolute;
             position: absolute;
-            top: 0;
-            right: -15px;
+            top: -10px;
+            right: 5px;
             display: block;
             display: block;
             width: 30px;
             width: 30px;
             height: 30px;
             height: 30px;