diff --git a/dist.7z b/dist.7z index 704ed151..6913ba9d 100644 Binary files a/dist.7z and b/dist.7z differ diff --git a/src/component/Account/account.vue b/src/component/Account/account.vue index 6a9280e5..57f7a42e 100644 --- a/src/component/Account/account.vue +++ b/src/component/Account/account.vue @@ -50,10 +50,10 @@
{{ userDetail.email }}
- +
diff --git a/src/component/Administrator/coupons/addAllUser.vue b/src/component/Administrator/coupons/addAllUser.vue index a279de62..680c7334 100644 --- a/src/component/Administrator/coupons/addAllUser.vue +++ b/src/component/Administrator/coupons/addAllUser.vue @@ -78,13 +78,24 @@ type="text" style="width: 220px" /> +
+
+ + Start Time: * + + +
End Time: * @@ -156,7 +167,8 @@ export default defineComponent({ title: "", }); let operationsData = reactive({ - rangePickerValue: "", + endTime: "", + startTime: "", percentOff: "", commissionRate: "", maxRedemptions: "", @@ -178,12 +190,17 @@ export default defineComponent({ operationsData.cooperator = data.cooperator; operationsData.paidCommission = data.paidCommission; operationsData.remark = data.remark; - operationsData.rangePickerValue = dayjs( + operationsData.endTime = dayjs( new Date(data.redeemBy * 1000).toISOString().split("T")[0], "YYYY/MM/DD" ); + operationsData.startTime = dayjs( + new Date(data.startTime * 1000).toISOString().split("T")[0], + "YYYY/MM/DD" + ); + console.log(data) - // operationsData.rangePickerValue='2024-08-05T00:00:06' + // operationsData.endTime='2024-08-05T00:00:06' // operationsData.validEndTime='2024-08-05T00:00:06' // operationsData.commissionRate = data.commissionRate // operationsData.maxRedemptions = data.maxRedemptions @@ -192,20 +209,23 @@ export default defineComponent({ } }; let setAddData = () => { - const timestampMs = - new Date(operationsData.rangePickerValue).getTime() / 1000; // 直接获取毫秒时间戳 + const emdTimeMs = + new Date(operationsData.endTime).getTime() / 1000; // 直接获取毫秒时间戳 + const startTimeMs = + new Date(operationsData.startTime).getTime() / 1000; // 直接获取毫秒时间戳 return { percentOff: operationsData.percentOff, maxRedemptions: operationsData.maxRedemptions, commissionRate: operationsData.commissionRate, - timestamp: timestampMs, + endTime: emdTimeMs, + startTime: startTimeMs, cooperator: operationsData.cooperator, remark: operationsData.remark, }; }; let setEditData = () => { const timestampMs = - new Date(operationsData.rangePickerValue).getTime() / 1000; // 直接获取毫秒时间戳 + new Date(operationsData.endTime).getTime() / 1000; // 直接获取毫秒时间戳 return { id: operationsData.id, paidCommission: operationsData.commissionRate, @@ -214,7 +234,8 @@ export default defineComponent({ }; }; let cancelDsign = () => { - operationsData.rangePickerValue = ""; + operationsData.endTime = ""; + operationsData.startTime = ""; operationsData.percentOff = ""; operationsData.commissionRate = ""; operationsData.maxRedemptions = ""; @@ -228,7 +249,7 @@ export default defineComponent({ let data; if (operations.title == "Add") { data = setAddData(); - if (!data.commissionRate || !data.timestamp || !data.percentOff) + if (!data.commissionRate || !data.startTime || !data.percentOff || !data.endTime) return message.warning("Please check the input box marked with *"); Https.axiosPost(Https.httpUrls.createCoupon, data).then((rv) => { if (rv) { diff --git a/src/component/Canvas/CanvasEditor/components/ToolsSidebar.vue b/src/component/Canvas/CanvasEditor/components/ToolsSidebar.vue index c3c2ab46..9f795b96 100644 --- a/src/component/Canvas/CanvasEditor/components/ToolsSidebar.vue +++ b/src/component/Canvas/CanvasEditor/components/ToolsSidebar.vue @@ -18,7 +18,7 @@ const emit = defineEmits([ "undo-redo-status-changed", "trigger-library" ]); -const {t} = useI18n() +const {t,locale} = useI18n() const props = defineProps({ activeTool: String, minimapEnabled: { @@ -166,6 +166,16 @@ const normalToolsList = ref([ icon: { name: "CFont", size: "20" }, class: "text-btn", }, + { + id: "help", + title: t("Canvas.help"), + action: () => openTutorial(), + icon: { name: "CHelp", size: "30" }, + class: "text-btn", + style: { + 'margin-top': 'auto', + }, + }, ]); // 红绿图模式工具列表 @@ -244,6 +254,14 @@ function addText() { emit("add-text"); } +function openTutorial() { + if(locale == 'ENGLISH'){ + window.open('https://aida-user-manual.super.site/specific-scenarios/freely-sketching-in-canvas', '_blank'); + }else{ + window.open('https://aida-user-manual-chinese.super.site/%e4%bd%bf%e7%94%a8%e7%94%bb%e5%b8%83%e8%bf%9b%e8%a1%8c%e7%bc%96%e8%be%91 ', '_blank'); + } +} + function undo() { if (!canUndo.value) return; undoFun(); diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 90c2b06d..c088e087 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -357,7 +357,7 @@ export default defineComponent({ designSingleItemDTOList:clothes, isPreview:true, // ifSubmit:designItemDetail.isPreview, - gender:workspace?.sex == 'Male'?1:0, + gender:workspace?.sex, sketchString:'', modelId:(detailData.currentDetailType == 'models' && detailData.designDetail.newModel)?detailData.designDetail.newModel.id:detailData.designDetail.oldModel?detailData.designDetail.oldModel.id:'', modelType:(detailData.currentDetailType == 'models' && detailData.designDetail.newModel)?detailData.designDetail.newModel.type:detailData.designDetail.oldModel?detailData.designDetail.oldModel.type:'', @@ -567,15 +567,17 @@ export default defineComponent({ height: 100%; overflow: hidden; &.detailLeft{ - width: 34rem; + width: 30rem; // width: 34rem; display: flex; flex-direction: column; } &.isEditPattern{width: 0px;} &.model{ - width: 50rem; - margin: 0 10rem; + width: 45rem; + // width: 50rem; + margin: 0 8rem; + // margin: 0 10rem; display: flex; flex-direction: column; } diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue index f3386abe..44cc1bbc 100644 --- a/src/component/Detail/canvas/index.vue +++ b/src/component/Detail/canvas/index.vue @@ -16,14 +16,6 @@ imageMode:'contains', }" ref="editCanvas"> - -
@@ -35,6 +27,7 @@ ref="editFrontBack"> -->