Merge branch 'main' of ssh://18.167.251.121:10002/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/components/MyList.vue

@@ -3,6 +3,7 @@
 	const props = defineProps({
 		loading: { default: false, type: Boolean },
 		finish: { default: false, type: Boolean },
+		empty: { default: false, type: Boolean },
 		pel: { default: () => {}, type: Function }
 	})
 	const emit = defineEmits(['load'])
@@ -23,12 +24,13 @@
 	})
 </script>
 <template>
-	<div class="my-list" ref="el">
+	<div class="my-list" ref="el" :class="{ empty: !loading && empty }">
 		<slot></slot>
 		<div class="footer">
 			<p v-show="!loading" class="placeholder" ref="placeholder"></p>
-			<span class="loading" v-show="loading">Loading...</span>
+			<span class="loading" v-if="loading">Loading...</span>
-			<span class="nomore" v-show="finish">No more</span>
+			<span class="empty" v-else-if="empty">Nothing Here</span>
+			<span class="nomore" v-else-if="finish">No more</span>
 		</div>
 	</div>
 </template>
@@ -40,12 +42,28 @@
 		> .footer {
 			width: 100%;
 			font-size: 3rem;
-			color: #000;
+			color: #a1a1a1;
 			text-align: center;
 			margin: var(--my-list-footer-margin, 0);
 			> .placeholder {
 				height: 1px;
 			}
+			> .empty {
+				font-size: 4rem;
+			}
+		}
+		&.empty {
+			> .footer {
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				height: 100%;
+				padding: 0;
+				margin: 0;
+				> .empty {
+					margin-bottom: 5rem;
+				}
+			}
 		}
 	}
 </style>

src/views/Workshop/creation/creation-list.vue

@@ -268,7 +268,12 @@
 			</div>
 		</div>
 		<div class="list">
-			<my-list v-model:loading="loading" v-model:finish="finish" @load="onLoad">
+			<my-list
+				v-model:loading="loading"
+				v-model:finish="finish"
+				@load="onLoad"
+				:empty="list.length === 0"
+			>
 				<div
 					class="item"
 					v-for="(v, i) in list"

src/views/Workshop/library.vue

@@ -47,7 +47,7 @@
 			cancelButtonText: 'Cancel'
 		}).catch(() => 0)
 		if (res === 0) return
-		console.log(obj,i)
+		console.log(obj, i)
 		deleteCustomerPhoto(obj.visitRecordId)
 			.then(() => {
 				list.splice(i, 1)
@@ -68,7 +68,12 @@
 	<div class="library">
 		<div class="title">Library</div>
 		<div class="list">
-			<my-list v-model:loading="loading" v-model:finish="finish" @load="onLoad">
+			<my-list
+				v-model:loading="loading"
+				v-model:finish="finish"
+				:empty="list.length === 0"
+				@load="onLoad"
+			>
 				<div class="item" v-for="(v, i) in list" :key="v.visitRecordId">
 					<div class="image">
 						<img v-lazy="v.defaultImageUrl" />
@@ -115,18 +120,18 @@
 		}
 
 		> .title {
-			font-family: satoshiRegular;
+			font-family: satoshiBold;
-			font-size: 9rem;
+			font-size: 8.9rem;
 			text-align: left;
 			line-height: 124%;
-			margin: 5rem;
+			margin: 5rem 9.1rem;
 		}
 		> .list {
 			flex: 1;
 			overflow: hidden;
-			margin: 0 3rem;
+			margin: 0 4.5rem;
 			> .my-list {
-				padding: 0 3.8rem;
+				padding: 0 4.5rem;
 				--my-list-footer-margin: 2rem 0;
 				> .item {
 					position: relative;

src/views/Workshop/profile.vue

@@ -1,66 +1,85 @@
 <script setup lang="ts">
-import { ref, reactive, onMounted, inject ,watch} 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
-}>()
+	}>()
 
-const userInfoStore = useUserInfoStore()
+	const userInfoStore = useUserInfoStore()
-const overallStore = useOverallStore()
+	const overallStore = useOverallStore()
-const emit = defineEmits(['view-type', 'selected-customer','change-visible'])
+	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
 		show.value = true
-}
+	}
-const close = () => {
+	const close = () => {
 		show.value = false
-}
+	}
-
+	const onEditItem = (item) => {
-watch(show,(newVal)=>{
-  emit('change-visible', newVal)
-  MyEvent.emit('change-profile-visible',newVal)
-})
-
-const onEditItem = (item) => {
 		if (!form[item]) return
 		form[item].edit = true
-}
+	}
-const onSaveItem = (item) => {
+	const onSaveItem = (item) => {
 		if (!form[item]) return
 		form[item].edit = false
-}
+	}
-const switchCustomer = () => {
+	const switchCustomer = () => {
 		// console.log('switchCustomer')
 		handleShowPopup(true)
-}
+	}
-const edit = () => {
+	const edit = () => {
+		form.password.value = ''
 		isEdit.value = true
-}
+	}
-const confirm = () => {
+	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 = () => {
+	const logout = () => {
 		showConfirmDialog({
 			title: 'Log out',
 			message: 'Are you sure you want to log out?',
@@ -74,23 +93,23 @@ const logout = () => {
 				})
 			})
 			.catch(() => {})
-}
+	}
 
