Commit f19bf8ee33be64d209a112e7c83bb97f94d07b02
1 parent
a48b6578
拼团列表的优化
Showing
2 changed files
with
12 additions
and
3 deletions
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
| @@ -3395,7 +3395,7 @@ Page({ | @@ -3395,7 +3395,7 @@ Page({ | ||
| 3395 | 3395 | ||
| 3396 | //获取order信息根据订单编号order_sn | 3396 | //获取order信息根据订单编号order_sn |
| 3397 | await getApp().request.promiseGet("/api/weshop/rechargeServicelist/page", { | 3397 | await getApp().request.promiseGet("/api/weshop/rechargeServicelist/page", { |
| 3398 | - data: { store_id: os.stoid, prom_id: prom_id,pt_status: 1} | 3398 | + data: { store_id: os.stoid, prom_id: prom_id,pt_status: 1,pt_listno:teamgroup[i].listno} |
| 3399 | }).then(res => { | 3399 | }).then(res => { |
| 3400 | var order = res.data.data.pageData; | 3400 | var order = res.data.data.pageData; |
| 3401 | teamgroup[i].open_num = order.length; | 3401 | teamgroup[i].open_num = order.length; |
| @@ -3681,8 +3681,16 @@ Page({ | @@ -3681,8 +3681,16 @@ Page({ | ||
| 3681 | } | 3681 | } |
| 3682 | setTimeout(th.countDown2, 1000); | 3682 | setTimeout(th.countDown2, 1000); |
| 3683 | }, | 3683 | }, |
| 3684 | + | ||
| 3684 | //-- 跳转参加团 -- | 3685 | //-- 跳转参加团 -- |
| 3685 | go_cj_team: function (e) { | 3686 | go_cj_team: function (e) { |
| 3687 | + | ||
| 3688 | + //先判断有没有登陆 | ||
| 3689 | + if(!getApp().globalData.user_id){ | ||
| 3690 | + getApp().goto("/packageE/pages/togoin/togoin"); | ||
| 3691 | + return false; | ||
| 3692 | + } | ||
| 3693 | + | ||
| 3686 | var ind = e.currentTarget.dataset.ind; | 3694 | var ind = e.currentTarget.dataset.ind; |
| 3687 | var item = this.data.teamgroup[ind]; | 3695 | var item = this.data.teamgroup[ind]; |
| 3688 | var goods_id = e.currentTarget.dataset.goodsid; | 3696 | var goods_id = e.currentTarget.dataset.goodsid; |
| @@ -3713,7 +3721,7 @@ Page({ | @@ -3713,7 +3721,7 @@ Page({ | ||
| 3713 | success: function (a) { | 3721 | success: function (a) { |
| 3714 | if (a.confirm) { | 3722 | if (a.confirm) { |
| 3715 | wx.navigateTo({ | 3723 | wx.navigateTo({ |
| 3716 | - url: "/pages/user/order_detail/order_detail?order_id=" + odr.order_id, | 3724 | + url: "/packageA/pages/details_serviceCard/details_serviceCard?order_id=" + odr.order_id, |
| 3717 | }); | 3725 | }); |
| 3718 | } | 3726 | } |
| 3719 | } | 3727 | } |
pages/activity/pind_list/pind_list.js
| @@ -91,7 +91,7 @@ Page({ | @@ -91,7 +91,7 @@ Page({ | ||
| 91 | var th = this; | 91 | var th = this; |
| 92 | //设置全局定时器 | 92 | //设置全局定时器 |
| 93 | th.data.timer = setInterval(function () { | 93 | th.data.timer = setInterval(function () { |
| 94 | - th.countDown(); | 94 | + if(th.data.is_get) th.countDown(); |
| 95 | }, 1000); | 95 | }, 1000); |
| 96 | }, | 96 | }, |
| 97 | 97 | ||
| @@ -229,6 +229,7 @@ Page({ | @@ -229,6 +229,7 @@ Page({ | ||
| 229 | } | 229 | } |
| 230 | e.data.currentPage++; | 230 | e.data.currentPage++; |
| 231 | } | 231 | } |
| 232 | + | ||
| 232 | th.setData({ | 233 | th.setData({ |
| 233 | goodlist: alllist, | 234 | goodlist: alllist, |
| 234 | isshow: 1, | 235 | isshow: 1, |