2023-11-24-dist

This commit is contained in:
X1627315083
2023-11-24 16:18:44 +08:00
parent dc2385a5a5
commit e908818d8d
40 changed files with 454 additions and 295 deletions

1
dist/css/180.2125670a.css vendored Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

1
dist/css/468.bf097f98.css vendored Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

1
dist/css/826.3dbf20b0.css vendored Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

1
dist/css/946.6b599249.css vendored Normal file

File diff suppressed because one or more lines are too long

1
dist/css/949.3b1596c4.css vendored Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

BIN
dist/img/裁剪后1.aaa6c811.jpg vendored Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 39 KiB

BIN
dist/img/裁剪后2.1d40a106.jpg vendored Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 81 KiB

BIN
dist/img/裁剪后3.1fa5ced1.jpg vendored Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

2
dist/index.html vendored
View File

@@ -1 +1 @@
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>AiDA</title><link rel="stylesheet" href="./css/googleapis.css"><link rel="stylesheet" href="./css/roboto.css"><script defer="defer" src="/js/chunk-vendors.9c1ca004.js"></script><script defer="defer" src="/js/app.8b46e86f.js"></script><link href="/css/chunk-vendors.5e9dbdc9.css" rel="stylesheet"><link href="/css/app.d89b5b7b.css" rel="stylesheet"></head><body><script src="./js/color-thief.js"></script><noscript><strong>We're sorry but aida doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>AiDA</title><link rel="stylesheet" href="./css/googleapis.css"><link rel="stylesheet" href="./css/roboto.css"><script defer="defer" src="/js/chunk-vendors.9c1ca004.js"></script><script defer="defer" src="/js/app.2f8a659a.js"></script><link href="/css/chunk-vendors.5e9dbdc9.css" rel="stylesheet"><link href="/css/app.75908b6d.css" rel="stylesheet"></head><body><script src="./js/color-thief.js"></script><noscript><strong>We're sorry but aida doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

59
dist/js/180.db93bd6f.js vendored Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

1
dist/js/468.6361b38d.js vendored Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

1
dist/js/946.b6c37147.js vendored Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 89 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 81 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

View File

