chenchao / YOHOBUYPC · Commits

Go to a project

Authored by Lynnic
Commit 1d09f08a0c79beed5f133a905918c3073e1ee249 2 parents e919e41b dc947366

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

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