Merge branch 'feature/giftCart' into release/6.1

@@ -89,8 +89,8 @@
 <script id="activate-gift-tpl" type="text/html">
     <div class="title">激活礼品卡</div>
     <div class="verify-input activate-center">
-        <div class="gift-group"><input type="text" placeholder="请输入礼品卡号" class="card-code" /></div>
-        <div class="gift-group activate-input-last"><input type="text" placeholder="请输入礼品卡密" class="card-pwd" /></div>
+        <div class="gift-group"><input type="text" placeholder="请输入礼品卡卡号" class="card-code" /></div>
+        <div class="gift-group activate-input-last"><input type="text" placeholder="请输入礼品卡卡密" class="card-pwd" /></div>
     </div>
 </script>
 

@@ -164,6 +164,7 @@ meGift = {
     verifyEmailCode: function() {
         var that = this;
         var dg = new dialog.Dialog({
+            closeIcon: false,
             content: that.emailTpl({}),
             className: 'me-gift-confirm',
             btns: [{
@@ -203,6 +204,7 @@ meGift = {
     getMobileCode: function() {
         var that = this;
         var dg = new dialog.Dialog({
+            closeIcon: false,
             content: that.mobileTpl({}),
             className: 'me-gift-confirm',
             btns: [{
@@ -274,6 +276,7 @@ meGift = {
     activateGift: function() {
         var that = this;
         var dg = new dialog.Dialog({
+            closeIcon: false,
             content: that.giftTpl({}),
             className: 'me-gift-confirm',
             btns: [{
@@ -333,6 +336,7 @@ meGift = {
         meAlertDialog.addClass('hide');
 
         dg = new dialog.Dialog({
+            closeIcon: false,
             content: content,
             className: 'me-gift-alert',
             mask: !!mask,