Authored by htoooth

fix

... ... @@ -76,7 +76,7 @@
</span>
</li>
<li class="relative clearfix sms-captcha-img-wrap sms-login hide">
<li class="clearfix sms-captcha-img-wrap sms-login hide">
<input id="sms-captcha-input" class="input va captcha" type="text" name="captcha"
placeholder="图形验证码"
autocomplete="off" maxlength="4">
... ...
... ... @@ -1121,7 +1121,7 @@ const _detailDataPkg = (origin, uid, vipLevel, cookies) => {
};
if (propOrigin('isLimitBuy', false) && propOrigin('limitProductCode', '')) {
result.limitProductCode = crypto.encryption(null, propOrigin('limitProductCode') + '');
result.limitProductCode = propOrigin('limitProductCode');
requestApi.limited = productAPI.getLimitedProductStatusAsync(
propOrigin('limitProductCode'),
... ... @@ -1366,6 +1366,7 @@ const _detailDataPkg = (origin, uid, vipLevel, cookies) => {
if (!_.has(result, 'fashionTopGoods')) {
cookies && cookies(_.get(result, 'skn', ''));
}
return {
goodsInfo: result,
banner: _.isEmpty(bandInfo) ? null : bandInfo,
... ...
... ... @@ -17,13 +17,13 @@ module.exports = {
cookieDomain: '.yohobuy.com',
domains: {
favApi: 'http://192.168.102.31:8092/brower',
api: 'http://api-test3.yohops.com:9999/',
service: 'http://service-test3.yohops.com:9999/',
//api: 'http://api-test3.yohops.com:9999/',
//service: 'http://service-test3.yohops.com:9999/',
//
// api: 'http://api.yoho.cn/',
// service: 'http://service.yoho.cn/',
api: 'http://api.yoho.cn/',
service: 'http://service.yoho.cn/',
// api: 'http://dev-api.yohops.com:9999/',
//api: 'http://dev-api.yohops.com:9999/',
// service: 'http://dev-service.yohops.com:9999/',
search: 'http://192.168.102.216:8080/yohosearch/'
... ...
... ... @@ -762,7 +762,7 @@ function smsCaptchaImgAsync() {
}
function validateSmsCaptchaImg() {
smsCaptchaImgLocal()
return smsCaptchaImgLocal()
.then(smsCaptchaImgAsync)
.then(hideSmsCaptchaImgTip);
}
... ... @@ -1107,7 +1107,9 @@ $captchaSmsBtn.on('click', function() {
return;
}
validateAccount().then(function() {
validateAccount()
.then(validateSmsCaptchaImg)
.then(function() {
disable60sSendSmsBtn();
return sendCaptchaSmsAsync();
});
... ...
... ... @@ -24,7 +24,7 @@ var $main = $('.main'),
skn = $main.data('skn'),
deposit = $main.data('deposit') === 'Y',
secKill = $main.data('seckill') === 'Y',
limitCode = encodeURIComponent($main.data('limitcode'));
limitCode = $main.data('limitcode');
var SLIDETIME = 200;
... ... @@ -51,8 +51,8 @@ var dialogTpl = require('hbs/product/coupon-dialog.hbs');
var $goodsIdArr = [],
pageNum = 1;
function productUrl(s) {
return window.location.href + '?openby:yohobuy={"action":"go.productDetail","params":{"product_skn":"' + s + '"}}';
function limitedProductUrl(s) {
return window.location.href + '?openby:yohobuy={"action":"go.limitpurchase","params":{"lp":"' + s + '"}}';
}
function isEmpty(el) {
... ... @@ -413,7 +413,7 @@ bindEvent.add(function() {
$qrcode.qrcode({
render: 'table',
size: 140,
text: productUrl(skn)
text: limitedProductUrl(limitCode)
});
}
... ...
... ... @@ -54,6 +54,14 @@
}
}
.sms-captcha-img-wrap {
position: relative;
.err-tip {
left: 335px;
}
}
/* 验证码 */
.captcha {
float: left;
... ...