Commit 0d91bc73 authored by chenqikuai's avatar chenqikuai

fix

parent 8b28f74f
...@@ -98,9 +98,9 @@ ...@@ -98,9 +98,9 @@
} }
}, },
"@ctrl/tinycolor": { "@ctrl/tinycolor": {
"version": "3.4.0", "version": "3.4.1",
"resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.4.0.tgz", "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.4.1.tgz",
"integrity": "sha512-JZButFdZ1+/xAfpguQHoabIXkcqRRKpMrWKBkpEZZyxfY9C1DpADFB8PEqGSTeFr135SaTRfKqGKx5xSCLI7ZQ==" "integrity": "sha512-ej5oVy6lykXsvieQtqZxCOaLT+xD4+QNarq78cIYISHmZXshCvROLudpQN3lfL8G0NL7plMSSK+zlyvCaIJ4Iw=="
}, },
"@element-plus/icons-vue": { "@element-plus/icons-vue": {
"version": "1.1.4", "version": "1.1.4",
...@@ -137,9 +137,9 @@ ...@@ -137,9 +137,9 @@
"integrity": "sha512-Y30eVMcZva8o84c0HcXAtDO4BEzPJMvF6+B7x7urL2xbAqVsGJhojOyHLaoQHQYjb6OkqRq5kO+zeySycQwKqg==" "integrity": "sha512-Y30eVMcZva8o84c0HcXAtDO4BEzPJMvF6+B7x7urL2xbAqVsGJhojOyHLaoQHQYjb6OkqRq5kO+zeySycQwKqg=="
}, },
"@floating-ui/dom": { "@floating-ui/dom": {
"version": "0.4.2", "version": "0.4.4",
"resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-0.4.2.tgz", "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-0.4.4.tgz",
"integrity": "sha512-2/4vOhMAujkMmGqGX1Gut84phe5MNfk1kGeM+RSTJCpeR0SWR2/RR+/f1r1msOvTQa28wn7HEhxGe71CjYY/vw==", "integrity": "sha512-0Ulu3B/dqQplUUSqnTx0foSrlYuMN+GTtlJWvNJwt6Fr7/PqmlR/Y08o6/+bxDWr6p3roBJRaQ51MDZsNmEhhw==",
"requires": { "requires": {
"@floating-ui/core": "^0.6.1" "@floating-ui/core": "^0.6.1"
} }
...@@ -171,9 +171,9 @@ ...@@ -171,9 +171,9 @@
} }
}, },
"@popperjs/core": { "@popperjs/core": {
"version": "2.11.4", "version": "2.11.5",
"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.4.tgz", "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz",
"integrity": "sha512-q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg==" "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw=="
}, },
"@rollup/pluginutils": { "@rollup/pluginutils": {
"version": "4.2.0", "version": "4.2.0",
...@@ -196,6 +196,19 @@ ...@@ -196,6 +196,19 @@
"integrity": "sha512-BIga/WEqTi35ccnGysOuO4RmwVnpajv9oDB/sDQSY2b7/Ac7RyYR30bv7otZwByMvOJV9Vqq6/O1DFAnOzE4Pg==", "integrity": "sha512-BIga/WEqTi35ccnGysOuO4RmwVnpajv9oDB/sDQSY2b7/Ac7RyYR30bv7otZwByMvOJV9Vqq6/O1DFAnOzE4Pg==",
"dev": true "dev": true
}, },
"@types/lodash": {
"version": "4.14.181",
"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.181.tgz",
"integrity": "sha512-n3tyKthHJbkiWhDZs3DkhkCzt2MexYHXlX0td5iMplyfwketaOeKboEVBqzceH7juqvEg3q5oUoBFxSLu7zFag=="
},
"@types/lodash-es": {
"version": "4.17.6",
"resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz",
"integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==",
"requires": {
"@types/lodash": "*"
}
},
"@types/node": { "@types/node": {
"version": "17.0.23", "version": "17.0.23",
"resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz",
...@@ -428,34 +441,27 @@ ...@@ -428,34 +441,27 @@
"integrity": "sha512-ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ==" "integrity": "sha512-ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ=="
}, },
"@vueuse/core": { "@vueuse/core": {
"version": "8.2.3", "version": "8.2.6",
"resolved": "https://registry.npmjs.org/@vueuse/core/-/core-8.2.3.tgz", "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-8.2.6.tgz",
"integrity": "sha512-bz6XroFRFOIGzhAHcnTfjtAQNkNcSELKPoSSUGROwYfOgTnaVyq7iKhgwdeRNom3y9q+a60RlhD35oJaGsXDHA==", "integrity": "sha512-fzlpM3B5oVe+UhCT1mXlhG1Zxdq2lq1Z2AvddSB8+RxrsSFzII7DKfsQEz8Vop7Lzc++4m8drTNbhPovYoFqHw==",
"requires": { "requires": {
"@vueuse/metadata": "8.2.3", "@vueuse/metadata": "8.2.6",
"@vueuse/shared": "8.2.3", "@vueuse/shared": "8.2.6",
"vue-demi": "*" "vue-demi": "*"
},
"dependencies": {
"@vueuse/shared": {
"version": "8.2.3",
"resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-8.2.3.tgz",
"integrity": "sha512-4Cd3s+x8ZwzzAf7o8jS7mEj9pQ1Zsf9aiNBAFg4rHcWeDY0S3XMgvN4ae2hBul7jmi+Ab4REAqiqYWyYqU86qg==",
"requires": {
"vue-demi": "*"
}
},
"vue-demi": {
"version": "0.12.5",
"resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.12.5.tgz",
"integrity": "sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q=="
}
} }
}, },
"@vueuse/metadata": { "@vueuse/metadata": {
"version": "8.2.3", "version": "8.2.6",
"resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-8.2.3.tgz", "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-8.2.6.tgz",
"integrity": "sha512-xH5256Bn6hBYvQWoaCBagpeCrzJmeEeWnyDDkwVFhx7+pLOe4I6gsMHie3yJoowK9AN/D7JLTtEBbWvvBi5TOA==" "integrity": "sha512-OBKtafCt+4RcEJlYDCjp1vl65pBCL2g4TmipEtdZ8/qphKlW6nakJbkY7XRN5grPmjqU99/ahJGtyGk5NHS2hw=="
},
"@vueuse/shared": {
"version": "8.2.6",
"resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-8.2.6.tgz",
"integrity": "sha512-J/W4CMfdL8TahELuSOgtfVO4eQXTjhigp7dVWIBsLUVFCeY9d49gvHUcQN3y5xYLZ6iNP57TjTQjMMT/zhklkw==",
"requires": {
"vue-demi": "*"
}
}, },
"acorn": { "acorn": {
"version": "7.4.1", "version": "7.4.1",
...@@ -714,9 +720,9 @@ ...@@ -714,9 +720,9 @@
"integrity": "sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==" "integrity": "sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA=="
}, },
"dayjs": { "dayjs": {
"version": "1.11.0", "version": "1.11.1",
"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.0.tgz", "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.1.tgz",
"integrity": "sha512-JLC809s6Y948/FuCZPm5IX8rRhQwOiyMb2TfVVQEixG7P8Lm/gt5S7yoQZmC8x1UehI9Pb7sksEt4xx14m+7Ug==" "integrity": "sha512-ER7EjqVAMkRRsxNCC5YqJ9d9VQYuWdGt7aiH2qA5R5wt8ZmWaP2dLUSIK6y/kVzLMlmh1Tvu5xUf4M/wdGJ5KA=="
}, },
"deepmerge": { "deepmerge": {
"version": "1.5.2", "version": "1.5.2",
...@@ -810,15 +816,17 @@ ...@@ -810,15 +816,17 @@
"dev": true "dev": true
}, },
"element-plus": { "element-plus": {
"version": "2.1.7", "version": "2.1.9",
"resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.1.7.tgz", "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.1.9.tgz",
"integrity": "sha512-jamE9F/a2rfAQJwf3kLaDfWXxhjXuAJAvrto76SLJsJfr3iIUAzC849RHdn6h7tNJy9Yanq8GlQAsdBe5lJmrA==", "integrity": "sha512-6mWqS3YrmJPnouWP4otzL8+MehfOnDFqDbcIdnmC07p+Z0JkWe/CVKc4Wky8AYC8nyDMUQyiZYvooCbqGuM7pg==",
"requires": { "requires": {
"@ctrl/tinycolor": "^3.4.0", "@ctrl/tinycolor": "^3.4.0",
"@element-plus/icons-vue": "^1.1.4", "@element-plus/icons-vue": "^1.1.4",
"@floating-ui/dom": "^0.4.1", "@floating-ui/dom": "^0.4.2",
"@popperjs/core": "^2.11.4", "@popperjs/core": "^2.11.4",
"@vueuse/core": "^8.1.2", "@types/lodash": "^4.14.181",
"@types/lodash-es": "^4.17.6",
"@vueuse/core": "^8.2.4",
"async-validator": "^4.0.7", "async-validator": "^4.0.7",
"dayjs": "^1.11.0", "dayjs": "^1.11.0",
"escape-html": "^1.0.3", "escape-html": "^1.0.3",
...@@ -826,7 +834,7 @@ ...@@ -826,7 +834,7 @@
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"lodash-unified": "^1.0.2", "lodash-unified": "^1.0.2",
"memoize-one": "^6.0.0", "memoize-one": "^6.0.0",
"normalize-wheel-es": "^1.1.1" "normalize-wheel-es": "^1.1.2"
} }
}, },
"emmet": { "emmet": {
...@@ -2091,6 +2099,11 @@ ...@@ -2091,6 +2099,11 @@
"resolved": "https://registry.npmjs.org/vue-cropper/-/vue-cropper-1.0.3.tgz", "resolved": "https://registry.npmjs.org/vue-cropper/-/vue-cropper-1.0.3.tgz",
"integrity": "sha512-yDrZkE4H5vOiMA9WQHE+6rmXrZ1S9TMZasEPAZPKg/2I/nySHL4ECD1lNxt7+ofTPKT+9+2sQkCwagPqEqiqJg==" "integrity": "sha512-yDrZkE4H5vOiMA9WQHE+6rmXrZ1S9TMZasEPAZPKg/2I/nySHL4ECD1lNxt7+ofTPKT+9+2sQkCwagPqEqiqJg=="
}, },
"vue-demi": {
"version": "0.12.5",
"resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.12.5.tgz",
"integrity": "sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q=="
},
"vue-router": { "vue-router": {
"version": "4.0.14", "version": "4.0.14",
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.0.14.tgz", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.0.14.tgz",
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"dependencies": { "dependencies": {
"axios": "^0.26.1", "axios": "^0.26.1",
"crypto-js": "^4.1.1", "crypto-js": "^4.1.1",
"element-plus": "^2.1.4", "element-plus": "^2.1.9",
"js-md5": "^0.7.3", "js-md5": "^0.7.3",
"simple-components01": "^0.1.15", "simple-components01": "^0.1.15",
"unplugin-element-plus": "^0.3.2", "unplugin-element-plus": "^0.3.2",
......
...@@ -83,6 +83,8 @@ export default defineComponent({ ...@@ -83,6 +83,8 @@ export default defineComponent({
type: "success", type: "success",
}); });
this.$emit("success"); this.$emit("success");
}else{
ElMessage.error(res?.msg)
} }
this.disabled = false; this.disabled = false;
}, },
......
...@@ -60,6 +60,8 @@ export default defineComponent({ ...@@ -60,6 +60,8 @@ export default defineComponent({
type: "success", type: "success",
}); });
this.$emit("success"); this.$emit("success");
}else{
ElMessage.error(res?.msg)
} }
this.disabled = false; this.disabled = false;
}, },
......
...@@ -144,6 +144,8 @@ export default defineComponent({ ...@@ -144,6 +144,8 @@ export default defineComponent({
type: "success", type: "success",
}); });
this.$emit("success"); this.$emit("success");
}else{
ElMessage.error(res?.msg)
} }
}, },
}, },
......
<template> <template>
<div class="edit-password"> <div class="edit-password">
<el-breadcrumb separator="/" class="head-nav"> <el-breadcrumb separator="/" class="head-nav">
<el-breadcrumb-item :to="{ path: '/userCenter' }">用户中心</el-breadcrumb-item> <el-breadcrumb-item :to="{ path: '/userCenter' }"
<el-breadcrumb-item>修改登录密码</el-breadcrumb-item> >用户中心</el-breadcrumb-item
</el-breadcrumb> >
<p class="title">修改登录密码:</p> <el-breadcrumb-item>修改登录密码</el-breadcrumb-item>
<syBusinessForm :form-list="formList" class="formlayout1"></syBusinessForm> </el-breadcrumb>
</div> <p class="title">修改登录密码:</p>
<syBusinessForm :form-list="formList" class="formlayout1"></syBusinessForm>
</div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent } from "vue"; import { defineComponent } from "vue";
...@@ -14,109 +16,109 @@ import { editPassword } from "@/service/Api.service"; ...@@ -14,109 +16,109 @@ import { editPassword } from "@/service/Api.service";
import { globalState } from "@/store/state"; import { globalState } from "@/store/state";
import { ElMessage, ElBreadcrumb, ElBreadcrumbItem } from "element-plus"; import { ElMessage, ElBreadcrumb, ElBreadcrumbItem } from "element-plus";
import md5 from "js-md5"; import md5 from "js-md5";
import { filterPhone, syBusinessForm } from "cqk-sy-ui" import { filterPhone, syBusinessForm } from "cqk-sy-ui";
import { generateFormList, validPassword } from "./config" import { generateFormList, validPassword } from "./config";
export default defineComponent({ export default defineComponent({
components: { components: {
ElBreadcrumb, ElBreadcrumbItem, syBusinessForm ElBreadcrumb,
}, ElBreadcrumbItem,
data() { syBusinessForm,
return { },
passwordForm: { data() {
phone: globalState.userInfos.phone, return {
email: globalState.userInfos.email, passwordForm: {
pwd: "", phone: globalState.userInfos.phone,
code: "", email: globalState.userInfos.email,
}, pwd: "",
formList: generateFormList({ phone: globalState.userInfos.phone, email: globalState.userInfos.email }, this.confirm) code: "",
}; },
}, formList: generateFormList(
created() { {
if ( phone: globalState.userInfos.phone,
!globalState.userInfos.phone && email: globalState.userInfos.email,
!globalState.userInfos.email
) {
this.$router.push("/userCenter");
}
},
methods: {
filterPhone,
async confirm(data: any) {
let info = {};
if (globalState.userInfos.phone !== "") {
info = {
phone: globalState.userInfos.phone,
code_type: 0,
pwd: md5(
String(data.pwd) +
md5(String(data.pwd.length))
),
code: data.code,
};
} else if (globalState.userInfos.email !== "") {
info = {
email: data.email,
pwd: md5(
String(data.pwd) +
md5(String(data.pwd.length))
),
code: data.code,
code_type: 1,
};
}
const res = await editPassword(info);
if (res && res.code === 200) {
ElMessage({
message: "密码修改成功",
type: "success",
});
this.$router.push("/userCenter");
}
}, },
this.confirm
),
};
},
created() {
if (!globalState.userInfos.phone && !globalState.userInfos.email) {
this.$router.push("/userCenter");
}
},
methods: {
filterPhone,
async confirm(data: any) {
let info = {};
if (globalState.userInfos.phone !== "") {
info = {
phone: globalState.userInfos.phone,
code_type: 0,
pwd: md5(String(data.pwd) + md5(String(data.pwd.length))),
code: data.code,
};
} else if (globalState.userInfos.email !== "") {
info = {
email: data.email,
pwd: md5(String(data.pwd) + md5(String(data.pwd.length))),
code: data.code,
code_type: 1,
};
}
const res = await editPassword(info);
if (res && res.code === 200) {
ElMessage({
message: "密码修改成功",
type: "success",
});
this.$router.push("/userCenter");
} else {
res?.msg && ElMessage.error(res?.msg);
}
}, },
},
}); });
</script> </script>
<style scoped> <style scoped>
.edit-password { .edit-password {
padding: 16px; padding: 16px;
min-height: calc(100vh - 95px); min-height: calc(100vh - 95px);
min-width: 1200px; min-width: 1200px;
background: #f8fafb; background: #f8fafb;
} }
.head-nav { .head-nav {
margin: 12px 0 40px 47px; margin: 12px 0 40px 47px;
} }
.title { .title {
margin-left: 47px; margin-left: 47px;
font-size: 20px; font-size: 20px;
font-family: PingFangSC-Semibold; font-family: PingFangSC-Semibold;
font-weight: 600; font-weight: 600;
color: rgba(53, 53, 53, 1); color: rgba(53, 53, 53, 1);
line-height: 40px; line-height: 40px;
} }
.form { .form {
width: 900px; width: 900px;
} }
.form .el-input { .form .el-input {
width: 610px; width: 610px;
} }
.form-code .el-input { .form-code .el-input {
width: 480px; width: 480px;
} }
.form-item { .form-item {
margin-bottom: 28px; margin-bottom: 28px;
} }
.confirm-btn { .confirm-btn {
margin-top: 10px; margin-top: 10px;
margin-left: 50px; margin-left: 50px;
} }
</style> </style>
<style> <style>
.edit-password .el-form-item__label { .edit-password .el-form-item__label {
margin-right: 21px; margin-right: 21px;
} }
</style> </style>
...@@ -93,6 +93,8 @@ export default defineComponent({ ...@@ -93,6 +93,8 @@ export default defineComponent({
that.start(); that.start();
}, 100); }, 100);
this.newPhone.random_token = old.data.random_token; this.newPhone.random_token = old.data.random_token;
}else{
old?.msg && ElMessage.error(old?.msg)
} }
} else { } else {
if (data.phone === "") { if (data.phone === "") {
...@@ -113,6 +115,8 @@ export default defineComponent({ ...@@ -113,6 +115,8 @@ export default defineComponent({
type: "success", type: "success",
}); });
this.$router.push("/userCenter"); this.$router.push("/userCenter");
}else{
ElMessage.error(newphone?.msg)
} }
} }
}, },
......
...@@ -114,6 +114,8 @@ export default defineComponent({ ...@@ -114,6 +114,8 @@ export default defineComponent({
}, 3000); }, 3000);
} }
} }
}else{
res?.msg && ElMessage.error(res.msg)
} }
} else { } else {
ElMessage("认证信息存在错误,请确认!"); ElMessage("认证信息存在错误,请确认!");
......
...@@ -85,6 +85,8 @@ export default defineComponent({ ...@@ -85,6 +85,8 @@ export default defineComponent({
}); });
this.$router.push("/userCenter"); this.$router.push("/userCenter");
}else{
res?.msg && ElMessage.error(res?.msg)
} }
}, },
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment