Authored by ccbikai(👎🏻🍜)

Merge branch 'hotfix/1015'

@@ -596,8 +596,7 @@ const getBrandIntro = (brandId, uid) => { @@ -596,8 +596,7 @@ const getBrandIntro = (brandId, uid) => {
596 method: 'app.brand.getBrandIntro', 596 method: 'app.brand.getBrandIntro',
597 brand_id: brandId 597 brand_id: brandId
598 }, param), { 598 }, param), {
599 - code: 200,  
600 - cache: true 599 + code: 200
601 }).then(result => { 600 }).then(result => {
602 if (result && result.data) { 601 if (result && result.data) {
603 let list = result.data; 602 let list = result.data;
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
5 */ 5 */
6 6
7 'use strict'; 7 'use strict';
  8 +const helpers = global.yoho.helpers;
8 9
9 module.exports = () => { 10 module.exports = () => {
10 return (req, res, next) => { 11 return (req, res, next) => {
@@ -31,6 +32,8 @@ module.exports = () => { @@ -31,6 +32,8 @@ module.exports = () => {
31 res.set('Access-Control-Allow-Origin', '*'); 32 res.set('Access-Control-Allow-Origin', '*');
32 } 33 }
33 34
  35 + res.locals.cartUrl = helpers.urlFormat('/cart/index/index');
  36 +
34 next(); 37 next();
35 }; 38 };
36 }; 39 };
1 <div id="suspend-cart" class="suspend-cart"> 1 <div id="suspend-cart" class="suspend-cart">
2 - <a href={{cartUrl}}> 2 + <a href="{{@root.cartUrl}}">
3 <span class="iconfont">&#xe62c;</span> 3 <span class="iconfont">&#xe62c;</span>
4 </a> 4 </a>
5 <span class="cart-count hide">0</span> 5 <span class="cart-count hide">0</span>
@@ -78,6 +78,10 @@ $categoryContainer.on('touchend', function(e) { @@ -78,6 +78,10 @@ $categoryContainer.on('touchend', function(e) {
78 $subLevel.not('.hide').addClass('hide'); 78 $subLevel.not('.hide').addClass('hide');
79 $subLevel.eq(index).removeClass('hide'); 79 $subLevel.eq(index).removeClass('hide');
80 } 80 }
  81 +
  82 + if ($this.find('a').attr('href')) {
  83 + location.href = $this.find('a').attr('href');
  84 + }
81 }); 85 });
82 86
83 $categoryContainer.find('.primary-level').on('touchstart touchend touchcancel', 'li', function() { 87 $categoryContainer.find('.primary-level').on('touchstart touchend touchcancel', 'li', function() {