diff --git a/app.json b/app.json index be7da9b..ab2d141 100644 --- a/app.json +++ b/app.json @@ -26,18 +26,11 @@ "pages/activity/pind_list/pind_list", "pages/team/team_success/team_success", "pages/team/team_show/team_show", - "pages/team/team_ping/team_ping", - "pages/cart/cart_wk/cart_wk", - - - + "pages/team/team_ping/team_ping", "pages/user/userqy/userqy", - "pages/user/user_spsy/user_spsy", - - + "pages/user/user_spsy/user_spsy", "pages/payment/pay_success/pay_success", "pages/user/plus/plus", - "pages/user/my_service/appment_main", "pages/user/my_service/i_service", "pages/user/my_service/cosmetology_list", @@ -227,7 +220,8 @@ "pages/user/monthgiftbag/giftpackinfo/giftpackinfo", "pages/user/monthgiftbag/giftpackbuy/giftpackbuy", "pages/cart/cart2_inte/cart2_inte", - "pages/cart/cart2_pt/cart2_pt" + "pages/cart/cart2_pt/cart2_pt", + "pages/cart/cart_wk/cart_wk" ] }, diff --git a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js index 6b453d8..c36a805 100644 --- a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js +++ b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js @@ -965,7 +965,7 @@ Page({ }, go_pay_wk:function(){ - var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id; + var url = "/packageE/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id; getApp().goto(url); }, diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js index 26f0375..53cd08d 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -5952,11 +5952,6 @@ Page({ getApp().goto(url); }, - //--跳转到支付尾款界面-- - // go_pay_wk: function () { - // var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.wk_order_id; - // getApp().goto(url); - // }, pop_err_img: function (e) { var txt = e.currentTarget.dataset.errorimg; diff --git a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js index da9ecc7..13c01bd 100644 --- a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js +++ b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js @@ -369,7 +369,7 @@ Page({ }, zfwk:function(){ - var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id; + var url = "/packageE/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id; wx.redirectTo({ url:url, }) diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index a2825ec..e80cc7c 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -3780,7 +3780,7 @@ Page({ //--跳转到支付尾款界面-- go_pay_wk: function () { - var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.wk_order_id; + var url = "/packageE/pages/cart/cart_wk/cart_wk?order_id=" + this.data.wk_order_id; getApp().goto(url); }, diff --git a/packageC/pages/presell/pregoodsInfo/goodsInfo.js b/packageC/pages/presell/pregoodsInfo/goodsInfo.js index 8196be9..7cfd9eb 100644 --- a/packageC/pages/presell/pregoodsInfo/goodsInfo.js +++ b/packageC/pages/presell/pregoodsInfo/goodsInfo.js @@ -3331,7 +3331,7 @@ Page({ //--跳转到支付尾款界面-- go_pay_wk: function () { - var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.wk_order_id; + var url = "/packageE/pages/cart/cart_wk/cart_wk?order_id=" + this.data.wk_order_id; getApp().goto(url); }, diff --git a/packageD/pages/shop/order_detail/order_detail.js b/packageD/pages/shop/order_detail/order_detail.js index ae977c1..8068d1e 100644 --- a/packageD/pages/shop/order_detail/order_detail.js +++ b/packageD/pages/shop/order_detail/order_detail.js @@ -803,7 +803,7 @@ Page({ }, zfwk:function(){ - var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id; + var url = "/packageE/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id; wx.redirectTo({ url:url, }) diff --git a/pages/cart/cart_wk/cart_wk.js b/packageE/pages/cart/cart_wk/cart_wk.js index eff2ef6..eff2ef6 100644 --- a/pages/cart/cart_wk/cart_wk.js +++ b/packageE/pages/cart/cart_wk/cart_wk.js diff --git a/pages/cart/cart_wk/cart_wk.json b/packageE/pages/cart/cart_wk/cart_wk.json index a3afde3..a3afde3 100644 --- a/pages/cart/cart_wk/cart_wk.json +++ b/packageE/pages/cart/cart_wk/cart_wk.json diff --git a/pages/cart/cart_wk/cart_wk.wxml b/packageE/pages/cart/cart_wk/cart_wk.wxml index 884f90b..884f90b 100644 --- a/pages/cart/cart_wk/cart_wk.wxml +++ b/packageE/pages/cart/cart_wk/cart_wk.wxml diff --git a/pages/cart/cart_wk/cart_wk.wxss b/packageE/pages/cart/cart_wk/cart_wk.wxss index bd6b927..bd6b927 100644 --- a/pages/cart/cart_wk/cart_wk.wxss +++ b/packageE/pages/cart/cart_wk/cart_wk.wxss diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index f2f6e6b..99bbd02 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -6971,7 +6971,7 @@ Page({ //--跳转到支付尾款界面-- go_pay_wk: function () { - var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.wk_order_id; + var url = "/packageE/pages/cart/cart_wk/cart_wk?order_id=" + this.data.wk_order_id; getApp().goto(url); }, diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js index 3bb3ff7..cff77c5 100644 --- a/pages/team/team_success/team_success.js +++ b/pages/team/team_success/team_success.js @@ -815,7 +815,7 @@ Page({ }, go_pay_wk:function(){ - var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id; + var url = "/packageE/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id; getApp().goto(url); }, diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index 36fb685..f14dad6 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -1221,7 +1221,7 @@ Page({ }, zfwk:function(){ - var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id; + var url = "/packageE/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id; wx.redirectTo({ url:url, }) diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index 95b35b4..0b79ea3 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -1661,7 +1661,7 @@ Page({ console.log("pay_wk"); var order_id = ee.currentTarget.dataset.order_id; wx.navigateTo({ - url: "/pages/cart/cart_wk/cart_wk?order_id=" + order_id, + url: "/packageE/pages/cart/cart_wk/cart_wk?order_id=" + order_id, }); }, diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml index 05127da..27ef3c7 100644 --- a/pages/user/order_list/order_list.wxml +++ b/pages/user/order_list/order_list.wxml @@ -289,7 +289,7 @@ - 支付尾款 + 支付尾款 支付中 立即支付