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-04 13:14:29 +08:00
parent bcb6483ce0
commit c42d7632ee
9 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dist/css/186.e306a42b.css vendored
View File

File diff suppressed because one or more lines are too long

1
dist/css/855.b14f028c.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

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.d0ecdfe2.js"></script><link href="/css/chunk-vendors.5e9dbdc9.css" rel="stylesheet"><link href="/css/app.2dce6a51.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.11ed7739.js"></script><link href="/css/chunk-vendors.5e9dbdc9.css" rel="stylesheet"><link href="/css/app.2dce6a51.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>

6
dist/js/186.e32891ac.js → dist/js/855.0f9ddeb5.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/js/app.d0ecdfe2.js → dist/js/app.11ed7739.js vendored
View File

File diff suppressed because one or more lines are too long

28
src/component/HomePage/NewCollectionReview.vue
View File

@@ -90,7 +90,8 @@ export default defineComponent({
}, },
data(){ data(){
return{ return{
asda:{}, imgOpen:true,
} }
}, },
watch: { watch: {
@@ -99,7 +100,10 @@ export default defineComponent({
// this.sketchList = [] // this.sketchList = []
// this.sketch = [[],[],[]] // this.sketch = [[],[],[]]
// this.sketchList = this.allBoardData.sketchboardFiles // this.sketchList = this.allBoardData.sketchboardFiles
this.setSketch() if(JSON.stringify(newVal)!=JSON.stringify(oldVal)){
this.setSketch()
}
}, },
immediate: true immediate: true
}, },
@@ -107,10 +111,13 @@ export default defineComponent({
}, },
mounted () { mounted () {
}, },
methods: { methods: {
setSketch(){ setSketch(){
if(!this.imgOpen){
return
}
this.imgOpen = false
this.sketch = [[],[],[]] this.sketch = [[],[],[]]
nextTick().then(async ()=>{ nextTick().then(async ()=>{
let sketch1:any = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item0')[0]?.getBoundingClientRect() let sketch1:any = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item0')[0]?.getBoundingClientRect()
@@ -119,21 +126,21 @@ export default defineComponent({
sketch1.num = 0 sketch1.num = 0
sketch2.num = 1 sketch2.num = 1
sketch3.num = 2 sketch3.num = 2
let aaa = JSON.parse(JSON.stringify(this.sketchList))
if(this.sketchList){ if(this.sketchList){
for (let i = 0; i < aaa.length; i++) { for (let i = 0; i < this.sketchList.length; i++) {
let arr = [sketch1,sketch2,sketch3] let arr = [sketch1,sketch2,sketch3]
let image = new Image() let image = new Image()
image.src = aaa[i].urlWithWhiteSide image.src = this.sketchList[i].urlWithWhiteSide
arr.sort((a,b)=>{ arr.sort((a,b)=>{
var a_num = a["height"]; var a_num = a["height"];
var b_num = b["height"]; var b_num = b["height"];
return a_num - b_num; return a_num - b_num;
}) })
// console.log(arr); // console.log(arr);
this.sketch[arr[0].num]?.push(aaa[i]) this.sketch[arr[0].num]?.push(this.sketchList[i])
// console.log([sketch1.height,sketch2.height,sketch3.height]); // console.log([sketch1.height,sketch2.height,sketch3.height]);
await new Promise((resolve:any)=>{ await new Promise((resolve:any)=>{
image.onload = ()=>{ image.onload = ()=>{
nextTick().then(()=>{ nextTick().then(()=>{
sketch1 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item0')[0]?.getBoundingClientRect() sketch1 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item0')[0]?.getBoundingClientRect()
@@ -143,15 +150,18 @@ export default defineComponent({
sketch1.num = 0 sketch1.num = 0
sketch2.num = 1 sketch2.num = 1
sketch3.num = 2 sketch3.num = 2
resolve()
}) })
setTimeout(()=>{
resolve()
},200)
} }
}) })
} }
this.imgOpen = true
this.store.commit('setshowSketchList', this.sketch) this.store.commit('setshowSketchList', this.sketch)
} }
}) })
} }
} }
}) })

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

@@ -928,6 +928,8 @@ export default defineComponent({
} }
.submit_button { .submit_button {
margin: 2rem auto 0; margin: 2rem auto 0;
position: relative;
z-index: 2;
} }
} }
.mark_loading{ .mark_loading{

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

@@ -1000,6 +1000,8 @@ export default defineComponent({
} }
.submit_button { .submit_button {
margin: 2rem auto 0; margin: 2rem auto 0;
position: relative;
z-index: 2;
} }
} }
.mark_loading{ .mark_loading{

1
src/views/HomeView.vue
View File

@@ -825,6 +825,7 @@ export default defineComponent({
}; };
// console.log(data); // console.log(data);
this.store.commit("setAllBoardDataChoose", collectionData); this.store.commit("setAllBoardDataChoose", collectionData);
// this.store.commit('clearShowSketchboard')
this.store.commit("setShowSketchboard", data.collection.sketchBoards); this.store.commit("setShowSketchboard", data.collection.sketchBoards);
this.store.commit( this.store.commit(
"setDesignCollectionId", "setDesignCollectionId",