Commit 05748a8a291811717e6bc4a3968ebdb21e2c16c8
1 parent
35de5a88
活动结束时间
Showing
1 changed file
with
2 additions
and
19 deletions
packageC/pages/presell/goodsInfo/goodsInfo.js
@@ -2345,19 +2345,7 @@ Page({ | @@ -2345,19 +2345,7 @@ Page({ | ||
2345 | sec: this.timeFormat(sec) | 2345 | sec: this.timeFormat(sec) |
2346 | } | 2346 | } |
2347 | } else { | 2347 | } else { |
2348 | - if (th.data.prom_st == 0) { | ||
2349 | - //var endTime2 = new Date(th.data.prom_end_time).getTime(); | ||
2350 | - var endTime2 = th.data.prom_act.end_time; | ||
2351 | - th.setData({ | ||
2352 | - prom_time_text: '距结束还剩:', | ||
2353 | - prom_st: 1 | ||
2354 | - }) | ||
2355 | - setTimeout(function () { | ||
2356 | - th.countDown(endTime2) | ||
2357 | - }, 1000); | ||
2358 | - return false; | ||
2359 | 2348 | ||
2360 | - } else { | ||
2361 | //活动已结束,全部设置为'00' | 2349 | //活动已结束,全部设置为'00' |
2362 | obj = { | 2350 | obj = { |
2363 | day: '00', | 2351 | day: '00', |
@@ -2373,7 +2361,7 @@ Page({ | @@ -2373,7 +2361,7 @@ Page({ | ||
2373 | djs: obj | 2361 | djs: obj |
2374 | }); | 2362 | }); |
2375 | return false; | 2363 | return false; |
2376 | - } | 2364 | + |
2377 | } | 2365 | } |
2378 | 2366 | ||
2379 | th.setData({ | 2367 | th.setData({ |
@@ -2458,8 +2446,7 @@ Page({ | @@ -2458,8 +2446,7 @@ Page({ | ||
2458 | 2446 | ||
2459 | //-------跳转pt商品------- | 2447 | //-------跳转pt商品------- |
2460 | go_to_nopay: function () { | 2448 | go_to_nopay: function () { |
2461 | - var th = this; | ||
2462 | - url = "/pages/user/order_detail/order_detail?order_id=" + th.data.buy_order.order_id; | 2449 | + var th =this,url = "/pages/user/order_detail/order_detail?order_id=" + th.data.buy_order.order_id; |
2463 | getApp().goto(url); | 2450 | getApp().goto(url); |
2464 | 2451 | ||
2465 | }, | 2452 | }, |
@@ -2472,10 +2459,6 @@ Page({ | @@ -2472,10 +2459,6 @@ Page({ | ||
2472 | 2459 | ||
2473 | var th = this; | 2460 | var th = this; |
2474 | var url = "/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn; | 2461 | var url = "/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn; |
2475 | - /*-- | ||
2476 | - wx.redirectTo({ | ||
2477 | - url:url, | ||
2478 | - })--*/ | ||
2479 | getApp().goto(url); | 2462 | getApp().goto(url); |
2480 | 2463 | ||
2481 | }, | 2464 | }, |