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

src/component/HomePage/renew.vue

@@ -679,10 +679,11 @@
 			margin-bottom: 1rem;
 			border-radius: 1rem;
 			overflow: hidden;
-			border: 1.5px solid #eaecf0;
+			border: 1.5px solid #E7EBFF;
+			cursor: pointer;
   
 			> .popular {
-			  background: #2d9f75;
+			  background: #1B223C;
 			  font-weight: 600;
 			  display: flex;
 			  justify-content: center;
@@ -705,14 +706,14 @@
 				> .price {
 				  font-size: 1.8rem;
 				  margin-top: 0.4rem;
-				  opacity: 0.4;
+				  // opacity: 0.4;
 				  font-weight: 500;
 				}
 			  }
 			  > .left {
 				> p:nth-child(1) {
 				  font-size: 2rem;
-				  opacity: 0.7;
+				  // opacity: 0.7;
 				  font-weight: 700;
 				}
 			  }
@@ -767,24 +768,14 @@
 				}
 			  }
 			}
-			&.active {
+			&.active,&:hover {
-			  background: #0ea98233;
+				// 40% opacity
-			  border: 2px solid #0ea982;
+			  background: rgba(231, 235, 255, 0.4);
-			  > .priceBox {
+			  // border: 2px solid #0ea982;
-				> .left {
+			 
-				  > p:nth-child(1) {
-					opacity: 1;
-				  }
-				}
-				> .right {
-				  > .discountsPrice {
-					opacity: 1;
-				  }
-				}
-			  }
 			}
 			&.sellWell {
-			  border: 2px solid #0ea982;
+			  // border: 2px solid #0ea982;
 			}
 		  }
 		  > .productItem:last-child {
@@ -821,6 +812,8 @@
 			margin: 2rem 0;
 			margin-bottom: .5rem;
 			margin-top: 1rem;
+			background: #1B223C;
+			color: #fff;
 		  }
 		  > .payMethod_payAffirm_clause {
 			  text-align: center;

src/component/mainPage/signUp/index.vue

@@ -38,7 +38,8 @@
 <script>
 	import { defineComponent, ref, reactive, watch, onMounted, nextTick, toRefs } from "vue";
 	import registerModel from './registerModel.vue'
-	import { message } from "ant-design-vue";
+import { message } from "ant-design-vue";
+	import CChargeIcon from '@/assets/icons/CCharge.svg'
 
     export default defineComponent({
 		components: {
@@ -62,7 +63,7 @@
 					monthly: [
 						{
 							title: "试用版",
-							img: '/image/homeIntroduct/personal.png',
+							img: CChargeIcon,
 							type:'personal',
 							info: "您的AI时尚设计助手",
 							price: '100积分',
@@ -103,7 +104,7 @@
 							info: "您的AI时尚设计助手",
 							price: 'HK$500',
 							detail: "每月·3500积分",
-							highlight: "",
+							highlight: "推荐",
 							discounts: '9折优惠',
 							detailList: [
 								'轻松充值积分',
@@ -185,7 +186,7 @@
 					monthly:[
 						{
 							title:"Personal",
-							img:'/image/homeIntroduct/personal.png',
+							img:CChargeIcon,
 							type:'personal',
 							info:"Your AI Fashion Design Assistant",
 							price:'100 credits',
@@ -226,7 +227,7 @@
 							info:"Your AI Fashion Design Assistant",
 							price:'HK$500',
 							detail:"per month · 3500 credits",
-							highlight:"",
+							highlight:"Recommended",
 							discounts:'10% off',
 							detailList:[
 								'Easy to Top up Credits',
@@ -420,8 +421,9 @@
 	@media (max-width: 767px) {
 		margin-top: 1.5rem;
 		padding: 0rem 3.7rem;
-		flex: 1;
+		// flex: 1;
-		overflow-y: auto;
+		// height: 100%;
+		// overflow-y: auto;
 	}
 	.back{
 		font-size: 1.6rem;
@@ -639,11 +641,15 @@
 				top: 0;
 				right: 0;
 				background: linear-gradient(88.13deg, #FBD2FF 0.91%, #E6D3FF 52.5%, #B694FF 101.09%);
-				border-radius: .5rem 1.5rem 0px 1.5rem;
+				// border-radius: .5rem 1.5rem 0px 1.5rem;
+				border-top-right-radius: 1.5rem;
+        border-bottom-left-radius: 0.5rem;
 				padding: .75rem .5rem;
 				@media (max-width: 767px) {
 					padding: .55rem .36rem;
-					border-radius: .46rem .36rem 0px .9rem;
+					// border-radius: .46rem .36rem 0px .9rem;
+					border-top-right-radius: 1.1rem;
+        border-bottom-left-radius: 0.4rem;
 					font-size: 1rem;
 				}
 			}

src/views/HomeRecommend.vue

@@ -212,7 +212,7 @@ export default defineComponent({
     right: 0;
     @media (max-width: 768px) {
       position: relative;
-      justify-content: space-between;
+      justify-content: flex-end;
       width: 100%;
       padding: 0.7rem 1.4rem;
       margin-left: auto;
@@ -223,11 +223,15 @@ export default defineComponent({
       @media (max-width: 768px) {
         display: block;
         height: 2.5rem;
+        margin-right: auto;
       }
     }
     .language_btn {
       color: #fff;
       cursor: pointer;
+      @media (max-width: 768px) {
+        color: #000;
+      }
     }
     > .gallery_btn {
       // margin-right: 2rem;

src/views/Register.vue

@@ -49,10 +49,12 @@
 						{{ isSelectSuccessively? 'CN':'EN'}}
 					</div>
 				</div>
-				<div class="gallery_btn" @click="setLogin">Login</div>
+				<div class="gallery_btn" @click="setLogin">{{ isSelectSuccessively?'登录':'Login' }}</div>
 			</div>
         </header>
-		<signUp ref="signUp" :isSelectSuccessively="isSelectSuccessively"></signUp>
+				<div class="content">
+					<signUp ref="signUp" :isSelectSuccessively="isSelectSuccessively"></signUp>
+				</div>
     </div>
 	
 </template>
@@ -312,4 +314,8 @@ export default defineComponent({
     }
     
 }
+.content{
+	flex: 1;
+	overflow-y: auto;
+}
 </style>