|
|
@@ -209,14 +209,11 @@
|
|
|
var cycle = ''
|
|
|
var cmap={1:"天",2:"月",3:"年",4:"季"}
|
|
|
if (filterObjNew.buy_type==filterObjNew.give_type){
|
|
|
- cycle = parseInt(filterObjNew.buy_cycle||0) +parseInt(filterObjNew.give_cycle||0) +cmap[filterObjNew.buy_type]
|
|
|
+ cycle = parseInt(filterObjNew.buy_cycle||0) +cmap[filterObjNew.buy_type]
|
|
|
}else{
|
|
|
if (filterObjNew.buy_cycle>0){
|
|
|
cycle+=filterObjNew.buy_cycle+cmap[filterObjNew.buy_type]
|
|
|
}
|
|
|
- if (filterObjNew.give_cycle>0){
|
|
|
- cycle+=filterObjNew.give_cycle+cmap[filterObjNew.give_type]
|
|
|
- }
|
|
|
}
|
|
|
return cycle
|
|
|
}
|
|
|
@@ -323,7 +320,7 @@
|
|
|
var seller_give_type = filterObj.seller_give_type;//时间类型：1/天、2/月
|
|
|
if (can1111 || give_type > 0 || seller_give_type > 0) {
|
|
|
var giveTime = isNewOrder ? filterObj.activity_give_cycle : filterObj.give_cycle;
|
|
|
- var sellerGiveTime = filterObj.seller_give_cycle
|
|
|
+ var sellerGiveTime = filterObj.seller_give_cycle || filterObj.give_cycle;
|
|
|
if (giveTime) {
|
|
|
if (give_type==1){
|
|
|
giveTime=giveTime+"天";
|
