wxd / MShopWeApp

Commit 34b2d07bbddb7d5377f57b6670c2d4e4d681338f

Authored by 后端研发-苏明海
2 parents 46a4fa44 400d2ce2

Merge branch 'dev' into 'test' 

Dev

See merge request !529
Inline Side-by-side
Showing 2 changed files with 14 additions and 12 deletions
pages/cart/cart2/cart2.js
  View file @34b2d07
... ... @@ -115,7 +115,6 @@ Page({
115 115  
116 116 },
117 117 onLoad: function(t) {
118   -
119 118 wx.setNavigationBarTitle({ title: "填写订单",})
120 119 var th = this; this.setData({ is_b_now: t.is_bnow == undefined ? 0 : t.is_bnow,});
121 120 th.data.param=t;
... ... @@ -256,7 +255,8 @@ Page({
256 255  
257 256 })
258 257  
259   -
  258 + //值在这里换
  259 + getApp().globalData.plus_buy_back=0;
260 260 },
261 261  
262 262 //-------------------获取物流---------------
... ...
pages/user/plus/plus.js
  View file @34b2d07
... ... @@ -36,8 +36,7 @@ Page({
36 36 is_fengxiang: 0, //是不是分享过来的
37 37 def_recommon: null, //分享人的手机号
38 38 def_serviceman: null, //分享人的营业员
39   - fir_leader:0, //分享人的ID
40   -
  39 + fir_leader:0, //分享人的ID
41 40 },
42 41 swiperChange: function (e) {
43 42 var currentId = e.detail.current;
... ... @@ -139,9 +138,9 @@ Page({
139 138 getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + app_d.user_id, {
140 139 success: function (e) {
141 140 var userInfo = e.data.data;
142   - if(userInfo['card_field']){
143   - var u_url = "/pages/user/cardinfo/cardinfo";
144   - wx.reLaunch({url: u_url})
  141 + if(userInfo['card_field'] && !getApp().globalData.is_card_back){
  142 + var u_url = "/pages/user/cardinfo/cardinfo";
  143 + wx.reLaunch({url: u_url})
145 144 }
146 145 },
147 146 });
... ... @@ -318,13 +317,16 @@ Page({
318 317 },
319 318  
320 319 //--支付成功，跳转到等级卡续费页面--
321   - success:function () {
322   -
  320 + success:function () {
  321 + //调一次就不再调用了
  322 + if(getApp().globalData.is_card_back) return false;
323 323 if(getApp().globalData.plus_buy_back){
324   - getApp().globalData.plus_buy_back=0;
325   - getApp().globalData.is_card_back=1;
  324 + //值在这里换
  325 + getApp().globalData.is_card_back=1;
  326 + getApp().globalData.plus_buy_back=0;
326 327 //返回购物车购买
327   - wx.navigateBack();
  328 + wx.navigateBack({ delta: 1,});
  329 + return false;
328 330 }else{
329 331 var u_url = "/pages/user/cardinfo/cardinfo";
330 332 wx.reLaunch({url: u_url})
... ...