aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zhangyahui
2025-11-26 17:00:14 +08:00
parent f6533e6027 7d2463d7c7
commit 0657037748
4 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/component/Detail/detailLeft/colorBox/index.vue
View File

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

4
src/component/Detail/detailLeft/module/libraryList.vue
View File

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

23
src/views/HomeRecommend.vue
View File

@@ -1,19 +1,19 @@
<template> <template>
<div class="homeRecommend_max"> <div class="homeRecommend_max">
<div class="header"> <div class="header">
<img <img
class="homeRecommend_logo" class="homeRecommend_logo"
@click="turnToNewPage('/')" @click="turnToNewPage('/')"
src="@/assets/images/homePage/aidaIcon.png" 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 class="language_btn">
<div @click="handleChangeLanguage"> <div @click="handleChangeLanguage">
<i class="fi fi-rr-globe"></i> <i class="fi fi-rr-globe"></i>
{{ isChinese ? 'CN' : 'EN' }} {{ isChinese ? 'CN' : 'EN' }}
</div> </div>
</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>
<div class="content"> <div class="content">
@@ -229,8 +229,25 @@ export default defineComponent({
.language_btn { .language_btn {
color: #fff; color: #fff;
cursor: pointer; 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) { @media (max-width: 768px) {
font-size: 1.5rem;
color: #000; color: #000;
>div {
>i{
font-size: 1.5rem;
margin-right: .7rem;
}
}
} }
} }
> .gallery_btn { > .gallery_btn {

10
src/views/affiliate/affiliatePage.vue
View File

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