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

WXD-SEASON\season
2 parents 1f104467 6117fc07
Showing 1 changed file with 7 additions and 4 deletions
pages/user/userinfo/userinfo.js
@@ -782,10 +782,11 @@ Page({
           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})
+          this.setData({
+              'user.staffName':choice_guide.StaffName,
+              'user.staffId':choice_guide.Id,
+              'user.staffTel':choice_guide.Tel
+          })
           return false;
     }
  
@@ -840,6 +841,8 @@ Page({
  
       }
     })
+
+
     a.getUserInfo(function(a) {
       var txt = util.formatTime(a.birthday, 'yyyy-M-d'),
         arr = txt.split(' ');