Merge branch 'feature/mipOpt' into 'release/6.4'

Feature/mip opt



See merge request !1190

@@ -34,6 +34,7 @@ app.locals.devEnv = app.get('env') === 'development';
 app.locals.isProduction = app.get('env') === 'production';
 app.locals.isProduction = app.get('env') === 'production';
 app.locals.version = pkg.version;
 app.locals.version = pkg.version;
 app.locals.startTime = moment().format('YYYYMMDDHH');
 app.locals.startTime = moment().format('YYYYMMDDHH');
+app.locals.currentYear = moment().format('YYYY');
 
 
 // 全局注册library
 // 全局注册library
 yohoLib.global(config);
 yohoLib.global(config);

@@ -26,8 +26,8 @@ exports.index = (req, res, next) => {
             fuzzyWord: list.fuzzyWord
             fuzzyWord: list.fuzzyWord
         };
         };
 
 
-        return res.render('list', Object.assign({
-            css: yield css('list.css'),
+        return res.render('chanpin', Object.assign({
+            css: yield css('chanpin.css'),
             title: `${goodsList.name}价格_图片_品牌_怎么样-YOHO!BUY有货`,
             title: `${goodsList.name}价格_图片_品牌_怎么样-YOHO!BUY有货`,
             mipUrl: `https://m.yohobuy.com${req.originalUrl}`,
             mipUrl: `https://m.yohobuy.com${req.originalUrl}`,
             mipFooter: true,
             mipFooter: true,

 <div class="good-list-page search-page yoho-page">
 <div class="good-list-page search-page yoho-page">
-    {{> list}}
+    {{> chanpin}}
     {{> mip-footer}}
     {{> mip-footer}}
 </div>
 </div>

@@ -9,6 +9,6 @@
         </mip-fixed>
         </mip-fixed>
     </div>
     </div>
     <p class="copy-right">
     <p class="copy-right">
-        CopyRight©2007-2017 南京新与力文化传播有限公司
+        CopyRight©2007-{{currentYear}} 南京新与力文化传播有限公司
     </p>
     </p>
 </div>
 </div>

@@ -8,7 +8,7 @@
         <div class="float-top "></div>
         <div class="float-top "></div>
     </p>
     </p>
     <address class="copyright">
     <address class="copyright">
-        CopyRight©2007-2017 南京新与力文化传播有限公司
+        CopyRight©2007-{{currentYear}} 南京新与力文化传播有限公司
     </address>
     </address>
 </footer>
 </footer>
 {{/pageFooter}}
 {{/pageFooter}}