merge

@@ -53,7 +53,7 @@ exports.activityChannel = (req, res) => {
     let categoryId = req.query.category_id;
     let categoryId = req.query.category_id;
     let type = req.query.type || 2;
     let type = req.query.type || 2;
     let template = type === 2 ? 'outlet/will-end' : 'outlet/will-start';
     let template = type === 2 ? 'outlet/will-end' : 'outlet/will-start';
-    let page = type === 2 ? 'tobeend' : 'soon';
+    let page = type === 2 ? 'outlet-will-end' : 'outlet-will-start';
     let yhChannel = yhChannelMap[channel];
     let yhChannel = yhChannelMap[channel];
 
 
     outletModel.getNearlyActivity(yhChannel, type, categoryId).then(result => {
     outletModel.getNearlyActivity(yhChannel, type, categoryId).then(result => {

@@ -13,7 +13,7 @@ new Countdown.Countdown({
     el: el
     el: el
 });
 });
 
 
-$('.will-end-back').on('click', function(){
+$('.will-end-back').on('click', function() {
     tip.show('活动即将结束');
     tip.show('活动即将结束');
     return false;
     return false;
 });
 });

@@ -13,7 +13,7 @@ new Countdown.Countdown({
     el: el
     el: el
 });
 });
 
 
-$('.back-ground-white').on('click', function(){
+$('.back-ground-white').on('click', function() {
     tip.show('活动即将开始');
     tip.show('活动即将开始');
     return false;
     return false;
 });
 });