Merge refs/remotes/origin/master into refs/heads/master

models/user.js

@@ -26,20 +26,24 @@ class UserModel extends HTTP {
   }
 
 
-  updateUserInfo(avatarUrl, nickName, success){
+  updateUserInfo(data, success){
     let params = {
       url: UserConst.user_updateUserInfo_url,
       method: Method.POST,
       data: {
         isRegister: 2, //1.注册 2.修改用户信息
-        avatar: avatarUrl,
-        realName: nickName,
+        avatar: data.avatarUrl,
+        realName: data.nickName,
+        phone: data.phone,
+        company: data.company,
+        position: data.position
       },
       success: success
     }
     this.request(params)
   }
 
+  
   getMyMessageList(page, success){
     let params = {
       url: UserConst.user_myMessage_url,

pages/user/myInfo/index.js

@@ -10,7 +10,7 @@ Page({
    */
   data: {
     avatarUrl:String,
-    nikeName: String,
+    nickName: String,
     phone: String,
     company: String,
     position: String,
@@ -23,7 +23,7 @@ Page({
     console.log(options)
     this.setData({
       avatarUrl: options.userIcon,
-      nikeName: options.userName,
+      nickName: options.userName,
       phone: options.userPhone || '',
       company: options.company || '',
       position: options.position || '',
@@ -32,9 +32,9 @@ Page({
   onTapItem(e) {
     const { type } = e.currentTarget.dataset
     console.log(type)
-    // if(type === 'userIcon'){
-    //   this.upload()
-    // }
+    if(type === 'userIcon'){
+      this.upload()
+    }
   },
   upload(){
     let that = this
@@ -69,34 +69,16 @@ Page({
       }
     })
   },
-  getUserInfo(){
-    userModel.getUserInfo(res => {
-      let nickName = res.result.nickName
-      let avatarUrl = res.result.avatarUrl
-      this.setData({
-        avatarUrl: res.result.avatarUrl,
-        nikeName: res.result.nickName,
-        phone: res.result.phone || '',
-        company: res.result.company || '',
-        position: res.result.position || '',
-      })
-      store.saveUserInfo({
-        nickName: res.result.nickName,
-        avatarUrl: res.result.avatarUrl,
-        phone: res.result.phone || ''
-      })
-    })
-  },
-  bindNikeNameInput(e){
+  bindNickNameInput(e){
     this.setData({
-      nikeName:e.detail.value
-    })
-  },
-  bindPhoneInput(e) {
-    this.setData({
-      phone: e.detail.value
+      nickName:e.detail.value
     })
   },
+  // bindPhoneInput(e) {
+  //   this.setData({
+  //     phone: e.detail.value
+  //   })
+  // },
   bindCompanyInput(e) {
     this.setData({
       company: e.detail.value
@@ -108,15 +90,13 @@ Page({
     })
   },
   submit(){
-    let avatarUrl = this.data.avatarUrl
-    let nikeName = this.data.nikeName
-    let phone = this.data.phone
-    let company = this.data.company
-    let position = this.data.position
-
-    userModel.updateUserInfo(avatarUrl, nikeName, phone, company, position, res => {
-      // that.getUserInfo()
+    userModel.updateUserInfo(this.data, res => {
       if(res.code === 200){
+        store.saveUserInfo({
+          nickName: this.data.nickName,
+          avatarUrl: this.data.avatarUrl,
+          phone: this.data.phone || ''
+        })
         wx.showToast({
           title: '修改成功',
           icon: 'none',

pages/user/myInfo/index.wxml

@@ -4,6 +4,7 @@
     <mp-cell 
       bindtap="onTapItem" data-type="userIcon"
       title="头像"
+      link="true"
       ext-class="cell-item">
       <image slot="footer" class="user_logo" src="{{avatarUrl}}" />
     </mp-cell>
@@ -11,32 +12,32 @@
       bindtap="onTapItem" data-type="userName"
       title="名字" 
       ext-class="cell-item">
-      <view slot="footer" class="msg_footer" >{{nikeName}}</view>
-      <!-- <input slot="footer" class="footer_input" bindinput="bindNikeNameInput" value="{{nikeName}}"></input> -->
+      <!-- <view slot="footer" class="msg_footer" >{{nikeName}}</view> -->
+      <input slot="footer" class="footer_input" maxlength="120" bindinput="bindNickNameInput" value="{{nickName}}"></input>
     </mp-cell>
     <mp-cell 
       bindtap="onTapItem" data-type="userPhone"
       title="手机号"
       ext-class="cell-item">
-      <view slot="footer" class="msg_footer" >{{phone}}</view>
-      <!-- <input slot="footer" class="footer_input" bindinput="bindPhoneInput" value="{{phone}}"></input> -->
+      <!-- <view slot="footer" class="msg_footer" >{{phone}}</view> -->
+      <input slot="footer" class="footer_input_phone" maxlength="45" bindinput="bindPhoneInput" value="{{phone}}" disabled></input>
     </mp-cell>
     <mp-cell
       bindtap="onTapItem" data-type="workUnit"
       title="工作单位"
       ext-class="cell-item">
-      <view slot="footer" class="msg_footer" >{{company}}</view>
-      <!-- <input slot="footer" class="footer_input" bindinput="bindCompanyInput" value="{{company}}"></input> -->
+      <!-- <view slot="footer" class="msg_footer" >{{company}}</view> -->
+      <input slot="footer" class="footer_input" maxlength="45" bindinput="bindCompanyInput" value="{{company}}"></input>
     </mp-cell>
     <mp-cell 
       bindtap="onTapItem" data-type="position"
       title="职务"
       ext-class="cell-item">
-      <view slot="footer" class="msg_footer" >{{position}}</view>
-      <!-- <input slot="footer" class="footer_input" bindinput="bindPositionInput" value="{{position}}"></input> -->
+      <!-- <view slot="footer" class="msg_footer" >{{position}}</view> -->
+      <input slot="footer" class="footer_input" maxlength="45" bindinput="bindPositionInput" value="{{position}}"></input>
     </mp-cell>
-    <!-- <view class="btnView">
+    <view class="btnView">
       <e-ibutton title="提交" bind:onTap="submit"/>
-    </view> -->
+    </view>
   </mp-cells>
 </view>

pages/user/myInfo/index.wxss

@@ -59,11 +59,23 @@
   padding: 0 10px 0 0;
 }
 .footer_input{
+  padding: 0 5px;
   font-size: 14px;
   border: 1px solid #AAAAAA;
   border-radius: 4px;
   height: 30px;
   text-align: left;
+  color: #3B3B3B;
+}
+.footer_input_phone{
+  padding: 0 5px;
+  font-size: 14px;
+  border: 1px solid #AAAAAA;
+  border-radius: 4px;
+  height: 30px;
+  text-align: left;
+  color: #3B3B3B;
+  background-color: #f7f7f7;
 }
 .msg_footer{
   font-size: 14px;