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-07 14:26:21 +08:00
parent 1ffdfba500
commit 6e0cc3156d
11 changed files with 56 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,14 +99,14 @@ li {
padding: 0 1rem;
}
.started_btn {
padding: 0.5rem 2rem;
padding: 0.4rem 1.8rem;
display: inline-block;
border-radius: 2rem;
font-size: 1.2rem;
color: #fff;
background-color: #39215b;
cursor: pointer;
zoom: 0.9;
zoom: 1;
}
.el-cascader {
font-size: 1.2rem;

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

@@ -109,14 +109,14 @@ ul,li{
}
//started公共按钮样式
.started_btn{
padding: .5rem 2rem;
padding: .4rem 1.8rem;
display: inline-block;
border-radius: 2rem;
font-size: 1.2rem;
color: #fff;
background-color: #39215b;
cursor: pointer;
zoom: .9;
zoom: 1;
}

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

@@ -362,7 +362,7 @@ export default defineComponent({
if(this.driver__.driver){
nextTick().then(()=>{
// driverObj__.moveNext();
driverObj__.moveTo(20);
driverObj__.moveTo(21);
})
}
}

2
src/component/Detail/habit.vue
View File

@@ -595,7 +595,7 @@ export default defineComponent({
if(this.driver__.driver){
nextTick().then(()=>{
// driverObj__.moveNext();
driverObj__.moveTo(28);
driverObj__.moveTo(29);
})
}

13
src/component/HomePage/Cropper.vue
View File

@@ -1,5 +1,6 @@
<template>
<a-modal class="modal_component cut_pricture_modal"
<a-modal class="modal_component cut_pricture_modal Guide_1_2_2"
:class="[driver__.driver?'showEvents':'']"
v-model:visible="cutPicuterModal"
:footer="null"
width="65%"
@@ -70,15 +71,22 @@
</a-modal>
</template>
<script lang="ts">
import { defineComponent } from 'vue'
import { defineComponent,inject } from 'vue'
import 'vue-cropper/dist/index.css'
import { VueCropper } from "vue-cropper";
import { openGuide,driverObj__ } from "@/tool/guide";
import {base64toFile} from '@/tool/util'
export default defineComponent({
props:['cropperFileData','isUpload'],
components:{
VueCropper,
},
setup(){
let driver__:any = inject('driver__')
return {
driver__
}
},
data(){
return {
cutPicuterModal:false,
@@ -142,6 +150,7 @@ export default defineComponent({
let file = base64toFile(data,this.cropperFileData.name);
this.$emit('handleCropperSuccess',{file:file, fileData:this.cropperFileData})
})
},
closeCropper(){

2
src/component/HomePage/Generate.vue
View File

@@ -339,7 +339,7 @@ export default defineComponent({
this.store.commit("addGenerateMaterialFils", data);
// console.log(this.fileList);
let moodboard = this.store.state.UploadFilesModule.moodboard
if(moodboard.length >= 3 && this.driver__.driver){
if(moodboard.length >= 1 && this.driver__.driver){
driverObj__.moveNext()
}
},

4
src/component/HomePage/MoodboardUpload.vue
View File

@@ -109,12 +109,12 @@
></Generate>
</div>
<div v-show="moodboarList.length" class="modal_right">
<div class="modal_layout Guide_1_7" :class="[driver__.driver?'showEvents':'']">
<div class="modal_layout">
<div class="modal_text">
<div>
{{ $t('MoodboardUpload.Thumbnail') }}
</div>
<div class="modal_btn started_btn" @click="layout()">{{ $t('MoodboardUpload.layout') }}</div>
<div class="modal_btn started_btn Guide_1_7" :class="[driver__.driver?'showEvents':'']" @click="layout()">{{ $t('MoodboardUpload.layout') }}</div>
</div>
<div class="modal_img" :class="[driver__.driver?'hideEvents':'']">
<div class="modal_img_item" v-for="item,index in moodboarList" :key="item" @click="deleteFile(item)">

31
src/component/HomePage/PrintboardUpload.vue
View File

@@ -51,7 +51,7 @@
</div>
</div>
<div class="upload_file_item upload_component" v-show="printboardList.length < 8">
<div class="upload_file_item upload_component Guide_1_2_1" :class="[driver__.driver?'showEvents':'']" v-show="printboardList.length < 8">
<a-upload
:action="uploadUrl + '/api/element/upload'"
list-type="picture-card"
@@ -62,7 +62,7 @@
:headers="{Authorization:token}"
v-model:file-list="fileList"
:customRequest="function(){}"
multiple
:multiple="!driver__.driver"
:maxCount="8 - printboardList.length+fileList.length"
accept=".jpg,.png,.jpeg,.bmp"
@change="fileUploadChange"
@@ -132,7 +132,7 @@
</div>
</template>
<script lang="ts">
import { defineComponent,h,ref,computed,inject } from 'vue'
import { defineComponent,h,ref,computed,inject, nextTick } from 'vue'
import { LoadingOutlined } from '@ant-design/icons-vue';
import {getCookie} from '@/tool/cookie'
import {getUploadUrl} from '@/tool/util'
@@ -201,9 +201,9 @@ export default defineComponent({
watch:{
printBoards:{
handler(newVal:any,oldVal:any){
if(newVal.length>=2 && this.driver__.driver && newVal.length!=oldVal.length){
driverObj__.moveTo(7)
}
// if(newVal.length>=2 && this.driver__.driver && newVal.length!=oldVal.length){
// driverObj__.moveTo(7)
// }
}
}
},
@@ -250,17 +250,19 @@ export default defineComponent({
},
fileUploadChange(data:any){
let file = data.file
let res = JSON.parse(file.xhr.response);
// let res = JSON.parse(data?.xhr?.response);
file.id_ = GO.id++
file.type_ = {
type1:'upload',
type2:'Printboard'
};
file.pin = false;
file.id = res.data.id
// file.id = res.data.id?res.data.id:""
let Cropper:any = this.$refs.Cropper
if(this.currentFileNum === 1){
var reader = new FileReader();
reader.onload = (e:any) => {
let data_new;
if (typeof e.target.result === 'object') {
@@ -270,6 +272,8 @@ export default defineComponent({
data_new = e.target.result;
}
Cropper.getOptionImg(data_new)
};
// 转化为base64
// reader.readAsDataURL(file)
@@ -277,7 +281,11 @@ export default defineComponent({
reader.readAsArrayBuffer(file.originFileObj);
this.cropperFileData = file
Cropper.changeShowModal(true)
nextTick().then(()=>{
if(this.driver__.driver){
driverObj__.moveNext()
}
})
}else{
this.customRequest(file)
}
@@ -445,6 +453,11 @@ export default defineComponent({
this.cropperFileData = {name:'',uid:''}
this.store.commit('setPrintboardFile',fileList)
hide()
nextTick().then(()=>{
if(this.driver__.driver){
driverObj__.moveNext()
}
})
}
).catch(res=>{
let index = -1

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

@@ -66,6 +66,7 @@
</div>
<div
class="category_list Guide_1_13_1"
:class="[driver__.driver?'showEvents':'']"
v-show="file.categoryShow"
>
<div
@@ -110,7 +111,8 @@
</div>
</div>
<div
class="upload_file_item upload_component"
class="upload_file_item upload_component Guide_1_9"
:class="[driver__.driver?'showEvents':'']"
v-show="sketchboardList.length < 8"
>
<a-upload
@@ -119,10 +121,10 @@
:data="{
...upload,
}"
:multiple="!driver__.driver"
:before-upload="beforeUpload"
:headers="{ Authorization: token }"
v-model:file-list="fileList"
multiple
:maxCount="8 - sketchboardList.length+fileList.length"
accept=".jpg,.png,.jpeg,.bmp"
@change="(file) => fileUploadChange(file)"
@@ -348,7 +350,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(16)
driverObj__.moveTo(17)
}
}
}
@@ -423,7 +425,7 @@ export default defineComponent({
this.store.commit("setSketchboardFile", fileList);
nextTick().then(()=>{
if(this.driver__.driver){
driverObj__.moveTo(14)
driverObj__.moveTo(15)
}
})
@@ -462,7 +464,7 @@ export default defineComponent({
file.categoryShow = true;
nextTick().then(()=>{
if(this.driver__.driver){
driverObj__.moveTo(15)
driverObj__.moveTo(16)
}
})

2
src/lang/en.ts
View File

@@ -215,7 +215,7 @@ export default {
jsContent5:'Please click Layout to sort randomly',
},
Cropper:{
Cutpicture:'Cut picture',
Cutpicture:'Crop image',
Finish:'Finish',
Cancel:'Cancel',
CropPreview:'Crop Preview',

12
src/tool/guide.js
View File

@@ -21,7 +21,8 @@ const driverObj__ = driver({
{ element: '.Guide_1_7', popover: { title: '', description: 'Click here to layout your moodboard.' } },
{ element: '.Guide_1_8', popover: { title: '', description: 'Click here for next step.' } },
//以上moodboard
{ element: '.Guide_1_2', popover: { title: '', description: 'Upload two print images here' } },
{ element: '.Guide_1_2_1', popover: { title: '', description: 'Upload two print images here' } },
{ element: '.Guide_1_2_2', popover: { title: '', description: 'Crop the uploaded image here.' } },
{ element: '.Guide_1_8', popover: { title: '', description: 'Click here for next step.' } },
{ element: '.Guide_1_10', popover: { title: '', description: 'Click here to extract primary colors from image.' } },
{ element: '.Guide_1_11', popover: { title: '', description: 'Select the color you want from these color blocks as the first color.' } },
@@ -30,9 +31,9 @@ const driverObj__ = driver({
{ element: '.Guide_1_11_2', popover: { title: '', description: 'Choose the color you want from these color blocks.' } },
{ 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_9', popover: { title: '', description: 'Upload or select two sketches for your collection on this page.' } },
{ element: '.Guide_1_13', popover: { title: '', description: 'Upload or select two sketches for your collection on this page.' } },
{ element: '.Guide_1_13', popover: { title: '', description: 'Click here to choose a category for the uploaded sketch.' } },
{ 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
@@ -46,7 +47,7 @@ const driverObj__ = driver({
{ 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_25', popover: { title: '', description: 'Preview printed design here.' ,side: "right",align: 'end' } },
{ 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.' } },
@@ -67,7 +68,7 @@ const driverObj__ = driver({
// prevBtnText: '‹—',
doneBtnText: '✕',
onPopoverRender: (popover, options) => {//每个步骤的元素和所有信息
console.log(popover,options,element);
// console.log(popover,options,element);
if(element){
element.classList.remove('Guide_')
}
@@ -84,7 +85,6 @@ const driverObj__ = driver({
// options.state.activeIndex >= 24 && options.state.activeIndex < 25 ||
driverObj__.isLastStep()
){
console.log(driver);
popover.footer.style.display = 'block'
popover.footerButtons.style.pointerEvents = 'auto';
// driver.classList.add('showEvents')