From f59e2acdacbb6d59ac297c6c690d64332e827630 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 23 Sep 2025 16:03:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E7=AE=B1=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=94=A8=E6=88=B7id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Account/account.vue | 4 +- .../Administrator/coupons/addAllUser.vue | 41 ++++++++++++++----- src/component/HomePage/bindEmail.vue | 1 + src/component/home/design/index.vue | 12 ++++++ src/component/home/newProject/workspace.vue | 4 +- src/store/homeStore/homeStore.ts | 1 - src/views/Administrator.vue | 2 +- 7 files changed, 49 insertions(+), 16 deletions(-) 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/HomePage/bindEmail.vue b/src/component/HomePage/bindEmail.vue index 872278b0..7ffd5464 100644 --- a/src/component/HomePage/bindEmail.vue +++ b/src/component/HomePage/bindEmail.vue @@ -365,6 +365,7 @@ export default defineComponent({ title:this.selectSex, surname:this.surname, givenName:this.givenName, + userId:this.userDetail.userId, }; if(this.loginTime){ this.loginTime = false diff --git a/src/component/home/design/index.vue b/src/component/home/design/index.vue index e33f809e..afbb8946 100644 --- a/src/component/home/design/index.vue +++ b/src/component/home/design/index.vue @@ -1818,7 +1818,19 @@ export default defineComponent({ }, getSkecthBoard(boardData: any) { + console.log(boardData,this.store.state.Workspace.probjects) boardData = boardData || [] + const mapB = new Map(); + boardData.forEach(item => { + if (item.categoryValue !== undefined) { + mapB.set(item.categoryValue, true); + } + }); + + boardData.filter(item => + item.categoryValue !== undefined && mapB.has(item.categoryValue) + ); + console.log(boardData) let sketchBoards = boardData.map((v: any) => { let data = { designType: v.resData.designType, diff --git a/src/component/home/newProject/workspace.vue b/src/component/home/newProject/workspace.vue index c1b1cf92..3c55a263 100644 --- a/src/component/home/newProject/workspace.vue +++ b/src/component/home/newProject/workspace.vue @@ -27,11 +27,11 @@
{{$t('Habit.Gender')}}:
diff --git a/src/store/homeStore/homeStore.ts b/src/store/homeStore/homeStore.ts index a65b145b..ef0780ef 100644 --- a/src/store/homeStore/homeStore.ts +++ b/src/store/homeStore/homeStore.ts @@ -95,7 +95,6 @@ const HomeStoreModule : Module = { } }, setUploadElement(state,data){ - console.log(data) if(data?.isGetModule){ state.uploadElement = [] } diff --git a/src/views/Administrator.vue b/src/views/Administrator.vue index f884ad15..6ea91468 100644 --- a/src/views/Administrator.vue +++ b/src/views/Administrator.vue @@ -4,7 +4,7 @@
-
{{ $t('upgradePlan.Back') }}Back
+
{{ $t('upgradePlan.Back') }}
{{ $t('Header.Administrator') }}