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

src/stores/modules/generate.ts

@@ -142,4 +142,4 @@ export const useGenerateStore = defineStore({
       this.customerInfo = data
     }
   }
-})
+})

src/views/Workshop/product.vue

@@ -169,7 +169,7 @@ const { isLoading } = toRefs(data);
 			> .modelBox{
 				margin-top: 2.5rem;
 				> .model{
-					border: 2px solid #D9D9D9;
+					border: .2rem solid #D9D9D9;
 					// height: 110rem;
 					aspect-ratio: 2 / 3;
 					position: relative;

src/views/Workshop/selectModel.vue

@@ -122,7 +122,7 @@ const { modelList, selectModel } = toRefs(data);
 				align-items: center;
 				> .item{
 					width: calc((100% - 2.5rem * 2) / 3);
-					border: 2px solid #D9D9D9;
+					border: .2rem solid #D9D9D9;
 					border-radius: 1rem;
 					margin-bottom: 5.4rem;
 					height: 75rem;

src/views/Workshop/uploadFace1.vue

@@ -23,7 +23,7 @@
 		generateStore.uploadCustomizeInfo({
 			tryOnId: generateStore.originalTryOn.id,
 			tryOnUrl: generateStore.originalTryOn.tryOnUrl,
-			isFavorite: generateStore.originalTryOn.isLike,
+			isFavorite: generateStore.originalTryOn.isLike
 		})
 		router.push({ name: 'customize' })
 	}
@@ -65,6 +65,8 @@
 			position: relative;
 			width: 100%;
 			height: auto;
+			min-height: 100%;
+			object-fit: cover;
 		}
 		> .texts {
 			top: 0;

src/views/Workshop/uploadFace2.vue

@@ -13,7 +13,7 @@
 	})
 	const router = useRouter()
 	const fileData = generateStore.photoInfo
