wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by uedxwg
Commit b383bd2fda142fef2e6a3b6b43d71b4a7d743e68 2 parents 6bcc053f ec1c95b2

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

Inline Side-by-side
Showing 15 changed files with 25 additions and 25 deletions
... ... @@ -22,7 +22,7 @@
}());
})(document, window);
</script>
<link rel="stylesheet" href="http://cdn.yoho.cn/myohobuy/1.1.2/index.css">
<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/1.3.13/index.css">
</head>
<body class=passport-body>
<div class="back-email-page passport-page yoho-page">
... ... @@ -37,8 +37,8 @@
<span id="btn-sure" class="btn btn-sure disable row">确定</span>
</div>
</div>
<script src="http://cdn.yoho.cn/myohobuy/1.1.2/lib.js"></script>
<script src="http://cdn.yoho.cn/myohobuy/1.1.2/index.js"></script>
<script src="//cdn.yoho.cn/myohobuy/1.3.13/index.css"></script>
<script src="//cdn.yoho.cn/myohobuy/1.3.13/index.css"></script>
<script type="text/javascript">
(function(w,d,s,j,f){
... ...
... ... @@ -26,7 +26,7 @@
<link rel="dns-prefetch" href="//static.yohobuy.com">
<link rel="dns-prefetch" href="//img12.static.yhbimg.com">
<link rel="dns-prefetch" href="//img13.static.yhbimg.com">
<link rel="stylesheet" href="http://static.dev.yohobuy.com/css/index.css">
<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/1.3.13/index.css">
<link rel="apple-touch-icon-precomposed" href="http://static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png">
<link rel="apple-touch-startup-image" sizes="640x920" href="http://static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)">
<link rel="apple-touch-startup-image" sizes="320x460" href="http://static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)">
... ...
... ... @@ -22,7 +22,7 @@
}());
})(document, window);
</script>
<link rel="stylesheet" href="http://cdn.yoho.cn/myohobuy/1.1.2/index.css">
<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/1.3.13/index.css">
</head>
<body class=passport-body>
<div class="back-mobile-page passport-page yoho-page">
... ...
... ... @@ -26,7 +26,7 @@
<link rel="dns-prefetch" href="//static.yohobuy.com">
<link rel="dns-prefetch" href="//img12.static.yhbimg.com">
<link rel="dns-prefetch" href="//img13.static.yhbimg.com">
<link rel="stylesheet" href="http://static.dev.yohobuy.com/css/index.css">
<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/1.3.13/index.css">
<link rel="apple-touch-icon-precomposed" href="http://static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png">
<link rel="apple-touch-startup-image" sizes="640x920" href="http://static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)">
<link rel="apple-touch-startup-image" sizes="320x460" href="http://static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)">
... ...
... ... @@ -10549,17 +10549,21 @@ $('.cart-goods').on('touchstart', '.checkbox', function() {
* @return false or undefined
*
*/
function showEditPannelWithSku(html, id, isSelected, isEditNum) {
if (html.length < 2) {
function showEditPannelWithSku(html, id, isSelected, isEditNum, skn) {
var $html = $(html);
if (!$html.hasClass('chose-panel')) {
tip.show('出错啦！');
return false;
}
// 记录成功加载的选择框
previousEditSkn = skn;
//删掉页面上原有的pannel
chosePanel.remove();
$(html).appendTo('#mainCart');
$html.appendTo('#mainCart');
chosePanel.init();
chosePanel.setEditModeWithSknId(id, isSelected);
... ... @@ -10594,9 +10598,6 @@ $('.icon-edit').on('touchstart', function(e) {
return;
}
previousEditSkn = skn;
$checkBox = $this.closest('.info').siblings('.checkbox');
$tag = $this.closest('.deps').siblings('.few-tag');
... ... @@ -10610,7 +10611,6 @@ $('.icon-edit').on('touchstart', function(e) {
loading.showLoadingMask();
$.ajax({
url: '/cart/index/goodinfo',
data: {
... ... @@ -10618,7 +10618,7 @@ $('.icon-edit').on('touchstart', function(e) {
buy_num: count
},
success: function(res) {
showEditPannelWithSku(res, id, $checkBox.hasClass('icon-cb-checked'), canEditNum);
showEditPannelWithSku(res, id, $checkBox.hasClass('icon-cb-checked'), canEditNum, skn);
},
error: function() {
tip.show('网络异常');
... ...
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
... ... @@ -96,17 +96,21 @@ $('.cart-goods').on('touchstart', '.checkbox', function() {
* @return false or undefined
*
*/
function showEditPannelWithSku(html, id, isSelected, isEditNum) {
if (html.length < 2) {
function showEditPannelWithSku(html, id, isSelected, isEditNum, skn) {
var $html = $(html);
if (!$html.hasClass('chose-panel')) {
tip.show('出错啦！');
return false;
}
// 记录成功加载的选择框
previousEditSkn = skn;
//删掉页面上原有的pannel
chosePanel.remove();
$(html).appendTo('#mainCart');
$html.appendTo('#mainCart');
chosePanel.init();
chosePanel.setEditModeWithSknId(id, isSelected);
... ... @@ -141,9 +145,6 @@ $('.icon-edit').on('touchstart', function(e) {
return;
}
previousEditSkn = skn;
$checkBox = $this.closest('.info').siblings('.checkbox');
$tag = $this.closest('.deps').siblings('.few-tag');
... ... @@ -157,7 +158,6 @@ $('.icon-edit').on('touchstart', function(e) {
loading.showLoadingMask();
$.ajax({
url: '/cart/index/goodinfo',
data: {
... ... @@ -165,7 +165,7 @@ $('.icon-edit').on('touchstart', function(e) {
buy_num: count
},
success: function(res) {
showEditPannelWithSku(res, id, $checkBox.hasClass('icon-cb-checked'), canEditNum);
showEditPannelWithSku(res, id, $checkBox.hasClass('icon-cb-checked'), canEditNum, skn);
},
error: function() {
tip.show('网络异常');
... ...
... ... @@ -475,7 +475,7 @@ class CartModel
}
// 累加商品金额
$goodsPrice += $single['subtotal'];
$goodsPrice += $oneGoods['count'] * $oneGoods['price'];
$result['goods'][] = $oneGoods;
}
... ...