Merge branch 'dev_vite' of ssh://18.167.251.121:10002/aidlab/aida_front into dev_vite

src/component/Account/account.vue

@@ -266,9 +266,11 @@ export default defineComponent({
 .account_page{
 	height: 100%;
 	// overflow-y: auto;
-	padding: 0 26rem;
+	// padding: 0 26rem;
 	// padding: 0 7rem;
 	padding-top: 4rem;
+	max-width: 100rem;
+	margin: 0 auto;
 	display: flex;
 	overflow: hidden;
 	.account_page_titleImg{

src/component/HomePage/newPosted.vue

@@ -4,7 +4,7 @@
 		<!-- <div class="newPosted_generalMessage_title_setting pointer" @click="allRead">全部已读</div> -->
 	</div>
 	<div class="newPosted_generalMessage_center modal_title_text">
-		<div class="newPosted_generalMessage_item" v-for="item in dataList" :key="item.id" @click="setRead(item)">
+		<div class="newPosted_generalMessage_item" v-for="item in dataList" :key="item.id">
 			<!-- <a-badge :dot="item.isRead == 0"></a-badge> -->
 			<div class="newPosted_generalMessage_item_right">
 				<div class="newPosted_generalMessage_item_img pointer" @click="openOtherUsers(item)">

src/component/HomePage/scaleVideo.vue

@@ -77,10 +77,19 @@ export default defineComponent({
 		left: 50%;
 		top: 50%;
 		transform: translate(-50%,-50%);
+		// width: 80%;
+		// height: auto;
+		// max-height: 80vh;
+		// width: max-content;
 		position: absolute;
 		video{
-			max-height:80vh;
+			// width: 100%;
-			max-width:80vw;
+			// max-height: 80vh;
+			// height: 100%;
+			// object-fit: contain;
+			// width: max-content;
+			max-height: 80vh;
+			max-width: 80vw;
 		}
 		.general_video_btn{
 			color: #fff;

src/views/SellerDashboard/MyListings/createSelectItem/index.vue

@@ -304,6 +304,23 @@ const {} = toRefs(data);
 				&.Small{
 					--itemWidth: 17rem;
 					--itemHeight: 26.1rem;
+					--iconFS: 1.4rem;
+					--iconWH: 2.4rem;
+					--iconTR: 1.2rem;
+				}
+				&.Medium{
+					--itemWidth: 22.6rem;
+					--itemHeight: 34.6rem;
+					--iconFS: 1.6rem;
+					--iconWH: 3rem;
+					--iconTR: 1.4rem;
+				}
+				&.Large{
+					--itemWidth: 29.2rem;
+					--itemHeight: 44.8rem;
+					--iconFS: 2.2rem;
+					--iconWH: 4rem;
+					--iconTR: 1.62rem;
 				}
 				> .item{
 					width: var(--itemWidth);
@@ -314,18 +331,19 @@ const {} = toRefs(data);
 					position: relative;
 					> .choose{
 						display: flex;
-						width: 2.4rem;
+						width: var(--iconWH);
-						height: 2.4rem;
+						height: var(--iconWH);
 						position: absolute;
 						background-color: #000;
 						border-radius: 50%;
 						display: none;
 						justify-content: center;
 						align-items: center;
-						top: 1.2rem;
+						top: var(--iconTR);
-						right: .9rem;
+						right: var(--iconTR);
 						> i{
 							color: #fff;
+							font-size: var(--iconFS);
 							display: flex;
 						}
 					}

src/views/SellerDashboard/MyOrders/index.vue

@@ -93,7 +93,7 @@
 	const maxItemNum = ref(2)
 	const loading = ref(false)
 	const finish = ref(false)
-	const total = ref(30)
+	const total = ref(0)
 	const page = ref(1)
 	const size = ref(10)
 	const nameOrId = ref("")
@@ -107,9 +107,9 @@
 		}
 		const data = {
 			page: page.value,
-			size: size.value,
+			size: size.value
-			nameOrId: nameOrId.value
 		}
+		if (nameOrId.value) data.nameOrId = nameOrId.value
 		console.log(data)
 		setTimeout(() => {
 			for (let i = 0; i < size.value; i++) {
@@ -134,6 +134,7 @@
 					]
 				})
 			}
+			total.value = 30
 			page.value++
 			finish.value = page.value > total.value / 10
 			loading.value = false