@@ -303,6 +303,7 @@ li {
bottom: 0;
top: auto;
margin: 0 9rem;
z-index: 10001;
}
.modal_component.ant-modal {
top: 0;
@@ -385,6 +386,12 @@ li {
.operate_file_block .select_img_type .category_list .category_item:hover {
background: linear-gradient(-137deg, #eeefdb, #e7dbed);
}
.ant-modal-wrap {
z-index: 10003 ;
}
.driver-overlay-animated {
z-index: 10002 !important;
}
.habit :deep(.ant-btn:hover),
:deep(.ant-btn:focus),
:deep(.ant-btn:active),

View File

@@ -340,6 +340,7 @@ ul,li{
bottom: 0;
top: auto;
margin: 0 9rem;
z-index: 10001;
}
//弹窗公共样式
@@ -442,9 +443,12 @@ ul,li{
}
}
}
// .ant-modal-wrap{
// z-index: 10001;
// }
.ant-modal-wrap{
z-index: 10003 ;
}
.driver-overlay-animated{
z-index: 10002 !important;
}
// .ant-select-dropdown{
// z-index: 10001;
// }

View File

@@ -1,7 +1,8 @@
<template>
<div>
<!-- designDetailShow -->
<a-modal class="design_detail_modal_component"
<a-modal class="design_detail_modal_component Guide_1_18"
:class="[driver__.driver?'hideEvents':'']"
v-model:visible="designDetailShow"
:footer="null"
width="65%"
@@ -25,18 +26,18 @@
<div class="detail_modal_body_img">
<!-- <img class="detial_img" :src="designItemDetail.designItemUrl"> -->
<div v-show="imgDesignImg" class="detail_modal_body">
<div v-show="imgDesignImg" class="detail_modal_body Guide_1_19" :class="[driver__.driver?'hideEvents':'']">
<div class="detail_modal_body_nav">
<div v-for="item,index in designItemDetail?.clothes" :class="{active:item.clothesOpen}" @click="clothesOpen(index)">
<img :src="item?.path" alt="">
</div>
</div>
<div class="detail_modal_model_content">
<div class="detail_modal_item_back" :class="{active:body}" v-for="item,index in frontBack.back" :style="item.style">
<div class="detail_modal_item_back Guide_" :class="{active:body}" v-for="item,index in frontBack.back" :style="item.style">
<img :src="item.imageUrl" alt="">
</div>
<img class="detail_modal_model" :src="frontBack.body?.layersObject[0]?.imageUrl" alt="">
<div class="detail_modal_item_front" :class="{active:body}" v-for="item,index in frontBack.front" :style="item.style" @click.stop="clothesDetail(item,index)">
<div class="detail_modal_item_front Guide_" :class="{active:body}" v-for="item,index in frontBack.front" :style="item.style" @click.stop="clothesDetail(item,index)">
<img :src="item.imageUrl" alt="">
</div>
</div>
@@ -62,7 +63,7 @@
{{ $t('DesignDetail.Submit') }}
</div>
</div>
<div class="detail_modal_body_category">
<div class="detail_modal_body_category Guide_1_20" :class="[driver__.driver?'hideEvents':'']">
<div v-show="designOrder" class="detail_modal_right_top scroll_style">
<div class="clothes_detail_item clothes_detail_item_apparel">
<div class="clothes_item_header">
@@ -127,7 +128,7 @@
</template>
<script lang="ts">
import { defineComponent,computed,ref,provide } from 'vue'
import { defineComponent,computed,ref,provide,nextTick } from 'vue'
import DesignDetailAlter from '@/component/Detail/DesignDetailAlter.vue'
import magnifyingGlass from '@/component/Detail/magnifyingGlass.vue'
import setDesignItem from '@/component/Detail/setDesignItem.vue'
@@ -135,6 +136,7 @@ import Draggable from 'vuedraggable'
import { Https } from "@/tool/https";
import {getUploadUrl,isMoible} from '@/tool/util'
import { useStore } from "vuex";
import { openGuide,driverObj__ } from "@/tool/guide";
import GO from '@/tool/GO';
import { setCookie, getCookie, WriteCookie } from "@/tool/cookie";
import { useI18n } from 'vue-i18n'
@@ -177,6 +179,10 @@ export default defineComponent({
let setRevocationShow = ref(false)//判断是不是第一次进来和切换下一张
let oppositeRevocationShow:any = ref()
let revocationShow:any = ref()
let driver__:any = computed(()=>{
return store.state.Guide.guide
})
provide('driver__',driver__)
let {t} = useI18n()
return{
@@ -196,6 +202,7 @@ export default defineComponent({
setRevocationShow,
oppositeRevocationShow,
revocationShow,
driver__,
t,
}
},
@@ -336,10 +343,17 @@ export default defineComponent({
this.generateHighDesignImg = rv.highDesignUrl
this.designDetailShow = true
this.loadingShow = false
if(this.driver__.driver){
nextTick().then(()=>{
driverObj__.moveTo(18);
})
}
}
).catch(rv=>{
this.loadingShow = false
})
},
async setImgSize(){
let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))

View File

@@ -162,10 +162,12 @@
<span>{{ $t('DesignDetailAlter.Palette') }}</span>
</div>
<div class="color_setting_block">
<Sketch class="sketch_color" v-model="selectColor" :show.sync="colorPickerVisible"/>
<!-- <Sketch class="sketch_color" v-model="selectColor" :show.sync="colorPickerVisible"/> -->
<!-- <Chrome class="chrome_color" v-model="selectColor"></Chrome> -->
<Chrome class="chrome_color" v-model="selectColor"></Chrome>
<!-- <Slider class="sileder_color" v-model="selectColor"></Slider> -->
<div class="color_block">
<!-- <div class="color_block">
<div class="color_left" @click="colorBlockHex = !colorBlockHex">
<div v-show="colorBlockHex">
{{ $t('DesignDetailAlter.HEX') }}
@@ -189,7 +191,7 @@
</div>
</div>
</div>
</div> -->
</div>
</div>
@@ -261,7 +263,7 @@ import GO from "@/tool/GO";
import { useStore } from "vuex";
import { LoadingOutlined } from '@ant-design/icons-vue';
import { message,Upload} from 'ant-design-vue';
import { Sketch} from '@ans1998/vue3-color'
import { Sketch, Chrome} from '@ans1998/vue3-color'
import {getUploadUrl,rgbToHsv} from '@/tool/util'
import DesignDetailEnd from './DesignDetailEnd.vue';
import { getCookie } from "@/tool/cookie";
@@ -269,7 +271,7 @@ import { useI18n } from 'vue-i18n';
export default defineComponent({
props: ["msg"],
components:{
Draggable,Sketch,DesignDetailEnd
Draggable,Sketch,DesignDetailEnd,Chrome
},
setup(prop) {
const store = useStore();
@@ -443,8 +445,12 @@ export default defineComponent({
mounted () {
this.token = getCookie("token") || "";
this.uploadUrl = getUploadUrl();
let dropperDom = document.getElementsByClassName("detail_modal_body_select")[0].getElementsByClassName('vc-sketch-color-wrap')[0]
dropperDom.addEventListener('click',async ()=>{
const backIcon = document.createElement('div');
backIcon.classList.add('vc-sketch-color-wrap')
let dropperDom = document.getElementsByClassName("detail_modal_body_select")[0].getElementsByClassName('vc-chrome-fields-wrap')[0]
console.log(dropperDom);
dropperDom.appendChild(backIcon);
backIcon.addEventListener('click',async ()=>{
try {
const dropper = new EyeDropper();
const result = await dropper.open();
@@ -454,7 +460,6 @@ export default defineComponent({
const g = parseInt(hex.substring(2, 4), 16);
const b = parseInt(hex.substring(4, 6), 16);
this.selectColor = {rgba:{r:r,g:g,b:b,a:1},hex:result.sRGBHex}
// 返回RGB格式的字符串
// return `rgb(${r}, ${g}, ${b})`;
// box.style.backgroundColor = label.textContent = result.sRGBHex;
} catch (e) {
@@ -1314,8 +1319,7 @@ export default defineComponent({
}
}
.color_setting_block{
// width: 16.5rem;
width: 18rem;
width: 16.5rem;
margin: auto;
background: #f0eaee;
@@ -1323,89 +1327,113 @@ export default defineComponent({
overflow: hidden;
// box-shadow: 2px 2px 8px #000;
box-shadow: 2px 2px 8px rgba(0,0,0,.3);
background: linear-gradient(70deg, #eee4f3, #f3f4e6);
.sketch_color{
box-shadow: none;
width: 18rem;
background: rgba(0,0,0,0);
padding-top: 1rem !important;
padding: 0;
.vc-sketch{
}
.vc-sketch-saturation-wrap{
.chrome_color{
width: 16.5rem;
// height: 16.5rem;
overflow: hidden;
background: linear-gradient(70deg, #eee4f3, #f3f4e6);
.vc-chrome-saturation-wrap{
height: 100%;
width: 16rem;
height: 16rem;
max-height: 17rem;
max-width: 17rem;
margin: auto;
margin: .7rem auto;
padding-bottom: 0;
}
.vc-sketch-presets{
display: none;
}
.vc-botton-container{
display: none;
}
.vc-chrome-body{
display: none;
}
.vc-sketch-field{
display: none;
.vc-input__input{
text-align: center;
padding: .4rem 0;
border-radius: 5px;
}
}
.vc-sketch-color-wrap{
border-radius: 5px;
box-shadow: inset 0 0 0 1px #ccc;
.vc-sketch-active-color{
}
.vc-sketch-active-color{
display: none;
}
.vc-checkerboard{
display: none;
}
}
.vc-sketch-color-wrap{
background-image: url(@../../../../assets/images/homePage/dropper.png);
background-size: 1.5rem;
background-repeat: no-repeat;
background-position: 50%;
cursor: pointer;
}
// .vc-sketch-color-wrap{
// display: none;
// }
.vc-sketch-controls{
padding: 0;
width: 90%;
margin: .5rem auto;
.vc-sketch-hue-wrap,.vc-sketch-alpha-wrap{
.vc-hue{
border-radius: 1.5rem;
margin: 0.5rem auto;
margin: 0 auto;
background: rgba(0,0,0,0);
margin-bottom: 2rem;
// display: none;
.vc-chrome-fields-wrap{
margin-top: 5%;
padding: 0;
position: relative;
.vc-chrome-toggle-btn{
width: 3.2rem;
.vc-chrome-toggle-icon{
height: auto;
margin-right: -0.4rem;
margin-top: 0rem;
display: flex;
flex-direction: column;
align-items: center;
svg{
width: 2.4rem !important;
height: 2.4rem !important;
}
}
}
.vc-alpha{
border-radius: 1.5rem;
overflow: hidden;
.vc-chrome-fields{
.vc-chrome-field{
padding-left: .6rem;
}
.vc-input__label{
font-size: 1.6rem;
}
.vc-input__input{
font-size: 1.1rem;
height: 2.1rem;
}
}
.ant-upload-list{
}
.vc-sketch-color-wrap{
background-image: url(@../../../../assets/images/homePage/dropper.png);
background-image: url(@../../../../assets/images/homePage/裁剪后1.jpg);
background-image: url(@../../../../assets/images/homePage/裁剪后2.jpg);
background-image: url(@../../../../assets/images/homePage/裁剪后3.jpg);
background-size: 1.5rem;
background-repeat: no-repeat;
background-position: 50%;
cursor: pointer;
margin: 0;
width: 2.2rem;
height: 2.2rem;
padding: .7rem;
border: 1px solid;
position: absolute;
bottom: -.5rem;
right: .5rem;
border-radius: .5rem;
}
.vc-chrome-fields{
.vc-input__label{
margin-top: 1rem;
}
}
}
.vc-sketch-alpha-wrap{
margin-top: .5rem;
.vc-chrome-controls{
align-items: center;
flex-direction: row-reverse;
.vc-chrome-color-wrap{
// width: 3.6rem;
width: auto;
.vc-chrome-active-color,.vc-checkerboard{
width: 3rem;
height: 3rem;
}
}
.vc-chrome-hue-wrap,.vc-chrome-alpha-wrap{
.vc-hue{
border-radius: 15px;
}
.vc-alpha{
border-radius: 15px;
overflow: hidden;
}
}
.vc-chrome-hue-wrap{
margin-bottom: .5rem;
}
}
}
}
.chrome_color{
width: 16.5rem;
height: 16.5rem;
overflow: hidden;
.vc-chrome-saturation-wrap{
height: 100%;
}
.vc-chrome-saturation-wrap .vc-saturation-circle{
width: 1rem;
height: 1rem;

View File

@@ -22,10 +22,10 @@
<span>{{ $t('ColorboardUpload.Palette') }}</span>
</div>
<div class="color_setting_block">
<Sketch class="sketch_color" v-model="selectColor" :show.sync="colorPickerVisible"/>
<!-- <Chrome class="chrome_color" v-model="selectColor"></Chrome> -->
<!-- <Sketch class="sketch_color" v-model="selectColor" :show.sync="colorPickerVisible"/> -->
<Chrome class="chrome_color" v-model="selectColor"></Chrome>
<!-- <Slider class="sileder_color" v-model="selectColor"></Slider> -->
<div class="color_block">
<!-- <div class="color_block">
<div class="color_left" @click="colorBlockHex = !colorBlockHex">
<div v-show="colorBlockHex">
{{ $t('ColorboardUpload.HEX') }}
@@ -48,7 +48,7 @@
<div class="rgb_item">{{getSelectRGB(selectColor).b}}</div>
</div>
</div>
</div>
</div> -->
</div>
<!-- <div class="color_review_block">
<div class="clear_button" @click="clearCurrentColor()">Clear</div>
@@ -117,7 +117,7 @@
</div>
</template>
<script>
import { Chrome,Slider,Sketch,Material,Compact,Swatches,Photoshop } from '@ans1998/vue3-color'
import { Chrome,Slider,Sketch,Material,Compact,Swatches,} from '@ans1998/vue3-color'
import { Https } from "@/tool/https";
import GO from "@/tool/GO";
import { defineComponent, h,ref,inject } from 'vue'
@@ -133,7 +133,7 @@ export default defineComponent({
components:{
Chrome,
Slider,
Sketch
Sketch,
},
setup(){
let fileList = ref([])
@@ -214,8 +214,11 @@ export default defineComponent({
mounted(){
this.token = getCookie('token') || ''
this.uploadUrl = getUploadUrl()
let dropperDom = document.getElementsByClassName("colorboard_upload_modal")[0].getElementsByClassName('vc-sketch-color-wrap')[0]
dropperDom.addEventListener('click',async ()=>{
const backIcon = document.createElement('div');
backIcon.classList.add('vc-sketch-color-wrap')
let dropperDom = document.getElementsByClassName("colorboard_upload_modal")[0].getElementsByClassName('vc-chrome-fields-wrap')[0]
dropperDom.appendChild(backIcon);
backIcon.addEventListener('click',async ()=>{
try {
const dropper = new EyeDropper();
const result = await dropper.open();
@@ -231,26 +234,26 @@ export default defineComponent({
} catch (e) {
message.info(this.t('ColorboardUpload.jsContent1'))
}
})
},false)
this.clearSelectColor()
// if ("EyeDropper" in window) {
// console.log(true);
// }
// else {
// console.log(false);
// }
if ("EyeDropper" in window) {
console.log(true);
}
else {
console.log(false);
}
},
methods:{
clearSelectColor(){
let colorBg0 = document.getElementsByClassName('colorboard_upload_modal')[0].getElementsByClassName('color_block_bg')[0]
let colorBg1 = document.getElementsByClassName('colorboard_upload_modal')[0].getElementsByClassName('color_block_bg')[1]
if(this.selectColor?.rgba?.r || this.selectColor?.rgb?.r){
colorBg0.style.opacity = 1
colorBg1.style.opacity = 1
}else{
colorBg0.style.opacity = 0
colorBg1.style.opacity = 0
}
// let colorBg0 = document.getElementsByClassName('colorboard_upload_modal')[0].getElementsByClassName('color_block_bg')[0]
// let colorBg1 = document.getElementsByClassName('colorboard_upload_modal')[0].getElementsByClassName('color_block_bg')[1]
// if(this.selectColor?.rgba?.r || this.selectColor?.rgb?.r){
// colorBg0.style.opacity = 1
// colorBg1.style.opacity = 1
// }else{
// colorBg0.style.opacity = 0
// colorBg1.style.opacity = 0
// }
},
//选择不同的色块
selectColorItem(index,color){
@@ -674,69 +677,97 @@ export default defineComponent({
overflow: hidden;
// box-shadow: 2px 2px 8px #000;
box-shadow: 2px 2px 8px rgba(0,0,0,.3);
.chrome_color{
width: 16.5rem;
// height: 16.5rem;
overflow: hidden;
background: linear-gradient(70deg, #eee4f3, #f3f4e6);
.sketch_color{
box-shadow: none;
width: 18rem;
background: rgba(0,0,0,0);
padding-top: 1rem !important;
max-width: 17rem;
padding: 0;
.vc-sketch{
}
.vc-sketch-saturation-wrap{
width: 16rem;
height: 16rem;
max-height: 17rem;
max-width: 17rem;
margin: auto;
padding-bottom: 0;
}
.vc-sketch-presets{
display: none;
}
.vc-botton-container{
display: none;
}
.vc-chrome-body{
display: none;
}
.vc-sketch-field{
display: none;
.vc-input__input{
text-align: center;
padding: .4rem 0;
border-radius: 5px;
}
}
.vc-sketch-color-wrap{
border-radius: 5px;
box-shadow: inset 0 0 0 1px #ccc;
.vc-sketch-active-color{
}
.vc-sketch-active-color{
display: none;
}
.vc-checkerboard{
display: none;
}
}
.vc-sketch-color-wrap{
background-image: url(@../../../../assets/images/homePage/dropper.png);
background-size: 1.5rem;
background-repeat: no-repeat;
background-position: 50%;
cursor: pointer;
.vc-chrome-saturation-wrap{
height: 100%;
width: 16rem;
height: 16rem;
max-height: 17rem;
max-width: 17rem;
margin: .7rem auto;
padding-bottom: 0;
}
.vc-chrome-body{
padding: 0;
width: 90%;
margin: 0.5rem auto;
margin: 0 auto;
background: rgba(0,0,0,0);
margin-bottom: 2rem;
// display: none;
.vc-chrome-fields-wrap{
margin-top: 5%;
padding: 0;
position: relative;
.vc-chrome-toggle-btn{
width: 3.2rem;
.vc-chrome-toggle-icon{
height: auto;
margin-right: -0.4rem;
margin-top: 0rem;
display: flex;
flex-direction: column;
align-items: center;
svg{
width: 2.4rem !important;
height: 2.4rem !important;
}
}
}
.vc-chrome-fields{
.vc-chrome-field{
padding-left: .6rem;
}
.vc-input__label{
font-size: 1.6rem;
}
.vc-input__input{
font-size: 1.1rem;
height: 2.1rem;
}
}
.ant-upload-list{
}
.vc-sketch-color-wrap{
background-image: url(@../../../../assets/images/homePage/dropper.png);
background-size: 1.5rem;
background-repeat: no-repeat;
background-position: 50%;
cursor: pointer;
margin: 0;
width: 2.2rem;
height: 2.2rem;
padding: .7rem;
border: 1px solid;
position: absolute;
bottom: -.5rem;
right: .5rem;
border-radius: .5rem;
}
.vc-chrome-fields{
.vc-input__label{
margin-top: 1rem;
}
}
}
// .vc-sketch-color-wrap{
// display: none;
// }
.vc-sketch-controls{
width: 90%;
margin: .5rem auto;
.vc-sketch-hue-wrap,.vc-sketch-alpha-wrap{
.vc-chrome-controls{
align-items: center;
flex-direction: row-reverse;
.vc-chrome-color-wrap{
// width: 3.6rem;
width: auto;
.vc-chrome-active-color,.vc-checkerboard{
width: 3rem;
height: 3rem;
}
}
.vc-chrome-hue-wrap,.vc-chrome-alpha-wrap{
.vc-hue{
border-radius: 15px;
}
@@ -745,24 +776,17 @@ export default defineComponent({
overflow: hidden;
}
}
.vc-sketch-alpha-wrap{
margin-top: .5rem;
.vc-chrome-hue-wrap{
margin-bottom: .5rem;
}
}
}
.chrome_color{
width: 16.5rem;
height: 16.5rem;
overflow: hidden;
.vc-chrome-saturation-wrap .vc-saturation-circle{
width: 1rem;
height: 1rem;
}
}
.vc-chrome-saturation-wrap{
height: 100%;
}
.vc-chrome-saturation-wrap .vc-saturation-circle{
width: 1rem;
height: 1rem;
}
}
.sileder_color{
margin-top:1.3rem;

View File

@@ -66,7 +66,7 @@
<div v-show="exportNav[4].change" class="img_block_item img_block_item_sketch_like h50">
<div class="lager_img_item" v-for="(design) in likeDesignCollectionList" :key="design.designItemUrl">
<div class="all_img_item_block">
<img class="all_img_content" :src="design.designItemUrl">
<img class="all_img_content" :src="design.designOutfitUrl">
</div>
</div>
</div>

View File

@@ -49,6 +49,9 @@
<SketchboardUpload ref="SketchboardUpload" v-show="collectionStep === 4"></SketchboardUpload>
<!-- <MarketingSketchUpload ref="MarketingSketchUpload" v-show="collectionStep === 5"></MarketingSketchUpload> -->
</div>
<div class="mark_loading" v-show="isShowMark">
<a-spin size="large" />
</div>
</a-modal>
</div>
@@ -64,6 +67,7 @@ import SketchboardUpload from '@/component/HomePage/SketchboardUpload.vue'
import MarketingSketchUpload from '@/component/HomePage/MarketingSketchUpload.vue'
import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
import { Modal,message } from 'ant-design-vue';
import { Https } from "@/tool/https";
import {useStore} from 'vuex'
import { openGuide,driverObj__ } from "@/tool/guide";
import GO from "@/tool/GO";
@@ -84,9 +88,11 @@ export default defineComponent({
return store.state.Guide.guide
})
provide('driver__',driver__)
let isShowMark = ref(false)
return {
driver__,
t,
isShowMark,
}
},
@@ -167,21 +173,46 @@ export default defineComponent({
//完成
finishCollection(){
let colorBoards = this.store.state.UploadFilesModule.colorBoards
if(!colorBoards || colorBoards?.length < 1){
message.info(this.$t('collectionModal.jsContent3'))
return
}
this.isShowMark = true
let sketchList = this.store.state.UploadFilesModule.sketchboard
let arr:any = []
sketchList.forEach((item:any) => {
let obj = {
designType:item.resData.designType,
isPin:item.pin,
level2Type:item.category,
sketchBoardId:item.id
}
arr.push(obj)
});
let data = {sketchBoards:arr}
this.store.commit('clearAllId')
GO.id = 0
this.showCollectionModal =false
this.collectionStep = 1
this.$emit('finishCollection')
this.showCollectionModal =false
this.collectionStep = 1
this.$emit('finishCollection')
if(this.driver__.driver){
driverObj__.moveNext()
}
// let elList = document.querySelectorAll('.img_block_item_sketch img')
// Https.axiosPost(Https.httpUrls.sketchBoardsBoundingBox, data)
// .then((rv: any) => {
// elList.forEach((item:any)=>{
// item.src = item.src
// })
// this.store.commit('clearAllId')
// GO.id = 0
// this.showCollectionModal =false
// this.collectionStep = 1
// this.$emit('finishCollection')
// if(this.driver__.driver){
// driverObj__.moveNext()
// }
// })
// .catch((res) => {
// });
}
}
})

View File

@@ -5,6 +5,10 @@ import { useStore } from "vuex";
let driverIndex__ = 0
let store
let element
let data = {
index:driverIndex__,
driver:true,
}
const driverObj__ = driver({
steps: [
{ element: '#Guide_1_1', popover: { title: 'Title', description: 'Description' } },
@@ -23,6 +27,11 @@ const driverObj__ = driver({
{ element: '.Guide_1_2', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_14', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_15', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_16', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_17', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_18', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_19', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_20', popover: { title: 'Title', description: 'Description' } },
],
// showProgress: true,//控制总页数和当前页数是否显示
@@ -35,12 +44,15 @@ const driverObj__ = driver({
overlayOpacity:.4,
overlay: true,
onPopoverRender: (popover, options) => {//每个步骤的元素和所有信息
// console.log(popover,options);
console.log(popover,options);
if(element){
element.classList.remove('Guide_')
}
popover.previousButton.style.display = 'none'
if(options.state.activeIndex >= 1 && options.state.activeIndex <= 2){
if(
options.state.activeIndex >= 1 && options.state.activeIndex <= 2 ||
options.state.activeIndex >= 18 && options.state.activeIndex <= 19
){
popover.footer.style.display = 'block'
addDiv(options.state.activeElement)
}else{
@@ -49,15 +61,24 @@ const driverObj__ = driver({
}
// console.log(options.state.activeIndex);
driverIndex__ = driverObj__.getState().activeIndex
let data = {
index:driverIndex__,
driver:true,
}
data.index = driverIndex__
store?.commit("setGuide", data);
element = options.state.activeElement
element.classList.add('Guide_')
},
//销毁前
onDestroyStarted:()=>{
// data.driver = false
store?.commit("setGuide", data);
driverObj__.destroy();//销毁方法
},
//销毁前
onDestroyed:()=>{
},
// onNextClick:(element, step, options) =>{
// console.log(element,step,options);
// driverObj__.moveNext()
@@ -100,7 +121,12 @@ function removeDiv(element){
const openGuide = () =>{
// driverObj__.drive();
store = useStore()
// driverObj__.moveTo(18);
let data = {
index:driverIndex__,
driver:false,
}
store?.commit("setGuide", data);
// driverObj__.moveNext();
// driverObj__.movePrevious();
}

View File

@@ -158,7 +158,7 @@ export const Https = {
generateLike:'/api/generate/like',//喜欢ganerate图片
generateDislike:'/api/generate/dislike',//喜欢ganerate图片
elementUpload:`/api/element/upload`,//上传图片
sketchBoardsBoundingBox:`/design/sketchBoardsBoundingBox`,//裁剪sketch图片
sketchBoardsBoundingBox:`/api/design/sketchBoardsBoundingBox`,//裁剪sketch图片
},
axiosGet(url,config) {

View File

@@ -1,5 +1,5 @@
<template>
<div class="home_page">
<div class="home_page .Guide_1_16">
<HeaderComponent></HeaderComponent>
<div class="page_content">
<!-- <img class="page_content_bg" src="@/assets/images/homePage/bg.png" /> -->
@@ -69,11 +69,11 @@
</div>
<div class="right_content_body">
<div class="right_content_img_block scroll_style" v-mousewheel :class="{active:designCollectionList.length != 0}">
<div class="right_content_img_block scroll_style Guide_1_17" v-mousewheel :class="{active:designCollectionList.length != 0}">
<div class="right_content_img_item">
<!-- <draggable
group="people" > -->
<div class="content_img_block" v-for="(
<div class="content_img_block hideEvents" v-for="(
design, index
) in designCollectionList" :key="design?.designItemId" @click="
designDetail(
@@ -82,16 +82,17 @@
designCollectionList,
'dislike'
)
">
<div class="content_img_flex">
<img class="content_img" :src="design.designOutfitUrl" />
</div>
<div class="icon iconfont icon-jushoucang icon_like" @click.stop="
likeDesignCollection(
design,
index
)
"></div>
">
<div class="content_img_flex">
<img class="content_img" :src="design.designOutfitUrl" />
</div>
<div class="icon iconfont icon-jushoucang icon_like" @click.stop="
likeDesignCollection(
design,
index
)
">
</div>
</div>
<!-- </draggable> -->
@@ -293,6 +294,9 @@ export default defineComponent({
let isShowOperate = ref(false)
let userInfo:any = {}
let {t} = useI18n()
let driver__:any = computed(()=>{
return store.state.Guide.guide
})
return {
store,
likeDesignCollectionList,
@@ -306,6 +310,7 @@ export default defineComponent({
isShowOperate,
userInfo,
t,
driver__
};
},
data() {
@@ -437,6 +442,14 @@ export default defineComponent({
let collectionModal: any = this.$refs.collectionModal;
this.store.commit("clearAllData");
collectionModal.changeCollectionModal(true);
console.log(this.driver__.driver);
if(this.driver__.driver){
nextTick().then(()=>{
driverObj__.moveNext();
})
}
},
//recollection
@@ -510,6 +523,11 @@ export default defineComponent({
return;
}
let data = this.getDesignData("");
if(this.driver__.driver){
nextTick().then(()=>{
driverObj__.moveNext();
})
}
Https.axiosPost(Https.httpUrls.designCollection, data)
.then((rv: any) => {
@@ -527,6 +545,11 @@ export default defineComponent({
this.store.commit("setDesignId", rv.designId);
// this.designProgress = 0;
this.startDesignType = "design";
if(this.driver__.driver){
nextTick().then(()=>{
driverObj__.moveNext();
})
}
}
})
.catch((res) => {
@@ -975,6 +998,8 @@ export default defineComponent({
type: type,
};
designDetail.showDesignDetailModal(data);
},
//完成单个图片设计

View File

@@ -591,7 +591,7 @@ export default defineComponent({
generateDetailId:item.id,
level1Type:this.selectCode,
level2Type: designType,
gender:this.sex.name,
gender:this.sex.value,
timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone
}
Https.axiosPost(Https.httpUrls.generateLike, data).then(
@@ -923,7 +923,7 @@ export default defineComponent({
file:event.file,
level1Type:this.selectCode,
level2Type:designType,
sex:this.selectCode == 'Sketchboard' ? this.sex.name:'',
sex:this.selectCode == 'Sketchboard' ? this.sex.value:'',
modelType:'',
checkMd5:1,
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
@@ -992,7 +992,7 @@ export default defineComponent({
level1Type:this.selectCode,
level2Type:designType,
page:this.currentPage,
modelSex:this.sex.name?this.sex.name:'',
modelSex:this.sex.value?this.sex.value:'',
pictureName:this.searchPictureName,
size:this.pageSize,
intersection:this.intersection,
@@ -1123,7 +1123,7 @@ export default defineComponent({
text:this.captionGeneration,
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
version:this.selectCode == 'Printboard'?this.printModel.num:1,//为1就是Print
gender:this.selectCode == 'Sketchboard'?this.sex.name:'',
gender:this.selectCode == 'Sketchboard'?this.sex.value:'',
}
if(generateType == 'image'||generateType == 'text-image'){
if(generageImg?.id){