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

src/views/Workshop/product.vue

@@ -38,7 +38,7 @@ const startGenerate = ()=>{
 	let value = {
 		customerId:generateStore.customerId,
 		visitRecordId:generateStore.visitRecordId,
-		styleId:generateStore.style.id,
+		styleId:generateStore.styleId,
 		// customerPhotoId:null,
 		// modelPhotoId:null,
 		// prompt:null,

src/views/Workshop/selectStyle.vue

@@ -92,6 +92,7 @@ onMounted(()=>{
 	emit('view-type', 1)
 	// if(!data.styleList[0]?.id)getRequestOutfitList(0)
 	if(getGenerateTime)clearTimeout(getGenerateTime)
+	console.log(data.styleList)
 	if(!data.styleList[0]?.taskId){
 		requestOutfit({num:4,index:0})
 	}else if(data.styleList.filter((item)=>item?.status != 'SUCCEEDED').length > 0){
@@ -101,7 +102,6 @@ onMounted(()=>{
 })
 onUnmounted(()=>{
 	if(getGenerateTime)clearTimeout(getGenerateTime)
-	generateStore.clearProductData()
 })
 defineExpose({})
 const { styleList, select } = toRefs(data);

src/views/login/LoginPage.vue

@@ -243,7 +243,7 @@ const handleSignup = () => {
   .input-field {
     width: 100%;
     height: 10rem;
-    padding: 16px 20px;
+    padding: 1.6rem 2rem;
     border: 2px solid #fff;
     background: transparent;
     border-radius: 7.1rem;
@@ -289,7 +289,7 @@ const handleSignup = () => {
 
 .google-button {
   width: 100%;
-  padding: 16px;
+  padding: 1.6rem;
   border: 2px solid #fff;
   border-radius: 7rem;
   font-size: 3.83rem;

src/views/login/SignupPage.vue

@@ -259,7 +259,7 @@ const handleSignupByGoogle = async () => {
   .input-field {
     width: 100%;
     height: 10rem;
-    padding: 16px 20px;
+    padding: 1.6rem 2rem;
     border: 2px solid #fff;
     background: transparent;
     border-radius: 7.1rem;
@@ -294,7 +294,7 @@ const handleSignupByGoogle = async () => {
 
 .google-button {
   width: 100%;
-  padding: 16px;
+  padding: 1.6rem;
   border: 2px solid #fff;
   border-radius: 7rem;
   font-size: 3.83rem;