Merge remote-tracking branch 'origin/StableVersion' into develop
This commit is contained in:
X1627315083
2
.env
2
.env
@@ -1,4 +1,4 @@
|
||||
# NODE_ENV = 'production'
|
||||
NODE_ENV = 'development'
|
||||
# VUE_APP_BASE_URL = 'http://18.167.251.121:10086'
|
||||
VUE_APP_BASE_URL = 'https://api.aida.com.hk'
|
||||
VUE_APP_BASE_URL = 'https://www.api.aida.com.hk'
|
||||
|
||||
4
.env.dev
4
.env.dev
@@ -4,8 +4,8 @@ NODE_ENV = 'development'
|
||||
|
||||
# VUE_APP_BASE_URL = 'http://18.167.251.121:10086'
|
||||
VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
|
||||
# VUE_APP_BASE_URL = 'https://api.aida.com.hk'
|
||||
VUE_APP_BASE_URL = 'https://www.api.aida.com.hk'
|
||||
# 佩佩
|
||||
VUE_APP_BASE_URL = 'http://192.168.1.7:5567'
|
||||
# VUE_APP_BASE_URL = 'http://192.168.1.7:5567'
|
||||
# 海波
|
||||
# VUE_APP_BASE_URL = 'http://192.168.1.9:5567'
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
NODE_ENV = 'production'
|
||||
# VUE_APP_BASE_URL = 'http://18.167.251.121:10086'
|
||||
# VUE_APP_BASE_URL = 'https://polyu.api.aida.com.hk'
|
||||
VUE_APP_BASE_URL = 'https://api.aida.com.hk'
|
||||
VUE_APP_BASE_URL = 'https://www.api.aida.com.hk'
|
||||
|
||||
@@ -270,13 +270,16 @@ li {
|
||||
pointer-events: auto !important;
|
||||
overflow-y: initial !important;
|
||||
}
|
||||
.Guide_.showEvents * {
|
||||
.Guide_.showEvents *,
|
||||
.Guide_ .showEvents * {
|
||||
pointer-events: auto !important;
|
||||
}
|
||||
.Guide_.showEvents .hideEvents {
|
||||
.Guide_.showEvents .hideEvents,
|
||||
.Guide_ .showEvents .hideEvents {
|
||||
pointer-events: none !important;
|
||||
}
|
||||
.Guide_.showEvents .hideEvents * {
|
||||
.Guide_.showEvents .hideEvents *,
|
||||
.Guide_ .showEvents .hideEvents * {
|
||||
pointer-events: none !important;
|
||||
}
|
||||
.Guide_ .Guide_active {
|
||||
@@ -299,6 +302,8 @@ li {
|
||||
filter: drop-shadow(0px 0px 2px #ff5f5f) drop-shadow(0px 0px 1px #ff5f5f);
|
||||
animation: identifier_img 1s infinite linear;
|
||||
display: block !important;
|
||||
cursor: pointer;
|
||||
pointer-events: auto !important;
|
||||
}
|
||||
@keyframes identifier_img {
|
||||
0% {
|
||||
|
||||
@@ -287,7 +287,7 @@ input:focus{
|
||||
.Guide_{
|
||||
pointer-events:auto !important;
|
||||
overflow-y: initial !important;
|
||||
&.showEvents{
|
||||
&.showEvents,.showEvents{
|
||||
*{
|
||||
pointer-events:auto !important;
|
||||
}
|
||||
@@ -322,6 +322,8 @@ input:focus{
|
||||
filter: drop-shadow(0px 0px 2px rgb(255, 95, 95))drop-shadow(0px 0px 1px rgb(255, 95, 95));
|
||||
animation: identifier_img 1s infinite linear;
|
||||
display: block !important;
|
||||
cursor: pointer;
|
||||
pointer-events:auto !important;
|
||||
@keyframes identifier_img {
|
||||
0% {
|
||||
filter: none;
|
||||
|
||||
@@ -28,8 +28,8 @@
|
||||
<!-- <img class="detial_img" :src="designItemDetail.designItemUrl"> -->
|
||||
|
||||
<div v-show="imgDesignImg" class="detail_modal_body">
|
||||
<div class="detail_modal_body_nav">
|
||||
<div v-for="item,index in designItemDetail?.clothes" v-show="item.id" :class="{active:item.clothesOpen}" @click="clothesOpen(index)">
|
||||
<div class="detail_modal_body_nav" :style="[(driver__.index == 35|| driver__.index == 36)?'transform: translate(-50%,0%)':'']">
|
||||
<div v-for="item,index in designItemDetail?.clothes" v-show="item.id" :class="{active:item.clothesOpen,Guide_1_19:(index == 0 && (driver__.index == 35|| driver__.index == 36))}" @click="clothesOpen(index)">
|
||||
<img :src="item?.path" alt="">
|
||||
<i v-show="deleteShow" class="fi fi-br-cross" @click.stop="setDelete(index)"></i>
|
||||
</div>
|
||||
@@ -543,7 +543,7 @@ export default defineComponent({
|
||||
if(this.driver__.driver){
|
||||
nextTick().then(()=>{
|
||||
// driverObj__.moveNext();
|
||||
driverObj__.moveTo(41);
|
||||
driverObj__.moveTo(36);
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -752,14 +752,14 @@ export default defineComponent({
|
||||
// path:imgData?.url,
|
||||
// designType: imgData?.designType
|
||||
// }]
|
||||
// if(this.driver__.driver){
|
||||
// nextTick().then(()=>{
|
||||
// driverObj__.moveNext();
|
||||
// })
|
||||
// }
|
||||
|
||||
imgData.path = imgData.url
|
||||
DesignDetailEnd.printsList.push(imgData)
|
||||
|
||||
if(this.driver__.driver){
|
||||
nextTick().then(()=>{
|
||||
driverObj__.moveNext();
|
||||
})
|
||||
}
|
||||
// console.log(this.current.printObject,imgData);
|
||||
}else if(this.selectCode == 'DesignElements'){
|
||||
imgData.path = imgData.url
|
||||
|
||||
@@ -829,7 +829,9 @@ export default defineComponent({
|
||||
}
|
||||
this.designOpenrtion = false
|
||||
if(this.driver__.driver){
|
||||
driverObj__.moveNext();
|
||||
nextTick(()=>{
|
||||
driverObj__.moveNext();
|
||||
})
|
||||
}
|
||||
},
|
||||
clearModal(){
|
||||
|
||||
@@ -833,7 +833,9 @@ export default defineComponent({
|
||||
this.designItemDetailTS = {}
|
||||
}
|
||||
if(this.driver__.driver){
|
||||
driverObj__.moveNext();
|
||||
nextTick(()=>{
|
||||
driverObj__.moveNext();
|
||||
})
|
||||
}
|
||||
},
|
||||
clearModal(){
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
<span :title="workspaceItem.styleName">{{ workspaceItem.styleName }}</span>
|
||||
</div>
|
||||
<!-- <div class="button_second">选择</div> -->
|
||||
<div class="started_btn" @click="setStyle">{{ $t('Habit.Select') }}</div>
|
||||
<div class="started_btn" :class="[driver__.driver?'hideEvents':'']" @click="setStyle">{{ $t('Habit.Select') }}</div>
|
||||
</div>
|
||||
<div class="habit_Overal_Single">
|
||||
<div
|
||||
@@ -726,7 +726,9 @@ export default defineComponent({
|
||||
// this.openType.habit = false
|
||||
nextTick().then(()=>{
|
||||
// driverObj__.moveTo(2);
|
||||
driverObj__.moveNext();
|
||||
setTimeout(() => {
|
||||
driverObj__.moveNext();
|
||||
}, 300);
|
||||
this.openType.model = false
|
||||
|
||||
// driverObj__.moveNext();
|
||||
|
||||
@@ -90,7 +90,7 @@
|
||||
<span>{{ $t('ColorboardUpload.UploadImage') }}</span>
|
||||
</div>
|
||||
<div class="upload_centetn">
|
||||
<div class="upload_item Guide_1_10">
|
||||
<div class="upload_item">
|
||||
<div class="upload_file_item upload_file_item_show">
|
||||
<i v-show="fileList.length == 0" class="fi fi-rr-square-plus"></i>
|
||||
<div v-show="fileList.length > 0" class="upload_file_item upload_file_item_upload" v-for="(file) in fileList" :key="file">
|
||||
@@ -102,7 +102,7 @@
|
||||
<div class="delete_file_block" @click="deleteFile(index)">Delete</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="upload_file_item_scale">
|
||||
<div class="upload_file_item_scale" :style="[(driver__.driver && (driver__.index == 19 || driver__.index == 18))?'display :flex;':'']">
|
||||
<a-upload
|
||||
:title="$t('ColorboardUpload.uploadTitle')"
|
||||
:capture="null"
|
||||
@@ -112,6 +112,7 @@
|
||||
@change="fileUploadChange"
|
||||
:before-upload="beforeUpload"
|
||||
accept=".jpg,.png,.jpeg,.bmp"
|
||||
class=" Guide_1_10"
|
||||
>
|
||||
<div class="upload_tip_block">
|
||||
<i class="fi fi-br-upload"></i>
|
||||
@@ -123,8 +124,8 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="upload_color">
|
||||
<div v-for="color,index in selectColorList" :key="color" @click="setUplpadColor(color)" class="upload_color_item" :class="[ index == 0?'Guide_1_11':'',index == 1?'Guide_1_11_2':'']">
|
||||
<div class="upload_color" :style="[driver__.driver?' overflow: hidden !important;':'']">
|
||||
<div v-for="color,index in selectColorList" :key="color" @click="setUplpadColor(color)" class="upload_color_item" :class="[ index == 0?'Guide_1_11':'',index == 1?'Guide_1_11_2':'',]">
|
||||
<div class="upload_color_item_bg" :style="{'background-color':`rgba(${color.rgba.r},${color.rgba.g},${color.rgba.b},${color.rgba.a})`}">
|
||||
</div>
|
||||
<!-- <div class="upload_color_item_text">{{ pantongNameList[index] }}</div> -->
|
||||
@@ -454,6 +455,11 @@ export default defineComponent({
|
||||
file.status = 'done'
|
||||
this.fileList[0] = file
|
||||
this.getImgColor()
|
||||
// nextTick().then(()=>{
|
||||
// if(this.driver__.driver){
|
||||
// driverObj__.moveNext()
|
||||
// }
|
||||
// })
|
||||
};
|
||||
// 转化为base64S
|
||||
reader.readAsDataURL(fileData)
|
||||
|
||||
@@ -205,11 +205,11 @@
|
||||
<div class="exportCanvasBox_left_credits" v-show="credits<1">
|
||||
<div><span class="icon iconfont icon-zhuyi"></span>{{ $t('exportModel.insufficient') }}</div>
|
||||
</div>
|
||||
<div class="exportCanvasBox_left_btn">
|
||||
<div class="exportCanvasBox_left_btn Guide_1_38">
|
||||
<!-- <div class="subitOkPreviewBtn" :class="{active:allBoardData.printboardFiles.length<=0}" :title="allBoardData.printboardFiles.length<=0?$t('exportModel.jsContent2'):''" @click="setHDExport">{{ $t('exportModel.HDExport') }}</div> -->
|
||||
<div class="subitOkPreviewBtn" @click="setSubmit">{{ $t('exportModel.Save') }}</div>
|
||||
<div class="subitOkPreviewBtn" @click="setShare">{{ $t('exportModel.Share') }}</div>
|
||||
<div class="subitOkPreviewBtn Guide_1_32" @click="setExport">{{ $t('exportModel.Export') }}</div>
|
||||
<div class="subitOkPreviewBtn" @click="setExport">{{ $t('exportModel.Export') }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -321,10 +321,10 @@ export default defineComponent({
|
||||
props: ["msg", "sketchCatecoryList"],
|
||||
setup(props,{emit}) {
|
||||
const {t} = useI18n()
|
||||
const store = useStore();
|
||||
let driver__ = computed(()=>{
|
||||
return store.state.Guide.guide
|
||||
})
|
||||
const store = useStore();
|
||||
|
||||
let showUpgradePlan = ref(false);
|
||||
let canvas = reactive({});
|
||||
@@ -605,7 +605,6 @@ export default defineComponent({
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
isShowMark.value = false
|
||||
}
|
||||
updateCanvasState('')//加载完成后记录一下
|
||||
@@ -870,9 +869,6 @@ export default defineComponent({
|
||||
FileSaver.saveAs(content, "DesignFiles"); // 利用file-saver保存文件 自定义文件名
|
||||
isShowMark.value = false;
|
||||
});
|
||||
if(driver__.value.driver){
|
||||
driverObj__.moveNext()
|
||||
}
|
||||
setSubmit()//导出的时候保存
|
||||
initAligningGuidelines(canvas,true)
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<div class="generate">
|
||||
<div v-if="type_.type2 == 'Printboard' && scene.value == 'Pattern'" class="generate_checkbox Guide_1_2_2" :class="[driver__.driver?'hideEvents':'']">
|
||||
<generalMenu :dataList="printModelList" @setprintModel="setprintModel" :item="printModel" :driver__="driver__.driver" :driverClass="{class1: 'Guide_1_2_4',class2:'Guide_1_2_5'}"></generalMenu>
|
||||
<div v-if="type_.type2 == 'Printboard' && scene.value == 'Pattern'" class="generate_checkbox" >
|
||||
<generalMenu :dataList="printModelList" @setprintModel="setprintModel" :item="printModel" :driver__="driver__.driver" :driverClass="{class1: 'Guide_1_2_4'}"></generalMenu>
|
||||
<!-- <generalMenu :dataList="sceneList" @setprintModel="setSceneList" :item="scene"></generalMenu> -->
|
||||
<!-- <div v-if="type_.type2 == 'Printboard'" class="printModel">
|
||||
<div @click.stop="PrintModel" class="Guide_1_2_4" :class="[driver__.driver?'showEvents':'']">{{ printModel.name }}</div>
|
||||
@@ -13,7 +13,7 @@
|
||||
</div> -->
|
||||
</div>
|
||||
<div class="input_border" >
|
||||
<div class="input_box Guide_1_5" :class="[inputShow?'active':'',driver__.driver?'showEvents':'']" >
|
||||
<div class="input_box Guide_1_5" :class="[inputShow?'active':'',type_.type2 =='Sketchboard'?'Guide_1_9_2':'']">
|
||||
<div class="input_box_btnBox">
|
||||
<div class="upload_item">
|
||||
<div
|
||||
@@ -55,7 +55,7 @@
|
||||
@keydown.enter="getgenerate()"
|
||||
@click="inputFocus()"
|
||||
/>
|
||||
<i class="fi fi-br-upload" :title="$t('Generate.uploadTitle')" v-show="!isTextarea && upload.level1Type !== 'Moodboard' && scene?.value != 'Slogan' && scene?.value != 'Logo'">
|
||||
<i class="fi fi-br-upload" :class="{ Guide_1_2_6:type_.type2 == 'Printboard'}" :title="$t('Generate.uploadTitle')" v-show="!isTextarea && upload.level1Type !== 'Moodboard' && scene?.value != 'Slogan' && scene?.value != 'Logo'">
|
||||
<a-upload
|
||||
class="search_upImg"
|
||||
:capture="null"
|
||||
@@ -87,20 +87,20 @@
|
||||
v-model="searchPictureName"
|
||||
></textarea>
|
||||
<!-- <div class="generage_btn started_btn" @click.stop="getgenerate">{{ $t('Generate.Generate') }}</div> -->
|
||||
<div v-show="!isGenerate" class="generage_btn started_btn " @click.stop="getgenerate">
|
||||
<div v-show="!isGenerate" class="generage_btn started_btn" :class="{Guide_1_2_8:type_.type2 == 'Printboard'}" @click.stop="getgenerate">
|
||||
{{ $t('Generate.Generate') }}
|
||||
<!-- <div v-show="isGenerate"><a-spin size="large" /></div> -->
|
||||
</div>
|
||||
<div v-show="isGenerate && !remGenerate" class="generage_btn started_btn" @click="getgenerate">
|
||||
<div v-show="isGenerate && !remGenerate" class="generage_btn started_btn" :class="{Guide_1_2_8:type_.type2 == 'Printboard'}" @click="getgenerate">
|
||||
<i class="fi fi-br-loading"></i>
|
||||
</div>
|
||||
<div v-show="remGenerate" @click="removeGenerate" class="generage_btn started_btn">
|
||||
<div v-show="remGenerate" @click="removeGenerate" class="generage_btn started_btn" :class="{Guide_1_2_8:type_.type2 == 'Printboard'}">
|
||||
{{$t('Generate.Close')}}
|
||||
</div>
|
||||
<span class="inputShowText" ref="inputShowText"></span>
|
||||
</div>
|
||||
<div class="search_keyword" v-if="workspace?.allKeywordsByStyle" v-show="isInputFocus" @click.stop="">
|
||||
<div class="search_keyword_center">
|
||||
<div class="search_keyword_center" >
|
||||
<div class="search_keyword_center_left">
|
||||
<div v-if="type_.type2 == 'Printboard'" v-for="item in styleRecommend" @click.stop="cliSetKeyword(item)" class="search_keyword_center_item"> {{item}} </div>
|
||||
<div v-for="item in workspace?.allKeywordsByStyle?.[type_.type2]" @click.stop="cliSetKeyword(item)" class="search_keyword_center_item"> {{item}} </div>
|
||||
@@ -139,7 +139,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
<div class="generage_img Guide_1_6" :style="[isGenerate?'overflow:hidden':'']" :class="[driver__.driver?'showEvents':'']">
|
||||
<div class="generage_img Guide_1_6" :class="{Guide_1_13_2:type_.type2 == 'Sketchboard',Guide_1_2_9:type_.type2 == 'Printboard'}" :style="[isGenerate?'overflow:hidden':'']">
|
||||
<div
|
||||
class="generage_img_item"
|
||||
v-for="(item, index) in fileList"
|
||||
@@ -148,7 +148,7 @@
|
||||
:class="[item.status != 'Success'?'hideEvents':'',item?.checked?'active':'']"
|
||||
>
|
||||
<img v-lazy="item.imgUrl" @click.stop="generageAdd(item)">
|
||||
<sketchCategory v-if="type_.type2 == 'Sketchboard' || type_.type2 == 'Printboard'" :isSpread="type_.type2 == 'Printboard'" :disignTypeList="sketchCatecoryList" :generateList="fileList" :item="item" :driver__="driver__.driver" :driverClass="{class1: 'Guide_1_13',class2:'Guide_1_13_1'}"></sketchCategory>
|
||||
<sketchCategory v-if="type_.type2 == 'Sketchboard' || type_.type2 == 'Printboard'" :isSpread="type_.type2 == 'Printboard'" :disignTypeList="sketchCatecoryList" :generateList="fileList" :item="item" :driver__="driver__.driver" :driverClass="{'class1': type_.type2 == 'Sketchboard'?'Guide_1_13':'','class2':type_.type2 == 'Sketchboard'?'Guide_1_13_1':''}"></sketchCategory>
|
||||
<div
|
||||
class="delete_like_file_block left1"
|
||||
:class="[driver__.driver?'hideEvents':'',]"
|
||||
@@ -386,7 +386,9 @@ export default defineComponent({
|
||||
this.store.commit("addGenerateMaterialFils", data);
|
||||
// console.log(this.fileList);
|
||||
let moodboard = this.store.state.UploadFilesModule.moodboardGenerateFiles
|
||||
if(moodboard.length >= 2 && this.driver__.driver){
|
||||
let sketch = this.store.state.UploadFilesModule.sketchGenerateFiles
|
||||
let print = this.store.state.UploadFilesModule.printGenerateFiles
|
||||
if((moodboard.length >= 2 || print.length >= 2 || sketch.length >= 2) && this.driver__.driver){
|
||||
driverObj__.moveNext()
|
||||
}
|
||||
},
|
||||
@@ -542,12 +544,14 @@ export default defineComponent({
|
||||
if((data.length == 0)|| (rv.filter((item:any)=>item.status == 'Invalid').length ==data.length)){
|
||||
if(rv.filter((item:any)=>item.status == 'Invalid').length ==dataNum){
|
||||
message.info(this.t('Generate.effectPoor'));
|
||||
}else{
|
||||
nextTick().then(()=>{
|
||||
if(this.driver__.driver){
|
||||
driverObj__.moveNext()
|
||||
}
|
||||
})
|
||||
}
|
||||
nextTick().then(()=>{
|
||||
if(this.driver__.driver){
|
||||
driverObj__.moveNext()
|
||||
}
|
||||
})
|
||||
|
||||
this.store.dispatch('getCredits')
|
||||
clearInterval(this.generateTime)
|
||||
clearInterval(this.remGenerateTime)
|
||||
|
||||
@@ -266,7 +266,6 @@ export default defineComponent({
|
||||
cropperFileData:{name:'',uid:''}, //裁剪的原始文件数据
|
||||
currentFileNum:0, //当前上传的文件数
|
||||
isUpload:false,
|
||||
captionGeneration:'',
|
||||
printboardList:computed(()=>{
|
||||
return useStore().state.UploadFilesModule.printboard
|
||||
}),
|
||||
@@ -284,10 +283,12 @@ export default defineComponent({
|
||||
this.workspace = computed(()=>{
|
||||
return this.store?.state?.Workspace?.workspace
|
||||
})
|
||||
let Generate:any = this.$refs.Generate
|
||||
|
||||
if(this.driver__.driver){
|
||||
this.captionGeneration = 'Elegant floral print for high-fashion attire'
|
||||
Generate.searchPictureName = 'Elegant floral print for high-fashion attire'
|
||||
}else{
|
||||
this.captionGeneration = ''
|
||||
Generate.searchPictureName = ''
|
||||
}
|
||||
},
|
||||
methods:{
|
||||
|
||||
@@ -136,7 +136,7 @@
|
||||
</div>
|
||||
<div class="modal_accomplish">
|
||||
<div class="modal_img">
|
||||
<div v-for="item,index in sketchboardList" :key="item" class="modal_imgItem Guide_1_2_9" :class="[driver__.driver?'showEvents':'']" >
|
||||
<div v-for="item,index in sketchboardList" :key="item" class="modal_imgItem" :class="[driver__.driver?'showEvents':'']" >
|
||||
<img v-lazy="item.imgUrl">
|
||||
<sketchCategory :disignTypeList="sketchCatecoryList" :generateList="sketchboardList" :isSpread="true" :item="item" :driver__="driver__.driver"></sketchCategory>
|
||||
<!-- 在sketch 和print暂时关闭like -->
|
||||
@@ -246,7 +246,6 @@ export default defineComponent({
|
||||
},
|
||||
token: "",
|
||||
uploadUrl: "",
|
||||
captionGeneration:'',
|
||||
workspaceCom:{},
|
||||
isTextarea:false,
|
||||
isInputFocus:false,
|
||||
@@ -330,10 +329,11 @@ export default defineComponent({
|
||||
this.workspaceCom = computed(()=>{
|
||||
return this.store?.state?.Workspace?.workspace
|
||||
})
|
||||
let Generate:any = this.$refs.Generate
|
||||
if(this.driver__.driver){
|
||||
this.captionGeneration = 'A detailed sketch of an elegant blouse with a high neck, flowing sleeves, and lace trim, highlighting texture and style.'
|
||||
Generate.searchPictureName = 'A detailed sketch of an elegant blouse with a high neck, flowing sleeves, and lace trim, highlighting texture and style.'
|
||||
}else{
|
||||
this.captionGeneration = ''
|
||||
Generate.searchPictureName = ''
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
@@ -443,13 +443,6 @@ export default defineComponent({
|
||||
}
|
||||
return (isJpgOrPng && isLt2M) || Upload.LIST_IGNORE;
|
||||
},
|
||||
cliSetKeyword(value:any){
|
||||
let str = ''
|
||||
if(this.captionGeneration[this.captionGeneration.length-1] != ',' && this.captionGeneration.length != 0){
|
||||
str = ','
|
||||
}
|
||||
this.captionGeneration += str + value
|
||||
},
|
||||
deleteFile(item: any) {
|
||||
if(item?.type_?.type1 == 'generate' || item?.type_?.type1 == 'material'){
|
||||
item.jsContent1 = this.t('uploadFile.jsContent1',{maxImg:20})
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -21,9 +21,9 @@
|
||||
</div>
|
||||
<div
|
||||
class="category_list"
|
||||
:class="driverClass.class2"
|
||||
v-show="item.categoryShow"
|
||||
v-if="!isSpread"
|
||||
:class="[driver__?'showEvents':'',driverClass.class2]"
|
||||
>
|
||||
<div
|
||||
:class="[
|
||||
@@ -88,14 +88,14 @@ export default defineComponent({
|
||||
setup(props:any,{emit}){
|
||||
let data = ''
|
||||
let showFileCategory = (file:any)=> {
|
||||
if(props.isSpread)return
|
||||
file.categoryShow = true;
|
||||
nextTick().then(()=>{
|
||||
if(props.driver__){
|
||||
|
||||
driverObj__.moveNext()
|
||||
}
|
||||
})
|
||||
if(props.isSpread)return
|
||||
file.categoryShow = true;
|
||||
document.addEventListener("click", hiddenFileCategory);
|
||||
}
|
||||
let hiddenFileCategory = () => {
|
||||
@@ -115,6 +115,7 @@ export default defineComponent({
|
||||
setSketchLibrary(props.item)
|
||||
}
|
||||
if(props.driver__){
|
||||
|
||||
driverObj__.moveNext()
|
||||
}
|
||||
// this.store.commit("sketchGenerateFiles", this.fileList);
|
||||
|
||||
@@ -94,10 +94,12 @@ import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
|
||||
import { Modal,message } from 'ant-design-vue';
|
||||
import { downloadIamge,base64ToFile } from "@/tool/util";
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useStore } from "vuex";
|
||||
|
||||
export default defineComponent({
|
||||
setup(prop,{emit}) {
|
||||
let {t} = useI18n()
|
||||
const store = useStore();
|
||||
let publish: any = ref(false);//弹窗
|
||||
let publishMask:any = ref(false)//弹窗遮罩
|
||||
let setBeenPublished:any = inject('setBeenPublished')
|
||||
@@ -225,7 +227,6 @@ export default defineComponent({
|
||||
emit('setPublish')
|
||||
message.success(t('Publish.jsContent4'))
|
||||
setBeenPublished()
|
||||
|
||||
})
|
||||
.catch((rv) => {
|
||||
publishData.isShowMark = false
|
||||
|
||||
@@ -568,14 +568,14 @@ export default {
|
||||
guide9:"输入捕捉您希望表达的情绪的关键词，然后单击<strong>生成</strong>按钮。",
|
||||
guide10:'为您的心情板选择两个图像。',
|
||||
guide11:"点击此处布局您的情绪版。",
|
||||
guide12:"点击此处生成印花图片。",
|
||||
guide12:"点击这里进入下一步。",
|
||||
guide13:"点击此处生成印花图片。",
|
||||
guide14:"我们为生成图片提供三个输入选项：仅图片、仅文本和图片文本。",
|
||||
guide15:"选择此选项，我们将使用您上传的图片和输入的文本生成四张印花图片。",
|
||||
// guide14:"我们为生成图片提供三个输入选项：仅图片、仅文本和图片文本。",
|
||||
// guide15:"选择此选项，我们将使用您上传的图片和输入的文本生成四张印花图片。",
|
||||
guide16:"在此处选择生成模型；不同的模型将以不同的风格生成图片。",
|
||||
guide17:"在此处选择生成模型；不同的模型将以不同的风格生成图片。",
|
||||
// guide17:"在此处选择生成模型；不同的模型将以不同的风格生成图片。",
|
||||
guide18:"在此处上传输入图片。",
|
||||
guide19:"点击此图片进行选择。",
|
||||
// guide19:"点击此图片进行选择。",
|
||||
guide20:"输入关于您希望创建的印花的关键词，然后点击<strong>生成</strong>按钮。",
|
||||
guide21:"选择您最喜欢的生成印花。",
|
||||
guide22:"点击此处进行下一步。",
|
||||
@@ -585,7 +585,7 @@ export default {
|
||||
guide26:"从这些颜色块中选择您想要的颜色。",
|
||||
guide27:"点击此处进行下一步。",
|
||||
guide28:"点击此处生成服装草图。",
|
||||
guide29:"使用仅文本选项进行生成。",
|
||||
// guide29:"使用仅文本选项进行生成。",
|
||||
guide30:"输入关于您希望创建的草图的关键词，然后点击<strong>生成</strong>按钮。",
|
||||
guide31:"点击此处为生成的草图选择一个类别。",
|
||||
guide32:"为草图选择正确的类别。",
|
||||
@@ -605,7 +605,15 @@ export default {
|
||||
guide46:"在此处预览印刷设计。",
|
||||
guide47:"在此处保存印刷设计。",
|
||||
guide48:"点击此处完成修改。",
|
||||
guide49:"点击此处导出您刚刚设计的系列。",
|
||||
guide49:"点击此完成出您刚刚设计的系列。",
|
||||
guide51:"这个界面允许您将设计结果转换为产品图。您可以通过调整文字和相似度来获得理想的效果。点击此产品图进入下一步。",
|
||||
guide52:"点击此处生成产品图。",
|
||||
guide53:"点击此按钮可对产品图应用更多工具。",
|
||||
guide54:"我们可以改变这张图片的光照方向和背景。",
|
||||
guide55:"点击此处生成一张从右侧打光的产品图。",
|
||||
guide56:"如果您喜欢这个结果，可以点击小红心保存。",
|
||||
guide57:"点击此处进入导出页面。",
|
||||
guide58:"您可以将作品分享到作品广场或者导出到本地。",
|
||||
guide50:"您的指南已经完成，现在您可以自由创作。要了解更多见解和细节，请查看我们主页上的演示视频：<a href='https://code-create.com.hk/aida/' style='pointer-events: auto;' target='_blank'>https://code-create.com.hk/aida/</a>。您可以随时告诉机器人您想重新开始教程。",
|
||||
},
|
||||
}
|
||||
|
||||
@@ -571,12 +571,12 @@ export default {
|
||||
guide11:"Click here to layout your moodboard.",
|
||||
guide12:"Click here for next step.",
|
||||
guide13:"Click here to generate print images.",
|
||||
guide14:"We provide three input options for generating images: Image Only, Text Only, and Text-Image.",
|
||||
guide15:"Select this option and we will generate four print images using both the picture you upload and the text you enter.",
|
||||
// guide14:"We provide three input options for generating images: Image Only, Text Only, and Text-Image.",
|
||||
// guide15:"Select this option and we will generate four print images using both the picture you upload and the text you enter.",
|
||||
guide16:"Choose a generation model here; different models will generate images in various styles.",
|
||||
guide17:"Choose a generation model here; different models will generate images in various styles.",
|
||||
// guide17:"Choose a generation model here; different models will generate images in various styles.",
|
||||
guide18:"Upload the input picture here.",
|
||||
guide19:"Click on this image to select it.",
|
||||
// guide19:"Click on this image to select it.",
|
||||
guide20:"Enter keywords about the print you wish to create and then click the <strong>Generate</strong> button.",
|
||||
guide21:"Select the generated prints you like best.",
|
||||
guide22:"Click here for next step.",
|
||||
@@ -586,7 +586,7 @@ export default {
|
||||
guide26:"Choose the color you want from these color blocks.",
|
||||
guide27:"Click here for next step.",
|
||||
guide28:"Click here to generate clothing sketches.",
|
||||
guide29:"Using text only option for generation.",
|
||||
// guide29:"Using text only option for generation.",
|
||||
guide30:"Enter keywords about the sketch you wish to create and then click the <strong>Generate</strong> button.",
|
||||
guide31:"Click here to choose a category for the generated sketch.",
|
||||
guide32:"Choose correct category for the sketch.",
|
||||
@@ -606,8 +606,16 @@ export default {
|
||||
guide46:"Preview printed design here.",
|
||||
guide47:"Save printed design here.",
|
||||
guide48:"Click here to finalize your modification.",
|
||||
guide49:"Click here to access the export page.",
|
||||
guide50:"Click here to export the collection you just designed.",
|
||||
guide51:"Your guide is complete, and now the canvas is yours to create freely. For more insights and details, check out our demo video on the homepage at <a href='https://code-create.com.hk/aida/' style='pointer-events: auto;' target='_blank'>https://code-create.com.hk/aida/</a><br>You can restart the tutorial at any time by simply telling the robot that you want to.",
|
||||
guide49:"Click here to access the finalize page.",
|
||||
guide51:"This interface allows you to transform design results into product images. You can achieve your desired effect by adjusting the text and similarity. Click this product image to proceed to the next step.",
|
||||
guide52:"Click here to generate the product image.",
|
||||
guide53:"Click this button to apply more tools to the product image. ",
|
||||
guide54:"We can adjust the lighting and background of this image. ",
|
||||
guide55:"Click here to generate a product image with lighting from the right side.",
|
||||
guide56:"If you like this result, click the little heart to save it.",
|
||||
guide57:"Click here to go to the export page. ",
|
||||
guide58:"You can share your work to the gallery or export to your local device.",
|
||||
// guide50:"Click here to export the collection you just designed.",
|
||||
guide50:"Your guide is complete, and now the canvas is yours to create freely. For more insights and details, check out our demo video on the homepage at <a href='https://code-create.com.hk/aida/' style='pointer-events: auto;' target='_blank'>https://code-create.com.hk/aida/</a><br>You can restart the tutorial at any time by simply telling the robot that you want to.",
|
||||
},
|
||||
}
|
||||
|
||||
@@ -74,12 +74,12 @@ function createDriver(){
|
||||
{ element: '.Guide_1_8', popover: { title: '', description: i18n.guide12 } },
|
||||
//以上moodboard
|
||||
{ element: '.Guide_1_2_1', popover: { title: '', description: i18n.guide13 } },
|
||||
{ element: '.Guide_1_2_2', popover: { title: '', description: i18n.guide14 } },
|
||||
{ element: '.Guide_1_2_3', popover: { title: '', description: i18n.guide15 } },
|
||||
// { element: '.Guide_1_2_2', popover: { title: '', description: i18n.guide14 } },
|
||||
// { element: '.Guide_1_2_3', popover: { title: '', description: i18n.guide15 } },
|
||||
{ element: '.Guide_1_2_4', popover: { title: '', description: i18n.guide16 } },
|
||||
{ element: '.Guide_1_2_5', popover: { title: '', description: i18n.guide17 } },
|
||||
// { element: '.Guide_1_2_5', popover: { title: '', description: i18n.guide17 } },
|
||||
{ element: '.Guide_1_2_6', popover: { title: '', description: i18n.guide18 } },
|
||||
{ element: '.Guide_1_2_7', popover: { title: '', description: i18n.guide19 } },
|
||||
// { element: '.Guide_1_2_7', popover: { title: '', description: i18n.guide19 } },
|
||||
{ element: '.Guide_1_2_8', popover: { title: '', description: i18n.guide20 } },
|
||||
{ element: '.Guide_1_2_9', popover: { title: '', description: i18n.guide21 } },
|
||||
{ element: '.Guide_1_8', popover: { title: '', description: i18n.guide22 } },
|
||||
@@ -89,7 +89,7 @@ function createDriver(){
|
||||
{ element: '.Guide_1_11_2', popover: { title: '', description: i18n.guide26 } },
|
||||
{ element: '.Guide_1_8', popover: { title: '', description: i18n.guide27 } },
|
||||
{ element: '.Guide_1_9', popover: { title: '', description: i18n.guide28 } },
|
||||
{ element: '.Guide_1_9_1', popover: { title: '', description: i18n.guide29 } },
|
||||
// { element: '.Guide_1_9_1', popover: { title: '', description: i18n.guide29 } },
|
||||
{ element: '.Guide_1_9_2', popover: { title: '', description: i18n.guide30 } },
|
||||
{ element: '.Guide_1_13', popover: { title: '', description: i18n.guide31 } },
|
||||
{ element: '.Guide_1_13_1', popover: { title: '', description: i18n.guide32 } },
|
||||
@@ -111,8 +111,16 @@ function createDriver(){
|
||||
{ element: '.Guide_1_25_1', popover: { title: '', description: i18n.guide47 ,side: "right",align: 'end' } },
|
||||
{ element: '.Guide_1_26', popover: { title: '', description: i18n.guide48 } },
|
||||
{ element: '.Guide_1_31', popover: { title: '', description: i18n.guide49 } },
|
||||
{ element: '.Guide_1_32', popover: { title: '', description: i18n.guide50 } },
|
||||
{ element: '.Guide_1_99', popover: { title: 'Begin Your Design', description: i18n.guide51 } },
|
||||
{ element: '.Guide_1_32', popover: { title: '', description: i18n.guide51 ,side: "right",align: 'center'} },
|
||||
{ element: '.Guide_1_33', popover: { title: '', description: i18n.guide52 } },
|
||||
{ element: '.Guide_1_34', popover: { title: '', description: i18n.guide53 } },
|
||||
{ element: '.Guide_1_35', popover: { title: '', description: i18n.guide54 } },
|
||||
{ element: '.Guide_1_33', popover: { title: '', description: i18n.guide55 } },
|
||||
{ element: '.Guide_1_36', popover: { title: '', description: i18n.guide56 } },
|
||||
{ element: '.Guide_1_37', popover: { title: '', description: i18n.guide57 } },
|
||||
{ element: '.Guide_1_38', popover: { title: '', description: i18n.guide58 } },
|
||||
{ element: '.Guide_1_99', popover: { title: '', description: i18n.guide50 ,side: "right",align: 'center'} },
|
||||
// { element: '.Guide_1_99', popover: { title: 'Begin Your Design', description: i18n.guide51 } },
|
||||
],
|
||||
// showProgress: true,//控制总页数和当前页数是否显示
|
||||
allowClose:false,
|
||||
@@ -137,9 +145,10 @@ function createDriver(){
|
||||
driver : true,
|
||||
stepsLenth:stepsLenth,
|
||||
}
|
||||
// console.log(driverIndex__);
|
||||
store?.commit("setGuide", data);
|
||||
if(options.state.activeIndex == 0 ||
|
||||
options.state.activeIndex == 39
|
||||
options.state.activeIndex == 34
|
||||
){
|
||||
popover.wrapper.style.display = 'none'
|
||||
}else{
|
||||
@@ -150,14 +159,15 @@ function createDriver(){
|
||||
// options.config.stagePadding = 10
|
||||
}else if(options.state.activeIndex == 6 || options.state.activeIndex == 7){
|
||||
popover.wrapper.style.transform = 'translateY(4rem)'
|
||||
}else if(options.state.activeIndex == 46){
|
||||
popover.wrapper.style.transform = 'translateY(-6rem)'
|
||||
}else if(options.state.activeIndex == 41){
|
||||
popover.wrapper.style.transform = 'translateY(-9rem)'
|
||||
}else{
|
||||
popover.wrapper.style.transform = 'initial'
|
||||
}
|
||||
if(
|
||||
options.state.activeIndex >= 6 && options.state.activeIndex < 9 ||
|
||||
options.state.activeIndex >= 14 && options.state.activeIndex < 15 ||
|
||||
options.state.activeIndex == 52 ||
|
||||
driverObj__.isLastStep()
|
||||
){
|
||||
popover.footer.style.display = 'block'
|
||||
@@ -166,10 +176,10 @@ function createDriver(){
|
||||
popover.footer.style.display = 'none'
|
||||
popover.footerButtons.style.pointerEvents = 'none';
|
||||
}
|
||||
nextTick().then(()=>{
|
||||
if(element){
|
||||
element.classList.remove('Guide_')
|
||||
}
|
||||
if(element){
|
||||
element.classList.remove('Guide_')
|
||||
}
|
||||
nextTick(()=>{
|
||||
element = options.state.activeElement
|
||||
element.classList.add('Guide_')
|
||||
})
|
||||
|
||||
@@ -122,7 +122,7 @@ export default defineComponent({
|
||||
if(!data.userId) return
|
||||
// console.log(getCookie("token"));
|
||||
Https.axiosPost(Https.httpUrls.accountLogout, data).then((rv) => {
|
||||
// WriteCookie("token");
|
||||
clonAllCookie();
|
||||
});
|
||||
}
|
||||
let goHome = ()=>{
|
||||
|
||||
@@ -77,7 +77,7 @@
|
||||
</div>
|
||||
|
||||
<div class="right_content_body">
|
||||
<div class="right_content_img_block scroll_style Guide_1_17" v-mousewheel :class="[designCollectionList.length != 0?'active':'',driver__.driver?'showEvents':'']">
|
||||
<div class="right_content_img_block scroll_style Guide_1_17 active" v-mousewheel :class="[driver__.driver?'showEvents':'']">
|
||||
<div class="right_content_img_item">
|
||||
<!-- <draggable
|
||||
group="people" > -->
|
||||
@@ -85,7 +85,7 @@
|
||||
design, index
|
||||
) in designCollectionList" :key="design?.designItemId">
|
||||
<div class="content_img_flex"
|
||||
:class="[driver__.driver?driver__.index == 37?'hideEvents':'':'']"
|
||||
:class="[(driver__.driver && driver__.index == 32)?'hideEvents':'']"
|
||||
@click="
|
||||
designDetail(
|
||||
design,
|
||||
@@ -95,8 +95,8 @@
|
||||
)
|
||||
">
|
||||
<img class="content_img" :src="design.designOutfitUrl" />
|
||||
</div>
|
||||
<div class="icon iconfont icon-jushoucang icon_like" :class="[driver__.driver?index == 0?driver__.index == 37?'Guide_active showEvents':'hideEvents':'hideEvents':'']" @click.stop="
|
||||
</div>
|
||||
<div class="icon iconfont icon-jushoucang icon_like" :class="[driver__.driver?index == 0?driver__.index == 32?'Guide_img showEvents':'':'':'']" @click.stop="
|
||||
likeDesignCollection(
|
||||
design,
|
||||
index
|
||||
@@ -934,9 +934,9 @@ export default defineComponent({
|
||||
"deleteLikeDesignCollectionList",
|
||||
index
|
||||
);
|
||||
if (!this.likeDesignCollectionList.length) {
|
||||
this.store.commit("deleteUserGroupId");
|
||||
}
|
||||
// if (!this.likeDesignCollectionList.length) {
|
||||
// this.store.commit("deleteUserGroupId");
|
||||
// }
|
||||
}
|
||||
this.disLikeLoading = false;
|
||||
})
|
||||
@@ -1115,10 +1115,10 @@ export default defineComponent({
|
||||
document.removeEventListener("click", this.closeShowOperateContent);
|
||||
},
|
||||
exportModel(){
|
||||
|
||||
let productImg:any = this.$refs.productImg
|
||||
productImg.productImgMask = true
|
||||
productImg.init(this.userGroupId)
|
||||
|
||||
},
|
||||
|
||||
//打开图片详情
|
||||
|
||||
@@ -99,6 +99,7 @@ import { ElCascader } from 'element-plus'
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import setLabel from '@/component/LibraryPage/setLabel.vue';
|
||||
import searchLabel from '@/component/LibraryPage/searchLabel.vue';
|
||||
import { useStore } from "vuex";
|
||||
|
||||
export default defineComponent({
|
||||
components: {
|
||||
@@ -110,6 +111,7 @@ export default defineComponent({
|
||||
searchLabel,
|
||||
},
|
||||
setup() {
|
||||
const store = useStore();
|
||||
let rangePickerValue:any = ref([])
|
||||
let renameData:any = ref({}) //修改名字选中的数据
|
||||
let isShowMark:any = ref(false)
|
||||
@@ -171,6 +173,7 @@ export default defineComponent({
|
||||
}
|
||||
provide('type',type)
|
||||
return {
|
||||
store,
|
||||
rangePickerValue,
|
||||
columns,
|
||||
collectionList,
|
||||
@@ -310,6 +313,19 @@ export default defineComponent({
|
||||
(rv: any) => {
|
||||
message.success(this.t('HistoryPage.jsContent1'))
|
||||
this.collectionList.splice(index,1)
|
||||
// let userGroupId: any = computed(() => {
|
||||
// return
|
||||
// });
|
||||
if(record.id == this.store.state.HomeStoreModule.userGroupId){
|
||||
this.store.commit('deleteUserGroupId')
|
||||
this.store.commit("setLikeDesignCollectionList", []);
|
||||
this.store.commit("clearAllData");
|
||||
this.store.commit("clearAllCollection");
|
||||
this.store.commit("setAllBoardDataChoose",{});
|
||||
this.store.commit("clearShowSketchboard",{});
|
||||
}
|
||||
console.log(this.store.state.HomeStoreModule.userGroupId,record);
|
||||
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user