Merge branch 'qa' of http://git.vipzhuang.cn/wxd/MShopWeApp

season
2 parents 0d52e850 beb8e5b2
Showing 3 changed files with 43 additions and 21 deletions
packageB/pages/user/choice_guide/choice_guide.js
packageD/pages/user/member/bring/bring.wxss
pages/user/userinfo/userinfo.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) {
@@ -140,7 +140,7 @@ margin-top:28rpx;
  }
  /* 提现方式 */
  .txfs{
-   width:120rpx;
+   width:150rpx;
    display: inline-block;
    font-size: 25rpx;
    color: #000000;
@@ -171,14 +171,13 @@ margin-top:28rpx;
  }
   /* 选中样式 1*/
   .ys{
-
-width:21rpx;
-height:21rpx;
-margin-left:3rpx;
-margin-top: 3rpx;
-background-color:#C4182E;
-border-radius:25rpx; /* 图形的半径 */
-display: none;
+    width:21rpx;
+    height:21rpx;
+    margin-left:2rpx;
+    margin-top: 2rpx;
+    background-color:#C4182E;
+    border-radius:25rpx; /* 图形的半径 */
+    display: none;
   }
   .ys.tab_item_active{
      display: block;
@@ -195,7 +194,7 @@ display: none;
   display:inline-block;
    font-size: 25rpx;
    color: #3b639f;
-   width: 100rpx;
+   width: 120rpx;
    height: 100%;
    line-height: 100%;
 }
@@ -203,7 +202,7 @@ display: none;
  .big-rim-two{
    display: flex;
   line-height:60rpx;
-   width:250rpx;
+   width:180rpx;
    height:60rpx;
    margin-top:14rpx;
@@ -775,18 +775,28 @@ 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;
+          this.setData({
+              'user.staffName':choice_guide.StaffName,
+              'user.staffId':choice_guide.Id,
+              'user.staffTel':choice_guide.Tel
+          })
+          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, {
@@ -831,6 +841,8 @@ Page({
       }
     })
+
+
     a.getUserInfo(function(a) {
       var txt = util.formatTime(a.birthday, 'yyyy-M-d'),
         arr = txt.split(' ');
@@ -1071,7 +1083,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)	      
   },