布局修改 部分bug修复
This commit is contained in:
@@ -63,7 +63,7 @@ import { Https } from "@/tool/https";
|
||||
import { useStore } from "vuex";
|
||||
import { downloadIamge,getMinioUrl } from "@/tool/util";
|
||||
import { useI18n } from 'vue-i18n'
|
||||
import selectList from '@/component/DetailCopy/detailLeft/module/selectList.vue'
|
||||
import selectList from '@/component/Detail/detailLeft/module/selectList.vue'
|
||||
import sketchCategory from "@/component/HomePage/sketchCategory.vue";
|
||||
import canvasBox from "./canvas/index.vue";
|
||||
import canvasUpload from "@/component/Canvas/CanvasEditor/index.vue";
|
||||
@@ -204,6 +204,7 @@ export default defineComponent({
|
||||
}
|
||||
const setCanvasJSON = (canvasJSON)=>{
|
||||
if(!canvasJSON)return
|
||||
if(!store.state.Workspace.probjects?.id)return
|
||||
let canvasData = JSON.parse(canvasJSON)
|
||||
console.log(canvasData)
|
||||
canvasData.canvas.objects.forEach((objectsItem:any) => {
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
>
|
||||
<div class="generalModel_btn">
|
||||
<div class="generalModel_closeIcon" @click.stop="cancelDsign()">
|
||||
<svg width="46" height="46" viewBox="0 0 46 46" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<svg width="100%" height="100%" viewBox="0 0 46 46" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<circle cx="23" cy="23" r="23" fill="white" fill-opacity="0.3"/>
|
||||
<rect x="32.5063" y="12" width="3" height="29" rx="1.5" transform="rotate(45 32.5063 12)" fill="black"/>
|
||||
<rect x="34.6274" y="32.5059" width="3" height="29" rx="1.5" transform="rotate(135 34.6274 32.5059)" fill="black"/>
|
||||
|
||||
@@ -131,7 +131,6 @@ import { getUploadUrl,isMoible,getMinioUrl } from "@/tool/util";
|
||||
import { getCookie,setCookie } from "@/tool/cookie";
|
||||
import showViewVideo from "@/tool/mount";
|
||||
|
||||
// import selectList from '@/component/DetailCopy/module/selectList.vue';
|
||||
export default defineComponent({
|
||||
components:{
|
||||
generalDrag,
|
||||
@@ -178,18 +177,18 @@ export default defineComponent({
|
||||
speedList:[
|
||||
{
|
||||
title:'',
|
||||
label:t('speedList.High'),
|
||||
label:t('speedList.toproductBasic'),
|
||||
value:'',
|
||||
},{
|
||||
title:'',
|
||||
label:t('speedList.wx'),
|
||||
label:t('speedList.toproductFlus'),
|
||||
value:'wx',
|
||||
},
|
||||
],
|
||||
speedState:false,
|
||||
speedData:{
|
||||
title:'Generate high-quality content',
|
||||
label:'High',
|
||||
label:t('speedList.toproductBasic'),
|
||||
value:'',
|
||||
},
|
||||
})
|
||||
@@ -295,8 +294,7 @@ export default defineComponent({
|
||||
Https.axiosPost(Https.httpUrls.poseTransform,value).then((rv)=>{
|
||||
data.remGenerate = true
|
||||
data.noLikeList.unshift({taskId:rv.taskId,parentId:data.selectImg.parentId})
|
||||
console.log(data.noLikeList)
|
||||
setGenerate([rv.taskId])
|
||||
setGenerate(rv.taskId)
|
||||
}).catch((res:any)=>{
|
||||
data.isGenerate = false
|
||||
clearInterval(data.remGenerateTime)
|
||||
@@ -313,7 +311,6 @@ export default defineComponent({
|
||||
state = false
|
||||
Https.axiosPost(Https.httpUrls.poseTransformResult,list).then(
|
||||
(rv) => {
|
||||
rv=[rv]
|
||||
state = true
|
||||
if(data.isGenerate){//防止取消后有正在执行的获取状态
|
||||
// data.waitList = rv.filter((item:any)=>item.status != 'Success' && item.status != 'Fail' && item.status != 'Invalid')
|
||||
@@ -323,6 +320,8 @@ export default defineComponent({
|
||||
let index = data.noLikeList.findIndex((obj:any) => obj.taskId === element.taskId);
|
||||
data.noLikeList[index] = element
|
||||
list = ''
|
||||
clearInterval(data.generateTime)
|
||||
clearInterval(data.remGenerateTime)
|
||||
// if(list?.filter)list = list?.filter((item:any) => item !== element.taskId);
|
||||
store.dispatch('getCredits')
|
||||
}else if(element.status == 'Fail'){
|
||||
@@ -346,7 +345,7 @@ export default defineComponent({
|
||||
data.isGenerate = false
|
||||
data.remGenerate = false
|
||||
});
|
||||
},20000)
|
||||
},10000)
|
||||
}
|
||||
const removeGenerate = ()=>{
|
||||
//取消操作
|
||||
@@ -481,6 +480,7 @@ export default defineComponent({
|
||||
Https.axiosPost(Https.httpUrls.poselikeOrDisike, {},{params:value}).then(
|
||||
(rv) => {
|
||||
if(str == 'like'){
|
||||
item.newLike = true
|
||||
let value = {
|
||||
likedList:[item],
|
||||
str:'add',
|
||||
@@ -536,10 +536,11 @@ export default defineComponent({
|
||||
if(props.isDesignPage)return
|
||||
data.fileList = store.state.HomeStoreModule.uploadElement
|
||||
})
|
||||
watch(()=>store.state.Workspace.probjects.id,(newVal,oldVal)=>{
|
||||
watch(()=>data.noLikeList.length,(newVal,oldVal)=>{
|
||||
nextTick(()=>{
|
||||
let list = store.state.HomeStoreModule.poseTransfer.list
|
||||
let taskIdList = list.filter((item:any)=>!item.videoUrl)
|
||||
console.log(taskIdList)
|
||||
if(taskIdList.length > 0){
|
||||
data.isGenerate = true
|
||||
data.remGenerate = true
|
||||
@@ -643,6 +644,7 @@ export default defineComponent({
|
||||
overflow: hidden;
|
||||
z-index: 3;
|
||||
margin-top: .2rem;
|
||||
|
||||
>div{
|
||||
background: #cccccc;
|
||||
line-height: 2;
|
||||
@@ -841,6 +843,7 @@ export default defineComponent({
|
||||
}
|
||||
> .content{
|
||||
flex: 1;
|
||||
overflow: hidden;
|
||||
padding: 1.7rem 2rem;
|
||||
border-radius: 3rem;
|
||||
background: #f7f8fa;
|
||||
|
||||
@@ -496,6 +496,7 @@ export default defineComponent({
|
||||
if(str == 'like'){
|
||||
if(rv?.sort)item.oldSort = rv.sort
|
||||
if(rv?.id)item.userLikeSortId = rv.id
|
||||
item.newLike = true
|
||||
let value = {
|
||||
likedList:[item],
|
||||
str:'add',
|
||||
@@ -686,14 +687,21 @@ export default defineComponent({
|
||||
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
|
||||
type:props.productimgMenu.value,
|
||||
}
|
||||
console.log(productImgData.generateList[props.productimgMenu.value].value,)
|
||||
Https.axiosGet(Https.httpUrls.generateStopWaiting, {params:data}).then(
|
||||
(rv) => {
|
||||
generateProceedList = []
|
||||
productImgData.generateList[props.productimgMenu.value] = productImgData.generateList[props.productimgMenu.value].filter((item:any)=>item.status == 'Success')
|
||||
let aa = productImgData.generateList[props.productimgMenu.value].filter((item:any)=>item.status == 'Success')
|
||||
}
|
||||
).catch(res=>{
|
||||
productImgData.generateList[props.productimgMenu.value] = productImgData.generateList[props.productimgMenu.value].filter((item:any)=>item.status == 'Success')
|
||||
});
|
||||
generateProceedList.forEach((item:any)=>{
|
||||
const index = productImgData.generateList[props.productimgMenu.value].findIndex(item => (item.status != 'Success'));
|
||||
if(props.productimgMenu == 'ToProductImage'){
|
||||
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
}
|
||||
let scaleImage = ref()
|
||||
@@ -855,6 +863,9 @@ export default defineComponent({
|
||||
setPrductimg(arr)
|
||||
}
|
||||
},{immediate: true })
|
||||
onMounted(()=>{
|
||||
ifMaximumLength()
|
||||
})
|
||||
return {
|
||||
upload,
|
||||
driver__,
|
||||
@@ -1273,6 +1284,7 @@ export default defineComponent({
|
||||
border-radius: 2rem;
|
||||
position: relative;
|
||||
flex: 1;
|
||||
overflow: hidden;
|
||||
}
|
||||
> .btnLeft,> .btnRight{
|
||||
position: absolute;
|
||||
|
||||
Reference in New Issue
Block a user