修改密码:接入完成

pull/29/head^2
YunaiV 2023-12-17 18:57:08 +08:00
parent 2c7d89d711
commit 6941b869c7
6 changed files with 68 additions and 88 deletions

View File

@ -1,6 +1,19 @@
import request from '@/sheep/request2';
const UserApi = {
// 修改密码
updateUserPassword: (data) => {
return request({
url: '/app-api/member/user/update-password',
method: 'PUT',
data,
custom: {
loadingMsg: '验证中',
showSuccess: true,
successMsg: '修改成功'
},
});
},
// 重置密码
resetUserPassword: (data) => {
return request({

View File

@ -93,18 +93,6 @@ export default {
},
}),
// 修改密码
changePassword: (data) =>
request({
url: '/user/api/user/changePassword',
method: 'POST',
data,
custom: {
showSuccess: true,
loadingMsg: '验证中',
},
}),
// 绑定、更换手机号
changeMobile: (data) =>
request({
@ -117,18 +105,6 @@ export default {
},
}),
// 修改用户名
changeUsername: (data) =>
request({
url: '/user/api/user/changeUsername',
method: 'POST',
data,
custom: {
showSuccess: true,
loadingMsg: '验证中',
},
}),
// 更新小程序信息
updateMpUserInfo: (data) =>
request({

View File

@ -1,4 +1,4 @@
<!-- 修改密码 - changePassword -->
<!-- 修改密码登录时 -->
<template>
<view>
<!-- 标题栏 -->
@ -16,29 +16,32 @@
labelWidth="140"
labelAlign="center"
>
<uni-forms-item name="oldPassword" label="旧密码">
<uni-forms-item name="code" label="验证码">
<uni-easyinput
placeholder="请输入旧密码"
v-model="state.model.oldPassword"
type="text"
placeholder="请输入验证码"
v-model="state.model.code"
type="number"
maxlength="4"
:inputBorder="false"
/>
>
<template v-slot:right>
<button
class="ss-reset-button code-btn code-btn-start"
:disabled="state.isMobileEnd"
:class="{ 'code-btn-end': state.isMobileEnd }"
@tap="getSmsCode('changePassword')"
>
{{ getSmsTimer('resetPassword') }}
</button>
</template>
</uni-easyinput>
</uni-forms-item>
<uni-forms-item name="newPassword" label="新密码">
<uni-forms-item name="reNewPassword" label="密码">
<uni-easyinput
type="password"
placeholder="请输入新密码"
v-model="state.model.newPassword"
:inputBorder="false"
/>
</uni-forms-item>
<uni-forms-item name="reNewPassword" label="确认密码">
<uni-easyinput
type="password"
placeholder="请重新输入您的新密码"
v-model="state.model.reNewPassword"
placeholder="请输入密码"
v-model="state.model.password"
:inputBorder="false"
>
<template v-slot:right>
@ -50,69 +53,51 @@
</uni-forms-item>
</uni-forms>
<view class="editPwd-btn-box ss-m-t-80">
<button class="ss-reset-button forgot-btn" @tap="showAuthModal('resetPassword')">
忘记密码
</button>
</view>
<button class="ss-reset-button type-btn" @tap="closeAuthModal">
取消修改
</button>
</view>
</template>
<script setup>
import { computed, watch, ref, reactive, unref } from 'vue';
import sheep from '@/sheep';
import { password } from '@/sheep/validate/form';
import { showAuthModal, closeAuthModal } from '@/sheep/hooks/useModal';
import { ref, reactive, unref } from 'vue';
import { code, password } from '@/sheep/validate/form';
import { closeAuthModal, getSmsCode, getSmsTimer } from '@/sheep/hooks/useModal';
import UserApi from '@/sheep/api/member/user';
const changePasswordRef = ref(null);
//
const state = reactive({
isMobileEnd: false, //
model: {
oldPassword: '', //
newPassword: '', //
reNewPassword: '', //
mobile: '', //
code: '', //
password: '', //
},
rules: {
oldPassword: password,
newPassword: password,
reNewPassword: {
rules: [
{
required: true,
errorMessage: '请确认密码',
},
{
validateFunction: function (rule, value, data, callback) {
if (value !== state.model.newPassword) {
callback('两次输入的密码不一致');
}
if (value === state.model.oldPassword) {
callback('新密码不能与旧密码相同');
}
return true;
},
},
],
},
code,
password,
},
});
// 6.
//
async function changePasswordSubmit() {
//
const validate = await unref(changePasswordRef)
.validate()
.catch((error) => {
console.log('error: ', error);
});
if (!validate) return;
sheep.$api.user.changePassword(state.model).then((res) => {
if (res.error === 0) {
sheep.$store('user').getInfo();
closeAuthModal();
}
});
if (!validate) {
return;
}
//
const { code } = await UserApi.updateUserPassword(state.model);
if (code !== 0) {
return;
}
//
closeAuthModal();
}
</script>

View File

@ -1,4 +1,4 @@
<!-- 重置密码 - resetPassword-- -->
<!-- 重置密码未登录时 -->
<template>
<view>
<!-- 标题栏 -->

View File

@ -58,7 +58,7 @@ export function closeMenuTools() {
}
// 发送短信验证码 60秒
export function getSmsCode(event, mobile = '') {
export function getSmsCode(event, mobile) {
const modalStore = $store('modal');
const lastSendTimer = modalStore.lastTimer[event];
if (typeof lastSendTimer === 'undefined') {
@ -72,7 +72,8 @@ export function getSmsCode(event, mobile = '') {
$helper.toast('请稍后再试');
return;
}
if (!test.mobile(mobile)) {
// 只有 mobile 非空时才校验。因为部分场景(修改密码),不需要输入手机
if (mobile && !test.mobile(mobile)) {
$helper.toast('手机号码格式不正确');
return;
}
@ -82,6 +83,10 @@ export function getSmsCode(event, mobile = '') {
switch (event) {
case 'resetPassword':
scene = 4;
break;
case 'changePassword':
scene = 3;
break;
}
$api.AuthUtil.sendSmsCode(mobile, scene).then((res) => {
if (res.code === 0) {

View File

@ -13,10 +13,11 @@ const modal = defineStore({
smsRegister: 0,
changeMobile: 0,
resetPassword: 0,
changePassword: 0,
}
}),
persist: {
enabled: true,
enabled: true,
strategies: [
{
key: 'modal-store',