diff --git a/package.json b/package.json index ff06a04d..b450bf69 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "yudao-ui-admin-vue3", - "version": "2.0.1-snapshot", + "version": "2.1.0-snapshot", "description": "基于vue3、vite4、element-plus、typesScript", "author": "xingyu", "private": false, diff --git a/src/api/erp/product/category/index.ts b/src/api/erp/product/category/index.ts index 72f47dc9..d67ccffd 100644 --- a/src/api/erp/product/category/index.ts +++ b/src/api/erp/product/category/index.ts @@ -13,8 +13,8 @@ export interface ProductCategoryVO { // ERP 产品分类 API export const ProductCategoryApi = { // 查询产品分类列表 - getProductCategoryList: async (params) => { - return await request.get({ url: `/erp/product-category/list`, params }) + getProductCategoryList: async () => { + return await request.get({ url: `/erp/product-category/list` }) }, // 查询产品分类精简列表 diff --git a/src/api/infra/demo/demo02/index.ts b/src/api/infra/demo/demo02/index.ts index 30e16863..736a1236 100644 --- a/src/api/infra/demo/demo02/index.ts +++ b/src/api/infra/demo/demo02/index.ts @@ -7,8 +7,8 @@ export interface Demo02CategoryVO { } // 查询示例分类列表 -export const getDemo02CategoryList = async (params) => { - return await request.get({ url: `/infra/demo02-category/list`, params }) +export const getDemo02CategoryList = async () => { + return await request.get({ url: `/infra/demo02-category/list` }) } // 查询示例分类详情 diff --git a/src/api/mall/promotion/seckill/seckillConfig.ts b/src/api/mall/promotion/seckill/seckillConfig.ts index e3d618f7..66857df8 100644 --- a/src/api/mall/promotion/seckill/seckillConfig.ts +++ b/src/api/mall/promotion/seckill/seckillConfig.ts @@ -17,6 +17,11 @@ export const SeckillConfigApi = { return await request.get({ url: `/promotion/seckill-config/page`, params }) }, + // 查询秒杀时段列表 + getSimpleSeckillConfigList: async () => { + return await request.get({ url: `/promotion/seckill-config/simple-list` }) + }, + // 查询秒杀时段详情 getSeckillConfig: async (id: number) => { return await request.get({ url: `/promotion/seckill-config/get?id=` + id }) diff --git a/src/api/mall/trade/order/index.ts b/src/api/mall/trade/order/index.ts index 364483b8..37fee8c7 100644 --- a/src/api/mall/trade/order/index.ts +++ b/src/api/mall/trade/order/index.ts @@ -141,7 +141,7 @@ export const getExpressTrackList = async (id: number | null) => { } export interface DeliveryVO { - id: number // 订单编号 + id?: number // 订单编号 logisticsId: number | null // 物流公司编号 logisticsNo: string // 物流编号 } diff --git a/src/components/FormCreate/src/config/useSelectRule.ts b/src/components/FormCreate/src/config/useSelectRule.ts index 3e5f1eb2..ff21a223 100644 --- a/src/components/FormCreate/src/config/useSelectRule.ts +++ b/src/components/FormCreate/src/config/useSelectRule.ts @@ -6,6 +6,7 @@ import { cloneDeep } from 'lodash-es' /** * 通用选择器规则 hook + * * @param option 规则配置 */ export const useSelectRule = (option: SelectRuleOption) => { diff --git a/src/plugins/formCreate/index.ts b/src/plugins/formCreate/index.ts index adc12136..44556de5 100644 --- a/src/plugins/formCreate/index.ts +++ b/src/plugins/formCreate/index.ts @@ -17,6 +17,7 @@ import { import FcDesigner from '@form-create/designer' import formCreate from '@form-create/element-ui' import install from '@form-create/element-ui/auto-import' + //======================= 自定义组件 ======================= import { UploadFile, UploadImg, UploadImgs } from '@/components/UploadFile' import { useApiSelect } from '@/components/FormCreate' diff --git a/src/utils/index.ts b/src/utils/index.ts index 5b29e41a..2590bce8 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -1,4 +1,4 @@ -import {toNumber} from 'lodash-es' +import { toNumber } from 'lodash-es' /** * @@ -445,7 +445,7 @@ export function jsonParse(str: string) { try { return JSON.parse(str) } catch (e) { - console.log(`str[${str}] 不是一个 JSON 字符串`) + console.error(`str[${str}] 不是一个 JSON 字符串`) return '' } } diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue index cef6e8e2..c59b9d22 100644 --- a/src/views/Home/Index.vue +++ b/src/views/Home/Index.vue @@ -62,7 +62,14 @@ @@ -76,13 +83,13 @@ :sm="24" :xs="24" > - +
{{ item.name }}
-
{{ t(item.message) }}
-
+
{{ t(item.message) }}
+
{{ item.personal }} {{ formatTime(item.time, 'yyyy-MM-dd') }}
@@ -204,45 +211,45 @@ let projects = reactive([]) const getProject = async () => { const data = [ { - name: 'Github', + name: 'ruoyi-vue-pro', icon: 'akar-icons:github-fill', - message: 'workplace.introduction', - personal: 'Archer', + message: 'https://github.com/YunaiV/ruoyi-vue-pro', + personal: 'Spring Boot 单体架构', time: new Date() }, { - name: 'Vue', + name: 'yudao-ui-admin-vue3', icon: 'logos:vue', - message: 'workplace.introduction', - personal: 'Archer', + message: 'https://github.com/yudaocode/yudao-ui-admin-vue3', + personal: 'Vue3 + element-plus', time: new Date() }, { - name: 'Angular', - icon: 'logos:angular-icon', - message: 'workplace.introduction', - personal: 'Archer', + name: 'yudao-ui-admin-vben', + icon: 'logos:vue', + message: 'https://github.com/yudaocode/yudao-ui-admin-vben', + personal: 'Vue3 + vben(antd)', time: new Date() }, { - name: 'React', - icon: 'logos:react', - message: 'workplace.introduction', - personal: 'Archer', + name: 'yudao-cloud', + icon: 'akar-icons:github', + message: 'https://github.com/YunaiV/yudao-cloud', + personal: 'Spring Cloud 微服务架构', time: new Date() }, { - name: 'Webpack', - icon: 'logos:webpack', - message: 'workplace.introduction', - personal: 'Archer', + name: 'yudao-ui-mall-uniapp', + icon: 'logos:vue', + message: 'https://github.com/yudaocode/yudao-ui-admin-uniapp', + personal: 'Vue3 + uniapp', time: new Date() }, { - name: 'Vite', - icon: 'vscode-icons:file-type-vite', - message: 'workplace.introduction', - personal: 'Archer', + name: 'yudao-ui-admin-vue2', + icon: 'logos:vue', + message: 'https://github.com/yudaocode/yudao-ui-admin-vue2', + personal: 'Vue2 + element-ui', time: new Date() } ] @@ -254,27 +261,27 @@ let notice = reactive([]) const getNotice = async () => { const data = [ { - title: '系统升级版本', + title: '系统支持 JDK 8/17/21，Vue 2/3', type: '通知', - keys: ['通知', '升级'], + keys: ['通知', '8', '17', '21', '2', '3'], date: new Date() }, { - title: '系统凌晨维护', + title: '后端提供 Spring Boot 2.7/3.2 + Cloud 双架构', type: '公告', - keys: ['公告', '维护'], + keys: ['公告', 'Boot', 'Cloud'], date: new Date() }, { - title: '系统升级版本', + title: '全部开源，个人与企业可 100% 直接使用，无需授权', type: '通知', - keys: ['通知', '升级'], + keys: ['通知', '无需授权'], date: new Date() }, { - title: '系统凌晨维护', + title: '国内使用最广泛的快速开发平台，超 300+ 人贡献', type: '公告', - keys: ['公告', '维护'], + keys: ['公告', '最广泛'], date: new Date() } ] diff --git a/src/views/ai/chat/index.vue b/src/views/ai/chat/index.vue new file mode 100644 index 00000000..bc846a3d --- /dev/null +++ b/src/views/ai/chat/index.vue @@ -0,0 +1,166 @@ + + + diff --git a/src/views/crm/business/status/BusinessStatusForm.vue b/src/views/crm/business/status/BusinessStatusForm.vue index 166fa41b..d6a4d6f8 100644 --- a/src/views/crm/business/status/BusinessStatusForm.vue +++ b/src/views/crm/business/status/BusinessStatusForm.vue @@ -100,7 +100,7 @@ const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用 const formType = ref('') // 表单的组：create - 新增；update - 修改 const formData = ref({ - id: 0, + id: undefined, name: '', deptIds: [], statuses: [] @@ -168,7 +168,7 @@ const submitForm = async () => { const resetForm = () => { checkStrictly.value = true formData.value = { - id: 0, + id: undefined, name: '', deptIds: [], statuses: [] diff --git a/src/views/erp/product/category/ProductCategoryForm.vue b/src/views/erp/product/category/ProductCategoryForm.vue index ef4a003e..cef420c7 100644 --- a/src/views/erp/product/category/ProductCategoryForm.vue +++ b/src/views/erp/product/category/ProductCategoryForm.vue @@ -46,7 +46,7 @@