Merge branch 'feature/VIP_DAY' into release/5.0.0

@@ -41,6 +41,15 @@ exports.index = (req, res, next) => {
         goods3: [51374524, 51338322, 51344316]
     };
 
+    if (req.app.get('env') !== 'product') {
+        cate = {
+            goods1: [512581904, 512581902, 512581900],
+            goods2: [512581822, 512581816, 512581812],
+            goods3: [512581806, 512581796, 512581792]
+        };
+    }
+
+
     vipDayModel.getGoods(cate)
         .then(result => {
             // console.log(result.data)

@@ -43,6 +43,7 @@ Game.prototype.bindEvents = function() {
                 var awardIndex;
 
                 if (res.code !== 200) {
+                    self.canPlay = true;
                     return tip.show(res.message);
                 }
 

@@ -294,6 +294,7 @@
         font-size: 20px;
         color: #fff;
         height: 53px;
+        margin-bottom: 10px;
     }
 
     .vip-good-fav {