Merge branch 'master' into release/5.0.0

@@ -8,11 +8,13 @@ const co = require('bluebird').coroutine;
 
 
 function humanNum_wan(num) {
-    if (num > 9999) {
-        num = (num / 10000).toFixed(2) + '万'
-    }
-
     return num;
+
+    // if (num > 9999) {
+    //     num = (num / 10000).toFixed(2) + '万'
+    // }
+
+    // return num;
 }
 
 exports.beforeIn = (req, res, next) => {
@@ -87,7 +89,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 +113,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: '拼手气',