diff --git a/packageA/pages/profile/profile.js b/packageA/pages/profile/profile.js index ee69960..e0b63cf 100644 --- a/packageA/pages/profile/profile.js +++ b/packageA/pages/profile/profile.js @@ -600,6 +600,10 @@ Page({ let url3 = '/api/weshop/users/getErpvipidPickup'; url1 += r.stoid; + if(t.is_reg){ + this.data.is_reg=1; + } + var uu = getApp().globalData.zc_dd; if (uu) { this.setData({head_pic: uu.head_pic, nickname: uu.nickname}) @@ -1006,15 +1010,17 @@ Page({ if (this.data.is_lable_set) { getApp().globalData.zc_dd = post_data; + var g_url="/packageE/pages/user/labels/labels?pageType=1"; + if(th.data.is_reg){ + g_url+="&is_reg=1"; + } wx.redirectTo({ - url: "/packageE/pages/user/labels/labels?pageType=1" + url:g_url }) }else{ this.zu_ce(post_data); } - - }, @@ -1042,7 +1048,7 @@ Page({ wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = s.getFullUrl(a.globalData.userInfo.head_pic); //wx.navigateBack({delta: 1}) //-- 看情况,是跳转等级卡,还是跳转到新人有礼 -- - getApp().go_to_page(function (){ + getApp().go_to_page(th.data.is_reg,function (){ wx.navigateBack({ delta: 1 }) }) @@ -1408,9 +1414,15 @@ Page({ if (this.data.is_lable_set) { getApp().globalData.zc_dd = post_data; - wx.redirectTo({ - url: "/packageE/pages/user/labels/labels?pageType=1" - }) + + var g_url="/packageE/pages/user/labels/labels?pageType=1"; + if(th.data.is_reg){ + g_url+="&is_reg=1"; + } + + wx.redirectTo({ + url: g_url + }) }else{ this.zu_ce(post_data); } diff --git a/packageE/pages/togoin/togoin.js b/packageE/pages/togoin/togoin.js index 50a78ab..4f82ffc 100644 --- a/packageE/pages/togoin/togoin.js +++ b/packageE/pages/togoin/togoin.js @@ -20,6 +20,12 @@ Page({ }) } getApp().globalData.isLoad_ad = 1; + + + if(options.is_reg){ + this.data.is_reg=1; + } + //--判断是否有接受到邀请人的ID-- if (options.first_leader) { this.setData({ first_leader: options.first_leader }); @@ -277,8 +283,13 @@ Page({ if (res.data.code == 0) { dd.mobile = res.data.data; getApp().globalData.zc_dd = dd; + + var g_url="/packageA/pages/profile/profile?is_back=1"; + if(th.data.is_reg){ + g_url+="&is_reg=1"; + } wx.redirectTo({ - url: "/packageA/pages/profile/profile?is_back=1" + url:g_url }) } }) @@ -306,9 +317,13 @@ Page({ if (res.data.code == 0) { dd.mobile = res.data.data; getApp().globalData.zc_dd = dd; - wx.redirectTo({ - url: "/packageE/pages/user/labels/labels?pageType=1" - }) + + var g_url="/packageE/pages/user/labels/labels?pageType=1"; + if(th.data.is_reg){ + g_url+="&is_reg=1"; + } + + wx.redirectTo({ url: g_url }) } }) } else { @@ -358,7 +373,7 @@ Page({ }) //-- 看情况,是跳转等级卡,还是跳转到新人有礼 -- - getApp().go_to_page(function (){ + getApp().go_to_page(th.data.is_reg,function (){ wx.navigateBack({ delta: 1 }) }) diff --git a/packageE/pages/user/labels/labels.js b/packageE/pages/user/labels/labels.js index dbda89d..f2c92d5 100644 --- a/packageE/pages/user/labels/labels.js +++ b/packageE/pages/user/labels/labels.js @@ -119,6 +119,10 @@ Page({ } + if(options.is_reg){ + this.data.is_reg=1; + } + th.query_nolabels(); th.get_config(); }, @@ -282,7 +286,7 @@ Page({ // url: '/pages/user/index/index', // }) //-- 看情况,是跳转等级卡,还是跳转到新人有礼 -- - getApp().go_to_page(function (){ + getApp().go_to_page(th.data.is_reg,function (){ wx.navigateBack({ delta: 1 }) }) @@ -296,7 +300,7 @@ Page({ } }) }else{ - getApp().go_to_page(function (){ + getApp().go_to_page(th.data.is_reg,function (){ // wx.navigateBack({ delta: 1 }) wx.reLaunch({ url: '/pages/user/index/index', diff --git a/pages/user/index/index.js b/pages/user/index/index.js index 536b0b8..3180f93 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -699,7 +699,7 @@ Page({ //--跳到绑定页面-- gobindtel: function () { wx.navigateTo({ - url: '/packageE/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin?is_reg=1', }) },