From 89cd75a6e262c35af445f493afefdedaee9e2fed Mon Sep 17 00:00:00 2001
From: likun <906102152@qq.com>
Date: Fri, 16 May 2025 18:04:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/apps/game/model/cdkey.go           |  2 +-
 admin/internal/errcode/code.go           |  2 ++
 ui/src/components/restful/table.vue      |  2 +-
 ui/src/components/restful/tableCDKey.vue |  2 ++
 ui/src/router/index.js                   |  9 +++++++++
 ui/src/views/user/history.vue            | 11 +++++++++++
 6 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 ui/src/views/user/history.vue

diff --git a/admin/apps/game/model/cdkey.go b/admin/apps/game/model/cdkey.go
index 9236e3f..d23919c 100644
--- a/admin/apps/game/model/cdkey.go
+++ b/admin/apps/game/model/cdkey.go
@@ -19,7 +19,7 @@ type CDKey struct {
 	Name           string            `gorm:"type:varchar(100);uniqueIndex:idx_project_cdkey" name:"礼包说明" required:"true" uneditable:"true"`
 	CodeType       int               `name:"礼包类型" required:"true" choices:"GetCodeTypeChoices" uneditable:"true"`
 	Code           string            `gorm:"type:VARCHAR(50);index" name:"礼包码" desc:"一码通用才配置" uneditable:"true"`
-	CodeNum        int               `name:"礼包数量" desc:"一码一用才配置"`
+	CodeNum        int               `name:"礼包数量" desc:"一码一用才配置，最大礼包数量10万个"`
 	ValidStartTime sql.NullTime      `name:"生效起始时间"`
 	ValidEndTime   sql.NullTime      `name:"生效结束时间"`
 	Attach         []*MailAttachItem `gorm:"type:json;serializer:json" name:"礼包码奖励道具" type:"items" desc:"搜索道具并点击添加"`
diff --git a/admin/internal/errcode/code.go b/admin/internal/errcode/code.go
index e08cc30..6fe26bd 100644
--- a/admin/internal/errcode/code.go
+++ b/admin/internal/errcode/code.go
@@ -1,5 +1,7 @@
 package errcode
 
+// **** 修改了错误码定义，一定要手工项目根目录执行命令生成对应go文件：go generate ./... ****
+
 //go:generate go run ../../cmd/tools/generator/errcode.go
 
 const (
diff --git a/ui/src/components/restful/table.vue b/ui/src/components/restful/table.vue
index 852a166..0a2a7ee 100644
--- a/ui/src/components/restful/table.vue
+++ b/ui/src/components/restful/table.vue
@@ -489,7 +489,7 @@ const handlePaginationCurChange = (val) => {
                 <!--                <el-col :span="calcElColSpan">-->
                 <el-date-picker v-model="fieldDescInfo.value2" type="datetime"
                                 :placeholder="(fieldDescInfo.name + '结束')" format="YYYY/MM/DD HH:mm:ss"
-                                value-format="YYYY/MM/DD HH:mm:ss"></el-date-picker>
+                                value-format="YYYY/MM/DD HH:mm:ss" style="margin-left: 10px"></el-date-picker>
                 <!--                </el-col>-->
               </template>
               <template v-else>
diff --git a/ui/src/components/restful/tableCDKey.vue b/ui/src/components/restful/tableCDKey.vue
index 53e98d2..3f3fefd 100644
--- a/ui/src/components/restful/tableCDKey.vue
+++ b/ui/src/components/restful/tableCDKey.vue
@@ -398,6 +398,8 @@ const handleCodeTypeOnSelect = (codeType) => {
         console.log("校验礼包数量：", codeNum)
         if (dialogObjectForm.value['CodeType'] === 1 && codeNum <= 0) {
           callback(new Error("请至少大于0的奖励码数量！"))
+        } else if (dialogObjectForm.value['CodeType'] === 1 && codeNum > 100000) {
+          callback(new Error("礼包数量最大10万个！！"))
         } else {
           callback()
         }
diff --git a/ui/src/router/index.js b/ui/src/router/index.js
index 92b1324..fa37a2d 100644
--- a/ui/src/router/index.js
+++ b/ui/src/router/index.js
@@ -37,6 +37,15 @@ export const constUserChildrenRoutes = [
             icon: "Avatar",
         },
         component: () => import('@/views/user/character.vue'),
+    },
+    {
+        path: "/userhistory",
+        name: "userhistory",
+        meta: {
+            name: "用户操作记录",
+            icon: "Finished",
+        },
+        component: () => import('@/views/user/history.vue'),
     }
 ]
 
diff --git a/ui/src/views/user/history.vue b/ui/src/views/user/history.vue
new file mode 100644
index 0000000..0afe174
--- /dev/null
+++ b/ui/src/views/user/history.vue
@@ -0,0 +1,11 @@
+<script setup>
+
+</script>
+
+<template>
+  用户执行历史列表，待开发
+</template>
+
+<style scoped>
+
+</style>
\ No newline at end of file