push Develop
This commit is contained in:
@@ -4,16 +4,16 @@
|
||||
<div>Works</div>
|
||||
</div> -->
|
||||
<div class="modal_title_text modal_search">
|
||||
<div v-for="item in worksType" :key="item" v-show="isScroll?true:(item.value != 'myWorks')" class="modal_title_text_assistant" @click="setWorksSelect(item)" :class="{active:item.value == worksSelect}">
|
||||
<div v-for="item in worksType" :key="item" v-show="isScroll?true:(item.value != 'myWorks' && item.value !='favoriteWorks')" class="modal_title_text_assistant" @click="setWorksSelect(item)" :class="{active:item.value == worksSelect}">
|
||||
{{ item.name }}
|
||||
</div>
|
||||
<div class="modal_search_menu">
|
||||
<!-- <div class="modal_search_menu">
|
||||
<generalMenu :dataList="menuList" @setprintModel="setprintModel" :item="selectMenu"></generalMenu>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
<div class="page_content" >
|
||||
<Falls ref="fall" @loadend="isShowMark = false" :isScroll="isScroll" @getImgScale="getImgScale"></Falls>
|
||||
<div class="page_loading_box">
|
||||
<Falls ref="fall" @loadend="isShowMark = false" @setPortfolioLike="setPortfolioLike" :isScroll="isScroll" @getImgScale="getImgScale"></Falls>
|
||||
<div class="page_loading_box" v-show="!isNoData">
|
||||
<span class="page_loading" v-show="!isShowMark"></span>
|
||||
<span v-show="isShowMark">
|
||||
<a-spin size="large" />
|
||||
@@ -64,13 +64,17 @@ export default defineComponent({
|
||||
name: '全部',
|
||||
value: 'all'
|
||||
},
|
||||
// {
|
||||
// name: 'generate',
|
||||
// value: 'generate'
|
||||
// },
|
||||
// {
|
||||
// name: 'freehand sketching',
|
||||
// value: 'freehandSketching'
|
||||
// },
|
||||
{
|
||||
name: 'generate',
|
||||
value: 'generate'
|
||||
},
|
||||
{
|
||||
name: 'freehand sketching',
|
||||
value: 'freehandSketching'
|
||||
name: 'Favorite Works',
|
||||
value: 'favoriteWorks'
|
||||
},
|
||||
{
|
||||
name: 'My Works',
|
||||
@@ -194,6 +198,8 @@ export default defineComponent({
|
||||
}
|
||||
],
|
||||
getListDate:{
|
||||
"getLikePortfolio": 0,
|
||||
"getMyPortfolio": 0,
|
||||
page:1,
|
||||
size:10,
|
||||
},
|
||||
@@ -229,6 +235,19 @@ export default defineComponent({
|
||||
let fall:any = ref()
|
||||
let setWorksSelect = (val:any) => {
|
||||
filter.worksSelect = val.value
|
||||
if(val.value == 'all'){
|
||||
filter.getListDate.getLikePortfolio = 0
|
||||
filter.getListDate.getMyPortfolio = 0
|
||||
}else if(val.value == 'favoriteWorks'){
|
||||
filter.getListDate.getLikePortfolio = 1
|
||||
filter.getListDate.getMyPortfolio = 0
|
||||
}else if(val.value == 'myWorks'){
|
||||
filter.getListDate.getMyPortfolio = 1
|
||||
filter.getListDate.getLikePortfolio = 0
|
||||
}
|
||||
filter.getListDate.page = 0
|
||||
fall.value.clearData()
|
||||
getPorfolio()
|
||||
}
|
||||
let likeFile = (item:any,type:string) => {
|
||||
}
|
||||
@@ -237,24 +256,41 @@ export default defineComponent({
|
||||
newScaleImage.value.init(item)
|
||||
}
|
||||
let getPorfolio = ()=>{
|
||||
// let data = filter.getListDate
|
||||
// Https.axiosPost(Https.httpUrls.getPorfolio, data)
|
||||
// .then((rv) => {
|
||||
// console.log(rv);
|
||||
// filter.worksList = rv.content
|
||||
// })
|
||||
// .catch((rv) => {});
|
||||
let data = filter.getListDate
|
||||
console.log(123123);
|
||||
|
||||
if(filter.isShowMark && !filter.isNoData)return
|
||||
filter.isShowMark = true
|
||||
setTimeout(() => {
|
||||
filter.isShowMark = false
|
||||
fall.value.push(filter.worksList);
|
||||
}, 1000);
|
||||
Https.axiosPost(Https.httpUrls.getPorfolio, data)
|
||||
.then((rv) => {
|
||||
if (rv.content.length > 0) {
|
||||
filter.isShowMark = false
|
||||
fall.value.push(rv.content);
|
||||
} else {
|
||||
filter.isNoData = true
|
||||
}
|
||||
// filter.worksList = rv.content
|
||||
})
|
||||
.catch((rv) => {});
|
||||
|
||||
// setTimeout(() => {
|
||||
// filter.isShowMark = false
|
||||
// fall.value.push(filter.worksList)
|
||||
// }, 1000);
|
||||
}
|
||||
let {t} = useI18n()
|
||||
let setprintModel= (data:any)=>{
|
||||
selectMenu.value = data
|
||||
}
|
||||
let setPortfolioLike = (value:any) =>{
|
||||
// let data = {id:value.id}
|
||||
// Https.axiosGet(Https.httpUrls.portfolioLike, {params:data})
|
||||
// .then((rv) => {
|
||||
|
||||
// })
|
||||
// .catch((rv) => {
|
||||
// });
|
||||
}
|
||||
onMounted (()=>{
|
||||
getPorfolio()
|
||||
let worksPage:any = document.querySelector('.works_page')
|
||||
@@ -264,6 +300,7 @@ export default defineComponent({
|
||||
// 如果不是相交,则直接返回
|
||||
// console.log(entries[0]);
|
||||
if (!entries[0].intersectionRatio) return;
|
||||
filter.getListDate.page += 1
|
||||
getPorfolio()
|
||||
},
|
||||
// { root:worksPage }
|
||||
@@ -280,6 +317,7 @@ export default defineComponent({
|
||||
getImgScale,
|
||||
t,
|
||||
setprintModel,
|
||||
setPortfolioLike,
|
||||
}
|
||||
},
|
||||
data() {
|
||||
@@ -365,10 +403,11 @@ export default defineComponent({
|
||||
background: #f7f8fa;
|
||||
.page_loading_box{
|
||||
text-align: center;
|
||||
height: 50px;
|
||||
.page_loading{
|
||||
display: block;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
width: 50px;
|
||||
height: 50px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user