Merge branch 'gray' into 'master'

Gray



See merge request !375

@@ -181,7 +181,7 @@ let mobileRegister = (req, res, next) => {
         );
 
         if (!regResult.code || regResult.code !== 200) {
-            data.message = '注册失败';
+            data.message = regResult.message || '注册失败';
             return res.json(data);
         }
 

@@ -42,7 +42,7 @@ const list = require(`${cRoot}/list`);
 const search = require(`${cRoot}/search`);
 
 // 学生优惠controller
-const students = require(`${cRoot}/students`);
+// const students = require(`${cRoot}/students`);
 
 // 新品到着controller
 const newArrive = require(`${cRoot}/newArrive`);
@@ -153,13 +153,13 @@ router.post('/index/isFavoriteShop', favorite.isFavShop); //
 
 
 // 学生优惠routers
-router.get('/students', students.index); // students 首页
-router.get('/students/schoolArea', students.schoolArea); // 学校地区
-router.get('/students/schoolList', students.schoolList); // 学校地区
-router.get('/students/eduLevel', students.eduLevel); // 学校地区
-router.get('/students/verify', students.verify); // 身份验证
-router.get('/students/userAcquireStatus', students.userAcquireStatus); // 获取优惠券领取状态
-router.get('/students/list', students.list); // 获取优惠券领取状态
+// router.get('/students', students.index); // students 首页
+// router.get('/students/schoolArea', students.schoolArea); // 学校地区
+// router.get('/students/schoolList', students.schoolList); // 学校地区
+// router.get('/students/eduLevel', students.eduLevel); // 学校地区
+// router.get('/students/verify', students.verify); // 身份验证
+// router.get('/students/userAcquireStatus', students.userAcquireStatus); // 获取优惠券领取状态
+// router.get('/students/list', students.list); // 获取优惠券领取状态
 
 // 新品到着改版
 router.get('/newArrive', newArrive.index); // 获取优惠券领取状态

 {
   "name": "yohobuy-node",
-  "version": "6.6.14",
+  "version": "6.6.15",
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "repository": {

@@ -216,20 +216,22 @@ function pickCoupon(info) {
 }
 
 function couponSlide(num) {
-    if (!this.$btns) {
-        this.$btns = $couponBtn.children();
+    var that = this || window;
+
+    if (!that.$btns) {
+        that.$btns = $couponBtn.children();
     }
 
     $couponItem.eq(0).animate({
         'margin-left': -itemWidth * num
     });
 
-    this.$btns.removeClass('btn-end');
+    that.$btns.removeClass('btn-end');
 
     if (!num) {
-        this.$btns.eq(0).addClass('btn-end');
+        that.$btns.eq(0).addClass('btn-end');
     } else if (num >= $couponItem.length - 3) {
-        this.$btns.eq(1).addClass('btn-end');
+        that.$btns.eq(1).addClass('btn-end');
     }
 }
 

@@ -271,7 +271,7 @@
             top: 32px;
             margin-left: -35px;
             width: 146px;
-            height: 216px;
+            padding: 20px 0 14px;
             background-color: #f4f4f4;
             border: none;
             z-index: 1000;
@@ -281,7 +281,7 @@
                 position: relative;
                 margin: 2px auto 3px;
                 width: 96px;
-                height: 168px;
+                height: 96px;
             }
 
             .qr-img {
@@ -1491,16 +1491,16 @@
     top: 260px;
     right: 20px;
     width: 117px;
-    height: 216px;
+    padding-top: 20px;
     border: none;
     background-color: transparent;
     z-index: 990;
     display: block;
 
     .code-img {
-        width: 117px;
-        height: 192px;
-        background-image: resolve("layout/qr-wenle-large.png");
+        width: 116px;
+        height: 116px;
+        background-image: resolve("layout/cover-qr-large.png");
         background-repeat: no-repeat;
         background-size: 100% 100%;
     }