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

season
2 parents 1d67c0c0 515b0238
Showing 2 changed files with 12 additions and 9 deletions
packageD/pages/user/member/bring/bring.wxss
pages/user/userinfo/userinfo.js
@@ -171,12 +171,12 @@ margin-top:28rpx;
  }
   /* 选中样式 1*/
   .ys{
-    width:18rpx;
-    height:18rpx;
-    margin-left:4rpx;
-    margin-top: 4rpx;
+    width:21rpx;
+    height:21rpx;
+    margin-left:2rpx;
+    margin-top: 2rpx;
     background-color:#C4182E;
-    border-radius:50rpx; /* 图形的半径 */
+    border-radius:25rpx; /* 图形的半径 */
     display: none;
   }
   .ys.tab_item_active{
@@ -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(' ');