aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

付款详情新增字段

Browse Source
This commit is contained in:
X1627315083
2025-01-15 11:23:23 +08:00
parent e0aceccb19
commit 5c7782113c
5 changed files with 42 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/component/Administrator/Transaction/TransactionTable.vue
View File

@@ -268,6 +268,14 @@ export default defineComponent({
width:100,
fixed: "left",
sorter: true,
},
{
title: "Payer",
align: "center",
dataIndex: "payer",
key: "payer",
width:150,
ellipsis:true,
},
{
title: "Platform",

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

@@ -550,7 +550,6 @@ export default defineComponent({
display: flex;
flex-direction: column;
flex-shrink: 0;
width: 50%;
// width: 50rem*1.2);
.switch_type_list {
display: flex;
@@ -640,6 +639,7 @@ export default defineComponent({
flex: 1;
margin-left: calc(3rem*1.2);
display: flex;
min-width: calc(57rem*1.2);
flex-direction: column;
overflow: hidden;
.modal_layout,.modal_accomplish{

5
src/component/WorksPage/newScaleImageMobile.vue
View File

@@ -7,6 +7,7 @@
:footer="null"
:get-container="() => $refs.newScaleImageMobileModal"
width="100%"
height="70%"
:maskClosable="false"
:centered="true"
:closable="false"
@@ -630,6 +631,10 @@ export default defineComponent({
background: #39215b;
}
}
.generalModel_closeIcon{
border-radius: 50%;
background: #949494;
}
.newScaleImageMobile_modal {
box-shadow: none;
height: 100%;

81
src/tool/canvasGeneralCopy.js
View File

@@ -401,7 +401,8 @@ class MyCanvas {
}
});
}
if(str == 'dashed' || str == 'dashedPencil' || str != 'movePosition'){
if(str == 'dashed' || str == 'dashedPencil'){
// if(str == 'dashed' || str == 'dashedPencil' || str != 'movePosition'){
if(this.layer.selectLayer.group.custom.groupType == 'Grid')this.setGroupGrid('all')
this.clipPath = {
isImg:false,
@@ -474,7 +475,7 @@ class MyCanvas {
// }
this.dashed.state = false
}
let dashedGroup = MyCanvas.canvas.getObjects().filter(obj => obj.custom.dashed)[0];
let dashedGroup = MyCanvas.canvas.getObjects().filter(obj => obj?.custom?.dashed)[0];
if(this.dashed.state && (this.operation == 'dashed' || this.operation == 'dashedPencil') && dashedGroup)return
if(!this.dashed.state && (this.operation == 'dashed' || this.operation == 'dashedPencil') && !event.target?.custom?.dashed && dashedGroup){
MyCanvas.canvas.remove(dashedGroup)
@@ -624,12 +625,13 @@ class MyCanvas {
});
MyCanvas.canvas.bringToFront(this.createPatterning.polyLineBtn);//设置优先级最高
}else if(this.operation){
console.log(23232);
this.createPatterning.state = false
MyCanvas.canvas.renderAll();
if(this.operation == 'dashed'){
await this.setDashed(this.createPatterning.current)
}else{
this.addLayer({target:this.createPatterning.current})
this.addLayer({target:this.createPatterning?.current})
this.setOperation('movePosition')
}
this.clearPatterning()//临时图形置为空并且添加撤回对象里面
@@ -693,71 +695,9 @@ class MyCanvas {
dashed:true
}
})
console.log(223);
MyCanvas.canvas.add(group)
})
// this.addLayer({target:obj})//更新参数
// for (let index = 0; index < elements.length; index++) {
// const item = elements[index];
// await new Promise((resolve, reject) => {
// if(this.isAddToLayer(item)){
// item.clone((cloned)=>{
// this.setClone(item,cloned)
// if(item.custom?.layerId != -1){
// temporar.add(cloned)
// }
// resolve()
// })
// }
// })
// }
// const {left,height,top,width} = position
// let scale = 1.2/MyCanvas.canvas.getZoom()<1?1.2:1.2/MyCanvas.canvas.getZoom()
// let data = temporar.toDataURL({left,height:height+scale,top,width:width+scale});
// let img = await this.createImage({minioUrl:data})
// img.set({scaleX:1,scaleY:1})
// MyCanvas.canvas.forEachObject((item) =>{
// if(item.custom.isSelectable)return
// if(!this.isAddToLayer(item))return
// let imgScale = {
// pX:(item.scaleX?item.scaleX:1),
// pY:(item.scaleY?item.scaleY:1),
// }
// let scaleWH = item.width / (item.width * imgScale.pX)
// let rect = new fabric.Rect({
// left:left * scaleWH - item.left - item.width / 2,
// top:top * scaleWH - item.top - item.height / 2,
// width:width * scaleWH,
// height:height * scaleWH,
// })
// let group
// if(item.clipPath){
// item.clipPath.clone(cloned =>{
// group = cloned
// })
// }else{
// group = new fabric.Group([],)
// }
// group.set({
// width:item.width * imgScale.pX,
// height:item.height * imgScale.pY,
// left: -item.width * imgScale.pX / 2,
// top: -item.height * imgScale.pY / 2,
// inverted:true,
// })
// group.add(rect)
// item.set({clipPath:group})
// MyCanvas.canvas.renderAll(); // 请求重绘画布
// })
// img.set({
// left:left,
// top:top,
// custom:{
// layerId:this.layer.selectLayer.id,
// },
// // hasControls:false,
// })
// MyCanvas.canvas.add(img)
}
async setGridOrObject(id,str){
this.layer.list.forEach((item) => {
@@ -897,7 +837,6 @@ class MyCanvas {
async setLiquefactionImgObj(liquefaction,data){
if(liquefaction.type == 'upImgFiles'){
await new Promise((resolve, reject) => {
console.log(liquefaction.img);
liquefaction.img.setSrc(data, (value)=>{
delete liquefaction.img.minioUrl
resolve()
@@ -1229,7 +1168,6 @@ class MyCanvas {
setMove(){
MyCanvas.canvas.isDrawingMode = false
MyCanvas.canvas.forEachObject((obj) =>{
console.log(obj,this.isSelectable(obj));
if(this.isSelectable(obj)){
obj.selectable = true
}else{
@@ -1533,7 +1471,11 @@ class MyCanvas {
item.moveTo(index)
})
if(!options?.target?.custom?.dashed && this.layer.selectLayer.group.custom.groupType == 'Grid')this.setGroupGrid('all')
if(!options?.target?.custom?.dashed && this.layer.selectLayer.group.custom.groupType == 'Grid'){
console.log(this.layer.selectLayer.group);
this.layer.selectLayer.group.add(options.target)
// this.setGroupGrid('all')
}
MyCanvas.canvas.renderAll();
@@ -1930,7 +1872,6 @@ class MyCanvas {
if(str == 'loadingCompleted'){
// this.reverseCanvasState.push(canvasAsJson);
}
console.log(JSON.parse(canvasAsJson))
this.normalCanvasState.push({canvasAsJson,layerList,layerId});
if (this.isLoadCanvas) {
this.reverseCanvasState = []

20
src/views/HomeView/HomeView.vue
View File

@@ -398,8 +398,8 @@ export default defineComponent({
let collItemDom = ref()
let domHidden = ref(JSON.parse(sessionStorage.getItem('domHidden') as any) || false);
let recycleDomHidden = ref(false);
if(likeDesignCollectionList.value.length>0){
JSON.parse(sessionStorage.getItem('recycleDomHidden') as any) || false
if(designCollectionList.value.length>0){
recycleDomHidden.value = JSON.parse(sessionStorage.getItem('recycleDomHidden') as any) || false
}
let getDesignTime = null as any;
const setSystemDesigner = (time:any)=>{
@@ -433,7 +433,19 @@ export default defineComponent({
})
},time)
}
const setDesignItemStyle = ()=>{
posiitonData.value.generateElList = []
let elArr = collItemDom.value.querySelectorAll('.content_img_GetWidth')
designCollectionList.value.forEach((item:any,index:any)=>{
posiitonData.value.generateElList.push({
el: elArr[index],
sort: designCollectionList.value.length - index - 1,
index: designCollectionList.value.length - index - 1,
userLikeSortId:item.designItemId
});
})
}
const setDeleteDesign = (index:any)=>{
store.commit("setDeleteDesignCollectionList",index);
@@ -629,6 +641,7 @@ export default defineComponent({
chooseIsDesign,
portfolio,
setSystemDesigner,
setDesignItemStyle,
showDesignMark,
...toRefs(collItemSize),
likeItemDom,
@@ -792,6 +805,7 @@ export default defineComponent({
// };
// designDetail.showDesignDetailModal(data);
this.setSystemDesigner(0)
this.setDesignItemStyle()
},
directives:{
mousewheel:{