优化
This commit is contained in:
		
							parent
							
								
									2f5c365e1b
								
							
						
					
					
						commit
						89cd75a6e2
					
				@ -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:"搜索道具并点击添加"`
 | 
			
		||||
 | 
			
		||||
@ -1,5 +1,7 @@
 | 
			
		||||
package errcode
 | 
			
		||||
 | 
			
		||||
// **** 修改了错误码定义,一定要手工项目根目录执行命令生成对应go文件:go generate ./... ****
 | 
			
		||||
 | 
			
		||||
//go:generate go run ../../cmd/tools/generator/errcode.go
 | 
			
		||||
 | 
			
		||||
const (
 | 
			
		||||
 | 
			
		||||
@ -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>
 | 
			
		||||
 | 
			
		||||
@ -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()
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
@ -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'),
 | 
			
		||||
    }
 | 
			
		||||
]
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										11
									
								
								ui/src/views/user/history.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								ui/src/views/user/history.vue
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,11 @@
 | 
			
		||||
<script setup>
 | 
			
		||||
 | 
			
		||||
</script>
 | 
			
		||||
 | 
			
		||||
<template>
 | 
			
		||||
  用户执行历史列表,待开发
 | 
			
		||||
</template>
 | 
			
		||||
 | 
			
		||||
<style scoped>
 | 
			
		||||
 | 
			
		||||
</style>
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user