detail调整

This commit is contained in:
X1627315083
2024-07-08 09:42:21 +08:00
parent 3fd6343e53
commit b6cb8e9bf0
22 changed files with 276 additions and 157 deletions

View File

@@ -293,7 +293,7 @@
</a-modal>
</template>
<script>
import {defineComponent, computed, h, ref, nextTick, createVNode, reactive, onMounted,
import {defineComponent, computed, h, ref, nextTick, inject, reactive, onMounted,
} from "vue";
import { Https } from "@/tool/https";
import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
@@ -357,16 +357,12 @@ export default defineComponent({
let sketchGrouping = 3; //sketch分组
let likeDesign = 4; //整体图分组
let disposeMoodboardShow = true;
let canvasState = ref()//存放canvas操作
let reverseCanvasState = ref([])//存放canvas操作
let normalCanvasState = ref([])//存放canvas操作
let isLoadCanvas = false//撤回或者反撤回false为撤回
let userlikeGroupId = 0
let beenPublished = 0
let init = (productData) => {
beenPublished = productData.beenPublished
userlikeGroupId = productData.userlikeGroupId
canvasWH.value.height = 100
normalCanvasState.value = []
@@ -745,11 +741,11 @@ export default defineComponent({
};
if (key == "likeDesignCollectionList") {
data.imgUrl = item.designOutfitUrl;
data.name = "result" + index + "." + data.imgUrl.split(".").pop().split("?").shift();;
data.name = "result" + index + "." + data.imgUrl.split(".").pop().split("?").shift();
}
if (key == "FinalizeImage") {
data.imgUrl = item.designOutfitUrl;
data.name = "porduct" + index + "." + data.imgUrl.split(".").pop().split("?").shift();;
data.imgUrl = item.url;
data.name = "Finalize" + index + "." + data.imgUrl.split(".").pop().split("?").shift();
}
img.push(data);
index++;
@@ -1843,7 +1839,6 @@ export default defineComponent({
let data = {
"imgUrl":imageDataURL,
userlikeGroupId:userlikeGroupId,
beenPublished
}
publishModal.init(data)
}
@@ -2133,7 +2128,7 @@ export default defineComponent({
position: sticky;
background: #f9fafb;
z-index: 2;
bottom: 0;
bottom: -1px;
.exportCanvasBox_left_btn{
display: flex;
justify-content: space-between;

View File

@@ -150,18 +150,23 @@
</div>
<div class="productImg_right_item_imgBox" v-else>
<img :src="item.url" alt="">
<div class="productImg_right_item_like" @click.stop="likeFile(item,'like',index)">
<i class="fi fi-rr-heart"></i>
<div class="productImg_right_item_iconRight">
<div class="productImg_right_item_like" @click.stop="likeFile(item,'like',index)">
<i class="fi fi-rr-heart"></i>
</div>
</div>
<div class="productImg_right_item_scale iconLeft" @click.stop="setScaleImage(generateList,index,true)">
<i class="fi fi-bs-expand-arrows-alt"></i>
</div>
<div class="productImg_right_item_menu iconLeft" @click.stop="setMenuShow(item)">
<i class="fi fi-rr-circle-ellipsis"></i>
<ul v-show="item.menuShow">
<li v-for="menuItem,index in productimgMenuList" v-show="index != 0" @click.stop="setMenu(menuItem,item)" :key="menuItem.value">{{ menuItem.label }}</li>
</ul>
<div class="productImg_right_item_iconLeft">
<div class="productImg_right_item_scale" @click.stop="setScaleImage(generateList,index,true)">
<i class="fi fi-bs-expand-arrows-alt"></i>
</div>
<div v-show="item.resultType != 'Relight'" class="productImg_right_item_menu" @click.stop="setMenuShow(item)">
<i class="fi fi-rr-circle-ellipsis"></i>
<ul v-show="item.menuShow">
<li v-for="menuItem,index in productimgMenuList" v-show="index != 0" @click.stop="setMenu(menuItem,item)" :key="menuItem.value">{{ menuItem.label }}</li>
</ul>
</div>
</div>
</div>
</div>
<div class="mark_loading" v-show="isShowMark">
@@ -175,17 +180,21 @@
<div class="productImg_right_item_box generalScroll" v-mousewheel>
<div class="productImg_right_item" v-for="item,index in likeList" :key="item">
<img :src="item.url" alt="">
<div class="productImg_right_item_like" @click.stop="likeFile(item,'noLike',index)">
<i class="fi fi-sr-heart"></i>
<div class="productImg_right_item_iconRight">
<div class="productImg_right_item_like" @click.stop="likeFile(item,'noLike',index)">
<i class="fi fi-sr-heart"></i>
</div>
</div>
<div class="productImg_right_item_scale iconLeft" @click.stop="setScaleImage(likeList,index,false)">
<i class="fi fi-bs-expand-arrows-alt"></i>
</div>
<div class="productImg_right_item_menu iconLeft" :title="$t('ProductImg.moreTitle')" @click.stop="setMenuShow(item)">
<i class="fi fi-rr-circle-ellipsis"></i>
<ul v-show="item.menuShow">
<li v-for="menuItem,index in productimgMenuList" v-show="index != 0" @click.stop="setMenu(menuItem,item)" :key="menuItem.value">{{ menuItem.label }}</li>
</ul>
<div class="productImg_right_item_iconLeft">
<div class="productImg_right_item_scale" @click.stop="setScaleImage(likeList,index,false)">
<i class="fi fi-bs-expand-arrows-alt"></i>
</div>
<div v-show="item.resultType != 'Relight'" class="productImg_right_item_menu" :title="$t('ProductImg.moreTitle')" @click.stop="setMenuShow(item)">
<i class="fi fi-rr-circle-ellipsis"></i>
<ul v-show="item.menuShow">
<li v-for="menuItem,index in productimgMenuList" v-show="index != 0" @click.stop="setMenu(menuItem,item)" :key="menuItem.value">{{ menuItem.label }}</li>
</ul>
</div>
</div>
</div>
</div>
@@ -236,7 +245,6 @@ export default defineComponent({
let productImgMask:any = ref(false)//弹窗遮罩
let productImgData:any = reactive({
isShowMark:false,
beenPublished:0,
fileList:{},
searchName:'',
isTextarea:false,//是否展开
@@ -279,9 +287,8 @@ export default defineComponent({
return store.state.HomeStoreModule.likeDesignCollectionList;
});
let userlikeGroupId = 0
let init = (userGroupId:any,beenPublished:any)=>{
let init = (userGroupId:any)=>{
productImg.value = true
productImgData.beenPublished = beenPublished
selectList.value['ToProductImage'] = JSON.parse(JSON.stringify(likeDesignCollectionList.value))
upload.value = {
userlikeGroupId:userGroupId
@@ -404,7 +411,6 @@ export default defineComponent({
key:'FinalizeImage',
imgList:imgList,
userlikeGroupId,
beenPublished:productImgData.beenPublished
}
let exportModel:any = ExportModel.value
@@ -554,8 +560,10 @@ export default defineComponent({
Https.axiosGet(Https.httpUrls.generateStopWaiting, {params:data}).then(
(rv) => {
generateProceedList = []
productImgData.generateList = productImgData.generateList.filter((item:any)=>item.status == 'Success')
}
).catch(res=>{
productImgData.generateList = productImgData.generateList.filter((item:any)=>item.status == 'Success')
});
}
}
@@ -564,8 +572,8 @@ export default defineComponent({
arr.forEach((item:any)=>{
item.imgUrl = item.url
})
// scaleImage.value.isProductimg = isLike
scaleImage.value.isProductimg = false
scaleImage.value.isProductimg = isLike
// scaleImage.value.isProductimg = false
scaleImage.value.init(arr,index)
scaleImage.value.isLike = false
scaleImage.value.isComparison = true
@@ -897,12 +905,26 @@ export default defineComponent({
img{
height: 100%;
}
.productImg_right_item_like,.productImg_right_item_scale,.productImg_right_item_menu{
display: none;
.productImg_right_item_iconRight,.productImg_right_item_iconLeft{
position: absolute;
top: 2rem;
display: flex;
flex-direction: column;
>div{
margin-bottom: 1rem;
}
>div:last-child{
margin-bottom: 0;
}
}
.productImg_right_item_iconRight{
right: 2rem;
}
.productImg_right_item_iconLeft{
left: 2rem;
}
.productImg_right_item_like,.productImg_right_item_scale,.productImg_right_item_menu{
display: none;
cursor: pointer;
width: 3rem;
height: 3rem;
@@ -936,13 +958,6 @@ export default defineComponent({
}
}
}
.iconLeft{
left: 2rem;
right: auto;
}
.productImg_right_item_scale{
top: 6rem;
}
}
.productImg_right_item:hover{
.productImg_right_item_like,.productImg_right_item_scale,.productImg_right_item_menu{

View File

@@ -87,7 +87,7 @@
</div>
</div>
</div>
<div class="scaleImage_content_imgBox">
<div class="scaleImage_content_imgBox" :class="{active:isComparison}">
<img v-if="isComparison" :src="scaleImageList[scaleImageIndex]?.sourceUrl">
<img :src="scaleImageList[scaleImageIndex]?.imgUrl">
<div class="img_operate_block" v-if="isLike">
@@ -183,6 +183,7 @@ export default defineComponent({
}
let imageStrength = productimg.productimgSimilarity == 100? 95 :productimg.productimgSimilarity
let data:any ={
direction:productimg.productimgRelightDirection,
prompt:productimg.productimgSearchName,
toProductImageVOList:[obj],
userLikeGroupId:productimg.productimgUpload.userlikeGroupId,
@@ -398,6 +399,13 @@ export default defineComponent({
width: auto;
height: 100%;
}
&.active{
display: flex;
img{
width: 50%;
object-fit: contain;
}
}
.img_operate_block{
width: 3.6rem;
height: 3.6rem;