fix
This commit is contained in:
@@ -22,6 +22,7 @@
|
|||||||
<div v-for="item,index in imgList" :key="item" class="content_img_item" :class="[ item?.checked ? 'active':'' , selectCode == 'Moodboard' ? 'moodb':'' ]" >
|
<div v-for="item,index in imgList" :key="item" class="content_img_item" :class="[ item?.checked ? 'active':'' , selectCode == 'Moodboard' ? 'moodb':'' ]" >
|
||||||
<img :src="item?.imgUrl" @click.stop="selectImgItem(item)">
|
<img :src="item?.imgUrl" @click.stop="selectImgItem(item)">
|
||||||
<sketchCategory v-if="selectCode == 'Sketchboard'" :disignTypeList="disignTypeList" :generateList="imgList" :item="item" :isSetSketchCategory="true"></sketchCategory>
|
<sketchCategory v-if="selectCode == 'Sketchboard'" :disignTypeList="disignTypeList" :generateList="imgList" :item="item" :isSetSketchCategory="true"></sketchCategory>
|
||||||
|
<printCategory v-if="selectCode == 'Printboard'" :disignTypeList="disignTypeList" :generateList="imgList" :item="item" :isSetSketchCategory="true"></printCategory>
|
||||||
<!-- <div v-if="selectCode == 'Sketchboard' || selectCode == 'Printboard'" class="pin_block">
|
<!-- <div v-if="selectCode == 'Sketchboard' || selectCode == 'Printboard'" class="pin_block">
|
||||||
<a-checkbox v-model:checked="item.pin">{{ $t('Material.PIN') }}</a-checkbox>
|
<a-checkbox v-model:checked="item.pin">{{ $t('Material.PIN') }}</a-checkbox>
|
||||||
</div> -->
|
</div> -->
|
||||||
@@ -48,9 +49,10 @@ import GO from '@/tool/GO';
|
|||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import { openGuide,driverObj__ } from "@/tool/guide";
|
import { openGuide,driverObj__ } from "@/tool/guide";
|
||||||
import sketchCategory from "@/component/HomePage/sketchCategory.vue";
|
import sketchCategory from "@/component/HomePage/sketchCategory.vue";
|
||||||
|
import printCategory from "@/component/HomePage/printCategory.vue";
|
||||||
|
|
||||||
export default defineComponent({
|
export default defineComponent({
|
||||||
components: { sketchCategory },
|
components: { sketchCategory,printCategory },
|
||||||
|
|
||||||
props: ["msg",'disignTypeList'],
|
props: ["msg",'disignTypeList'],
|
||||||
setup(prop) {
|
setup(prop) {
|
||||||
|
|||||||
@@ -28,9 +28,9 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div v-show="openClick == 3" class="generalMenu_printModel printMenu">
|
<div v-show="openClick == 3" class="generalMenu_printModel printMenu">
|
||||||
<div @click.stop="openPrintModel">{{ scene.label }} <i class="icon iconfont icon-xiala" :class="{forbidden:openMenu}"></i></div>
|
<div @click.stop="openPrintModel">{{ scene.name }} <i class="icon iconfont icon-xiala" :class="{forbidden:openMenu}"></i></div>
|
||||||
<ul v-show="openMenu">
|
<ul v-show="openMenu">
|
||||||
<li v-for="item,index in sceneList" class="printModel_item" @click.stop="setSceneList(item)">{{ item.label }}</li>
|
<li v-for="item,index in sceneList" class="printModel_item" @click.stop="setSceneList(item)">{{ item.name }}</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -91,7 +91,13 @@
|
|||||||
<span>{{ $t('PrintboardUpload.Maximum') }}</span>
|
<span>{{ $t('PrintboardUpload.Maximum') }}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<Material v-show="openClick == 2" ref="Material" msg="Printboard" @setLibrary = setSetchboardGenerate @confirmSelect="confirmSelect"></Material>
|
<Material v-show="openClick == 2"
|
||||||
|
ref="Material"
|
||||||
|
msg="Printboard"
|
||||||
|
@setLibrary = setSetchboardGenerate
|
||||||
|
@confirmSelect="confirmSelect"
|
||||||
|
:disignTypeList="printCatecoryList"
|
||||||
|
></Material>
|
||||||
<Generate v-show="openClick == 3" ref="Generate" :scene="scene" msg="Printboard"></Generate>
|
<Generate v-show="openClick == 3" ref="Generate" :scene="scene" msg="Printboard"></Generate>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal_right">
|
<div class="modal_right">
|
||||||
@@ -186,21 +192,24 @@ export default defineComponent({
|
|||||||
let workspace = ref({})
|
let workspace = ref({})
|
||||||
let sceneList = ref([
|
let sceneList = ref([
|
||||||
{
|
{
|
||||||
label:'Pattern',
|
name:'Pattern',
|
||||||
value:'Pattern'
|
value:'Pattern'
|
||||||
},{
|
},{
|
||||||
label:'Slogan',
|
name:'Slogan',
|
||||||
value:'Slogan'
|
value:'Slogan'
|
||||||
},{
|
},{
|
||||||
label:'Logo',
|
name:'Logo',
|
||||||
value:'Logo'
|
value:'Logo'
|
||||||
},
|
},
|
||||||
])
|
])
|
||||||
let scene = ref({
|
let scene = ref({
|
||||||
label:'Pattern',
|
name:'Pattern',
|
||||||
value:'Pattern'
|
value:'Pattern'
|
||||||
})
|
})
|
||||||
let openMenu = ref(false)
|
let openMenu = ref(false)
|
||||||
|
let printCatecoryList:any = computed(()=>{
|
||||||
|
return store.state.UserHabit.printType
|
||||||
|
})
|
||||||
return {
|
return {
|
||||||
fileList,
|
fileList,
|
||||||
printImgList,
|
printImgList,
|
||||||
@@ -215,6 +224,7 @@ export default defineComponent({
|
|||||||
sceneList,
|
sceneList,
|
||||||
scene,
|
scene,
|
||||||
openMenu,
|
openMenu,
|
||||||
|
printCatecoryList,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed:{
|
computed:{
|
||||||
|
|||||||
@@ -114,11 +114,11 @@
|
|||||||
libraryId:[item.id],
|
libraryId:[item.id],
|
||||||
level2Type:item.category,
|
level2Type:item.category,
|
||||||
}
|
}
|
||||||
Https.axiosPost(Https.httpUrls.setSketchLibrary,data).then(
|
// Https.axiosPost(Https.httpUrls.setSketchLibrary,data).then(
|
||||||
(rv: any) => {
|
// (rv: any) => {
|
||||||
}
|
// }
|
||||||
).catch((res)=>{
|
// ).catch((res)=>{
|
||||||
});
|
// });
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
showFileCategory,
|
showFileCategory,
|
||||||
@@ -129,7 +129,7 @@
|
|||||||
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<style lang="less">
|
<style lang="less" scoped>
|
||||||
//衣服类型下拉菜单
|
//衣服类型下拉菜单
|
||||||
.operate_file_block{
|
.operate_file_block{
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|||||||
@@ -129,7 +129,7 @@ export default defineComponent({
|
|||||||
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<style lang="less">
|
<style lang="less" scoped>
|
||||||
//衣服类型下拉菜单
|
//衣服类型下拉菜单
|
||||||
.operate_file_block{
|
.operate_file_block{
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
<div class="falls_item_img">
|
<div class="falls_item_img">
|
||||||
<img
|
<img
|
||||||
v-lazy="item.designPythonOutfitUrl"
|
v-lazy="item.designPythonOutfitUrl"
|
||||||
|
@click="setItemDetail(item)"
|
||||||
:style="{
|
:style="{
|
||||||
height: item.style.imgHeihgt + 'px',
|
height: item.style.imgHeihgt + 'px',
|
||||||
}"
|
}"
|
||||||
@@ -231,6 +232,9 @@ export default defineComponent({
|
|||||||
}
|
}
|
||||||
this.$el.style.height = Math.max(...this.poss) + this.gap_y + "px";
|
this.$el.style.height = Math.max(...this.poss) + this.gap_y + "px";
|
||||||
},
|
},
|
||||||
|
setItemDetail(data){
|
||||||
|
this.$emit('getImgScale',data)
|
||||||
|
}
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -226,12 +226,13 @@ export default defineComponent({
|
|||||||
textarea.value.select()
|
textarea.value.select()
|
||||||
document.execCommand("copy");
|
document.execCommand("copy");
|
||||||
}
|
}
|
||||||
let init = (list:any,index:any,dialogueIndex:any)=>{
|
let init = (item:any)=>{
|
||||||
scaleImage.value = true
|
scaleImage.value = true
|
||||||
imgData.scaleImageList = list
|
// imgData.scaleImageList = list
|
||||||
imgData.scaleImageIndex = index
|
// imgData.scaleImageIndex = index
|
||||||
let data = list[index]
|
// let data = list[index]
|
||||||
getDetail(data)
|
|
||||||
|
getDetail(item.id)
|
||||||
|
|
||||||
// let scaleImageList = this.store.state.UploadFilesModule.moodboard
|
// let scaleImageList = this.store.state.UploadFilesModule.moodboard
|
||||||
}
|
}
|
||||||
@@ -258,14 +259,14 @@ export default defineComponent({
|
|||||||
// },
|
// },
|
||||||
let getDetail = (value:any)=>{
|
let getDetail = (value:any)=>{
|
||||||
let data = value
|
let data = value
|
||||||
Https.axiosPost(Https.httpUrls.getPorfolioDetail,data).then(
|
// Https.axiosPost(Https.httpUrls.getPorfolioDetail,data).then(
|
||||||
(rv: any) => {
|
// (rv: any) => {
|
||||||
imgData.scaleImageData = rv
|
// imgData.scaleImageData = rv
|
||||||
console.log(imgData.scaleImageData);
|
// console.log(imgData.scaleImageData);
|
||||||
}
|
// }
|
||||||
).catch((res)=>{
|
// ).catch((res)=>{
|
||||||
}
|
// }
|
||||||
)
|
// )
|
||||||
}
|
}
|
||||||
let setChoose = () =>{
|
let setChoose = () =>{
|
||||||
router.push({name:'homePage',params: {id:imgData.scaleImageList[imgData.scaleImageIndex].userLikeGroupSourceId,type:'Works'}})
|
router.push({name:'homePage',params: {id:imgData.scaleImageList[imgData.scaleImageIndex].userLikeGroupSourceId,type:'Works'}})
|
||||||
|
|||||||
@@ -21,7 +21,16 @@ const userHabit : Module<UserHabit,RootState> = {
|
|||||||
credits:{
|
credits:{
|
||||||
value:0
|
value:0
|
||||||
},
|
},
|
||||||
printType:[],
|
printType:[{
|
||||||
|
name:'Pattern',
|
||||||
|
value:'Pattern'
|
||||||
|
},{
|
||||||
|
name:'Slogan',
|
||||||
|
value:'Slogan'
|
||||||
|
},{
|
||||||
|
name:'Logo',
|
||||||
|
value:'Logo'
|
||||||
|
},],
|
||||||
designElementsType:[],
|
designElementsType:[],
|
||||||
FemalePosition:[],
|
FemalePosition:[],
|
||||||
MalePosition:[],
|
MalePosition:[],
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="page_content" >
|
<div class="page_content" >
|
||||||
<Falls ref="fall" @loadend="isShowMark = false" :isScroll="isScroll"></Falls>
|
<Falls ref="fall" @loadend="isShowMark = false" :isScroll="isScroll" @getImgScale="getImgScale"></Falls>
|
||||||
<div class="page_loading_box">
|
<div class="page_loading_box">
|
||||||
<span class="page_loading" v-show="!isShowMark"></span>
|
<span class="page_loading" v-show="!isShowMark"></span>
|
||||||
<span v-show="isShowMark">
|
<span v-show="isShowMark">
|
||||||
@@ -232,9 +232,9 @@ export default defineComponent({
|
|||||||
}
|
}
|
||||||
let likeFile = (item:any,type:string) => {
|
let likeFile = (item:any,type:string) => {
|
||||||
}
|
}
|
||||||
let getImgScale = (index:any)=>{
|
let getImgScale = (item:any)=>{
|
||||||
newScaleImage.value.scaleImageMask = true
|
newScaleImage.value.scaleImageMask = true
|
||||||
newScaleImage.value.init(filter.worksList,index)
|
newScaleImage.value.init(item)
|
||||||
}
|
}
|
||||||
let getPorfolio = ()=>{
|
let getPorfolio = ()=>{
|
||||||
// let data = filter.getListDate
|
// let data = filter.getListDate
|
||||||
|
|||||||
Reference in New Issue
Block a user