merge from master

@@ -35,4 +35,4 @@ exports.sendcoupon = (req, res, next) => {
     couponModel.sendcoupon(req.query.id, req.user.uid).then(result => {
     couponModel.sendcoupon(req.query.id, req.user.uid).then(result => {
         res.json(result);
         res.json(result);
     }).catch(next);
     }).catch(next);
-};
+};

@@ -177,4 +177,4 @@ exports.sendcoupon = (couponId, uid) => {
         }
         }
         return returnData;
         return returnData;
     });
     });
-};
+};

@@ -22,4 +22,4 @@ router.get('/coupon/index', coupon.index);
 router.get('/coupon/couponstatus', coupon.getCouponStatus);
 router.get('/coupon/couponstatus', coupon.getCouponStatus);
 router.get('/coupon/sendcoupon', auth, coupon.sendcoupon);
 router.get('/coupon/sendcoupon', auth, coupon.sendcoupon);
 
 
-module.exports = router;
+module.exports = router;

@@ -13,7 +13,7 @@ var express = require('express'),
 var app = express();
 var app = express();
 
 
 // set view engin
 // set view engin
-var doraemon = path.join(__dirname, '../../doraemon/views'); //parent view root
+var doraemon = path.join(__dirname, '../../doraemon/views'); // parent view root
 
 
 app.on('mount', function(parent) {
 app.on('mount', function(parent) {
     delete parent.locals.settings; // 不继承父 App 的设置
     delete parent.locals.settings; // 不继承父 App 的设置

@@ -66,4 +66,4 @@ const index = (skn, limit) => {
 
 
 module.exports = {
 module.exports = {
     index
     index
-};
+};

@@ -24,4 +24,4 @@ const goodsCount = (uid, shoppingKey) => {
 
 
 module.exports = {
 module.exports = {
     goodsCount
     goodsCount
-};
+};

@@ -238,7 +238,7 @@ exports.getStudentsList = (params, channel) => {
 
 
         // 获取商品数据和顶部筛选条件
         // 获取商品数据和顶部筛选条件
         if (result[2].code === 200) {
         if (result[2].code === 200) {
-            //删掉student_price，不让页面显示
+            // 删掉student_price，不让页面显示
             _.forEach(result[2].data.product_list, goods => {
             _.forEach(result[2].data.product_list, goods => {
                 delete goods.student_price;
                 delete goods.student_price;
             });
             });

@@ -205,7 +205,7 @@ function getCouponStatus() {
                             child[i].classList.remove('hidden');
                             child[i].classList.remove('hidden');
                         }
                         }
                     }
                     }
-                })
+                });
             }
             }
         }
         }
     });
     });
@@ -220,4 +220,4 @@ $('.info').on('click', function(e) {
         requestCoupon($(this).closest('a').data('id'));
         requestCoupon($(this).closest('a').data('id'));
         redirect.gunangSrc = $(this).closest('a').get(0).href;
         redirect.gunangSrc = $(this).closest('a').get(0).href;
     }
     }
-});
+});

@@ -824,7 +824,7 @@ $(function() {
     $('#stuRights .stu-rights-item:eq(0), #stuRights .stu-rights-item:eq(1),' +
     $('#stuRights .stu-rights-item:eq(0), #stuRights .stu-rights-item:eq(1),' +
         '#stuRights .stu-rights-item:eq(2), #stuRights .stu-rights-item:eq(3)').hover(function() {
         '#stuRights .stu-rights-item:eq(2), #stuRights .stu-rights-item:eq(3)').hover(function() {
             var content = $(this).find('.item-content');
             var content = $(this).find('.item-content');
-        
+
             var gapHeight;
             var gapHeight;
 
 
             content.removeClass('hide');
             content.removeClass('hide');