-const showSwitchCustomerPopup = ref(false)
+	const showSwitchCustomerPopup = ref(false)
-const custmerParams = ref<CustomerListParams>({
+	const custmerParams = ref<CustomerListParams>({
 		current: 1,
 		size: 5,
 		desc: true
-})
+	})
-const customerList = ref<any[]>([])
+	const customerList = ref<any[]>([])
-const pager = reactive({
+	const pager = reactive({
 		loading: false,
 		noMore: false,
 		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 (reset) {
 			custmerParams.value.current = 1
@@ -134,7 +153,7 @@ const loadCustomers = async (reset = false) => {
 		} finally {
 			pager.loading = false
 		}
-}
+	}
 
 const onScroll = (e: Event) => {
   const el = e.target as HTMLElement
@@ -174,18 +193,18 @@ const handleSelectCustomer = () => {
   showSwitchCustomerPopup.value = false
 }
 
-const handleFetchCustomerList = () => {
+	const handleFetchCustomerList = () => {
 		loadCustomers(true)
-}
+	}
-MyEvent.add('update-customer-list', handleFetchCustomerList)
+	MyEvent.add('update-customer-list', handleFetchCustomerList)
 
 // const openSwitchCustomerPopup = (flag = true) => {
 //   showSwitchCustomerPopup.value = flag
 // }
 
-onMounted(() => {
+	onMounted(() => {
 		handleFetchCustomerList()
-})
+	})
 
 defineExpose({ open, close, handleShowPopup })
 </script>
@@ -238,7 +257,7 @@ defineExpose({ open, close, handleShowPopup })
 					</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">
@@ -266,7 +285,7 @@ defineExpose({ open, close, handleShowPopup })
 				</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>
@@ -311,11 +330,11 @@ defineExpose({ open, close, handleShowPopup })
 </template>
 
 <style scoped lang="less">
-.van-popup {
+	.van-popup {
 		max-height: 90%;
 		--van-popup-round-radius: 7.8rem;
-}
+	}
-.profile {
+	.profile {
 		margin: 6.5rem 0;
 		display: flex;
 		flex-direction: column;
@@ -424,9 +443,9 @@ defineExpose({ open, close, handleShowPopup })
 				margin-top: 17.8rem;
 			}
 		}
-}
+	}
 
-.van-popup.user-popup {
+	.van-popup.user-popup {
 		height: 116.1rem;
 		color: #181725;
 		border-top-left-radius: 7.8rem;
@@ -496,5 +515,5 @@ defineExpose({ open, close, handleShowPopup })
 			box-sizing: border-box;
 			text-align: center;
 		}
-}
+	}
 </style>