Merge branch 'StableVersion' of http://18.167.251.121:10003/aidlab/aida_front into StableVersion

This commit is contained in:
李志鹏
2026-04-15 11:37:13 +08:00
3 changed files with 10 additions and 17 deletions

View File

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

View File

@@ -41,10 +41,10 @@
<div class="center">{{ selectObject?.styleName?selectObject?.styleName:$t('Header.All') }}</div> <div class="center">{{ selectObject?.styleName?selectObject?.styleName:$t('Header.All') }}</div>
<div class="gallery_btn" @click="setStyle">{{ $t('Habit.Select') }}</div> <div class="gallery_btn" @click="setStyle">{{ $t('Habit.Select') }}</div>
</div> </div>
<div class="style brand marginBottom"> <!-- <div class="style brand marginBottom">
<div class="text">{{$t('Habit.Brand')}}:</div> <div class="text">{{$t('Habit.Brand')}}:</div>
<div class="gallery_btn" @click="setBrandDNA">{{ $t('Habit.Select') }}</div> <div class="gallery_btn" @click="setBrandDNA">{{ $t('Habit.Select') }}</div>
</div> </div> -->
<div class="brandImg" v-if="selectObject.userBrandDna"><img :src="selectObject.userBrandDnaImg"></div> <div class="brandImg" v-if="selectObject.userBrandDna"><img :src="selectObject.userBrandDnaImg"></div>
<div class="brandDNAStrenght marginBottom" v-if="selectObject.userBrandDna"> <div class="brandDNAStrenght marginBottom" v-if="selectObject.userBrandDna">
<div class="text" style="font-size: 1.6rem;"> <div class="text" style="font-size: 1.6rem;">

View File

@@ -340,12 +340,12 @@ const navTypeList = (t)=>{
value:'Models', value:'Models',
router:'library=Models' router:'library=Models'
}, },
{ // {
icon:'fi-ss-gem', // icon:'fi-ss-gem',
label:t('LibraryPage.brandDNA'), // label:t('LibraryPage.brandDNA'),
value:'MyBrand', // value:'MyBrand',
router:'library=MyBrand' // router:'library=MyBrand'
}, // },
] ]
}, },
// history:{ // history:{