Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
Showing
7 changed files
with
7 additions
and
38 deletions
| @@ -89,14 +89,13 @@ $addressForm.on('submit', function() { | @@ -89,14 +89,13 @@ $addressForm.on('submit', function() { | ||
| 89 | if (res.code !== 200) { | 89 | if (res.code !== 200) { |
| 90 | tip.show(res.message || '网络出了点问题~'); | 90 | tip.show(res.message || '网络出了点问题~'); |
| 91 | isSubmiting = false; | 91 | isSubmiting = false; |
| 92 | + loading.hideLoadingMask(); | ||
| 92 | } else { | 93 | } else { |
| 93 | window.location.href = '/home/address'; | 94 | window.location.href = '/home/address'; |
| 94 | } | 95 | } |
| 95 | }).fail(function() { | 96 | }).fail(function() { |
| 96 | tip.show('网络出了点问题~'); | 97 | tip.show('网络出了点问题~'); |
| 97 | isSubmiting = false; | 98 | isSubmiting = false; |
| 98 | - }).always(function() { | ||
| 99 | - loading.hideLoadingMask(); | ||
| 100 | }); | 99 | }); |
| 101 | return false; | 100 | return false; |
| 102 | }); | 101 | }); |
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | <div class="my-address-page yoho-page"> | 2 | <div class="my-address-page yoho-page"> |
| 3 | <div class="my-edit-address-page page-wrap"> | 3 | <div class="my-edit-address-page page-wrap"> |
| 4 | <form class="edit-address"> | 4 | <form class="edit-address"> |
| 5 | - <input type="hidden" name="id" value="{{address.id}}"> | 5 | + <input type="hidden" name="id" value="{{address.address_id}}"> |
| 6 | <label class="username"> | 6 | <label class="username"> |
| 7 | 收件人姓名 | 7 | 收件人姓名 |
| 8 | <input type="text" name="consignee" maxlength="20" value="{{address.consignee}}"> | 8 | <input type="text" name="consignee" maxlength="20" value="{{address.consignee}}"> |
| @@ -4,9 +4,9 @@ | @@ -4,9 +4,9 @@ | ||
| 4 | <P>您好！</P> | 4 | <P>您好！</P> |
| 5 | <P>为了向您提供更优质的服务，目前系统正在升级，请您耐心等待。</P> | 5 | <P>为了向您提供更优质的服务，目前系统正在升级，请您耐心等待。</P> |
| 6 | <P>系统升级期间，部分地区用户体验会有暂 时中断，如遇紧急事宜，欢迎垂询客服热线：400-889-9646 09:00-22:30(周一至周日)。</P> | 6 | <P>系统升级期间，部分地区用户体验会有暂 时中断，如遇紧急事宜，欢迎垂询客服热线：400-889-9646 09:00-22:30(周一至周日)。</P> |
| 7 | - <P>稍后系统将恢复正常使用，欢迎您继续光顾 YOHO!BUY 有货！</P> | 7 | + <P>稍后系统将恢复正常使用，欢迎您继续光顾 Yoho!Buy有货！</P> |
| 8 | <P>带来不便之处深表 歉意，请您谅解！</P> | 8 | <P>带来不便之处深表 歉意，请您谅解！</P> |
| 9 | <P>特此公告</P> | 9 | <P>特此公告</P> |
| 10 | - <P>YOHO!BUY 有货 客户服务中心。</P> | 10 | + <P>Yoho!Buy有货 客户服务中心。</P> |
| 11 | </div> | 11 | </div> |
| 12 | {{> layout/footer}} | 12 | {{> layout/footer}} |
| @@ -25,7 +25,7 @@ | @@ -25,7 +25,7 @@ | ||
| 25 | <a class="international" href={{internationalUrl}}>International Customer</a> | 25 | <a class="international" href={{internationalUrl}}>International Customer</a> |
| 26 | <div class="login-tip"> | 26 | <div class="login-tip"> |
| 27 | <div class="info-icon"></div> | 27 | <div class="info-icon"></div> |
| 28 | - Yoho!Family账号可登录YOHO!有货 | 28 | + Yoho!Family账号可登录Yoho!Buy有货 |
| 29 | </div> | 29 | </div> |
| 30 | <div id="retrive-pwd-mask" class="mask"></div> | 30 | <div id="retrive-pwd-mask" class="mask"></div> |
| 31 | <ul id="retrive-pwd-ways" class="retrive-pwd-ways"> | 31 | <ul id="retrive-pwd-ways" class="retrive-pwd-ways"> |
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 8 | <input id="phone-num" class="input phone-num" type="text" placeholder="手机号"> | 8 | <input id="phone-num" class="input phone-num" type="text" placeholder="手机号"> |
| 9 | </div> | 9 | </div> |
| 10 | <span id="btn-next" class="btn btn-next disable row">下一步</span> | 10 | <span id="btn-next" class="btn btn-next disable row">下一步</span> |
| 11 | - <p class="register-tip">YOHO!Family账号可登录YOHO!有货、YOHO!Boys、YOHO!Girls及SHOW</p> | 11 | + <p class="register-tip">YOHO!Family账号可登录Yoho!Buy有货、YOHO!Boys、YOHO!Girls及SHOW</p> |
| 12 | </div> | 12 | </div> |
| 13 | </div> | 13 | </div> |
| 14 | {{> layout/footer}} | 14 | {{> layout/footer}} |
| @@ -45,7 +45,7 @@ | @@ -45,7 +45,7 @@ | ||
| 45 | <body {{#if isPassportPage}}class=passport-body{{/if}}> | 45 | <body {{#if isPassportPage}}class=passport-body{{/if}}> |
| 46 | {{#if systemUpdate}} | 46 | {{#if systemUpdate}} |
| 47 | <div class="systemUpdate"> | 47 | <div class="systemUpdate"> |
| 48 | - <a href="index/systemUpdate" class="systemHeader">YOHO!BUY关于系统升级的公告</a> | 48 | + <a href="index/systemUpdate" class="systemHeader">Yoho!Buy有货关于系统升级的公告</a> |
| 49 | <span>X</span> | 49 | <span>X</span> |
| 50 | </div> | 50 | </div> |
| 51 | {{/if}} | 51 | {{/if}} |
| 1 | -<div class="my-edit-address-page page-wrap hide"> | ||
| 2 | - {{# address}} | ||
| 3 | - <form class="edit-address"> | ||
| 4 | - <input type="hidden" name="id" value=""> | ||
| 5 | - <label class="username"> | ||
| 6 | - 收件人姓名 | ||
| 7 | - <input type="text" name="consignee" maxlength="20" value="{{consignee}}"> | ||
| 8 | - </label> | ||
| 9 | - <label class="mobile"> | ||
| 10 | - 手机号码 | ||
| 11 | - <input type="text" name="mobile" value="{{mobile}}"> | ||
| 12 | - </label> | ||
| 13 | - <label class="area"> | ||
| 14 | - 省市区 | ||
| 15 | - <input type="hidden" name="area_code" value="{{area_code}}"> | ||
| 16 | - <input type="text" name="area" value="{{area}}" readonly> | ||
| 17 | - <span class="iconfont"></span> | ||
| 18 | - </label> | ||
| 19 | - <label class="address"> | ||
| 20 | - 详细地址 | ||
| 21 | - <textarea name="address" maxlength="100">{{address}}</textarea> | ||
| 22 | - </label> | ||
| 23 | - | ||
| 24 | - </form> | ||
| 25 | - {{/ address}} | ||
| 26 | - | ||
| 27 | - <div class="submit"> | ||
| 28 | - 确认 | ||
| 29 | - </div> | ||
| 30 | -</div> |
-
Please register or login to post a comment