diff --git a/app.json b/app.json index 0644cd7..2420036 100644 --- a/app.json +++ b/app.json @@ -18,7 +18,7 @@ "pages/activity/seckill_list/seckill_list", "pages/activity/pind_list/pind_list", - "pages/team/team_success/team_success", + "pages/team/team_show/team_show", "pages/user/userqy/userqy", @@ -240,7 +240,8 @@ "name": "pack7", "pages": [ "pages/store/index", - "pages/user/express/express" + "pages/user/express/express", + "pages/team/team_success/team_success" ] } ], diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js index 55a1e2c..fa605f0 100644 --- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js +++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js @@ -3419,9 +3419,9 @@ Page({ /*--- wx.redirectTo({ - url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, + url: "/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn, });--*/ - getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn); + getApp().goto("/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn); } else { th.get_sto(); diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js index 2250a22..0a98fb4 100644 --- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js @@ -1523,7 +1523,7 @@ Page({ setTimeout(function () { // wx.reLaunch({ // //url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data, - // url: "/pages/team/team_success/team_success?ordersn=" + data.data, + // url: "/packageG/pages/team/team_success/team_success?ordersn=" + data.data, // }) wx.redirectTo({ @@ -1599,7 +1599,7 @@ Page({ // }else{ // // wx.reLaunch({ - // // url: "/pages/team/team_success/team_success?ordersn=" + data.data, + // // url: "/packageG/pages/team/team_success/team_success?ordersn=" + data.data, // // }) // } diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js index 13bacea..5f6dd91 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -4646,9 +4646,9 @@ Page({ // /*--- // wx.redirectTo({ - // url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, + // url: "/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn, // });--*/ - // getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn); + // getApp().goto("/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn); // } else { // th.setData({ @@ -5013,7 +5013,7 @@ Page({ wx.showLoading(); var th = this; - var url = "/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn; + var url = "/packageG/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn; /*-- wx.redirectTo({ url:url, @@ -5105,10 +5105,10 @@ Page({ wx.showLoading(); /*-- wx.redirectTo({ - url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, + url: "/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn, });--*/ - getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn); + getApp().goto("/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn); } else { wx.navigateTo({ diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index 022320c..8020c24 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -2899,7 +2899,7 @@ Page({ wx.showLoading(); var th = this; - var url = "/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn; + var url = "/packageG/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn; getApp().goto(url); }, diff --git a/packageC/pages/presell/pregoodsInfo/goodsInfo.js b/packageC/pages/presell/pregoodsInfo/goodsInfo.js index 38e9802..9f46a1d 100644 --- a/packageC/pages/presell/pregoodsInfo/goodsInfo.js +++ b/packageC/pages/presell/pregoodsInfo/goodsInfo.js @@ -2619,7 +2619,7 @@ Page({ wx.showLoading(); var th = this; - var url = "/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn; + var url = "/packageG/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn; getApp().goto(url); }, diff --git a/packageE/pages/cart/cart2_pt/cart2_pt.js b/packageE/pages/cart/cart2_pt/cart2_pt.js index 234d140..3c08d91 100644 --- a/packageE/pages/cart/cart2_pt/cart2_pt.js +++ b/packageE/pages/cart/cart2_pt/cart2_pt.js @@ -586,7 +586,7 @@ Page({ if(fy) return false; util_pay.set_fir(); //-- 通联的第三方支付的返回优化 -- - ut.is_pay_ok(th.data.ok_order_sn,"/pages/team/team_success/team_success?ordersn=" + th.data.ok_order_sn, + ut.is_pay_ok(th.data.ok_order_sn,"/packageG/pages/team/team_success/team_success?ordersn=" + th.data.ok_order_sn, "/pages/user/order_list/order_list",function (){ if(!th.data.ok_order_sn) return false; getApp().request.promiseGet("/api/weshop/order/page", @@ -598,7 +598,7 @@ Page({ //支付支付,返回首页 ut.m_toast('支付成功'); setTimeout(()=>{ - getApp().re_to("/pages/team/team_success/team_success?ordersn=" + th.data.ok_order_sn); + getApp().re_to("/packageG/pages/team/team_success/team_success?ordersn=" + th.data.ok_order_sn); },1000) }else{ @@ -1378,7 +1378,7 @@ Page({ setTimeout(function () { wx.reLaunch({ //url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data, - url: "/pages/team/team_success/team_success?ordersn=" + data.data, + url: "/packageG/pages/team/team_success/team_success?ordersn=" + data.data, }) }, 1000) }, function () { @@ -1424,7 +1424,7 @@ Page({ } else { wx.reLaunch({ - url: "/pages/team/team_success/team_success?ordersn=" + data.data, + url: "/packageG/pages/team/team_success/team_success?ordersn=" + data.data, }) } diff --git a/packageF/pages/team/team_more/team_more.js b/packageF/pages/team/team_more/team_more.js index c24596f..ad8343c 100644 --- a/packageF/pages/team/team_more/team_more.js +++ b/packageF/pages/team/team_more/team_more.js @@ -197,7 +197,7 @@ Page({ }); }else if (odr.pt_status == 1 && odr.order_status == 1){ wx.navigateTo({ - url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, + url: "/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn, }); } } diff --git a/packageF/pages/team/team_ping/team_ping.js b/packageF/pages/team/team_ping/team_ping.js index d1e2963..522b2d5 100644 --- a/packageF/pages/team/team_ping/team_ping.js +++ b/packageF/pages/team/team_ping/team_ping.js @@ -245,7 +245,7 @@ Page({ go_team_success:function(e) { var order_sn=e.currentTarget.dataset.ordsn; var goods_type=e.currentTarget.dataset.goods_type; - var url="/pages/team/team_success/team_success?ordersn=" + order_sn; + var url="/packageG/pages/team/team_success/team_success?ordersn=" + order_sn; if(goods_type==1){ url="/packageA/pages/serviceCard_pd/team_success/team_success?ordersn=" + order_sn; } diff --git a/pages/cart/cart4/cart4.js b/pages/cart/cart4/cart4.js index befb038..44086ab 100644 --- a/pages/cart/cart4/cart4.js +++ b/pages/cart/cart4/cart4.js @@ -90,7 +90,7 @@ Page({ wx.setStorageSync("order:order_list:update", !0); if(this.data.is_pt==1){ wx.redirectTo({ - url: "/pages/team/team_success/team_success?ordersn=" + this.data.pt_order_sn, + url: "/packageG/pages/team/team_success/team_success?ordersn=" + this.data.pt_order_sn, }); }else { diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 4560153..7c90395 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -5296,9 +5296,9 @@ Page({ /*--- wx.redirectTo({ - url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, + url: "/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn, });--*/ - getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn); + getApp().goto("/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn); } else { th.setData({ @@ -5637,7 +5637,7 @@ Page({ wx.showLoading(); var th = this; - var url = "/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn; + var url = "/packageG/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn; /*-- wx.redirectTo({ url:url, @@ -5733,7 +5733,7 @@ Page({ this.data.is_go_to_team_show = 1; wx.showLoading(); - getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn); + getApp().goto("/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn); } else { console.log(222, goods_id) diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js index 7068b32..c37d922 100644 --- a/pages/team/team_show/team_show.js +++ b/pages/team/team_show/team_show.js @@ -476,7 +476,7 @@ Page({ is_ok=0; }else if (odr.pt_status == 1 && odr.order_status == 1){ wx.navigateTo({ - url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, + url: "/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn, }); is_ok=0; }