Authored by 周少峰

Merge branch 'master' into release/5.6

... ... @@ -16,6 +16,7 @@ exports.special = (req, res) => {
specialModel.getSpecialData(id, channel).then((result) => {
let headerData = result[0];
result[1].content = result[1].content.replace(/http:/ig, '');
res.render('special', _.merge({
module: 'activity',
page: 'special'
... ...
... ... @@ -51,7 +51,6 @@
<div data-role="fine-slide" class="slide-panel"></div>
<div data-role="latestWalk-slide" class="slide-panel" style="display:none;"></div>
</div>
{{> cart-together-tpl }}
{{/unless}}
<div class="loading loading-single"><span></span>请稍后...</div>
... ...