-	if(!fileData.file?.size) generateStore.updatePhotoInfo({});
+	if (!fileData.file?.size) generateStore.updatePhotoInfo({})
 	// 上传照片
 	const handleUploadFace = () => {
 		const input = document.createElement('input')
@@ -44,7 +44,7 @@
 		formData.append('visitRecordId', generateStore.visitRecordId + '')
 		formData.append('file', fileData.file)
 		uploadCustomerPhoto(formData).then((res) => {
-			generateStore.updatePhotoInfo({...res, file: fileData.file})
+			generateStore.updatePhotoInfo({ ...res, file: fileData.file })
 			generateStore.clearCustomizeInfo()
 			router.push({ name: 'customize' })
 		})
@@ -97,6 +97,8 @@
 			position: relative;
 			width: 100%;
 			height: auto;
+			min-height: 100%;
+			object-fit: cover;
 		}
 		> .content {
 			top: 0;

src/views/asistant/components/NoticeItem.vue

@@ -136,7 +136,7 @@ const actionList: ActionItem[] = [
   height: 7.4rem;
   border-radius: 50%;
   margin-right: 1.88rem;
-  border: 2px solid #000;
+  border: .2rem solid #000;
   padding: 1.4rem;
 
   img {

src/views/login/LoginPage.vue

@@ -234,12 +234,12 @@ const handleSignup = () => {
     -moz-backdrop-filter: blur(35px);
     -ms-backdrop-filter: blur(35px);
     -o-backdrop-filter: blur(35px);
-    border: 2px solid rgba(255, 255, 255, 0.15);
+    border: .2rem solid rgba(255, 255, 255, 0.15);
     border-radius: 4.79rem;
     padding: 11.2rem 8.62rem 14.28rem 7.18rem;
     box-shadow: 0 0.8rem 3.2rem rgba(0, 0, 0, 0.1);
     overflow: hidden;
-    border: 2px solid #fff;
+    border: .2rem solid #fff;
     font-size: 3.83rem;
   }
 
@@ -247,7 +247,7 @@ const handleSignup = () => {
     width: 100%;
     height: 10rem;
     padding: 1.6rem 2rem;
-    border: 2px solid #fff;
+    border: .2rem solid #fff;
     background: transparent;
     border-radius: 7.1rem;
     color: white;
@@ -293,7 +293,7 @@ const handleSignup = () => {
 .google-button {
   width: 100%;
   padding: 1.6rem;
-  border: 2px solid #fff;
+  border: .2rem solid #fff;
   border-radius: 7rem;
   font-size: 3.83rem;
   cursor: pointer;

src/views/login/ResetPage.vue

@@ -183,12 +183,12 @@ const handleSuccess = (data: any) => {
     -moz-backdrop-filter: blur(35px);
     -ms-backdrop-filter: blur(35px);
     -o-backdrop-filter: blur(35px);
-    border: 2px solid rgba(255, 255, 255, 0.15);
+    border: .2rem solid rgba(255, 255, 255, 0.15);
     border-radius: 4.79rem;
     padding: 6.8rem 5.9rem 6.2rem 7.18rem;
     box-shadow: 0 0.8rem 3.2rem rgba(0, 0, 0, 0.1);
     overflow: hidden;
-    border: 2px solid #fff;
+    border: .2rem solid #fff;
     font-size: 3.83rem;
   }
 }

src/views/login/SignupPage.vue

@@ -232,12 +232,12 @@ const handleSignupByGoogle = async () => {
     -moz-backdrop-filter: blur(35px);
     -ms-backdrop-filter: blur(35px);
     -o-backdrop-filter: blur(35px);
-    border: 2px solid rgba(255, 255, 255, 0.15);
+    border: .2rem solid rgba(255, 255, 255, 0.15);
     border-radius: 4.79rem;
     padding: 11.2rem 8.62rem 14.28rem 7.18rem;
     box-shadow: 0 0.8rem 3.2rem rgba(0, 0, 0, 0.1);
     overflow: hidden;
-    border: 2px solid #fff;
+    border: .2rem solid #fff;
     font-size: 3.83rem;
   }
 
@@ -245,7 +245,7 @@ const handleSignupByGoogle = async () => {
     width: 100%;
     height: 10rem;
     padding: 1.6rem 2rem;
-    border: 2px solid #fff;
+    border: .2rem solid #fff;
     background: transparent;
     border-radius: 7.1rem;
     color: white;
@@ -280,7 +280,7 @@ const handleSignupByGoogle = async () => {
 .google-button {
   width: 100%;
   padding: 1.6rem;
-  border: 2px solid #fff;
+  border: .2rem solid #fff;
   border-radius: 7rem;
   font-size: 3.83rem;
   cursor: pointer;

src/views/login/components/Mail.vue

@@ -45,7 +45,7 @@ const handleNext = () => {
     width: 100%;
     height: 10rem;
     padding: 2.4rem 5.5rem;
-    border: 2px solid #fff;
+    border: .2rem solid #fff;
     background: transparent;
     border-radius: 7.1rem;
     color: white;

src/views/login/components/Password.vue

@@ -48,7 +48,7 @@ const handleNext = () => {
     width: 100%;
     height: 10rem;
     padding: 0 2.2rem 0 5.5rem;
-    border: 2px solid #fff;
+    border: .2rem solid #fff;
     border-radius: 7.1rem;
     overflow: hidden;
     box-sizing: border-box;

src/views/stylist/customer.vue

@@ -124,7 +124,7 @@ const handleConfirm = async () => {
       font-size: 5.6rem;
       width: 32.5rem;
       height: 8.1rem;
-      border: 2px solid #fff;
+      border: .2rem solid #fff;
       display: flex;
       align-items: center;
       justify-content: center;
@@ -133,7 +133,7 @@ const handleConfirm = async () => {
   }
   .entry-btn {
     position: absolute;
-    border: 2px solid #fff;
+    border: .2rem solid #fff;
     bottom: 10.3rem;
     right: 5.5rem;
     height: 9rem;
@@ -146,7 +146,7 @@ const handleConfirm = async () => {
     .back-container {
       width: 7.3rem;
       height: 7.3rem;
-      border: 2px solid #fff;
+      border: .2rem solid #fff;
       border-radius: 1.8rem;
       font-size: 4.3rem;
       background: rgba(0, 0, 0, 0.2);
@@ -184,7 +184,7 @@ const handleConfirm = async () => {
 
     .glass-form {
       height: 84.8rem;
-      border: 2px solid #ffffff;
+      border: .2rem solid #ffffff;
       border-radius: 4.7rem;
       margin: 0 14.2rem;
       padding: 8.2rem 7.9rem;
@@ -215,7 +215,7 @@ const handleConfirm = async () => {
           width: 100%;
           height: 10rem;
           line-height: 10rem;
-          border: 2px solid #fff;
+          border: .2rem solid #fff;
           border-radius: 7rem;
           padding: 0 5.5rem;
           color: #fff;
@@ -240,7 +240,7 @@ const handleConfirm = async () => {
         font-size: 4rem;
         font-family: 'satoshiRegular';
         cursor: pointer;
-        box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
+        box-shadow: 0 .2rem 8px rgba(0, 0, 0, 0.2);
       }
     }
     .copyright {

src/views/stylist/dressfor.vue

@@ -54,7 +54,7 @@ const handleStart = () => {
       font-size: 5.6rem;
       width: 32.5rem;
       height: 8.1rem;
-      border: 2px solid #fff;
+      border: .2rem solid #fff;
       display: flex;
       align-items: center;
       justify-content: center;

src/views/stylist/index.vue

@@ -194,7 +194,7 @@ watch(showVideo, (newValue) => {
   z-index: 3;
   box-shadow: 0 2rem 2.5rem rgba(0, 0, 0, 0.25), 0 0 6rem rgba(0, 0, 0, 0.25);
   border: 0.1rem solid rgba(255, 255, 255, 0.2);
-  filter: drop-shadow(2px 4px 6.6px rgba(0, 0, 0, 0.25));
+  filter: drop-shadow(.2rem 4px 6.6px rgba(0, 0, 0, 0.25));
   &.left {
     left: 1rem;
   }
@@ -211,8 +211,8 @@ watch(showVideo, (newValue) => {
     .swiper-container {
       width: 66rem;
       height: 100rem;
-      border: 2px solid #fff;
+      border: .2rem solid #fff;
-      border-radius: 12px;
+      border-radius: 1.2rem;
       display: flex;
       flex-direction: column;
       align-items: center;