Commit 0fc93451c35080c88041297bcbd9bfd32459c86c
1 parent
3fb1b88c
注册回退的优化
Showing
4 changed files
with
46 additions
and
15 deletions
packageA/pages/profile/profile.js
| ... | ... | @@ -600,6 +600,10 @@ Page({ |
| 600 | 600 | let url3 = '/api/weshop/users/getErpvipidPickup'; |
| 601 | 601 | url1 += r.stoid; |
| 602 | 602 | |
| 603 | + if(t.is_reg){ | |
| 604 | + this.data.is_reg=1; | |
| 605 | + } | |
| 606 | + | |
| 603 | 607 | var uu = getApp().globalData.zc_dd; |
| 604 | 608 | if (uu) { |
| 605 | 609 | this.setData({head_pic: uu.head_pic, nickname: uu.nickname}) |
| ... | ... | @@ -1006,15 +1010,17 @@ Page({ |
| 1006 | 1010 | |
| 1007 | 1011 | if (this.data.is_lable_set) { |
| 1008 | 1012 | getApp().globalData.zc_dd = post_data; |
| 1013 | + var g_url="/packageE/pages/user/labels/labels?pageType=1"; | |
| 1014 | + if(th.data.is_reg){ | |
| 1015 | + g_url+="&is_reg=1"; | |
| 1016 | + } | |
| 1009 | 1017 | wx.redirectTo({ |
| 1010 | - url: "/packageE/pages/user/labels/labels?pageType=1" | |
| 1018 | + url:g_url | |
| 1011 | 1019 | }) |
| 1012 | 1020 | }else{ |
| 1013 | 1021 | this.zu_ce(post_data); |
| 1014 | 1022 | } |
| 1015 | 1023 | |
| 1016 | - | |
| 1017 | - | |
| 1018 | 1024 | }, |
| 1019 | 1025 | |
| 1020 | 1026 | |
| ... | ... | @@ -1042,7 +1048,7 @@ Page({ |
| 1042 | 1048 | wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = s.getFullUrl(a.globalData.userInfo.head_pic); |
| 1043 | 1049 | //wx.navigateBack({delta: 1}) |
| 1044 | 1050 | //-- 看情况,是跳转等级卡，还是跳转到新人有礼 -- |
| 1045 | - getApp().go_to_page(function (){ | |
| 1051 | + getApp().go_to_page(th.data.is_reg,function (){ | |
| 1046 | 1052 | wx.navigateBack({ delta: 1 }) |
| 1047 | 1053 | }) |
| 1048 | 1054 | |
| ... | ... | @@ -1408,9 +1414,15 @@ Page({ |
| 1408 | 1414 | |
| 1409 | 1415 | if (this.data.is_lable_set) { |
| 1410 | 1416 | getApp().globalData.zc_dd = post_data; |
| 1411 | - wx.redirectTo({ | |
| 1412 | - url: "/packageE/pages/user/labels/labels?pageType=1" | |
| 1413 | - }) | |
| 1417 | + | |
| 1418 | + var g_url="/packageE/pages/user/labels/labels?pageType=1"; | |
| 1419 | + if(th.data.is_reg){ | |
| 1420 | + g_url+="&is_reg=1"; | |
| 1421 | + } | |
| 1422 | + | |
| 1423 | + wx.redirectTo({ | |
| 1424 | + url: g_url | |
| 1425 | + }) | |
| 1414 | 1426 | }else{ |
| 1415 | 1427 | this.zu_ce(post_data); |
| 1416 | 1428 | } | ... | ... |
packageE/pages/togoin/togoin.js
| ... | ... | @@ -20,6 +20,12 @@ Page({ |
| 20 | 20 | }) |
| 21 | 21 | } |
| 22 | 22 | getApp().globalData.isLoad_ad = 1; |
| 23 | + | |
| 24 | + | |
| 25 | + if(options.is_reg){ | |
| 26 | + this.data.is_reg=1; | |
| 27 | + } | |
| 28 | + | |
| 23 | 29 | //--判断是否有接受到邀请人的ID-- |
| 24 | 30 | if (options.first_leader) { |
| 25 | 31 | this.setData({ first_leader: options.first_leader }); |
| ... | ... | @@ -277,8 +283,13 @@ Page({ |
| 277 | 283 | if (res.data.code == 0) { |
| 278 | 284 | dd.mobile = res.data.data; |
| 279 | 285 | getApp().globalData.zc_dd = dd; |
| 286 | + | |
| 287 | + var g_url="/packageA/pages/profile/profile?is_back=1"; | |
| 288 | + if(th.data.is_reg){ | |
| 289 | + g_url+="&is_reg=1"; | |
| 290 | + } | |
| 280 | 291 | wx.redirectTo({ |
| 281 | - url: "/packageA/pages/profile/profile?is_back=1" | |
| 292 | + url:g_url | |
| 282 | 293 | }) |
| 283 | 294 | } |
| 284 | 295 | }) |
| ... | ... | @@ -306,9 +317,13 @@ Page({ |
| 306 | 317 | if (res.data.code == 0) { |
| 307 | 318 | dd.mobile = res.data.data; |
| 308 | 319 | getApp().globalData.zc_dd = dd; |
| 309 | - wx.redirectTo({ | |
| 310 | - url: "/packageE/pages/user/labels/labels?pageType=1" | |
| 311 | - }) | |
| 320 | + | |
| 321 | + var g_url="/packageE/pages/user/labels/labels?pageType=1"; | |
| 322 | + if(th.data.is_reg){ | |
| 323 | + g_url+="&is_reg=1"; | |
| 324 | + } | |
| 325 | + | |
| 326 | + wx.redirectTo({ url: g_url }) | |
| 312 | 327 | } |
| 313 | 328 | }) |
| 314 | 329 | } else { |
| ... | ... | @@ -358,7 +373,7 @@ Page({ |
| 358 | 373 | }) |
| 359 | 374 | |
| 360 | 375 | //-- 看情况,是跳转等级卡，还是跳转到新人有礼 -- |
| 361 | - getApp().go_to_page(function (){ | |
| 376 | + getApp().go_to_page(th.data.is_reg,function (){ | |
| 362 | 377 | wx.navigateBack({ delta: 1 }) |
| 363 | 378 | }) |
| 364 | 379 | ... | ... |
packageE/pages/user/labels/labels.js
| ... | ... | @@ -119,6 +119,10 @@ Page({ |
| 119 | 119 | |
| 120 | 120 | } |
| 121 | 121 | |
| 122 | + if(options.is_reg){ | |
| 123 | + this.data.is_reg=1; | |
| 124 | + } | |
| 125 | + | |
| 122 | 126 | th.query_nolabels(); |
| 123 | 127 | th.get_config(); |
| 124 | 128 | }, |
| ... | ... | @@ -282,7 +286,7 @@ Page({ |
| 282 | 286 | // url: '/pages/user/index/index', |
| 283 | 287 | // }) |
| 284 | 288 | //-- 看情况,是跳转等级卡，还是跳转到新人有礼 -- |
| 285 | - getApp().go_to_page(function (){ | |
| 289 | + getApp().go_to_page(th.data.is_reg,function (){ | |
| 286 | 290 | wx.navigateBack({ delta: 1 }) |
| 287 | 291 | }) |
| 288 | 292 | |
| ... | ... | @@ -296,7 +300,7 @@ Page({ |
| 296 | 300 | } |
| 297 | 301 | }) |
| 298 | 302 | }else{ |
| 299 | - getApp().go_to_page(function (){ | |
| 303 | + getApp().go_to_page(th.data.is_reg,function (){ | |
| 300 | 304 | // wx.navigateBack({ delta: 1 }) |
| 301 | 305 | wx.reLaunch({ |
| 302 | 306 | url: '/pages/user/index/index', | ... | ... |