fe / yohobuy-node · Commits

Go to a project

Authored by 黄涛
Commit aff1da0ada7eb06360cde1d899779bf1b29f6696 1 parent 72575449

refactor

Inline Side-by-side
Showing 6 changed files with 113 additions and 108 deletions
... ... @@ -128,94 +128,84 @@ const getCouponAsync = (bid, skn, uid) => {
//
// return api.get('', params);
return Promise.resolve(
{
'alg': 'SALT_MD5',
'code': 200,
'data': {
newList: {
title: '可领取的券',
body: [
{
'couponName': '满￥199减10',
'amount': 10,
'acquireStatus': 1,
'createTime': 1476358043,
'startTime': 1476633600,
'lifeTime': '2016.10.17-2016.10.28',
'endTime': 1477584000,
'couponId': 14200,
'rule4ShortName': '满￥100减10元'
},
{
'couponName': '满￥199减10',
'amount': 22,
'acquireStatus': 1,
'createTime': 1475152374,
'startTime': 1474992000,
'lifeTime': '2016.09.28-2016.11.17',
'endTime': 1479312000,
'couponId': 14144,
'rule4ShortName': '满￥100减10元'
},
{
'couponName': '满￥199减10',
'amount': 15,
'acquireStatus': 1,
'createTime': 1476358258,
'startTime': 1476115200,
'lifeTime': '2016.10.11-2016.11.18',
'endTime': 1479398400,
'couponId': 14202,
'rule4ShortName': '满￥100减10元'
}
]
},
oldList: {
title: '已领取的券',
body: [
{
'couponName': '满￥199减10',
'amount': 10,
'acquireStatus': 3,
'createTime': 1476358043,
'startTime': 1476633600,
'lifeTime': '2016.10.17-2016.10.28',
'endTime': 1477584000,
'couponId': 14200,
'rule4ShortName': '满￥100减10元'
},
{
'couponName': '满￥199减10',
'amount': 22,
'acquireStatus': 3,
'createTime': 1475152374,
'startTime': 1474992000,
'lifeTime': '2016.09.28-2016.11.17',
'endTime': 1479312000,
'couponId': 14144,
'rule4ShortName': '满￥100减10元'
},
{
'couponName': '满￥199减10',
'amount': 15,
'acquireStatus': 3,
'createTime': 1476358258,
'startTime': 1476115200,
'lifeTime': '2016.10.11-2016.11.18',
'endTime': 1479398400,
'couponId': 14202,
'rule4ShortName': '满￥100减10元'
}
]
}
},
'md5': 'fe8f6e48b14c8f0b5044cb73d7c79900',
'message': '操作成功'
}
return Promise.resolve(
{
'alg': 'SALT_MD5',
'code': 200,
'data': [
{
'couponName': '满￥199减10',
'amount': 10,
'acquireStatus': 1,
'createTime': 1476358043,
'startTime': 1476633600,
'lifeTime': '2016.10.17-2016.10.28',
'endTime': 1477584000,
'couponId': 14200,
'rule4ShortName': '满￥100减10元'
},
{
'couponName': '满￥199减10',
'amount': 22,
'acquireStatus': 1,
'createTime': 1475152374,
'startTime': 1474992000,
'lifeTime': '2016.09.28-2016.11.17',
'endTime': 1479312000,
'couponId': 14144,
'rule4ShortName': '满￥100减10元'
},
{
'couponName': '满￥199减10',
'amount': 15,
'acquireStatus': 1,
'createTime': 1476358258,
'startTime': 1476115200,
'lifeTime': '2016.10.11-2016.11.18',
'endTime': 1479398400,
'couponId': 14202,
'rule4ShortName': '满￥100减10元'
},
{
'couponName': '满￥199减10',
'amount': 10,
'acquireStatus': 3,
'createTime': 1476358043,
'startTime': 1476633600,
'lifeTime': '2016.10.17-2016.10.28',
'endTime': 1477584000,
'couponId': 14200,
'rule4ShortName': '满￥100减10元'
},
{
'couponName': '满￥199减10',
'amount': 22,
'acquireStatus': 3,
'createTime': 1475152374,
'startTime': 1474992000,
'lifeTime': '2016.09.28-2016.11.17',
'endTime': 1479312000,
'couponId': 14144,
'rule4ShortName': '满￥100减10元'
},
{
'couponName': '满￥199减10',
'amount': 15,
'acquireStatus': 3,
'createTime': 1476358258,
'startTime': 1476115200,
'lifeTime': '2016.10.11-2016.11.18',
'endTime': 1479398400,
'couponId': 14202,
'rule4ShortName': '满￥100减10元'
}
],
'md5': 'fe8f6e48b14c8f0b5044cb73d7c79900',
'message': '操作成功'
}
)
;
}
}
;
module.exports = {
... ...
... ... @@ -1033,12 +1033,13 @@ const _getCoupon = (coupons) => {
return false;
}
// let couponList = _.get(coupons, 'data', []);
let couponList = _.get(coupons, 'data', []);
// let pickProp = Fn.pick(['couponName', 'amount', 'couponId', 'acquireStatus','rule4ShortName']);
// let encodeId = Fn.update('couponId', (cid) => crypto.encryption(null, cid + ''));
let pickProp = Fn.pick(['couponName', 'amount', 'couponId', 'acquireStatus','rule4ShortName']);
let encodeId = Fn.update('couponId', (cid) => crypto.encryption(null, cid + ''));
let replace = Fn.update('rule4ShortName',(r)=> r.replace(/￥/g,'¥'));
// return Fn.map(Fn.pipe(pickProp, encodeId))(couponList);
return Fn.map(Fn.pipe(pickProp, encodeId, replace))(couponList);
return coupons.data;
};
... ...
{{#coupon}}
<div class="coupon-big">
<div class="header">优惠券</div>
<div class="coupon-big-list">
{{#newList}}
{{> product/coupon-big-item}}
{{/newList}}
{{#oldList}}
{{> product/coupon-big-item}}
{{/oldList}}
</div>
</div>
{{/coupon}}
... ...
... ... @@ -33,16 +33,6 @@
</div>
{{/if}}
{{#coupon}}
<div class="big-coupon-list">
{{#newList}}
{{> product/coupon-big-item}}
{{/newList}}
{{#oldList}}
{{> product/coupon-big-item}}
{{/oldList}}
</div>
{{/coupon}}
... ...
... ... @@ -31,10 +31,6 @@ var colTxt = {
var $saleReturn = $('#saleReturn');
var couponTpl = [
''
].json('');
Handlebars.registerHelper('if_cond', function(left, operator, right, options) {
switch (operator) {
case '==':
... ... @@ -87,6 +83,8 @@ bindEvent.add(function() {
var Alert = require('../common/dialog').Alert;
var Dialog = requir('../common/dialog').Dialog;
var $moreCoupon = $('.more-coupon');
var $coupons = $('.coupon-item').map(function() {
... ...
... ... @@ -264,10 +264,21 @@
}
.big-coupon-list {
.coupon-big {
width: 400px;
height: 700px;
overflow :auto;
.header {
font-size: 25px;
text-align: center;
margin-bottom: 20px;
width: 100%;
}
.coupon-big-list {
width: 100%;
height: 600px;
overflow: auto;
}
.divide-line {
position: relative;
... ...