diff --git a/packageB/pages/user/choice_guide/choice_guide.js b/packageB/pages/user/choice_guide/choice_guide.js index 23ce6eb..ca623d2 100644 --- a/packageB/pages/user/choice_guide/choice_guide.js +++ b/packageB/pages/user/choice_guide/choice_guide.js @@ -14,12 +14,19 @@ Page({ show_pop:0, sele_item:null, input_val:null, + + is_back:0 }, //------初始化加载---------- - onLoad: function(t) {}, + onLoad: function(t) { + if(t.is_back){ + this.data.is_back=t.is_back + } + + }, onShow: function() { - getApp().check_can_share(); + getApp().check_can_share(); this.data.ismore=0;this.data.isload=0; this.setData({list:null}); this.get_list(); @@ -96,7 +103,11 @@ Page({ go_user_info:function () { var item=this.data.sele_item; getApp().globalData.choice_guide=item; - getApp().goto("/pages/user/userinfo/userinfo"); + + if( this.data.is_back) + wx.navigateBack({ delta: 1 }) + else + getApp().goto("/pages/user/userinfo/userinfo"); }, img_err:function (e) { diff --git a/packageD/pages/user/member/bring/bring.wxss b/packageD/pages/user/member/bring/bring.wxss index e63c138..a0731e8 100644 --- a/packageD/pages/user/member/bring/bring.wxss +++ b/packageD/pages/user/member/bring/bring.wxss @@ -171,14 +171,13 @@ margin-top:28rpx; } /* 选中样式 1*/ .ys{ - -width:18rpx; -height:18rpx; -margin-left:4rpx; -margin-top: 4rpx; -background-color:#C4182E; -border-radius:50rpx; /* 图形的半径 */ -display: none; + width:18rpx; + height:18rpx; + margin-left:4rpx; + margin-top: 4rpx; + background-color:#C4182E; + border-radius:50rpx; /* 图形的半径 */ + display: none; } .ys.tab_item_active{ display: block; diff --git a/pages/user/userinfo/userinfo.js b/pages/user/userinfo/userinfo.js index 480b862..1c85018 100644 --- a/pages/user/userinfo/userinfo.js +++ b/pages/user/userinfo/userinfo.js @@ -775,18 +775,27 @@ Page({ onShow: function() { getApp().check_can_share(); var e = this; + + //如果有传值进行跳转的话, + var choice_guide=null; + if(getApp().globalData.choice_guide){ + choice_guide=JSON.parse(JSON.stringify(getApp().globalData.choice_guide)); + getApp().globalData.choice_guide=null; + let user=this.data.user; + user.staffName=choice_guide.StaffName; + user.staffId=choice_guide.Id; + user.staffTel=choice_guide.Tel; + this.setData({user}) + return false; + } + if (this.data.is_zy){ this.data.is_zy=0; return false; } this.wait_for_store_config(); - //如果有传值进行跳转的话 - var choice_guide=null; - if(getApp().globalData.choice_guide){ - choice_guide=JSON.parse(JSON.stringify(getApp().globalData.choice_guide)); - getApp().globalData.choice_guide=null; - } + var req = t; req.get("/api/weshop/users/getAndUpdateUser/" + r.stoid + "/" + getApp().globalData.user_id, { @@ -1071,7 +1080,7 @@ Page({ this.data.sele_ing=1; this.check_click_ok(function(){ th.data.is_zy=1; - getApp().goto("/packageB/pages/user/choice_guide/choice_guide"); + getApp().goto("/packageB/pages/user/choice_guide/choice_guide?is_back=1"); },1) },