Authored by ccbikai(👎🏻🍜)

Merge branch 'hotfix/1015'

... ... @@ -596,8 +596,7 @@ const getBrandIntro = (brandId, uid) => {
method: 'app.brand.getBrandIntro',
brand_id: brandId
}, param), {
code: 200,
cache: true
code: 200
}).then(result => {
if (result && result.data) {
let list = result.data;
... ...
... ... @@ -5,6 +5,7 @@
*/
'use strict';
const helpers = global.yoho.helpers;
module.exports = () => {
return (req, res, next) => {
... ... @@ -31,6 +32,8 @@ module.exports = () => {
res.set('Access-Control-Allow-Origin', '*');
}
res.locals.cartUrl = helpers.urlFormat('/cart/index/index');
next();
};
};
... ...
<div id="suspend-cart" class="suspend-cart">
<a href={{cartUrl}}>
<a href="{{@root.cartUrl}}">
<span class="iconfont">&#xe62c;</span>
</a>
<span class="cart-count hide">0</span>
</div>
\ No newline at end of file
</div>
... ...
... ... @@ -78,6 +78,10 @@ $categoryContainer.on('touchend', function(e) {
$subLevel.not('.hide').addClass('hide');
$subLevel.eq(index).removeClass('hide');
}
if ($this.find('a').attr('href')) {
location.href = $this.find('a').attr('href');
}
});
$categoryContainer.find('.primary-level').on('touchstart touchend touchcancel', 'li', function() {
... ...