merge master

@@ -9,7 +9,7 @@ const co = require('bluebird').coroutine;
 
 function humanNum_wan(num) {
     if (num > 9999) {
-        num = (num / 10000).toFixed(2) + '万'
+        num = (num / 10000).toFixed(2) + '万';
     }
 
     return num;
@@ -111,7 +111,7 @@ exports.crazyLuck = (req, res, next) => {
         let joinNum = yield vipDayModel.getJoinNum(2);
 
         coins = (coins && coins.data && coins.data.total) || 0;
-        joinNum = (joinNum && joinNum.data) || 0
+        joinNum = (joinNum && joinNum.data) || 0;
 
         res.render('vip_day/crazy_luck', {
             title: '拼手气',

@@ -921,7 +921,7 @@ const _detailDataPkg = (origin, uid, vipLevel, ua) => {
 };
 
 let _getShopsInfo = (brandId) => {
-    if(!brandId) {
+    if (!brandId) {
         return Promise.resolve([]);
     }
     return api.get('', {