wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by whb
Commit 0dea6ee13559b837974246ea359787094d757a0e 2 parents 62b94686 5eecb566

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

Inline Side-by-side
Showing 2 changed files with 18 additions and 20 deletions
... ... @@ -23,18 +23,18 @@ class Yohobuy
const SERVICE_URL = 'http://service.api.yohobuy.com/';
const YOHOBUY_URL = 'http://www.yohobuy.com/';**/
// const API_URL = 'http://apih5.yoho.cn/';
// const API_URL2 = 'http://apih5.yoho.cn/';
// const SERVICE_URL = 'http://serviceh5.yoho.cn/';
// const YOHOBUY_URL = 'http://www.yohobuy.com/';
// const API_OLD = 'http://api2.open.yohobuy.com/';
const API_URL = 'http://apih5.yoho.cn/';
const API_URL2 = 'http://apih5.yoho.cn/';
const SERVICE_URL = 'http://serviceh5.yoho.cn/';
const YOHOBUY_URL = 'http://www.yohobuy.com/';
const API_OLD = 'http://api2.open.yohobuy.com/';
// /* 测试环境 */
// const API_URL = 'http://192.168.102.205:8080/gateway/'; // 先临时使用网关
const API_URL = 'http://testapi.yoho.cn:28078/';
/**const API_URL = 'http://testapi.yoho.cn:28078/';
const SERVICE_URL = 'http://testservice.yoho.cn:28077/';
const YOHOBUY_URL = 'http://www.yohobuy.com/';
const API_OLD = 'http://test2.open.yohobuy.com/';
const API_OLD = 'http://test2.open.yohobuy.com/';**/
/* 预览环境 */
// const API_URL = 'http://preapi.yoho.cn/';
... ...
... ... @@ -151,7 +151,7 @@ function changeSizeChosed(newSizeIndex) {
}
}
//老的选中尺码在新选中的颜色对应尺码中不存在,需要下述1,2,3,4
//特殊处理: 老的选中尺码在新选中的颜色对应尺码中不存在,需要下述1,2,3
// 1.重置尺码选择的标志变量.
$curSizeBlock = null;
hasChooseSize = false;
... ... @@ -161,9 +161,7 @@ function changeSizeChosed(newSizeIndex) {
// 3.目标颜色行第一行显示
$colorRowList.eq(0).removeClass('hide');
// 4.老的选中颜色去掉勾选,新的选中颜色加上勾选
//changeColorChosed(0);
curColorIndex = 0;
return -1;
}
... ... @@ -235,14 +233,6 @@ $yohoPage.on('touchstart', '.color-list .block', function() {
$sizeRowList.eq(index + 1).removeClass('hide');
curSizeIndex = index + 1;
// 特殊处理
//if (-1 === curGoodNum) {
//
// //index = $this.data('index') - 1;
//
//}
$curColorBlock = $this;
// 修改颜色时修改商品图片
... ... @@ -251,7 +241,15 @@ $yohoPage.on('touchstart', '.color-list .block', function() {
// 颜色块切换勾选样式
$this.siblings('.chosed').removeClass('chosed');
$this.toggleClass('chosed');
// 特殊处理
if (-1 === curGoodNum) {
$curColorBlock = $($colorRowList.eq(0).children().get(index));
$curColorBlock.addClass('chosed');
} else {
$this.toggleClass('chosed');
}
$('#good-num').val(1);
// 设置按钮的样式和文字
... ...