diff --git a/packageA/pages/serviceCard_pd/cart_wk/cart_wk.js b/packageA/pages/serviceCard_pd/cart_wk/cart_wk.js
index 137c906..4abcb1c 100644
--- a/packageA/pages/serviceCard_pd/cart_wk/cart_wk.js
+++ b/packageA/pages/serviceCard_pd/cart_wk/cart_wk.js
@@ -115,11 +115,11 @@ Page({
})
//--更新默认地址--,看一下是不是跳到地址页面
- if (!getApp().globalData.is_cart_old) {
- this.update_code();
- } else {
- getApp().globalData.is_cart_old = 0;
- }
+ // if (!getApp().globalData.is_cart_old) {
+ // this.update_code();
+ // } else {
+ // getApp().globalData.is_cart_old = 0;
+ // }
},
/**
@@ -608,7 +608,7 @@ Page({
util_pay.pay_data(t,function (){
var allmoney = th.data.allpice;
- th.jumpPaymentPage(th.data.order.order_sn, allmoney);
+ th.jumpPaymentPage(th.data.order.order_id, allmoney);
},function (){
th.data.paying=0;
//getApp().my_warnning("支付失败", 0, th);
@@ -693,9 +693,9 @@ Page({
//------支付成功页面--------
- jumpPaymentPage: function (order_sn, order_amount) {
+ jumpPaymentPage: function (order_id, order_amount) {
wx.setStorageSync("order:order_list:update", !0), wx.redirectTo({
- url: "/pages/payment/pay_success/pay_success?order_sn=" + order_sn + "&type=1",
+ url: "/pages/payment/pay_success/pay_success?order_id=" + order_id + "&type=1&card=1",
});
},
diff --git a/packageA/pages/serviceCard_pd/team_show/team_show.js b/packageA/pages/serviceCard_pd/team_show/team_show.js
index 977f032..54d5d36 100644
--- a/packageA/pages/serviceCard_pd/team_show/team_show.js
+++ b/packageA/pages/serviceCard_pd/team_show/team_show.js
@@ -452,7 +452,7 @@ Page({
getApp().goto("/packageA/pages/details_serviceCard/details_serviceCard?order_id=" + odr.order_id)
is_ok=0;
}else if (odr.pt_status == 1 && odr.order_status == 1){
- getApp().goto( "/pages/team/team_success/team_success?ordersn=" + odr.order_sn);
+ getApp().goto( "/packageA/pages/serviceCard_pd/team_success/team_success?ordersn=" + odr.order_sn);
is_ok=0;
}
}
diff --git a/packageA/pages/serviceCard_pd/team_show/team_show.wxml b/packageA/pages/serviceCard_pd/team_show/team_show.wxml
index 9d6ae9e..fcd8d17 100644
--- a/packageA/pages/serviceCard_pd/team_show/team_show.wxml
+++ b/packageA/pages/serviceCard_pd/team_show/team_show.wxml
@@ -11,7 +11,7 @@
- {{goods.service_name}}
+ {{goods.serviceName}}
diff --git a/packageA/pages/serviceCard_pd/team_success/team_success.js b/packageA/pages/serviceCard_pd/team_success/team_success.js
index ccbff9b..4185a3a 100644
--- a/packageA/pages/serviceCard_pd/team_success/team_success.js
+++ b/packageA/pages/serviceCard_pd/team_success/team_success.js
@@ -418,7 +418,7 @@ Page({
//二微码
var path3 = os.url+ "/api/wx/open/app/user/getWeAppEwm/"+
- os.stoid+"?sceneValue="+scene+"&pageValue=pages/team/team_show/team_show";
+ os.stoid+"?sceneValue="+scene+"&pageValue=/packageA/pages/serviceCard_pd/team_show/team_show";
console.log(path3,6000);
@@ -844,7 +844,7 @@ Page({
var th=this;
var scene=this.data.teamgroup.id;
var goods_id=this.data.teamlist.goods_id;
- var url="/pages/team/team_show/team_show?tg_id="+scene+"&goods_id="+goods_id;
+ var url="/packageA/pages/serviceCard_pd/team_show/team_show?tg_id="+scene+"&goods_id="+goods_id;
//--分享图片--
var img=th.data.iurl+th.data.teamlist.share_imgurl;
//--把会员分享出去--
diff --git a/pages/team/team_ping/team_ping.js b/pages/team/team_ping/team_ping.js
index 4a8a5dd..1504e41 100644
--- a/pages/team/team_ping/team_ping.js
+++ b/pages/team/team_ping/team_ping.js
@@ -242,9 +242,13 @@ Page({
//----跳转到拼单success展示-----
go_team_success:function(e) {
var order_sn=e.currentTarget.dataset.ordsn;
- wx.navigateTo({
- url: "/pages/team/team_success/team_success?ordersn=" + order_sn,
- });
+ var goods_type=e.currentTarget.dataset.goods_type;
+ var url="/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;
+ }
+ getApp().goto(url);
+
},
onHide:function(){
diff --git a/pages/team/team_ping/team_ping.wxml b/pages/team/team_ping/team_ping.wxml
index 63b2c2f..52bd7bc 100644
--- a/pages/team/team_ping/team_ping.wxml
+++ b/pages/team/team_ping/team_ping.wxml
@@ -11,7 +11,7 @@
-
+