3d添加印花 等
This commit is contained in:
@@ -64,12 +64,23 @@
|
||||
<div style="margin-left:2rem;" @click="deleteBatchPic" class="gallery_btn">Delete</div>
|
||||
</div>
|
||||
<div class="imgBox">
|
||||
<div class="imgItem" v-for="item,index in imgList" :key="item.id" :class="{active:selectImgList.indexOf(item.id) > -1}" @click="selectImg(item)">
|
||||
<Falls ref="fall" @loadend="isShowMark = false" :itemWidth="200" :isScroll="false" :isText="false"></Falls>
|
||||
<div class="page_loading_box" v-show="!isNoData" style="text-align: center;width: 100%;">
|
||||
<span class="page_loading" ref="loadingDom" v-show="!isShowMark"></span>
|
||||
<span v-show="isShowMark">
|
||||
<a-spin size="large" />
|
||||
</span>
|
||||
</div>
|
||||
<div class="imgNull" v-show="isNoData && isNull">
|
||||
<img src="@/assets/images/homePage/null_img.png">
|
||||
</div>
|
||||
|
||||
<!-- <div class="imgItem" v-for="item,index in imgList" :key="item.id" :class="{active:selectImgList.indexOf(item.id) > -1}" @click="selectImg(item)">
|
||||
<img :src="item.url" alt="">
|
||||
<i class="fi fi-rr-trash icon_delete" @click="deleteSinglePic(item,index)"></i>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
<div class="total">
|
||||
<!-- <div class="total">
|
||||
<a-pagination
|
||||
v-model:current="currentPage"
|
||||
v-model:pageSize="pageSize"
|
||||
@@ -78,11 +89,11 @@
|
||||
:showSizeChanger="false"
|
||||
@change="changePage"
|
||||
/>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
<div class="mark_loading" v-show="isShowMark">
|
||||
<!-- <div class="mark_loading" v-show="isShowMark">
|
||||
<a-spin size="large" />
|
||||
</div>
|
||||
</div> -->
|
||||
<Cropper ref="Cropper" @handleCropperSuccess="handleCropperSuccess" :cropperFileData="cropperFileData" :isRound="true"></Cropper>
|
||||
<!-- <loadBrandDNA ref="loadBrandDNA"></loadBrandDNA> -->
|
||||
</div>
|
||||
@@ -97,10 +108,12 @@ import { useI18n } from 'vue-i18n'
|
||||
import Cropper from '@/component/HomePage/Cropper.vue'
|
||||
// import loadBrandDNA from '@/component/LibraryPage/loadBrandDNA.vue'
|
||||
import { getCookie } from "@/tool/cookie";
|
||||
import Falls from "@/component/WorksPage/Falls.vue";
|
||||
|
||||
|
||||
export default defineComponent({
|
||||
components:{
|
||||
Cropper
|
||||
Cropper,Falls
|
||||
},
|
||||
|
||||
emits:['update:isShowMark','handleBack'],
|
||||
@@ -135,14 +148,17 @@ export default defineComponent({
|
||||
schedule:{
|
||||
num:0,
|
||||
state:false
|
||||
}
|
||||
},
|
||||
isNoData:false,//如果数据为空就不加载
|
||||
isNull:true,
|
||||
})
|
||||
const dataDom = reactive({
|
||||
Cropper:null as any,
|
||||
fall:null as any,
|
||||
loadBrandDNA:null as any,
|
||||
loadingDom:null as any,
|
||||
})
|
||||
const customRequest = (event:any)=>{
|
||||
console.log(data.detail)
|
||||
let new_data = {
|
||||
file:event.file,
|
||||
brandId:data.detail.id,
|
||||
@@ -150,11 +166,13 @@ export default defineComponent({
|
||||
data.isShowMark = true
|
||||
Https.axiosPost(Https.httpUrls.brandDNAUpload, new_data,{headers:{'Content-Type': 'multipart/form-data'}}).then(
|
||||
(rv: any) => {
|
||||
getLibraryList()
|
||||
// getLibraryList()
|
||||
rv.canvasUrl = rv.minIOPath
|
||||
dataDom.fall.push([rv]);
|
||||
data.isShowMark = false
|
||||
}
|
||||
).catch((res)=>{
|
||||
getLibraryList()
|
||||
// getLibraryList()
|
||||
data.isShowMark = false
|
||||
});
|
||||
}
|
||||
@@ -187,16 +205,39 @@ export default defineComponent({
|
||||
brandId:data.detail.id,
|
||||
// intersection:intersection.value,
|
||||
}
|
||||
if(data.isShowMark && !data.isNoData)return
|
||||
data.isShowMark = true
|
||||
Https.axiosPost(Https.httpUrls.queryLibraryPage,value).then(
|
||||
(rv: any) => {
|
||||
data.imgList = rv.content
|
||||
data.total = rv.total
|
||||
data.isShowMark = false
|
||||
Https.axiosPost(Https.httpUrls.queryLibraryPage,value)
|
||||
.then((rv) => {
|
||||
if(value.page == 1 && rv.content.length == 0){
|
||||
data.isNull = true
|
||||
}else{
|
||||
data.isNull = false
|
||||
}
|
||||
).catch((res)=>{
|
||||
if (rv.content.length > 0) {
|
||||
data.isNull = false
|
||||
dataDom.fall.push(rv.content);
|
||||
} else {
|
||||
data.isNoData = true
|
||||
}
|
||||
// filter.worksList = rv.content
|
||||
})
|
||||
.catch((rv) => {
|
||||
data.isShowMark = false
|
||||
if(data.currentPage == 1){
|
||||
data.isNull = true
|
||||
}
|
||||
data.isNoData = true
|
||||
});
|
||||
// .then(
|
||||
// (rv: any) => {
|
||||
// data.imgList = rv.content
|
||||
// data.total = rv.total
|
||||
// data.isShowMark = false
|
||||
// }
|
||||
// ).catch((res)=>{
|
||||
// data.isShowMark = false
|
||||
// });
|
||||
}
|
||||
let beforeUpload=(file:any,fileList:any)=>{
|
||||
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg' || file.type === 'image/bmp';
|
||||
@@ -245,11 +286,22 @@ export default defineComponent({
|
||||
data.minioUrl = value.brandLogo
|
||||
clearInterval(data.getProgressTime)
|
||||
getProgress()
|
||||
getLibraryList()
|
||||
// emit("update:isShowMark",true)
|
||||
// setTimeout(()=>{
|
||||
// emit("update:isShowMark",false)
|
||||
// },2000)
|
||||
// getLibraryList()
|
||||
data.isNoData = false
|
||||
data.currentPage = 0
|
||||
dataDom.fall.clearData()
|
||||
dataDom.fall.list = []
|
||||
dataDom.fall.wait_list = []
|
||||
new IntersectionObserver(
|
||||
(entries, observer) => {
|
||||
// 如果不是相交,则直接返回
|
||||
// console.log(entries[0]);
|
||||
if (!entries[0].intersectionRatio) return;
|
||||
data.currentPage+=1
|
||||
getLibraryList()
|
||||
},
|
||||
// { root:worksPage }
|
||||
).observe(dataDom.loadingDom);
|
||||
}
|
||||
const back = ()=>{
|
||||
clearInterval(data.getProgressTime)
|
||||
@@ -369,6 +421,9 @@ export default defineComponent({
|
||||
deleteSinglePic,
|
||||
selectImg,
|
||||
}
|
||||
},
|
||||
directives:{
|
||||
|
||||
},
|
||||
provide() {
|
||||
return {
|
||||
@@ -481,6 +536,14 @@ export default defineComponent({
|
||||
display: flex;
|
||||
align-content: flex-start;
|
||||
flex-wrap: wrap;
|
||||
overflow-y: auto;
|
||||
> .imgNull{
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
> .imgItem{
|
||||
width: 100px;
|
||||
margin: 1rem;
|
||||
|
||||
Reference in New Issue
Block a user