merge master

@@ -58,7 +58,7 @@ const getCommonHeader = (req, res, next) => {
     let channel = req.query.channel ? req.query.channel : 'boys';
 
     headerModel.requestHeaderData(channel).then((result)=>{
-        _.merge(res.locals,result);
+        _.merge(res.locals, result);
         next();
     });
 };
@@ -82,6 +82,6 @@ const sessionEffective = (req, res, next) => {
 };
 
 // 查看二维码
-router.get('/QRcode',sessionEffective,[getHomeNav,getCommonHeader],personalController.QRcode);
+router.get('/QRcode', sessionEffective, [getHomeNav, getCommonHeader], personalController.QRcode);
 
 module.exports = router;

@@ -64,6 +64,6 @@ $('.btn-qcode').click(function() {
     document.body.innerHTML = $('#print_wrap').show().html();
     setTimeout(function(argument) {
         window.print();
-    },1000);
+    }, 1000);
     return false;
 });