修改账号信息
This commit is contained in:
@@ -59,3 +59,19 @@ export const googleAuth = (data: GoogleAuthParamsType): Promise<LoginResponse> =
|
|||||||
params: data
|
params: data
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/** 更改用户信息
|
||||||
|
* @param data 包含用户信息的对象
|
||||||
|
* @param data.username 用户名
|
||||||
|
* @param data.email 邮箱
|
||||||
|
* @param data.password 密码
|
||||||
|
* @returns 包含更新后的用户信息的对象
|
||||||
|
*/
|
||||||
|
export const updateUserInfo = (data: any) => {
|
||||||
|
return request({
|
||||||
|
url: '/api/auth/updateUserInfo',
|
||||||
|
method: 'post',
|
||||||
|
data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,61 +1,84 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref, reactive, onMounted, inject } from 'vue'
|
import { ref, reactive, onMounted, inject } from 'vue'
|
||||||
import router from '@/router'
|
import router from '@/router'
|
||||||
import { showConfirmDialog } from 'vant'
|
import { showConfirmDialog, showToast } from 'vant'
|
||||||
import { useUserInfoStore, useOverallStore } from '@/stores'
|
import { useUserInfoStore, useOverallStore } from '@/stores'
|
||||||
import { LogOut } from '@/api/login'
|
import { LogOut } from '@/api/login'
|
||||||
import { getCustomerList, type CustomerListParams,customerCheckin } from '@/api/workshop'
|
import { getCustomerList, type CustomerListParams, customerCheckin } from '@/api/workshop'
|
||||||
import MyEvent from '@/utils/myEvent'
|
import MyEvent from '@/utils/myEvent'
|
||||||
|
import { encryptPassword } from '@/utils/tools'
|
||||||
|
import { updateUserInfo } from '@/api/login'
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
isCustomer?: boolean
|
isCustomer?: boolean
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
const userInfoStore = useUserInfoStore()
|
const userInfoStore = useUserInfoStore()
|
||||||
const overallStore = useOverallStore()
|
const overallStore = useOverallStore()
|
||||||
const emit = defineEmits(['view-type', 'selected-customer'])
|
const emit = defineEmits(['view-type', 'selected-customer'])
|
||||||
const show = ref(false)
|
const show = ref(false)
|
||||||
const isEdit = ref(false)
|
const isEdit = ref(false)
|
||||||
const form = reactive({
|
const form = reactive({
|
||||||
name: { msg: '', value: userInfoStore.state.userInfo.username },
|
name: { msg: '', value: '' },
|
||||||
email: { msg: '', value: userInfoStore.state.userInfo.email },
|
email: { msg: '', value: '' },
|
||||||
// password: { show: false, msg: '', value: userInfoStore.state.userInfo.password }
|
password: { show: true, msg: '', value: '' }
|
||||||
})
|
})
|
||||||
const open = () => {
|
const open = () => {
|
||||||
|
form.name.value = userInfoStore.state.userInfo.username
|
||||||
|
form.email.value = userInfoStore.state.userInfo.email
|
||||||
|
form.password.value = ''
|
||||||
isEdit.value = false
|
isEdit.value = false
|
||||||
show.value = true
|
show.value = true
|
||||||
}
|
}
|
||||||
const close = () => {
|
const close = () => {
|
||||||
show.value = false
|
show.value = false
|
||||||
}
|
}
|
||||||
const onEditItem = (item) => {
|
const onEditItem = (item) => {
|
||||||
if (!form[item]) return
|
if (!form[item]) return
|
||||||
form[item].edit = true
|
form[item].edit = true
|
||||||
}
|
}
|
||||||
const onSaveItem = (item) => {
|
const onSaveItem = (item) => {
|
||||||
if (!form[item]) return
|
if (!form[item]) return
|
||||||
form[item].edit = false
|
form[item].edit = false
|
||||||
}
|
}
|
||||||
const switchCustomer = () => {
|
const switchCustomer = () => {
|
||||||
// console.log('switchCustomer')
|
// console.log('switchCustomer')
|
||||||
handleShowPopup(true)
|
handleShowPopup(true)
|
||||||
}
|
}
|
||||||
const edit = () => {
|
const edit = () => {
|
||||||
|
form.password.value = ''
|
||||||
isEdit.value = true
|
isEdit.value = true
|
||||||
}
|
}
|
||||||
const confirm = () => {
|
const confirm = () => {
|
||||||
overallStore.setLoading(true)
|
const password = form.password.value
|
||||||
const params = {
|
const params = {
|
||||||
username: form.name.value,
|
username: form.name.value,
|
||||||
email: form.email.value,
|
email: form.email.value,
|
||||||
|
password
|
||||||
}
|
}
|
||||||
console.log(params)
|
if (password) {
|
||||||
setTimeout(() => {
|
if (password.length < 6) {
|
||||||
|
return showToast('Password must be at least 6 characters')
|
||||||
|
} else {
|
||||||
|
params.password = encryptPassword(password)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
params.password = userInfoStore.state.userInfo.password
|
||||||
|
}
|
||||||
|
|
||||||
|
overallStore.setLoading(true)
|
||||||
|
updateUserInfo(params).then((res) => {
|
||||||
overallStore.setLoading(false)
|
overallStore.setLoading(false)
|
||||||
|
showToast('Update success')
|
||||||
|
userInfoStore.setUserInfo({
|
||||||
|
...userInfoStore.state.userInfo,
|
||||||
|
...params
|
||||||
|
})
|
||||||
|
form.password.value = ''
|
||||||
isEdit.value = false
|
isEdit.value = false
|
||||||
}, 1000)
|
})
|
||||||
}
|
}
|
||||||
const logout = () => {
|
const logout = () => {
|
||||||
showConfirmDialog({
|
showConfirmDialog({
|
||||||
title: 'Log out',
|
title: 'Log out',
|
||||||
message: 'Are you sure you want to log out?',
|
message: 'Are you sure you want to log out?',
|
||||||
@@ -69,23 +92,23 @@ const logout = () => {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
.catch(() => {})
|
.catch(() => {})
|
||||||
}
|
}
|
||||||
|
|
||||||
const showSwitchCustomerPopup = ref(false)
|
const showSwitchCustomerPopup = ref(false)
|
||||||
const custmerParams = ref<CustomerListParams>({
|
const custmerParams = ref<CustomerListParams>({
|
||||||
current: 1,
|
current: 1,
|
||||||
size: 5,
|
size: 5,
|
||||||
desc: true
|
desc: true
|
||||||
})
|
})
|
||||||
const customerList = ref<any[]>([])
|
const customerList = ref<any[]>([])
|
||||||
const pager = reactive({
|
const pager = reactive({
|
||||||
loading: false,
|
loading: false,
|
||||||
noMore: false,
|
noMore: false,
|
||||||
total: null as number | null
|
total: null as number | null
|
||||||
})
|
})
|
||||||
const customerListEl = ref<HTMLElement | null>(null)
|
const customerListEl = ref<HTMLElement | null>(null)
|
||||||
|
|
||||||
const loadCustomers = async (reset = false) => {
|
const loadCustomers = async (reset = false) => {
|
||||||
if (pager.loading) return
|
if (pager.loading) return
|
||||||
if (reset) {
|
if (reset) {
|
||||||
custmerParams.value.current = 1
|
custmerParams.value.current = 1
|
||||||
@@ -129,35 +152,35 @@ const loadCustomers = async (reset = false) => {
|
|||||||
} finally {
|
} finally {
|
||||||
pager.loading = false
|
pager.loading = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const onScroll = (e: Event) => {
|
const onScroll = (e: Event) => {
|
||||||
const el = e.target as HTMLElement
|
const el = e.target as HTMLElement
|
||||||
if (!el) return
|
if (!el) return
|
||||||
if (pager.loading || pager.noMore) return
|
if (pager.loading || pager.noMore) return
|
||||||
if (el.scrollTop + el.clientHeight >= el.scrollHeight - 50) {
|
if (el.scrollTop + el.clientHeight >= el.scrollHeight - 50) {
|
||||||
loadCustomers(false)
|
loadCustomers(false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 打开customer选择时关闭profile弹窗 如果不是点击confirem关闭则重新打开profile弹窗
|
// 打开customer选择时关闭profile弹窗 如果不是点击confirem关闭则重新打开profile弹窗
|
||||||
const handleShowPopup = (flag: boolean) => {
|
const handleShowPopup = (flag: boolean) => {
|
||||||
showSwitchCustomerPopup.value = flag
|
showSwitchCustomerPopup.value = flag
|
||||||
show.value = !flag
|
show.value = !flag
|
||||||
if (flag) {
|
if (flag) {
|
||||||
loadCustomers(true)
|
loadCustomers(true)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const handleChangeChecked = (item) => {
|
const handleChangeChecked = (item) => {
|
||||||
customerList.value.forEach((customer) => {
|
customerList.value.forEach((customer) => {
|
||||||
customer.checked = customer.vipId === item.vipId
|
customer.checked = customer.vipId === item.vipId
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
const handleSelectCustomer = () => {
|
const handleSelectCustomer = () => {
|
||||||
const selectedCustomer = customerList.value.find((customer) => customer.checked)
|
const selectedCustomer = customerList.value.find((customer) => customer.checked)
|
||||||
if (selectedCustomer) {
|
if (selectedCustomer) {
|
||||||
emit('selected-customer', selectedCustomer)
|
emit('selected-customer', selectedCustomer)
|
||||||
}
|
}
|
||||||
if(!props.isCustomer){
|
if (!props.isCustomer) {
|
||||||
// show.value = true
|
// show.value = true
|
||||||
customerCheckin({ nickname: selectedCustomer.name }).then((res) => {
|
customerCheckin({ nickname: selectedCustomer.name }).then((res) => {
|
||||||
useUserInfoStore().resetGenerateParams()
|
useUserInfoStore().resetGenerateParams()
|
||||||
@@ -166,22 +189,22 @@ const handleSelectCustomer = () => {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
showSwitchCustomerPopup.value = false
|
showSwitchCustomerPopup.value = false
|
||||||
}
|
}
|
||||||
|
|
||||||
const handleFetchCustomerList = () => {
|
const handleFetchCustomerList = () => {
|
||||||
loadCustomers(true)
|
loadCustomers(true)
|
||||||
}
|
}
|
||||||
MyEvent.add('update-customer-list', handleFetchCustomerList)
|
MyEvent.add('update-customer-list', handleFetchCustomerList)
|
||||||
|
|
||||||
const openSwitchCustomerPopup = (flag = true) => {
|
const openSwitchCustomerPopup = (flag = true) => {
|
||||||
showSwitchCustomerPopup.value = flag
|
showSwitchCustomerPopup.value = flag
|
||||||
}
|
}
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
handleFetchCustomerList()
|
handleFetchCustomerList()
|
||||||
})
|
})
|
||||||
|
|
||||||
defineExpose({ open, close, openSwitchCustomerPopup })
|
defineExpose({ open, close, openSwitchCustomerPopup })
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
@@ -232,7 +255,7 @@ defineExpose({ open, close, openSwitchCustomerPopup })
|
|||||||
</label>
|
</label>
|
||||||
<p class="error" v-show="form.email.msg">{{ form.email.msg }}</p>
|
<p class="error" v-show="form.email.msg">{{ form.email.msg }}</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-item" v-if="form.password">
|
<div class="form-item" v-if="isEdit">
|
||||||
<div class="label">Password</div>
|
<div class="label">Password</div>
|
||||||
<label class="input">
|
<label class="input">
|
||||||
<div class="icon" @click="form.password.show = !form.password.show">
|
<div class="icon" @click="form.password.show = !form.password.show">
|
||||||
@@ -260,7 +283,7 @@ defineExpose({ open, close, openSwitchCustomerPopup })
|
|||||||
</template>
|
</template>
|
||||||
<template v-else>
|
<template v-else>
|
||||||
<button class="switch" @click="switchCustomer">Switch Customer</button>
|
<button class="switch" @click="switchCustomer">Switch Customer</button>
|
||||||
<!-- <button class="edit" @click="edit">Edit Profile</button> -->
|
<button class="edit" @click="edit">Edit Profile</button>
|
||||||
<button class="logout" @click="logout">Log out</button>
|
<button class="logout" @click="logout">Log out</button>
|
||||||
</template>
|
</template>
|
||||||
</form>
|
</form>
|
||||||
@@ -305,11 +328,11 @@ defineExpose({ open, close, openSwitchCustomerPopup })
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style scoped lang="less">
|
<style scoped lang="less">
|
||||||
.van-popup {
|
.van-popup {
|
||||||
max-height: 90%;
|
max-height: 90%;
|
||||||
--van-popup-round-radius: 7.8rem;
|
--van-popup-round-radius: 7.8rem;
|
||||||
}
|
}
|
||||||
.profile {
|
.profile {
|
||||||
margin: 6.5rem 0;
|
margin: 6.5rem 0;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
@@ -418,9 +441,9 @@ defineExpose({ open, close, openSwitchCustomerPopup })
|
|||||||
margin-top: 17.8rem;
|
margin-top: 17.8rem;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.van-popup.user-popup {
|
.van-popup.user-popup {
|
||||||
height: 116.1rem;
|
height: 116.1rem;
|
||||||
color: #181725;
|
color: #181725;
|
||||||
border-top-left-radius: 7.8rem;
|
border-top-left-radius: 7.8rem;
|
||||||
@@ -490,5 +513,5 @@ defineExpose({ open, close, openSwitchCustomerPopup })
|
|||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
Reference in New Issue
Block a user