Merge branch 'master' of https://git.czcyedu.com/huoran/FE_middlePlatform_server

src/utils/api.js

@@ -5,7 +5,6 @@ let host2 = 'http://192.168.31.125:9000'//林
 let host3 = 'http://192.168.31.140:9000'//7
 let host = 'http://192.168.31.137:9000'// 陈赓
 export default {
-
   logins: `${host}/users/user/login`, //登录
   verification:`${host}/users/user/captcha`,// 验证码
 
@@ -21,7 +20,6 @@ export default {
   addUser: `${host}/liuwanr/userInfo/addUser`, //增加用户新版
   queryUser: `${host}/liuwanr/userInfo/queryUserInfo`, //查询用户新版
   deleteUser: `${host}/liuwanr/userInfo/deleteUserInfo`, //删除用户新版
-  updateUser: `${host}/liuwanr/user/updateUser`, //编辑用户
   queryAccountIsExist: `${host}/liuwanr/userInfo/queryServerAccountIsExist`, //查询账号是否存在
   queryUserOR: `${host}/liuwanr/userInfo/queryUserOR`, //查询系统列表详情
   queryWorkNumberIsExist:`${host}/liuwanr/userInfo/queryWorkNumberIsExist`,//查询学号、工号是否存在
@@ -31,12 +29,7 @@ export default {
   queryStuPro: `${host}/liuwanr/stuProfessionalArchitecture/queryStuProfessionalArchitecture`, //查询学生专业
   queryStuGrade: `${host}/liuwanr/stuProfessionalArchitecture/queryStuGrade`, //查询学生年级
   queryStuClass: `${host}/liuwanr/stuProfessionalArchitecture/queryStuClass`, //查询学生班级
-  userQueryCustomer: `${host}/liuwanr/userInfo/queryCustomer`, //查询客户列表
-  updateUserInfo: `${host}/liuwanr/userInfo/updateUserInfo`, //查询更新用户
-  updateUserProfiles: `${host}/liuwanr/userInfo/updateUserProfiles`, //更新用户个人档案
   updateOR: `${host}/liuwanr/userInfo/updateOR`, //更新用户组织架构
-  deletePlatform: `${host}/liuwanr/userInfo/deletePlatform`, //更新用户组织架构
-  updateUserRoleId: `${host}/liuwanr/userInfo/updateUserRoleId`, //更新用户角色id接口
 
   // 客户管理
   delCustomers: `${host3}/nakadai/customer/delCustomers`,
@@ -54,20 +47,20 @@ export default {
   queryPlatform: `${host}/liuwanr/userInfo/queryPlatform`,
 
   // 用户管理
-  delUserAccount: `${host}/users/userAccount/delUserAccount`,
+  delUserAccount: `${host3}/users/userAccount/delUserAccount`,
-  queryUserInfoDetails: `${host}/users/userAccount/queryUserInfoDetails`,
+  queryUserInfoDetails: `${host3}/users/userAccount/queryUserInfoDetails`,
-  queryUserInfoList: `${host}/users/userAccount/queryUserInfoList`,
+  queryUserInfoList: `${host3}/users/userAccount/queryUserInfoList`,
-  resetPwd: `${host}/users/userAccount/resetPwd`,
+  resetPwd: `${host3}/users/userAccount/resetPwd`,
-  selectAccountDetail: `${host}/users/userAccount/selectAccountDetail`,
+  selectAccountDetail: `${host3}/users/userAccount/selectAccountDetail`,
-  selectUserSysBind: `${host}/users/userAccount/selectUserSysBind`,
+  selectUserSysBind: `${host3}/users/userAccount/selectUserSysBind`,
-  updatePersonCenter: `${host}/users/userAccount/updatePersonCenter`,
+  updatePersonCenter: `${host3}/users/userAccount/updatePersonCenter`,
-  updateUserAvatars: `${host}/users/userAccount/updateUserAvatars`,
+  updateUserAvatars: `${host3}/users/userAccount/updateUserAvatars`,
-  userInfo: `${host}/users/userAccount/userInfo`,
+  userInfo: `${host3}/users/userAccount/userInfo`,
-  checkCode: `${host}/users/userAccount/checkCode`,
+  bindPhone: `${host3}/users/userAccount/bindPhone`,
-  findPasswordByEmail: `${host}/users/userAccount/findPasswordByEmail`,
+  sendPhoneCode: `${host3}/users/userAccount/sendPhoneCode`,
-  findPasswordByPhone: `${host}/users/userAccount/findPasswordByPhone`,
+  findPasswordByPhone: `${host3}/users/userAccount/findPasswordByPhone`,
-  updateAccountEnable: `${host}/users/userAccount/updateAccountEnable`,
+  updateAccountEnable: `${host3}/users/userAccount/updateAccountEnable`,
-  updateAccountAllEnable: `${host}/users/userAccount/updateAccountAllEnable`,
+  updateAccountAllEnable: `${host3}/users/userAccount/updateAccountAllEnable`,
   
   queryOrder: `${host}/liuwanr/order/queryOrder`, //查询订单
   queryOrderDetails: `${host}/liuwanr/order/queryOrderDetails`, //查询订单详情

src/views/setting/Person.vue

@@ -866,6 +866,7 @@ export default {
                     userId: form.userId,
                 }],
                 hrUserInfo: {
+                    provinceId: form.provinceId,
                     cityId: form.cityId,
                     countries: form.countries,
                     dateBirth: form.dateBirth,
@@ -965,17 +966,16 @@ export default {
         sendPhoneCode(){
             if(!this.phone) return this.$message.warning('请输入手机号')
             if(!/^1[3456789]\d{9}$/.test(this.phone)) return this.$message.warning('请输入正确的手机号')
-            let data = {
+            this.$post(this.api.sendPhoneCode,{
                 userId: this.userId,
                 phone: this.phone,
                 types: 2
-            }
+            }).then(res => {
-            this.$post(this.api.sendPhoneCode,data).then(res => {
+                if(res.status == 200){
-                if(res.errmessage == 'success'){
                     this.phoneCountdown()
                     this.phoneOpener = res.data
                 }
-            }).catch(res => {});
+            }).catch(res => {})
         },
         phoneSubmit(){
             if(!this.phone) return this.$message.warning('请输入手机号')