|
@@ -478,15 +478,13 @@
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+ //周期
|
|
|
var effectiveBool = true;
|
|
var effectiveBool = true;
|
|
|
//续费升级逻辑修改后判断是否不延期
|
|
//续费升级逻辑修改后判断是否不延期
|
|
|
if (filterObj.cycleunit == 0 && filterObj.cyclecount == 0) {
|
|
if (filterObj.cycleunit == 0 && filterObj.cyclecount == 0) {
|
|
|
effectiveBool=false;
|
|
effectiveBool=false;
|
|
|
$(".cyclecount").text("不延期");
|
|
$(".cyclecount").text("不延期");
|
|
|
- }
|
|
|
|
|
- //周期
|
|
|
|
|
- if ((r.data.order.vip_starttime != undefined) && (r.data.order.vip_endtime != undefined)) {
|
|
|
|
|
|
|
+ }else if ((r.data.order.vip_starttime != undefined) && (r.data.order.vip_endtime != undefined)) {
|
|
|
var start_time_vip = r.data.order.vip_starttime;
|
|
var start_time_vip = r.data.order.vip_starttime;
|
|
|
var end_time_vip = r.data.order.vip_endtime;
|
|
var end_time_vip = r.data.order.vip_endtime;
|
|
|
var start_time_arr = start_time_vip.split(" ")[0].split("-")
|
|
var start_time_arr = start_time_vip.split(" ")[0].split("-")
|
