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;
@@ -87,7 +87,7 @@ exports.crazyWheel = (req, res, next) => {
     }
 
     vipDayModel.getJoinNum(1).then(result => {
-        let joins =  result && result.data || 0;
+        let joins = result && result.data || 0;
 
         res.render('vip_day/crazy_wheel', {
             title: '疯狂大转盘',
@@ -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: '拼手气',

@@ -105,7 +105,7 @@ exports.getGoods = cate => {
             let skn = product.productSkn;
             let imgSrc = url.parse(product.defaultImages);
 
-            product.defaultImages = ['//', imgSrc.hostname, imgSrc.pathname].join(''); 
+            product.defaultImages = ['//', imgSrc.hostname, imgSrc.pathname].join('');
 
             product.url = helpers.appUrlFormat(product.url, 'go.productDetail', {
                 product_skn: skn

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

@@ -64,4 +64,4 @@ module.exports = {
             'window.jQuery': 'yoho-jquery'
         })
     ]
-};
\ No newline at end of file
+};