个人中心对接

src/api/user.js

@@ -67,4 +67,13 @@ export async function setUserData(data) {
         method: 'post',
         data,
     })
+}
+
+// 个人中心，密码修改
+export async function updatePwd(params) {
+    return request({
+        url: '/system/user/updatePwd',
+        method: 'put',
+        params,
+    })
 }

src/views/login/index.vue

@@ -129,7 +129,7 @@ export default {
     getLoginStyle() {
       api
         .getLoginStyle({
-          url:window.location.host.indexOf('localhost') != -1 ?'dianli.uskycloud.com':window.location.host
+          url:window.location.host.indexOf('localhost') != -1 ?'fivee.dianli.uskycloud.com':window.location.host
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {

src/views/middle.vue

@@ -124,7 +124,7 @@ export default defineComponent({
     function getLoginStyle() {
       api
         .getLoginStyle({
-          url:window.location.host.indexOf('localhost') != -1 ?'dianli.uskycloud.com':window.location.host
+          url:window.location.host.indexOf('localhost') != -1 ?'fivee.dianli.uskycloud.com':window.location.host
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {

src/views/perCenter/index.vue

@@ -10,27 +10,27 @@
       </template>
       <div class="text item">
         <span class="text-left">租户名称：</span>
-        <span class="text-right">{{tenantName }}</span>
+        <span class="text-right">{{ tenantName }}</span>
       </div>
       <div class="text item">
         <span class="text-left">管理员：</span>
-        <span class="text-right">{{nickName }}</span>
+        <span class="text-right">{{ nickName }}</span>
       </div>
       <div class="text item">
         <span class="text-left">管理员手机号：</span>
-        <span class="text-right">{{phoneNumber }}</span>
+        <span class="text-right">{{ phoneNumber }}</span>
       </div>
       <div class="text item">
         <span class="text-left">系统平台：</span>
-        <span class="text-right">{{systemName }}</span>
+        <span class="text-right">{{ systemName }}</span>
       </div>
       <div class="text item">
         <span class="text-left">地址：</span>
-        <span class="text-right">{{address }}</span>
+        <span class="text-right">{{ address }}</span>
       </div>
       <div class="text item">
         <span class="text-left">到期时间：</span>
-        <span class="text-right">{{tenantTerm }}</span>
+        <span class="text-right">{{ tenantTerm }}</span>
       </div>
     </el-card>
 
@@ -46,10 +46,14 @@
       </template>
 
       <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-
         <!-- 个人信息start -->
         <el-tab-pane label="个人信息" name="first">
-          <el-form :model="form" ref="formInfo" :rules="rules" label-width="120px">
+          <el-form
+            :model="form"
+            ref="formInfo"
+            :rules="rules"
+            label-width="120px"
+          >
             <el-form-item label="租户名称" prop="tenantName">
               <el-input v-model="form.tenantName" disabled />
             </el-form-item>
@@ -63,7 +67,9 @@
               <el-input v-model="form.address" />
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" @click="submitForm('formInfo')">保存</el-button>
+              <el-button type="primary" @click="submitForm('formInfo')">
+                保存
+              </el-button>
               <el-button @click="resetForm()">取消</el-button>
             </el-form-item>
           </el-form>
@@ -72,25 +78,31 @@
 
         <!-- 修改密码start -->
         <el-tab-pane label="修改密码" name="second">
-          <el-form model="form2" ref="formInfo2" :rules="rules2" label-width="120px">
-            <el-form-item label="账号" prop="userName">
-              <el-input v-model="form2.userName" disabled />
-            </el-form-item>
+          <el-form
+            :model="form"
+            ref="formInfo2"
+            :rules="rules"
+            label-width="120px"
+          >
             <el-form-item label="账号" prop="userName">
-              <el-input v-model="form2.userName"  />
+              <el-input v-model="form.userName" disabled />
             </el-form-item>
+
             <el-form-item label="原密码" prop="password" type="password">
-              <el-input v-model="form2.password" show-password />
+              <el-input v-model="form.password" show-password />
             </el-form-item>
-            <el-form-item label="密码" prop="pass" type="password">
-              <el-input v-model="form2.pass" show-password />
+            <el-form-item label="密码" prop="newPass" type="password">
+              <el-input v-model="form.newPass" show-password />
             </el-form-item>
             <el-form-item label="再次输入" prop="passAgain" type="password">
-              <el-input v-model="form2.passAgain" show-password />
+              <el-input v-model="form.passAgain" show-password />
             </el-form-item>
+
             <el-form-item>
-              <el-button type="primary" @click="onSubmit">保存</el-button>
-              <el-button >取消</el-button>
+              <el-button type="primary" @click="submitForm2('formInfo2')">
+                保存
+              </el-button>
+              <el-button @click="resetForm2()">取消</el-button>
             </el-form-item>
           </el-form>
         </el-tab-pane>
@@ -103,10 +115,10 @@
 </template>
 
 <script>
-import { defineComponent, ref, onMounted, } from 'vue'
+import { defineComponent, ref, onMounted } from 'vue'
 import * as api from '@/api/user.js'
 import { ElMessage } from 'element-plus'
-import {  validatorPhone} from '@/utils'
+import { validatorPhone } from '@/utils'
 
 import { useStore } from 'vuex'
 
@@ -115,25 +127,21 @@ export default defineComponent({
   setup() {
     const activeName = ref('first')
 
-    const store = useStore()
-
-    const tenantName=ref('')
-    const phoneNumber=ref('')
-    const nickName=ref('')
-    const address=ref('')
-    const tenantTerm=ref('')
-    const systemName=ref('')
-    const userId=ref('')
-         
-    const form=ref([])
-    const formInfo=ref(null)
-
+    const store = useStore();
     
-    const form2=ref([])
-    const formInfo2=ref(null)
+    const tenantName = ref('')
+    const phoneNumber = ref('')
+    const nickName = ref('')
+    const address = ref('')
+    const tenantTerm = ref('')
+    const systemName = ref('')
+    const userId = ref('')
 
-    
+    const form = ref([])
+    const formInfo = ref(null)
 
+    const form2 = ref([])
+    const formInfo2 = ref(null)
 
     const validatePass = (rule, value, callback) => {
       if (value === '') {
@@ -150,9 +158,10 @@ export default defineComponent({
       }
     }
     const validatePass2 = (rule, value, callback) => {
+   
       if (value === '') {
         callback(new Error('请再次输入密码'))
-      } else if (value !== form2.value.pass) {
+      } else if (value !== form.value.newPass) {
         callback(new Error('两次输入密码不一致!'))
       } else {
         callback()
@@ -167,12 +176,12 @@ export default defineComponent({
           console.log(requset)
 
           tenantName.value = requset.data[0].tenantName
-          phoneNumber.value  = requset.data[0].phoneNumber
-          nickName.value  = requset.data[0].nickName
-          address.value  = requset.data[0].address
-          tenantTerm.value  = requset.data[0].tenantTerm
-          systemName.value  = requset.data[0].systemName
-          userId.value=requset.data[0].userId
+          phoneNumber.value = requset.data[0].phoneNumber
+          nickName.value = requset.data[0].nickName
+          address.value = requset.data[0].address
+          tenantTerm.value = requset.data[0].tenantTerm
+          systemName.value = requset.data[0].systemName
+          userId.value = requset.data[0].userId
 
           form.value.tenantName = requset.data[0].tenantName
           form.value.phoneNumber = requset.data[0].phoneNumber
@@ -181,10 +190,8 @@ export default defineComponent({
           form.value.tenantTerm = requset.data[0].tenantTerm
           form.value.systemName = requset.data[0].systemName
 
-
-          form2.value.userName = requset.data[0].userName
-          form2.value.password = requset.data[0].password
-       
+          form.value.userName = requset.data[0].userName
+          form.value.password = requset.data[0].password
         } else {
           alert(requset.msg)
         }
@@ -194,9 +201,6 @@ export default defineComponent({
     const submitForm = () => {
       formInfo.value.validate((valid) => {
         if (valid) {
-          // form.value.groupingId = props.groupingId
-          // console.log(form.value)
-
           api
             .setUserData({
               userId: userId.value,
@@ -219,13 +223,50 @@ export default defineComponent({
         }
       })
     }
+
+
+    // 保存-修改密码操作
+    const submitForm2 = () => {
+      formInfo.value.validate((valid) => {
+        if (valid) {
+          api
+            .updatePwd({
+              oldPassword: form.value.password,
+              newPassword:form.value.newPass,
+            })
+            .then((requset) => {
+              if (requset.status === 'SUCCESS') {
+                ElMessage.success({
+                  message: '密码修改成功',
+                  type: 'success',
+                })
+
+                // context.emit('func')
+              } else {
+                ElMessage.error(requset.msg)
+              }
+            })
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    }
+
+
     //重置
     function resetForm() {
-      form.value.nickName='';
-      form.value.phoneNumber=''
-      form.value.address=''
+      form.value.nickName = ''
+      form.value.phoneNumber = ''
+      form.value.address = ''
     }
 
+    //重置2
+    function resetForm2() {
+      form.value.password = ''
+      form.value.newPass = ''
+      form.value.passAgain = ''
+    }
 
     onMounted(() => {
       getUserData()
@@ -235,7 +276,9 @@ export default defineComponent({
       store,
       getUserData,
       resetForm,
+      resetForm2,
       submitForm,
+      submitForm2,
       tenantName,
       phoneNumber,
       nickName,
@@ -266,6 +309,20 @@ export default defineComponent({
           },
         ],
         address: [{ required: true, message: '请输入地址', trigger: 'blur' }],
+
+        userName: [{ required: true, message: '请输入账号', trigger: 'blur' }],
+        password: [
+          { required: true, message: '请输入原密码', trigger: 'blur' },
+          { validator: validatePass, trigger: 'blur' },
+        ],
+        newPass: [
+          { required: true, message: '请输入密码', trigger: 'blur' },
+          { validator: validatePass, trigger: 'blur' },
+        ],
+        passAgain: [
+          { required: true, message: '请再次输入密码', trigger: 'blur' },
+          { validator: validatePass2, trigger: 'blur', required: true },
+        ],
       },
       form2,
       formInfo2,
@@ -275,7 +332,7 @@ export default defineComponent({
           { required: true, message: '请输入原密码', trigger: 'blur' },
           { validator: validatePass, trigger: 'blur' },
         ],
-        pass: [
+        newPass: [
           { required: true, message: '请输入密码', trigger: 'blur' },
           { validator: validatePass, trigger: 'blur' },
         ],