Merge branch 'feature/giftCart' into release/6.1

@@ -238,6 +238,7 @@ meGift = {
                         code: $('input.mobile-code').val()
                         code: $('input.mobile-code').val()
                     }, verifyData, captcha).then(function(res) {
                     }, verifyData, captcha).then(function(res) {
                         if (res.code === 200) {
                         if (res.code === 200) {
+                            that.isBinMobile = 1;
                             dg.close();
                             dg.close();
                             that.activateGift();
                             that.activateGift();
                         }
                         }
@@ -312,7 +313,7 @@ meGift = {
                     }, verifyData, captcha).then(function(res) {
                     }, verifyData, captcha).then(function(res) {
                         if (res.code === 200) {
                         if (res.code === 200) {
                             dg.close();
                             dg.close();
-                            that.meAlert('<p>您的礼品卡激活成功</p><p>请尽情享用</p>', false, function() {
+                            that.meAlert('<p>您的礼品卡激活成功</p>', false, function() {
                                 location.reload();
                                 location.reload();
                             });
                             });
                         }
                         }

@@ -96,17 +96,26 @@
 
 
 .me-gift-alert {
 .me-gift-alert {
     width: 350px;
     width: 350px;
-    height: 190px;
 
 
     .content {
     .content {
         color: #444;
         color: #444;
-        padding: 55px 0;
+        padding: 62px 0;
         font-size: 18px;
         font-size: 18px;
 
 
         p {
         p {
             margin-top: 10px;
             margin-top: 10px;
         }
         }
     }
     }
+
+    .btns {
+        margin-bottom: 10px;
+    }
+
+    .btn {
+        width: 160px;
+        height: 30px;
+        line-height: 30px;
+    }
 }
 }
 
 
 .me-gift-confirm {
 .me-gift-confirm {
@@ -286,6 +295,24 @@
     div.content {
     div.content {
         padding: 10px 30px;
         padding: 10px 30px;
     }
     }
+
+    .btns {
+        margin-bottom: 10px;
+    }
+
+    .btn {
+        min-width: 100px;
+        height: 30px;
+        line-height: 30px;
+    }
+
+    .confirm-sure {
+        margin-left: 45px;
+    }
+
+    .alert-sure {
+        width: 160px;
+    }
 }
 }
 
 
 .me-gift-confirm.me-page {
 .me-gift-confirm.me-page {