diff --git a/src/component/Account/message/system.vue b/src/component/Account/message/system.vue
index 0ec97451..dc0586d0 100644
--- a/src/component/Account/message/system.vue
+++ b/src/component/Account/message/system.vue
@@ -133,8 +133,13 @@ export default defineComponent({
}
.modal_title_text_intro{
margin-left: 4rem;
+
}
}
}
+ .modal_title_text_intro{
+ word-break: break-word;
+ white-space: pre-wrap;
+ }
}
diff --git a/src/component/Administrator/affiliate/affiliateAudit/affiliateAudit.vue b/src/component/Administrator/affiliate/affiliateAudit/affiliateAudit.vue
index 04f5394b..c1d9d698 100644
--- a/src/component/Administrator/affiliate/affiliateAudit/affiliateAudit.vue
+++ b/src/component/Administrator/affiliate/affiliateAudit/affiliateAudit.vue
@@ -69,7 +69,7 @@
Edit
- {{ text }} HDK
+ {{ text }} HKD
@@ -109,20 +109,26 @@ export default defineComponent({
key: "username",
},
{
- title: 'Create Time',
- align: "center",
- width: 200,
- dataIndex: "createTime",
- key: "createTime",
- sorter: true,
- },{
title: 'State',
align: "center",
ellipsis: true,
width: 100,
dataIndex: "status",
key: "status",
-
+ },{
+ title: 'Commission Percent',
+ align: "center",
+ ellipsis: true,
+ width: 100,
+ dataIndex: "commissionPercent",
+ key: "commissionPercent",
+ customRender: (record: any) => {
+ if(record.text){
+ return record.text+'%'
+ }else{
+ return '-'
+ }
+ },
},{
title: 'Total income',
align: "center",
@@ -154,6 +160,13 @@ export default defineComponent({
width: 250,
dataIndex: "link",
key: "link",
+ },{
+ title: 'Create Time',
+ align: "center",
+ width: 200,
+ dataIndex: "createTime",
+ key: "createTime",
+ sorter: true,
},{
title: 'Updata Time',
align: "center",
diff --git a/src/component/Canvas/CanvasEditor/index.vue b/src/component/Canvas/CanvasEditor/index.vue
index 1e77aa0a..6ab169bb 100644
--- a/src/component/Canvas/CanvasEditor/index.vue
+++ b/src/component/Canvas/CanvasEditor/index.vue
@@ -20,11 +20,10 @@ import { SelectionManager } from "./managers/selection/SelectionManager";
import { RedGreenModeManager } from "./managers/RedGreenModeManager";
import texturePresetManager from "./managers/brushes/TexturePresetManager";
import { BrushStore } from "./store/BrushStore";
-import cuowuImg from '@/assets/images/homePage/cuowu.svg'
+import cuowuImg from "@/assets/images/homePage/cuowu.svg";
import { Https } from "@/tool/https";
-import SelectImages from '@/component/common/SelectImages.vue'
-import { UrlToFile } from '@/tool/util'
-
+import SelectImages from "@/component/common/SelectImages.vue";
+import { UrlToFile } from "@/tool/util";
// import { MinimapManager } from "./managers/minimap/MinimapManager";
@@ -105,14 +104,16 @@ const props = defineProps({
type: Boolean,
default: false, // 是否显示固定图层
},
- isGeneral: { // 从generalMiniCanvas来的
+ isGeneral: {
+ // 从generalMiniCanvas来的
type: Boolean,
- default:false
+ default: false,
},
- isEdit: { // 从design点击喜欢过的图片,再点击顶部的编辑图标
+ isEdit: {
+ // 从design点击喜欢过的图片,再点击顶部的编辑图标
type: Boolean,
- default: false
- }
+ default: false,
+ },
});
// 引用和状态
@@ -269,7 +270,7 @@ onMounted(async () => {
layerManager,
activeTool, // 响应式引用，存储当前选中的工具
brushSize: brushSize.value, // 可选，初始画笔大小
- t, // 国际化函数
+ t, // 国际化函数
});
// 初始化文本编辑功能
@@ -416,10 +417,9 @@ onMounted(async () => {
canvasManagerLoaded.value = true;
- // 添加删除按钮
- // if(!fabric.Object.prototype.controls.deleteControl)addRemoveBtn(removeLayer)
- addRemoveBtn(removeLayer)
-
+ // 添加删除按钮
+ // if(!fabric.Object.prototype.controls.deleteControl)addRemoveBtn(removeLayer)
+ addRemoveBtn(removeLayer);
// 触发组件初始化事件
nextTick(() => {
@@ -468,15 +468,15 @@ onMounted(async () => {
// 使用window的resize事件代替ResizeObserver
// 只有当窗口大小变化时才更新画布尺寸
// window.addEventListener("resize", handleWindowResize);
- if(props.config.initZoom) {
- const width = canvasManager.width;
- const height = canvasManager.height;
- const cwidth = props.config.width;
- const cheight = props.config.height;
- let zoom = Math.min(1,width/cwidth,height/cheight);
- if(zoom < 1) zoom -= 0.05;
- setZoom(zoom); // 设置画布缩放
- }
+ if (props.config.initZoom) {
+ const width = canvasManager.width;
+ const height = canvasManager.height;
+ const cwidth = props.config.width;
+ const cheight = props.config.height;
+ let zoom = Math.min(1, width / cwidth, height / cheight);
+ if (zoom < 1) zoom -= 0.05;
+ setZoom(zoom); // 设置画布缩放
+ }
});
watchEffect(() => {
@@ -518,7 +518,7 @@ onBeforeUnmount(() => {
liquifyManager = null;
selectionManager = null;
redGreenModeManager = null;
-// fabric.Object.prototype.controls.deleteControl = undefined;
+ // fabric.Object.prototype.controls.deleteControl = undefined;
// 移除window resize事件监听
// window.removeEventListener("resize", handleWindowResize);
@@ -541,18 +541,17 @@ function handleWindowResize() {
function resetZoom() {
canvasManager.resetZoom();
}
-
function setZoom(zoom) {
- setTimeout(()=>{
- if (!canvasManager) return;
- const newZoom = Math.max(zoom, 0.1); // 减少10%，最小0.1倍
- // 使用画布中心作为缩放点
- const centerPoint = {
- x: canvasManager.canvas.width / 2,
- y: canvasManager.canvas.height / 2,
- };
- canvasManager.animateZoom(centerPoint, newZoom);
- })
+ setTimeout(() => {
+ if (!canvasManager) return;
+ const newZoom = Math.max(zoom, 0.1);
+ // 使用画布中心作为缩放点
+ const centerPoint = {
+ x: canvasManager.canvas.width / 2,
+ y: canvasManager.canvas.height / 2,
+ };
+ canvasManager.animateZoom(centerPoint, newZoom);
+ });
}
function zoomIn() {
@@ -645,35 +644,36 @@ function moveLayerDown(layerId) {
layerManager.moveLayer(layerId, "down");
}
-function addRemoveBtn(fun){//添加删除按钮
- const deleteIcon = cuowuImg
- // 创建删除图片元素
- let deleteImg = document.createElement('img')
- deleteImg.src = deleteIcon
- function renderIcon(icon) {
- return function (ctx, left, top, styleOverride, fabricObject) {
- var size = this.cornerSize;
- ctx.save();
- ctx.translate(left, top);
- ctx.rotate(fabric.util.degreesToRadians(fabricObject.angle));
- ctx.drawImage(icon, -size/3, -size/3, size/1.5, size/1.5);
- ctx.restore();
- }
- }
- fabric.Object.prototype.controls.deleteControl = new fabric.Control({
- x: 0.5,
- y: -0.5,
- offsetY: -16,
- offsetX: 16,
- cursorStyle: 'pointer',
- mouseUpHandler:deleteFun,
- render: renderIcon(deleteImg),
- cornerSize: 24
- })
+function addRemoveBtn(fun) {
+ //添加删除按钮
+ const deleteIcon = cuowuImg;
+ // 创建删除图片元素
+ let deleteImg = document.createElement("img");
+ deleteImg.src = deleteIcon;
+ function renderIcon(icon) {
+ return function (ctx, left, top, styleOverride, fabricObject) {
+ var size = this.cornerSize;
+ ctx.save();
+ ctx.translate(left, top);
+ ctx.rotate(fabric.util.degreesToRadians(fabricObject.angle));
+ ctx.drawImage(icon, -size / 3, -size / 3, size / 1.5, size / 1.5);
+ ctx.restore();
+ };
+ }
+ fabric.Object.prototype.controls.deleteControl = new fabric.Control({
+ x: 0.5,
+ y: -0.5,
+ offsetY: -16,
+ offsetX: 16,
+ cursorStyle: "pointer",
+ mouseUpHandler: deleteFun,
+ render: renderIcon(deleteImg),
+ cornerSize: 24,
+ });
}
-function deleteFun(){
- removeLayer(layerManager.activeLayerId.value)
+function deleteFun() {
+ removeLayer(layerManager.activeLayerId.value);
}
function removeLayer(layerId) {
@@ -748,14 +748,14 @@ function handleImageUpload(event) {
const selectImages = ref(null);
const handleImageSelect = (data) => {
- UrlToFile(data.url,data.name).then((file)=>{
- handleImageUpload({ target: { files: [file] } })
- })
-}
+ UrlToFile(data.url, data.name).then((file) => {
+ handleImageUpload({ target: { files: [file] } });
+ });
+};
function triggerLibrary() {
// console.log('CanvasEditor', '打开收藏')
- if (props.isGeneral || props.isEdit) {
- selectImages.value.init()
+ if (props.isGeneral || props.isEdit) {
+ selectImages.value.init();
} else {
emit("trigger-library");
}
@@ -858,14 +858,14 @@ const changeCanvas = async (command) => {
...command, // 传递完整的命令数据
};
emit("changeCanvas", commandData);
- if(command.canUndo || command.canRedo){
- setTimeout(async ()=>{
- const imageData = await canvasManager.exportImage({
- restoreOpacityInRedGreen: true, // 恢复红绿图模式下的透明度
- isCropByBg:true,
- });
- emit("trigger-red-green-mouseup", imageData);
- },100)
+ if (command.canUndo || command.canRedo) {
+ setTimeout(async () => {
+ const imageData = await canvasManager.exportImage({
+ restoreOpacityInRedGreen: true, // 恢复红绿图模式下的透明度
+ isCropByBg: true,
+ });
+ emit("trigger-red-green-mouseup", imageData);
+ }, 100);
}
};
@@ -939,7 +939,7 @@ defineExpose({
layerId = "", // 导出具体图层ID
layerIdArray = [], // 导出多个图层ID数组
expPicType = "png", // 导出图片类型 JPG 或 PNG ,SVG
- isEnhanceImg, // 是否是增强图片
+ isEnhanceImg, // 是否是增强图片
} = {}) => {
return canvasManager.exportImage({
isContainBg,
@@ -948,7 +948,7 @@ defineExpose({
layerId,
layerIdArray,
expPicType,
- isEnhanceImg,
+ isEnhanceImg,
});
},
/**
@@ -1103,12 +1103,15 @@ defineExpose({
@undo-redo-status-changed="changeCanvas"
@trigger-library="triggerLibrary"
>
-
+
-
+
@@ -1131,14 +1134,14 @@ defineExpose({
-
@@ -1246,7 +1249,8 @@ defineExpose({
flex-direction: column;
/* height: 100vh; */
background-color: #ffffff;
- font-family: pingfang_medium, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
+ font-family: pingfang_medium, -apple-system, BlinkMacSystemFont, "Segoe UI",
+ sans-serif;
position: absolute;
left: 0;
right: 0;
diff --git a/src/component/home/design/index.vue b/src/component/home/design/index.vue
index b7914631..e011db01 100644
--- a/src/component/home/design/index.vue
+++ b/src/component/home/design/index.vue
@@ -1098,8 +1098,11 @@ export default defineComponent({
generateCourseItem.oldSort = generateCourseItem.sort
generateCourseItem.sort = list[index]?.childList.length + 1
if(data.status == 'add'){
- if(str == 'noBatch')upDataSort(generateCourseItem,index,str)
- list[index]?.childList.push(generateCourseItem)
+ if(list[index]?.childList.filter((item:any)=>(item.id == generateCourseItem?.id)).length == 0){
+ if(str == 'noBatch')upDataSort(generateCourseItem,index,str)
+ // list[index]?.childList.push(generateCourseItem)
+ list[index]?.childList.push(generateCourseItem)
+ }
}
}else{
let index = list.findIndex((item:any)=>(item.userLikeSortId == generateCourseItem.parentId))
@@ -1108,8 +1111,10 @@ export default defineComponent({
list[index].childList = []
}
if(data.status == 'add'){
- if(str == 'noBatch')upDataSort(generateCourseItem,index,str)
- list[index]?.childList.push(generateCourseItem)
+ if(list[index]?.childList.filter((item:any)=>(item.id == generateCourseItem?.id)).length == 0){
+ if(str == 'noBatch')upDataSort(generateCourseItem,index,str)
+ list[index]?.childList.push(generateCourseItem)
+ }
}else{
upDataSuccess(generateCourseItem)
// let childIndex = list[index].childList.findIndex((item:any)=>(item.id == generateCourseItem?.oldId || generateCourseItem?.id))
diff --git a/src/component/home/design/tools.vue b/src/component/home/design/tools.vue
index 8bc116ed..09764d2e 100644
--- a/src/component/home/design/tools.vue
+++ b/src/component/home/design/tools.vue
@@ -257,7 +257,7 @@ export default defineComponent({
{value:'disposeMoodboard',name:'Entirety Moodboard',nameCn:'整体情绪版'},
{value:'moodboardFiles',name:'Moodboard',nameCn:'情绪版'},
{value:'printboardFiles',name:'Printboard',nameCn:'印花板'},
- {value:'sketchboardFiles',name:'Sketchboard',nameCn:'整体情绪版'},
+ {value:'sketchboardFiles',name:'Sketchboard',nameCn:'线稿版'},
]
allCollectionStr.forEach((itemStr:any)=>{
let list = [] as any