Commit 418bce06e2c27b3cd1bd723bdab30bedf0199001
1 parent
23c488c6
服务卡项,拼团成功后台分享的优化
Showing
6 changed files
with
20 additions
and
16 deletions
packageA/pages/serviceCard_pd/cart_wk/cart_wk.js
@@ -115,11 +115,11 @@ Page({ | @@ -115,11 +115,11 @@ Page({ | ||
115 | }) | 115 | }) |
116 | 116 | ||
117 | //--更新默认地址--,看一下是不是跳到地址页面 | 117 | //--更新默认地址--,看一下是不是跳到地址页面 |
118 | - if (!getApp().globalData.is_cart_old) { | ||
119 | - this.update_code(); | ||
120 | - } else { | ||
121 | - getApp().globalData.is_cart_old = 0; | ||
122 | - } | 118 | + // if (!getApp().globalData.is_cart_old) { |
119 | + // this.update_code(); | ||
120 | + // } else { | ||
121 | + // getApp().globalData.is_cart_old = 0; | ||
122 | + // } | ||
123 | 123 | ||
124 | }, | 124 | }, |
125 | /** | 125 | /** |
@@ -608,7 +608,7 @@ Page({ | @@ -608,7 +608,7 @@ Page({ | ||
608 | 608 | ||
609 | util_pay.pay_data(t,function (){ | 609 | util_pay.pay_data(t,function (){ |
610 | var allmoney = th.data.allpice; | 610 | var allmoney = th.data.allpice; |
611 | - th.jumpPaymentPage(th.data.order.order_sn, allmoney); | 611 | + th.jumpPaymentPage(th.data.order.order_id, allmoney); |
612 | },function (){ | 612 | },function (){ |
613 | th.data.paying=0; | 613 | th.data.paying=0; |
614 | //getApp().my_warnning("支付失败", 0, th); | 614 | //getApp().my_warnning("支付失败", 0, th); |
@@ -693,9 +693,9 @@ Page({ | @@ -693,9 +693,9 @@ Page({ | ||
693 | 693 | ||
694 | 694 | ||
695 | //------支付成功页面-------- | 695 | //------支付成功页面-------- |
696 | - jumpPaymentPage: function (order_sn, order_amount) { | 696 | + jumpPaymentPage: function (order_id, order_amount) { |
697 | wx.setStorageSync("order:order_list:update", !0), wx.redirectTo({ | 697 | wx.setStorageSync("order:order_list:update", !0), wx.redirectTo({ |
698 | - url: "/pages/payment/pay_success/pay_success?order_sn=" + order_sn + "&type=1", | 698 | + url: "/pages/payment/pay_success/pay_success?order_id=" + order_id + "&type=1&card=1", |
699 | }); | 699 | }); |
700 | }, | 700 | }, |
701 | 701 |
packageA/pages/serviceCard_pd/team_show/team_show.js
@@ -452,7 +452,7 @@ Page({ | @@ -452,7 +452,7 @@ Page({ | ||
452 | getApp().goto("/packageA/pages/details_serviceCard/details_serviceCard?order_id=" + odr.order_id) | 452 | getApp().goto("/packageA/pages/details_serviceCard/details_serviceCard?order_id=" + odr.order_id) |
453 | is_ok=0; | 453 | is_ok=0; |
454 | }else if (odr.pt_status == 1 && odr.order_status == 1){ | 454 | }else if (odr.pt_status == 1 && odr.order_status == 1){ |
455 | - getApp().goto( "/pages/team/team_success/team_success?ordersn=" + odr.order_sn); | 455 | + getApp().goto( "/packageA/pages/serviceCard_pd/team_success/team_success?ordersn=" + odr.order_sn); |
456 | is_ok=0; | 456 | is_ok=0; |
457 | } | 457 | } |
458 | } | 458 | } |
packageA/pages/serviceCard_pd/team_show/team_show.wxml
@@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
11 | <view class='cenrt'> | 11 | <view class='cenrt'> |
12 | 12 | ||
13 | <view class='xc-goods-details ellipsis-2 fs28'> | 13 | <view class='xc-goods-details ellipsis-2 fs28'> |
14 | - <span>{{goods.service_name}}</span> | 14 | + <span>{{goods.serviceName}}</span> |
15 | </view> | 15 | </view> |
16 | </view> | 16 | </view> |
17 | <view class='cenrcen flex-vertical-between'> | 17 | <view class='cenrcen flex-vertical-between'> |
packageA/pages/serviceCard_pd/team_success/team_success.js
@@ -418,7 +418,7 @@ Page({ | @@ -418,7 +418,7 @@ Page({ | ||
418 | 418 | ||
419 | //二微码 | 419 | //二微码 |
420 | var path3 = os.url+ "/api/wx/open/app/user/getWeAppEwm/"+ | 420 | var path3 = os.url+ "/api/wx/open/app/user/getWeAppEwm/"+ |
421 | - os.stoid+"?sceneValue="+scene+"&pageValue=pages/team/team_show/team_show"; | 421 | + os.stoid+"?sceneValue="+scene+"&pageValue=/packageA/pages/serviceCard_pd/team_show/team_show"; |
422 | 422 | ||
423 | console.log(path3,6000); | 423 | console.log(path3,6000); |
424 | 424 | ||
@@ -844,7 +844,7 @@ Page({ | @@ -844,7 +844,7 @@ Page({ | ||
844 | var th=this; | 844 | var th=this; |
845 | var scene=this.data.teamgroup.id; | 845 | var scene=this.data.teamgroup.id; |
846 | var goods_id=this.data.teamlist.goods_id; | 846 | var goods_id=this.data.teamlist.goods_id; |
847 | - var url="/pages/team/team_show/team_show?tg_id="+scene+"&goods_id="+goods_id; | 847 | + var url="/packageA/pages/serviceCard_pd/team_show/team_show?tg_id="+scene+"&goods_id="+goods_id; |
848 | //--分享图片-- | 848 | //--分享图片-- |
849 | var img=th.data.iurl+th.data.teamlist.share_imgurl; | 849 | var img=th.data.iurl+th.data.teamlist.share_imgurl; |
850 | //--把会员分享出去-- | 850 | //--把会员分享出去-- |
pages/team/team_ping/team_ping.js
@@ -242,9 +242,13 @@ Page({ | @@ -242,9 +242,13 @@ Page({ | ||
242 | //----跳转到拼单success展示----- | 242 | //----跳转到拼单success展示----- |
243 | go_team_success:function(e) { | 243 | go_team_success:function(e) { |
244 | var order_sn=e.currentTarget.dataset.ordsn; | 244 | var order_sn=e.currentTarget.dataset.ordsn; |
245 | - wx.navigateTo({ | ||
246 | - url: "/pages/team/team_success/team_success?ordersn=" + order_sn, | ||
247 | - }); | 245 | + var goods_type=e.currentTarget.dataset.goods_type; |
246 | + var url="/pages/team/team_success/team_success?ordersn=" + order_sn; | ||
247 | + if(goods_type==1){ | ||
248 | + url="/packageA/pages/serviceCard_pd/team_success/team_success?ordersn=" + order_sn; | ||
249 | + } | ||
250 | + getApp().goto(url); | ||
251 | + | ||
248 | }, | 252 | }, |
249 | 253 | ||
250 | onHide:function(){ | 254 | onHide:function(){ |
pages/team/team_ping/team_ping.wxml
@@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
11 | <!--单号显示--> | 11 | <!--单号显示--> |
12 | <view class='wu' wx:if="{{order.length>0}}"> | 12 | <view class='wu' wx:if="{{order.length>0}}"> |
13 | <view class='pd' wx:for="{{order}}" wx:key> | 13 | <view class='pd' wx:for="{{order}}" wx:key> |
14 | - <view class='pd-list' bindtap="go_team_success" data-ordsn="{{item.order_sn}}"> | 14 | + <view class='pd-list' bindtap="go_team_success" data-ordsn="{{item.order_sn}}" data-goods_type="{{item.goods_type}}"> |
15 | <!--top--> | 15 | <!--top--> |
16 | <view class='pd-list-top'> | 16 | <view class='pd-list-top'> |
17 | <!-- <image src='{{iurl}}/miniapp/images/dianpu.png'></image> --> | 17 | <!-- <image src='{{iurl}}/miniapp/images/dianpu.png'></image> --> |