diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js index fa18378..aa7d00f 100644 --- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js +++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js @@ -3395,7 +3395,7 @@ Page({ //获取order信息根据订单编号order_sn await getApp().request.promiseGet("/api/weshop/rechargeServicelist/page", { - data: { store_id: os.stoid, prom_id: prom_id,pt_status: 1} + data: { store_id: os.stoid, prom_id: prom_id,pt_status: 1,pt_listno:teamgroup[i].listno} }).then(res => { var order = res.data.data.pageData; teamgroup[i].open_num = order.length; @@ -3681,8 +3681,16 @@ Page({ } setTimeout(th.countDown2, 1000); }, + //-- 跳转参加团 -- go_cj_team: function (e) { + + //先判断有没有登陆 + if(!getApp().globalData.user_id){ + getApp().goto("/packageE/pages/togoin/togoin"); + return false; + } + var ind = e.currentTarget.dataset.ind; var item = this.data.teamgroup[ind]; var goods_id = e.currentTarget.dataset.goodsid; @@ -3713,7 +3721,7 @@ Page({ success: function (a) { if (a.confirm) { wx.navigateTo({ - url: "/pages/user/order_detail/order_detail?order_id=" + odr.order_id, + url: "/packageA/pages/details_serviceCard/details_serviceCard?order_id=" + odr.order_id, }); } } diff --git a/pages/activity/pind_list/pind_list.js b/pages/activity/pind_list/pind_list.js index 9840a43..015606d 100644 --- a/pages/activity/pind_list/pind_list.js +++ b/pages/activity/pind_list/pind_list.js @@ -91,7 +91,7 @@ Page({ var th = this; //设置全局定时器 th.data.timer = setInterval(function () { - th.countDown(); + if(th.data.is_get) th.countDown(); }, 1000); }, @@ -229,6 +229,7 @@ Page({ } e.data.currentPage++; } + th.setData({ goodlist: alllist, isshow: 1,