Commit b420cdc7515d718c6e36b78862b45c7ba1bba4b2
1 parent
fc431d77
移包
Showing
12 changed files
with
26 additions
and
25 deletions
app.json
@@ -18,7 +18,7 @@ | @@ -18,7 +18,7 @@ | ||
18 | 18 | ||
19 | "pages/activity/seckill_list/seckill_list", | 19 | "pages/activity/seckill_list/seckill_list", |
20 | "pages/activity/pind_list/pind_list", | 20 | "pages/activity/pind_list/pind_list", |
21 | - "pages/team/team_success/team_success", | 21 | + |
22 | "pages/team/team_show/team_show", | 22 | "pages/team/team_show/team_show", |
23 | 23 | ||
24 | "pages/user/userqy/userqy", | 24 | "pages/user/userqy/userqy", |
@@ -240,7 +240,8 @@ | @@ -240,7 +240,8 @@ | ||
240 | "name": "pack7", | 240 | "name": "pack7", |
241 | "pages": [ | 241 | "pages": [ |
242 | "pages/store/index", | 242 | "pages/store/index", |
243 | - "pages/user/express/express" | 243 | + "pages/user/express/express", |
244 | + "pages/team/team_success/team_success" | ||
244 | ] | 245 | ] |
245 | } | 246 | } |
246 | ], | 247 | ], |
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
@@ -3419,9 +3419,9 @@ Page({ | @@ -3419,9 +3419,9 @@ Page({ | ||
3419 | 3419 | ||
3420 | /*--- | 3420 | /*--- |
3421 | wx.redirectTo({ | 3421 | wx.redirectTo({ |
3422 | - url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, | 3422 | + url: "/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn, |
3423 | });--*/ | 3423 | });--*/ |
3424 | - getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn); | 3424 | + getApp().goto("/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn); |
3425 | 3425 | ||
3426 | } else { | 3426 | } else { |
3427 | th.get_sto(); | 3427 | th.get_sto(); |
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
@@ -1523,7 +1523,7 @@ Page({ | @@ -1523,7 +1523,7 @@ Page({ | ||
1523 | setTimeout(function () { | 1523 | setTimeout(function () { |
1524 | // wx.reLaunch({ | 1524 | // wx.reLaunch({ |
1525 | // //url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data, | 1525 | // //url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data, |
1526 | - // url: "/pages/team/team_success/team_success?ordersn=" + data.data, | 1526 | + // url: "/packageG/pages/team/team_success/team_success?ordersn=" + data.data, |
1527 | // }) | 1527 | // }) |
1528 | 1528 | ||
1529 | wx.redirectTo({ | 1529 | wx.redirectTo({ |
@@ -1599,7 +1599,7 @@ Page({ | @@ -1599,7 +1599,7 @@ Page({ | ||
1599 | 1599 | ||
1600 | // }else{ | 1600 | // }else{ |
1601 | // // wx.reLaunch({ | 1601 | // // wx.reLaunch({ |
1602 | - // // url: "/pages/team/team_success/team_success?ordersn=" + data.data, | 1602 | + // // url: "/packageG/pages/team/team_success/team_success?ordersn=" + data.data, |
1603 | // // }) | 1603 | // // }) |
1604 | // } | 1604 | // } |
1605 | 1605 |
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -4646,9 +4646,9 @@ Page({ | @@ -4646,9 +4646,9 @@ Page({ | ||
4646 | 4646 | ||
4647 | // /*--- | 4647 | // /*--- |
4648 | // wx.redirectTo({ | 4648 | // wx.redirectTo({ |
4649 | - // url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, | 4649 | + // url: "/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn, |
4650 | // });--*/ | 4650 | // });--*/ |
4651 | - // getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn); | 4651 | + // getApp().goto("/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn); |
4652 | 4652 | ||
4653 | // } else { | 4653 | // } else { |
4654 | // th.setData({ | 4654 | // th.setData({ |
@@ -5013,7 +5013,7 @@ Page({ | @@ -5013,7 +5013,7 @@ Page({ | ||
5013 | wx.showLoading(); | 5013 | wx.showLoading(); |
5014 | 5014 | ||
5015 | var th = this; | 5015 | var th = this; |
5016 | - var url = "/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn; | 5016 | + var url = "/packageG/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn; |
5017 | /*-- | 5017 | /*-- |
5018 | wx.redirectTo({ | 5018 | wx.redirectTo({ |
5019 | url:url, | 5019 | url:url, |
@@ -5105,10 +5105,10 @@ Page({ | @@ -5105,10 +5105,10 @@ Page({ | ||
5105 | wx.showLoading(); | 5105 | wx.showLoading(); |
5106 | /*-- | 5106 | /*-- |
5107 | wx.redirectTo({ | 5107 | wx.redirectTo({ |
5108 | - url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, | 5108 | + url: "/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn, |
5109 | });--*/ | 5109 | });--*/ |
5110 | 5110 | ||
5111 | - getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn); | 5111 | + getApp().goto("/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn); |
5112 | 5112 | ||
5113 | } else { | 5113 | } else { |
5114 | wx.navigateTo({ | 5114 | wx.navigateTo({ |
packageC/pages/presell/goodsInfo/goodsInfo.js
@@ -2899,7 +2899,7 @@ Page({ | @@ -2899,7 +2899,7 @@ Page({ | ||
2899 | wx.showLoading(); | 2899 | wx.showLoading(); |
2900 | 2900 | ||
2901 | var th = this; | 2901 | var th = this; |
2902 | - var url = "/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn; | 2902 | + var url = "/packageG/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn; |
2903 | getApp().goto(url); | 2903 | getApp().goto(url); |
2904 | 2904 | ||
2905 | }, | 2905 | }, |
packageC/pages/presell/pregoodsInfo/goodsInfo.js
@@ -2619,7 +2619,7 @@ Page({ | @@ -2619,7 +2619,7 @@ Page({ | ||
2619 | wx.showLoading(); | 2619 | wx.showLoading(); |
2620 | 2620 | ||
2621 | var th = this; | 2621 | var th = this; |
2622 | - var url = "/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn; | 2622 | + var url = "/packageG/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn; |
2623 | getApp().goto(url); | 2623 | getApp().goto(url); |
2624 | 2624 | ||
2625 | }, | 2625 | }, |
packageE/pages/cart/cart2_pt/cart2_pt.js
@@ -586,7 +586,7 @@ Page({ | @@ -586,7 +586,7 @@ Page({ | ||
586 | if(fy) return false; | 586 | if(fy) return false; |
587 | util_pay.set_fir(); | 587 | util_pay.set_fir(); |
588 | //-- 通联的第三方支付的返回优化 -- | 588 | //-- 通联的第三方支付的返回优化 -- |
589 | - ut.is_pay_ok(th.data.ok_order_sn,"/pages/team/team_success/team_success?ordersn=" + th.data.ok_order_sn, | 589 | + ut.is_pay_ok(th.data.ok_order_sn,"/packageG/pages/team/team_success/team_success?ordersn=" + th.data.ok_order_sn, |
590 | "/pages/user/order_list/order_list",function (){ | 590 | "/pages/user/order_list/order_list",function (){ |
591 | if(!th.data.ok_order_sn) return false; | 591 | if(!th.data.ok_order_sn) return false; |
592 | getApp().request.promiseGet("/api/weshop/order/page", | 592 | getApp().request.promiseGet("/api/weshop/order/page", |
@@ -598,7 +598,7 @@ Page({ | @@ -598,7 +598,7 @@ Page({ | ||
598 | //支付支付,返回首页 | 598 | //支付支付,返回首页 |
599 | ut.m_toast('支付成功'); | 599 | ut.m_toast('支付成功'); |
600 | setTimeout(()=>{ | 600 | setTimeout(()=>{ |
601 | - getApp().re_to("/pages/team/team_success/team_success?ordersn=" + th.data.ok_order_sn); | 601 | + getApp().re_to("/packageG/pages/team/team_success/team_success?ordersn=" + th.data.ok_order_sn); |
602 | },1000) | 602 | },1000) |
603 | 603 | ||
604 | }else{ | 604 | }else{ |
@@ -1378,7 +1378,7 @@ Page({ | @@ -1378,7 +1378,7 @@ Page({ | ||
1378 | setTimeout(function () { | 1378 | setTimeout(function () { |
1379 | wx.reLaunch({ | 1379 | wx.reLaunch({ |
1380 | //url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data, | 1380 | //url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data, |
1381 | - url: "/pages/team/team_success/team_success?ordersn=" + data.data, | 1381 | + url: "/packageG/pages/team/team_success/team_success?ordersn=" + data.data, |
1382 | }) | 1382 | }) |
1383 | }, 1000) | 1383 | }, 1000) |
1384 | }, function () { | 1384 | }, function () { |
@@ -1424,7 +1424,7 @@ Page({ | @@ -1424,7 +1424,7 @@ Page({ | ||
1424 | 1424 | ||
1425 | } else { | 1425 | } else { |
1426 | wx.reLaunch({ | 1426 | wx.reLaunch({ |
1427 | - url: "/pages/team/team_success/team_success?ordersn=" + data.data, | 1427 | + url: "/packageG/pages/team/team_success/team_success?ordersn=" + data.data, |
1428 | }) | 1428 | }) |
1429 | } | 1429 | } |
1430 | 1430 |
packageF/pages/team/team_more/team_more.js
@@ -197,7 +197,7 @@ Page({ | @@ -197,7 +197,7 @@ Page({ | ||
197 | }); | 197 | }); |
198 | }else if (odr.pt_status == 1 && odr.order_status == 1){ | 198 | }else if (odr.pt_status == 1 && odr.order_status == 1){ |
199 | wx.navigateTo({ | 199 | wx.navigateTo({ |
200 | - url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, | 200 | + url: "/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn, |
201 | }); | 201 | }); |
202 | } | 202 | } |
203 | } | 203 | } |
packageF/pages/team/team_ping/team_ping.js
@@ -245,7 +245,7 @@ Page({ | @@ -245,7 +245,7 @@ Page({ | ||
245 | go_team_success:function(e) { | 245 | go_team_success:function(e) { |
246 | var order_sn=e.currentTarget.dataset.ordsn; | 246 | var order_sn=e.currentTarget.dataset.ordsn; |
247 | var goods_type=e.currentTarget.dataset.goods_type; | 247 | var goods_type=e.currentTarget.dataset.goods_type; |
248 | - var url="/pages/team/team_success/team_success?ordersn=" + order_sn; | 248 | + var url="/packageG/pages/team/team_success/team_success?ordersn=" + order_sn; |
249 | if(goods_type==1){ | 249 | if(goods_type==1){ |
250 | url="/packageA/pages/serviceCard_pd/team_success/team_success?ordersn=" + order_sn; | 250 | url="/packageA/pages/serviceCard_pd/team_success/team_success?ordersn=" + order_sn; |
251 | } | 251 | } |
pages/cart/cart4/cart4.js
@@ -90,7 +90,7 @@ Page({ | @@ -90,7 +90,7 @@ Page({ | ||
90 | wx.setStorageSync("order:order_list:update", !0); | 90 | wx.setStorageSync("order:order_list:update", !0); |
91 | if(this.data.is_pt==1){ | 91 | if(this.data.is_pt==1){ |
92 | wx.redirectTo({ | 92 | wx.redirectTo({ |
93 | - url: "/pages/team/team_success/team_success?ordersn=" + this.data.pt_order_sn, | 93 | + url: "/packageG/pages/team/team_success/team_success?ordersn=" + this.data.pt_order_sn, |
94 | }); | 94 | }); |
95 | 95 | ||
96 | }else { | 96 | }else { |
pages/goods/goodsInfo/goodsInfo.js
@@ -5296,9 +5296,9 @@ Page({ | @@ -5296,9 +5296,9 @@ Page({ | ||
5296 | 5296 | ||
5297 | /*--- | 5297 | /*--- |
5298 | wx.redirectTo({ | 5298 | wx.redirectTo({ |
5299 | - url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, | 5299 | + url: "/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn, |
5300 | });--*/ | 5300 | });--*/ |
5301 | - getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn); | 5301 | + getApp().goto("/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn); |
5302 | 5302 | ||
5303 | } else { | 5303 | } else { |
5304 | th.setData({ | 5304 | th.setData({ |
@@ -5637,7 +5637,7 @@ Page({ | @@ -5637,7 +5637,7 @@ Page({ | ||
5637 | wx.showLoading(); | 5637 | wx.showLoading(); |
5638 | 5638 | ||
5639 | var th = this; | 5639 | var th = this; |
5640 | - var url = "/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn; | 5640 | + var url = "/packageG/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn; |
5641 | /*-- | 5641 | /*-- |
5642 | wx.redirectTo({ | 5642 | wx.redirectTo({ |
5643 | url:url, | 5643 | url:url, |
@@ -5733,7 +5733,7 @@ Page({ | @@ -5733,7 +5733,7 @@ Page({ | ||
5733 | this.data.is_go_to_team_show = 1; | 5733 | this.data.is_go_to_team_show = 1; |
5734 | wx.showLoading(); | 5734 | wx.showLoading(); |
5735 | 5735 | ||
5736 | - getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn); | 5736 | + getApp().goto("/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn); |
5737 | 5737 | ||
5738 | } else { | 5738 | } else { |
5739 | console.log(222, goods_id) | 5739 | console.log(222, goods_id) |
pages/team/team_show/team_show.js
@@ -476,7 +476,7 @@ Page({ | @@ -476,7 +476,7 @@ Page({ | ||
476 | is_ok=0; | 476 | is_ok=0; |
477 | }else if (odr.pt_status == 1 && odr.order_status == 1){ | 477 | }else if (odr.pt_status == 1 && odr.order_status == 1){ |
478 | wx.navigateTo({ | 478 | wx.navigateTo({ |
479 | - url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, | 479 | + url: "/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn, |
480 | }); | 480 | }); |
481 | is_ok=0; | 481 | is_ok=0; |
482 | } | 482 | } |