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

src/component/Detail/detailLeft/colorBox/index.vue

@@ -141,6 +141,7 @@ export default defineComponent({
 					JSON.stringify(colorData.selectDetail.color.gradient) == JSON.stringify(color?.gradient)
 					&& colorData.selectDetail.color.rgba?.r
 				){
+					console.log('---',index)
 					isNoSelect = true
 					colorData.selectColor = item
 					colorData.colorList.index = index
@@ -160,8 +161,8 @@ export default defineComponent({
 					if(color?.gradient){
 						item.gradient = color?.gradient
 					} 
-					colorData.colorList.index = index
-					colorData.selectColor = item
+					// colorData.colorList.index = index
+					// colorData.selectColor = item
 				}
 				colorData.colorList.list[newVal].push(item)
 			}

src/component/Detail/detailLeft/module/libraryList.vue

@@ -350,6 +350,7 @@ export default defineComponent({
 			margin-top: 1rem;
 			justify-content: space-between;
 			align-content: flex-start;
+			padding-bottom: 2rem;
 			// &::-webkit-scrollbar{display: none;}
 			> .content_img_item{
 				width: calc((50% - 1rem));
@@ -368,9 +369,12 @@ export default defineComponent({
 			> .material_content_list_loding{
 				width: 100%;
 				aspect-ratio: 1/1;
+				height: 4rem;
 				overflow: hidden;
 				> img{
 					width: 100%;
+					height: 100%;
+					object-fit: contain;
 				}
 			}
 		}

src/views/HomeRecommend.vue

@@ -6,14 +6,14 @@
         @click="turnToNewPage('/')"
         src="@/assets/images/homePage/aidaIcon.png"
       />
+      <div class="gallery_btn login white" @click="setLogin">{{ t('Login.Login') }}</div>
+      <div class="gallery_btn" @click="signUp">{{ t('Login.SignUp') }}</div>
       <div class="language_btn">
         <div @click="handleChangeLanguage">
           <i class="fi fi-rr-globe"></i>
           {{ isChinese ? 'CN' : 'EN' }}
         </div>
       </div>
-      <div class="gallery_btn login white" @click="setLogin">{{ t('Login.Login') }}</div>
-      <div class="gallery_btn" @click="signUp">{{ t('Login.SignUp') }}</div>
     </div>
 
     <div class="content">
@@ -229,8 +229,25 @@ export default defineComponent({
     .language_btn {
       color: #fff;
       cursor: pointer;
+	  font-size: 2.5rem;
+	  >div {
+		display: flex;
+		>i{
+			display: flex;
+			align-items: center;
+			font-size: 2.5rem;
+			margin-right: .7rem;
+		}
+	  }
       @media (max-width: 768px) {
+		  font-size: 1.5rem;
         color: #000;
+		>div {
+			>i{
+				font-size: 1.5rem;
+				margin-right: .7rem;
+			}
+		}
       }
     }
     > .gallery_btn {

src/views/affiliate/affiliatePage.vue

@@ -147,11 +147,11 @@ export default defineComponent({
 				}
 			});
 			//储存所有用户id和name
-			Https.axiosGet(Https.httpUrls.getAllUserId,).then((rv: any) => {
-				if (rv) {
-					store.commit('setAllUserList',rv);
-				}
-			})
+			// Https.axiosGet(Https.httpUrls.getAllUserId,).then((rv: any) => {
+			// 	if (rv) {
+			// 		store.commit('setAllUserList',rv);
+			// 	}
+			// })
 			let allCountry = country
 			sessionStorage.setItem('allCountry',JSON.stringify(allCountry));
 			// state.nowPageName = state.rootSubmenuKeys[0].name