diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index e505955..1fbfc2e 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -2345,19 +2345,7 @@ Page({ sec: this.timeFormat(sec) } } else { - if (th.data.prom_st == 0) { - //var endTime2 = new Date(th.data.prom_end_time).getTime(); - var endTime2 = th.data.prom_act.end_time; - th.setData({ - prom_time_text: '距结束还剩:', - prom_st: 1 - }) - setTimeout(function () { - th.countDown(endTime2) - }, 1000); - return false; - } else { //活动已结束,全部设置为'00' obj = { day: '00', @@ -2373,7 +2361,7 @@ Page({ djs: obj }); return false; - } + } th.setData({ @@ -2458,8 +2446,7 @@ Page({ //-------跳转pt商品------- go_to_nopay: function () { - var th = this; - url = "/pages/user/order_detail/order_detail?order_id=" + th.data.buy_order.order_id; + var th =this,url = "/pages/user/order_detail/order_detail?order_id=" + th.data.buy_order.order_id; getApp().goto(url); }, @@ -2472,10 +2459,6 @@ Page({ var th = this; var url = "/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn; - /*-- - wx.redirectTo({ - url:url, - })--*/ getApp().goto(url); },