fe / yohobuy-node · Commits

Go to a project

Authored by 刘传洋
Commit 963980d0f94abd8a6f9b02613a933c80e903abe8 1 parent 5beb4f72

m

Inline Side-by-side
Showing 5 changed files with 24 additions and 50 deletions
... ... @@ -55,7 +55,8 @@ const setShoppingCookie = (req) => {
*/
const cart = (req, res, next) => {
let uid = 8040155; // req.user.uid;
let uid = 8040155; // req.user.uid; // 8040155; // req.user.uid; 20422448
// console.log('====================> ' + uid);
let shoppingKey = helper.getShoppingKeyByCookie(req);
let cartDelList = req.cookies['cart-del-list'];
... ...
... ... @@ -104,7 +104,7 @@
{{#if promotionInfos}}
<div class="gift-sell mt40">
{{#promotionInfos}}
<p data-role="promotion-wrap">
<div data-role="promotion-wrap" >
<code class="{{#unless isReach}}order-pay-mark-white{{/unless}}">{{tag}}</code>{{promotionTitle}}
<!--<a>去换购</a>-->
{{#if isGift}}
... ... @@ -118,10 +118,9 @@
{{#if isNotReach}}
<a class="btn-clear blue" target="_blank" href="{{promotionPageUrl}}" data-together-id="1" >去凑单&nbsp;></a>
{{/if}}
{{> cart-sel-gift-tpl }}
<!--<textarea data-role="gifts-cansel" class="hide" data-promotionid="{{promotionId}}">{{{giftGoodsListStr}}}</textarea>-->
</p>
{{!--<textarea data-role="gifts-cansel" class="hide" data-promotionid="{{promotionId}}">{{{giftGoodsListStr}}}</textarea>--}}
</div>
{{/promotionInfos}}
</div>
{{/if}}
... ...
<div class="detail-body">
<div class="yoho-dialog cart-togetherGoods"
data-role="cart-gift-win"
style="margin-top: -374.5px; margin-left: -350px; display:none;">
<span class="close">
<i class="iconfont"></i>
</span>
<div class="content">
<div class="detail-body">
<div class="slide-img">
<p>选赠品:<em><span
class="active">1元加价购</span><code>|</code><span>59元加价购</span><code>|</code><span>99元加价购</span></em></p>
... ... @@ -250,7 +257,7 @@
</div>
</div>
</div>
</div>
</div>
</div>
<input value="{{addToCart}}" id="addToCart" type="hidden"/>
... ...
... ... @@ -297,11 +297,6 @@ function renderAndShowSelWin($item, pinfo) {
var Cart = {
addToCart: function(params) {
$payWapper.find('.cart-item-check').each(function() {
var $item = $(this);
var $chk = $item.find('.cart-item-check');
if ($chk.hasClass('cart-item-checked')) {
},
toggleSelectOne: function() { // 单选
... ... @@ -749,16 +744,16 @@ editTarget.find('.sizes-list.mb10').each(function() {
var giftBtn = '[data-role=gift-view-btn],[data-role=gift-resel-btn],[data-role=gift-sel-btn]';
$('.shop-cart').on('click', giftBtn, function() {
var mtext = $(this).closest('[data-role=promotion-wrap]').find('textarea[data-role=gifts-cansel]').text();
var mhtml = $(this).closest('[data-role=promotion-wrap]').find('textarea[data-role=gifts-cansel]').html();
console.log(mtext);
console.log(mhtml);
var textJson = $.parseJSON(mtext);
var htmlJson = $.parseJSON(mhtml);
console.log(textJson);
console.log(htmlJson);
var $this = $(this);
var $win = $this.closest('[data-role=promotion-wrap]').find('[data-role=cart-gift-win]');
console.log($win.length);
$win.show();
});
$('.shop-cart').on('click', '[data-role="cart-gift-win"] .close', function(){
$(this).closest('[data-role="cart-gift-win"]').hide();
});
// 显示加价购
... ...
... ... @@ -146,7 +146,6 @@ var togetherDialog = {};
lazyLoad($('#details-html img'));
}
//凑单 顶部 轮播
$('.side-img-dd').slider2({
isCircle: true,
... ... @@ -475,31 +474,4 @@ $paySum.on('click', '.btn-account', function() {
// }
});
var giftBtn = '[data-role=gift-view-btn],[data-role=gift-resel-btn],[data-role=gift-sel-btn]';
$('.shop-cart').on('click', giftBtn, function() {
var $this = $(this);
var mtext = $(this).closest('[data-role=promotion-wrap]').find('textarea[data-role=gifts-cansel]').text();
// var mhtml = $(this).closest('[data-role=promotion-wrap]').find('textarea[data-role=gifts-cansel]').html();
var textJson = $.parseJSON(mtext);
// var htmlJson = $.parseJSON(mhtml);
var dialog = $this.data('_giftsWin'); // togetherDialog[id];
console.log(dialog);
if (!dialog) {
console.log('create ... ');
dialog = new Dialog({
content: dialogTpl(textJson),
className: 'cart-togetherGoods'
});
$this.data('_giftsWin', dialog);
}
dialog.show();
});
// require('./cart-action');
require('./cart-action');
... ...