fe / yohobuy-node · Commits

Go to a project

Authored by 周少峰
Commit e3d99e9e90433169fe043f16da59763f3866c7a8 2 parents 1a5a73cb d25f4c68

Merge branch 'master' into release/5.6

Inline Side-by-side
Showing 2 changed files with 1 additions and 1 deletions
@@ -16,6 +16,7 @@ exports.special = (req, res) => { @@ -16,6 +16,7 @@ exports.special = (req, res) => {
16 specialModel.getSpecialData(id, channel).then((result) => { 16 specialModel.getSpecialData(id, channel).then((result) => {
17 let headerData = result[0]; 17 let headerData = result[0];
18 18
  19 + result[1].content = result[1].content.replace(/http:/ig, '');
19 res.render('special', _.merge({ 20 res.render('special', _.merge({
20 module: 'activity', 21 module: 'activity',
21 page: 'special' 22 page: 'special'
@@ -51,7 +51,6 @@ @@ -51,7 +51,6 @@
51 <div data-role="fine-slide" class="slide-panel"></div> 51 <div data-role="fine-slide" class="slide-panel"></div>
52 <div data-role="latestWalk-slide" class="slide-panel" style="display:none;"></div> 52 <div data-role="latestWalk-slide" class="slide-panel" style="display:none;"></div>
53 </div> 53 </div>
54 - {{> cart-together-tpl }}  
55 {{/unless}} 54 {{/unless}}
56 55
57 <div class="loading loading-single"><span></span>请稍后...</div> 56 <div class="loading loading-single"><span></span>请稍后...</div>