fe / yohobuy-node · Commits

Go to a project

Authored by yyq
Commit c1642075c1001bf62902d2b2488fcc479871032a 2 parents 7c5dcf71 eb559a70

Merge branch 'release/6.1' of git.yoho.cn:fe/yohobuy-node into release/6.1

Inline Side-by-side
Showing 2 changed files with 6 additions and 2 deletions
@@ -89,8 +89,8 @@ @@ -89,8 +89,8 @@
89 <script id="activate-gift-tpl" type="text/html"> 89 <script id="activate-gift-tpl" type="text/html">
90 <div class="title">激活礼品卡</div> 90 <div class="title">激活礼品卡</div>
91 <div class="verify-input activate-center"> 91 <div class="verify-input activate-center">
92 - <div class="gift-group"><input type="text" placeholder="请输入礼品卡号" class="card-code" /></div>  
93 - <div class="gift-group activate-input-last"><input type="text" placeholder="请输入礼品卡密" class="card-pwd" /></div> 92 + <div class="gift-group"><input type="text" placeholder="请输入礼品卡卡号" class="card-code" /></div>
  93 + <div class="gift-group activate-input-last"><input type="text" placeholder="请输入礼品卡卡密" class="card-pwd" /></div>
94 </div> 94 </div>
95 </script> 95 </script>
96 96
@@ -164,6 +164,7 @@ meGift = { @@ -164,6 +164,7 @@ meGift = {
164 verifyEmailCode: function() { 164 verifyEmailCode: function() {
165 var that = this; 165 var that = this;
166 var dg = new dialog.Dialog({ 166 var dg = new dialog.Dialog({
  167 + closeIcon: false,
167 content: that.emailTpl({}), 168 content: that.emailTpl({}),
168 className: 'me-gift-confirm', 169 className: 'me-gift-confirm',
169 btns: [{ 170 btns: [{
@@ -203,6 +204,7 @@ meGift = { @@ -203,6 +204,7 @@ meGift = {
203 getMobileCode: function() { 204 getMobileCode: function() {
204 var that = this; 205 var that = this;
205 var dg = new dialog.Dialog({ 206 var dg = new dialog.Dialog({
  207 + closeIcon: false,
206 content: that.mobileTpl({}), 208 content: that.mobileTpl({}),
207 className: 'me-gift-confirm', 209 className: 'me-gift-confirm',
208 btns: [{ 210 btns: [{
@@ -274,6 +276,7 @@ meGift = { @@ -274,6 +276,7 @@ meGift = {
274 activateGift: function() { 276 activateGift: function() {
275 var that = this; 277 var that = this;
276 var dg = new dialog.Dialog({ 278 var dg = new dialog.Dialog({
  279 + closeIcon: false,
277 content: that.giftTpl({}), 280 content: that.giftTpl({}),
278 className: 'me-gift-confirm', 281 className: 'me-gift-confirm',
279 btns: [{ 282 btns: [{
@@ -333,6 +336,7 @@ meGift = { @@ -333,6 +336,7 @@ meGift = {
333 meAlertDialog.addClass('hide'); 336 meAlertDialog.addClass('hide');
334 337
335 dg = new dialog.Dialog({ 338 dg = new dialog.Dialog({
  339 + closeIcon: false,
336 content: content, 340 content: content,
337 className: 'me-gift-alert', 341 className: 'me-gift-alert',
338 mask: !!mask, 342 mask: !!mask,