Merge branch 'main' of http://18.167.251.121:10003/aidlab/lanecarford_front

src/api/login.ts

@@ -59,3 +59,19 @@ export const googleAuth = (data: GoogleAuthParamsType): Promise<LoginResponse> =
     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
+  })
+}

src/views/Workshop/profile.vue

@@ -1,11 +1,13 @@
 <script setup lang="ts">
-import { ref, reactive, onMounted, inject ,watch} from 'vue'
+	import { ref, reactive, onMounted, inject } from 'vue'
 	import router from '@/router'
-import { showConfirmDialog } from 'vant'
+	import { showConfirmDialog, showToast } from 'vant'
 	import { useUserInfoStore, useOverallStore } from '@/stores'
 	import { LogOut } from '@/api/login'
 	import { getCustomerList, type CustomerListParams, customerCheckin } from '@/api/workshop'
 	import MyEvent from '@/utils/myEvent'
+	import { encryptPassword } from '@/utils/tools'
+	import { updateUserInfo } from '@/api/login'
 
 	const props = defineProps<{
 		isCustomer?: boolean
@@ -13,27 +15,24 @@ const props = defineProps<{
 
 	const userInfoStore = useUserInfoStore()
 	const overallStore = useOverallStore()
-const emit = defineEmits(['view-type', 'selected-customer','change-visible'])
+	const emit = defineEmits(['view-type', 'selected-customer'])
 	const show = ref(false)
 	const isEdit = ref(false)
 	const form = reactive({
-  name: { msg: '', value: userInfoStore.state.userInfo.username },
-  email: { msg: '', value: userInfoStore.state.userInfo.email },
-//   password: { show: false, msg: '', value: userInfoStore.state.userInfo.password }
+		name: { msg: '', value: '' },
+		email: { msg: '', value: '' },
+		password: { show: true, msg: '', value: '' }
 	})
 	const open = () => {
+		form.name.value = userInfoStore.state.userInfo.username
+		form.email.value = userInfoStore.state.userInfo.email
+		form.password.value = ''
 		isEdit.value = false
 		show.value = true
 	}
 	const close = () => {
 		show.value = false
 	}
-
-watch(show,(newVal)=>{
-  emit('change-visible', newVal)
-  MyEvent.emit('change-profile-visible',newVal)
-})
-
 	const onEditItem = (item) => {
 		if (!form[item]) return
 		form[item].edit = true
@@ -47,18 +46,38 @@ const switchCustomer = () => {
 		handleShowPopup(true)
 	}
 	const edit = () => {
+		form.password.value = ''
 		isEdit.value = true
 	}
 	const confirm = () => {
-  overallStore.setLoading(true)
+		if (!isEdit.value) return
+		const password = form.password.value
 		const params = {
 			username: form.name.value,
 			email: form.email.value,
+			password
 		}
-  setTimeout(() => {
+		if (password) {
+			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)
+			showToast('Update success')
+			userInfoStore.setUserInfo({
+				...userInfoStore.state.userInfo,
+				...params
+			})
+			form.password.value = ''
 			isEdit.value = false
-  }, 1000)
+		})
 	}
 	const logout = () => {
 		showConfirmDialog({
@@ -237,7 +256,7 @@ defineExpose({ open, close, openSwitchCustomerPopup })
 					</label>
 					<p class="error" v-show="form.email.msg">{{ form.email.msg }}</p>
 				</div>
-        <div class="form-item" v-if="form.password">
+				<div class="form-item" v-if="isEdit">
 					<div class="label">Password</div>
 					<label class="input">
 						<div class="icon" @click="form.password.show = !form.password.show">
@@ -265,7 +284,7 @@ defineExpose({ open, close, openSwitchCustomerPopup })
 				</template>
 				<template v-else>
 					<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>
 				</template>
 			</form>