aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
X1627315083
2023-12-01 17:13:22 +08:00
parent 0c9e153157
commit 86697dc3dd
10 changed files with 139 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/assets/style/style.css
View File

@@ -347,6 +347,7 @@ li {
text-align: center;
background: rgba(0, 0, 0, 0.6);
position: relative;
overflow: initial !important;
}
.operate_file_block .select_img_type .select_category {
display: flex;

5
src/assets/style/style.less
View File

@@ -185,6 +185,9 @@ ul,li{
*{
pointer-events:auto !important;
}
// .select_img_type{
// overflow: initial !important;
// }
}
}
@@ -404,7 +407,7 @@ ul,li{
text-align: center;
background: rgba(0,0,0,0.6);
position: relative;
overflow: initial !important;
.select_category{
display: flex;
align-items: center;

26
src/component/Detail/DesignDetail.vue
View File

@@ -74,16 +74,19 @@
</div>
<img :src="designItemDetail?.clothes?.[currentIndex]?.path" alt="" class="centent" @click="openCurrent(1)">
</div>
<div class="clothes_detail_item clothes_detail_item_print Guide_1_20" :class="[driver__.driver?'showEvents':'']">
<div class="clothes_detail_item clothes_detail_item_print">
<div class="clothes_item_header">
<i class="fi fi-rs-comments"></i>
<div>{{ $t('DesignDetail.CurrentPrint') }}</div>
<i class="fi fi-rr-edit" @click.stop="openCurrent(2)"></i>
</div>
<div class="centent_div" v-if="designItemDetail?.clothes?.[currentIndex]?.printObject?.prints[0]?.path" @click="openCurrent(2)">
<img :src="designItemDetail?.clothes?.[currentIndex]?.printObject?.prints[0]?.path" alt="">
<div class="Guide_1_20" :class="[driver__.driver?'showEvents':'']">
<div class="centent_div" v-if="designItemDetail?.clothes?.[currentIndex]?.printObject?.prints[0]?.path" @click="openCurrent(2)">
<img :src="designItemDetail?.clothes?.[currentIndex]?.printObject?.prints[0]?.path" alt="">
</div>
<i v-else class="fi fi-rr-picture centent" @click="openCurrent(2)"></i>
</div>
<i v-else class="fi fi-rr-picture centent" @click="openCurrent(2)"></i>
</div>
<div class="clothes_detail_item clothes_detail_item_color">
<div class="clothes_item_header">
@@ -189,6 +192,7 @@ export default defineComponent({
})
provide('driver__',driver__)
let moible:any = isMoible()
provide('moible',moible)
let {t} = useI18n()
return{
designItemDetail,
@@ -319,13 +323,14 @@ export default defineComponent({
},
showDesignDetailModal(data:any,str:string){
this.moible = isMoible()
this.designItemId = data.design.designItemId
this.designOutfitId = data.design.designOutfitId
let url = Https.httpUrls.getDesignDetail + `?designItemId=${data.design.designItemId}&designPythonOutfitId=${data.design.designOutfitId}`
this.parentData = data
this.loadingShow = true
Https.axiosGet(url).then(
(rv: any) => {
async (rv: any) => {
rv.clothes.forEach((item:any)=>{
let a
if(item.layersObject[0].imageCategory.indexOf("back") == -1){
@@ -345,18 +350,19 @@ export default defineComponent({
}else{
this.body = true
}
if(str == 'setDesignItem'){
if(str == 'setDesignItem'){
}else{
this.designShowPrview = 1
}
this.setImgSize()
await this.setImgSize()
this.generateHighDesignImg = rv.highDesignUrl
this.designDetailShow = true
this.loadingShow = false
if(this.driver__.driver){
nextTick().then(()=>{
driverObj__.moveTo(18);
nextTick().then(()=>{
// driverObj__.moveNext();
driverObj__.moveTo(20);
})
}
}
@@ -428,10 +434,12 @@ export default defineComponent({
clearTimeout(onresizeTime)
onresizeTime = setTimeout(async ()=>{
await this_.setImgSize()
},500)
})()
}
this.frontBack = {
front:front,
back:back,

6
src/component/Detail/DesignDetailEnd.vue
View File

@@ -88,8 +88,8 @@
<div v-if="type_ == 2 && current?.printObject?.prints?.[0]?.path != null" @click.stop="setPrint" class="subitOkPreviewBtn Guide_1_23">{{ $t('DesignDetailEnd.Layout') }}</div>
<div v-else-if="type_ == 2 && current?.printObject?.prints?.[0]?.path == null" @click.stop="setPreview" class="subitOkPreviewBtn">{{ $t('DesignDetailEnd.preview') }}</div>
<DesignPrintOperation ref="DesignPrintOperation"></DesignPrintOperation>
<DesignPrintOperationMobile ref="DesignPrintOperationMobile"></DesignPrintOperationMobile>
<DesignPrintOperation v-if="!moible" ref="DesignPrintOperation"></DesignPrintOperation>
<DesignPrintOperationMobile v-else ref="DesignPrintOperationMobile"></DesignPrintOperationMobile>
</div>
<div class="mark_loading" v-show="loadingShow">
<a-spin size="large" />
@@ -120,6 +120,7 @@ export default defineComponent({
let setRevocation = inject('setRevocation')//父组件传过来的数据
let sketchImg = ref({})
let driver__ = inject('driver__')//父组件传过来的数据
let moible = inject('moible')//父组件传过来的数据
//印花
let overallSingle = ref(false)
@@ -138,6 +139,7 @@ export default defineComponent({
setRevocation,
sketchImg,
driver__,
moible,
type_,
overallSingle,
systemDesignerPercentage,

54
src/component/Detail/DesignPrintOperation.vue
View File

@@ -37,28 +37,32 @@
{{ $t('DesignPrintOperation.Single') }}
</div>
</div>
<div v-show="!overallSingle" class="habit_System_Designer">
<a-slider id="system_silder"
v-model:value="systemDesignerPercentage"
@afterChange="systemDesigner"
:tip-formatter="formatter"
>
</a-slider>
</div>
<div v-show="overallSingle" @click="random" class="button_second">{{ $t('DesignPrintOperation.Random') }}</div>
<div v-show="overallSingle" class="print_input">
<input class="search_input" :placeholder="$t('DesignPrintOperation.inputContent')" type="Number" v-model="printAmount" @input="setprintAmount">
<i class="fi fi-rr-trash" @click="deletePrint"></i>
</div>
<div class="designOpenrtion_nav">
<div class="designOpenrtion_single" v-show="overallSingle" v-for="item,index in designOpenrtionList" :key="item" :class="{active:printStyleList[index]?.designOpenrtionBtn?printStyleList[index]?.designOpenrtionBtn:false}">
<img :src="item.path" @click="setpitch(item,index)">
<div class="print_right show_print_right Guide_1_25" :class="[driver__.driver?'showEvents':'']">
<div v-show="!overallSingle" class="habit_System_Designer">
<div class="habit_System_Designer_text">Scale</div>
<a-slider id="system_silder"
v-model:value="systemDesignerPercentage"
@afterChange="systemDesigner"
:tip-formatter="formatter"
>
</a-slider>
</div>
<div class="designOpenrtion_overall" v-show="!overallSingle">
<img :src="designOpenrtionList[0].path">
<div v-show="overallSingle" @click="random" class="button_second">{{ $t('DesignPrintOperation.Random') }}</div>
<div v-show="overallSingle" class="print_input">
<input class="search_input" :placeholder="$t('DesignPrintOperation.inputContent')" type="Number" v-model="printAmount" @input="setprintAmount">
<i class="fi fi-rr-trash" @click="deletePrint"></i>
</div>
<div class="designOpenrtion_nav">
<div class="designOpenrtion_single" v-show="overallSingle" v-for="item,index in designOpenrtionList" :key="item" :class="{active:printStyleList[index]?.designOpenrtionBtn?printStyleList[index]?.designOpenrtionBtn:false}">
<img :src="item.path" @click="setpitch(item,index)">
</div>
<div class="designOpenrtion_overall" v-show="!overallSingle">
<img :src="designOpenrtionList[0].path">
</div>
</div>
<div class="subitOkPreviewBtn Guide_1_25" @click.stop="setPreview">{{ $t('DesignPrintOperation.preview') }}</div>
</div>
<div class="subitOkPreviewBtn Guide_1_25" @click.stop="setPreview">{{ $t('DesignPrintOperation.preview') }}</div>
</div>
</div>
<div class="designOpenrtion_centent" id="designOpenrtionCentent">
@@ -659,6 +663,7 @@ export default defineComponent({
// this.closeModal()
if(this.driver__.driver){
nextTick().then(()=>{
console.log(21321);
driverObj__.moveNext();
})
}
@@ -796,9 +801,9 @@ export default defineComponent({
}
}
.habit_System_Designer {
margin-top: 4rem;
transform: scale(.8);
width: 100%;
margin-top: 1.5rem;
.ant-slider-track,
.ant-slider-rail {
height: .6rem;
@@ -813,6 +818,11 @@ export default defineComponent({
.ant-slider-handle:hover{
box-shadow: 0 0 0 5px rgba(45, 46, 118, 0.2);
}
.habit_System_Designer_text{
font-size: 1.6rem;
color: rgba(0, 0, 0, 0.7);
font-weight: 600;
}
}
.button_second{
margin: 1rem 0;
@@ -877,6 +887,10 @@ export default defineComponent({
width: 80%;
}
}
&.show_print_right{
border: none;
padding: 0;
}
}
}
.designOpenrtion_centent{

57
src/component/Detail/DesignPrintOperationMobile.vue
View File

@@ -36,28 +36,31 @@
{{ $t('DesignPrintOperation.Single') }}
</div>
</div>
<div v-show="!overallSingle" class="habit_System_Designer">
<a-slider id="system_silder"
v-model:value="systemDesignerPercentage"
@afterChange="systemDesigner"
:tip-formatter="formatter"
>
</a-slider>
</div>
<div v-show="overallSingle" @click="random" class="button_second">{{ $t('DesignPrintOperation.Random') }}</div>
<div v-show="overallSingle" class="print_input">
<input class="search_input" :placeholder="$t('DesignPrintOperation.inputContent')" type="Number" v-model="printAmount" @input="setprintAmount">
<i class="fi fi-rr-trash" @click="deletePrint"></i>
</div>
<div class="designOpenrtion_nav">
<div class="designOpenrtion_single" v-show="overallSingle" v-for="item,index in designOpenrtionList" :key="item" :class="{active:printStyleList[index]?.designOpenrtionBtn?printStyleList[index]?.designOpenrtionBtn:false}">
<img :src="item.path" @click="setpitch(item,index)">
<div class="print_right show_print_right Guide_1_25" :class="[driver__.driver?'showEvents':'']">
<div v-show="!overallSingle" class="habit_System_Designer">
<div class="habit_System_Designer_text">Scale</div>
<a-slider id="system_silder"
v-model:value="systemDesignerPercentage"
@afterChange="systemDesigner"
:tip-formatter="formatter"
>
</a-slider>
</div>
<div class="designOpenrtion_overall" v-show="!overallSingle">
<img :src="designOpenrtionList[0].path">
<div v-show="overallSingle" @click="random" class="button_second">{{ $t('DesignPrintOperation.Random') }}</div>
<div v-show="overallSingle" class="print_input">
<input class="search_input" :placeholder="$t('DesignPrintOperation.inputContent')" type="Number" v-model="printAmount" @input="setprintAmount">
<i class="fi fi-rr-trash" @click="deletePrint"></i>
</div>
<div class="designOpenrtion_nav">
<div class="designOpenrtion_single" v-show="overallSingle" v-for="item,index in designOpenrtionList" :key="item" :class="{active:printStyleList[index]?.designOpenrtionBtn?printStyleList[index]?.designOpenrtionBtn:false}">
<img :src="item.path" @click="setpitch(item,index)">
</div>
<div class="designOpenrtion_overall" v-show="!overallSingle">
<img :src="designOpenrtionList[0].path">
</div>
</div>
<div class="subitOkPreviewBtn" @click.stop="setPreview">{{ $t('DesignPrintOperation.preview') }}</div>
</div>
<div class="subitOkPreviewBtn" @click.stop="setPreview">{{ $t('DesignPrintOperation.preview') }}</div>
</div>
</div>
<div class="designOpenrtion_centent" id="designOpenrtionCentent">
@@ -655,6 +658,11 @@ export default defineComponent({
this.loadingShow = false
this.designOpenrtion = false
// this.closeModal()
if(this.driver__.driver){
nextTick().then(()=>{
driverObj__.moveNext();
})
}
}
).catch(res=>{
this.loadingShow = false
@@ -789,9 +797,9 @@ export default defineComponent({
}
}
.habit_System_Designer {
margin-top: 4rem;
transform: scale(.8);
width: 100%;
margin-top: 1.5rem;
.ant-slider-track,
.ant-slider-rail {
height: .6rem;
@@ -806,6 +814,11 @@ export default defineComponent({
.ant-slider-handle:hover{
box-shadow: 0 0 0 5px rgba(45, 46, 118, 0.2);
}
.habit_System_Designer_text{
font-size: 1.6rem;
color: rgba(0, 0, 0, 0.7);
font-weight: 600;
}
}
.button_second{
margin: 1rem 0;
@@ -870,6 +883,10 @@ export default defineComponent({
width: 80%;
}
}
&.show_print_right{
border: none;
padding: 0;
}
}
}
.designOpenrtion_centent{

12
src/component/HomePage/ColorboardUpload.vue
View File

@@ -84,8 +84,8 @@
</div>
</a-upload>
</div>
<div class="upload_color Guide_1_11">
<div v-for="color,index in selectColorList" :key="color" @click="setUplpadColor(color)" class="upload_color_item" :class="[ index == 1?'Guide_1_11_2':'']">
<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_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> -->
@@ -387,9 +387,11 @@ export default defineComponent({
this.selectColorList = selectColorList
this.getHsvColor(selectColorList)
this.selectColor = {rgba:{r:color[0],g:color[1],b:color[2],a:1},hex:colorHex}
if(this.driver__.driver){
driverObj__.moveNext()
}
nextTick().then(()=>{
if(this.driver__.driver){
driverObj__.moveNext()
}
})
};
},100)

14
src/component/HomePage/SketchboardUpload.vue
View File

@@ -65,7 +65,7 @@
></div>
</div>
<div
class="category_list Guide_1_14"
class="category_list Guide_1_13_1"
v-show="file.categoryShow"
>
<div
@@ -348,7 +348,7 @@ export default defineComponent({
handler(newVal:any,oldVal:any){
if(newVal.length>=2 && this.driver__.driver&& newVal.length!=oldVal.length){
if(this.driver__.driver){
// driverObj__.moveTo(17)
driverObj__.moveTo(16)
}
}
}
@@ -460,11 +460,9 @@ export default defineComponent({
showFileCategory(file: any) {
file.categoryShow = true;
console.log(12312312);
nextTick().then(()=>{
if(this.driver__.driver){
driverObj__.moveNext()
driverObj__.moveTo(15)
}
})
@@ -486,6 +484,12 @@ export default defineComponent({
file.categoryValue = cate.value;
file.category = cate.name;
this.store.commit("setSketchboardFile", this.fileList);
nextTick().then(()=>{
if(this.driver__.driver){
driverObj__.moveNext()
// driverObj__.moveTo(13)
}
})
}
},
hiddenFileCategory() {

2
src/lang/en.ts
View File

@@ -301,7 +301,7 @@ export default {
Overall:'Overall',
Single:'Single',
NewColor:'New Color',
preview:'preview',
preview:'Preview',
Layout:'Layout',
jsContent1:'Please select print',
},

51
src/tool/guide.js
View File

@@ -32,28 +32,27 @@ const driverObj__ = driver({
{ element: '.Guide_1_8', popover: { title: '', description: 'Click here for next step.' } },
{ element: '.Guide_1_2', popover: { title: '', description: 'Upload two sketches for your collection on this page' } },
{ element: '.Guide_1_14', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_13', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_13', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_13', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_14', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_15', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_16', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_17', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_18', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_19', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_20', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_21', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_22', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_23', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_24', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_25', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_26', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_27', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_28', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_29', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_30', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_16', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_13', popover: { title: '', description: 'Upload or select two sketches for your collection on this page.' } },
{ element: '.Guide_1_13_1', popover: { title: '', description: 'Choose correct category for the sketch.' } },
{ element: '.Guide_1_14', popover: { title: '', description: 'After you have confirmed categories of sketches are correct, click here to complete the uploading process.' } },
//开始design
{ element: '.Guide_1_15', popover: { title: '', description: 'Click here to let AI generate design illustrations.' } },
{ element: '.Guide_1_16', popover: { title: '', description: 'Please wait a few seconds.' } },
{ element: '.Guide_1_17', popover: { title: '', description: 'Click on any design image you are interested in to modify the details.' } },
// { element: '.Guide_1_18', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_19', popover: { title: '', description: 'Click on the clothes to modify its details.' } },
{ element: '.Guide_1_20', popover: { title: '', description: 'Click here to add or change the print.' } },
{ element: '.Guide_1_21', popover: { title: '', description: 'You can find the print you uploaded earlier in your Library.' } },
{ element: '.Guide_1_22', popover: { title: '', description: 'Select a print for this sketch.' } },
{ element: '.Guide_1_23', popover: { title: '', description: 'Click here to layout the selected print' } },
// { element: '.Guide_1_24', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_25', popover: { title: '', description: 'Preview printed design here.' } },
{ element: '.Guide_1_26', popover: { title: '', description: 'Click here to finalize your modification.' } },
{ element: '.Guide_1_27', popover: { title: '', description: 'You can change the mannequin and other settings in Workspace.' } },
{ element: '.Guide_1_28', popover: { title: '', description: 'Change the mannequin here.' } },
{ element: '.Guide_1_29', popover: { title: '', description: 'Select a mannequin of your choice from our system library.' } },
{ element: '.Guide_1_30', popover: { title: '', description: 'Click the ‘Redesign’ button to generate new results using the selected mannequin.' } },
{ element: '.Guide_1_99', popover: { title: 'Begin Your Design', description: '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/" target="_blank"></a>' } },
],
// showProgress: true,//控制总页数和当前页数是否显示
allowClose:false,
@@ -68,7 +67,7 @@ const driverObj__ = driver({
// prevBtnText: '‹—',
doneBtnText: '✕',
onPopoverRender: (popover, options) => {//每个步骤的元素和所有信息
console.log(popover,options);
// console.log(popover,options,element);
if(element){
element.classList.remove('Guide_')
}
@@ -81,8 +80,8 @@ const driverObj__ = driver({
}
if(
// options.state.activeIndex >= 1 && options.state.activeIndex <= 2 ||
options.state.activeIndex >= 18 && options.state.activeIndex < 19 ||
options.state.activeIndex >= 24 && options.state.activeIndex < 25 ||
// options.state.activeIndex >= 18 && options.state.activeIndex < 19 ||
// options.state.activeIndex >= 24 && options.state.activeIndex < 25 ||
driverObj__.isLastStep()
){
popover.footer.style.display = 'block'
@@ -93,6 +92,7 @@ const driverObj__ = driver({
removeDiv(options.state.activeElement)
driver.classList.remove('showEvents')
}
// console.log(options.state.activeIndex);
driverIndex__ = driverObj__.getState().activeIndex
data = {
@@ -102,7 +102,6 @@ const driverObj__ = driver({
store?.commit("setGuide", data);
element = options.state.activeElement
element.classList.add('Guide_')
},
//销毁前
onDestroyStarted:()=>{