618 Commits

Author	SHA1	Message	Date
xiaobai	ca01b16096	提交订单列表和详情20230619	2023-06-19 15:57:20 +08:00
xiaobai	42a7aec0b5	提交订单页面和详情页面 20230619	2023-06-19 12:42:43 +08:00
YunaiV	91c53e2e3f	code review：订单详情	2023-06-17 21:12:20 +08:00
YunaiV	e3f250fff0	code review：订单列表	2023-06-17 21:02:29 +08:00
芋道源码	867c47de61	!165 trade-order 列表和详情初版 ... Merge pull request !165 from 矿泉水/dev	2023-06-17 11:04:12 +00:00
YunaiV	ae69492b53	code review：spu todo 去掉	2023-06-17 18:48:49 +08:00
YunaiV	7908160e68	Merge branch 'dev-to-dev' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev ... Conflicts: src/utils/dict.ts	2023-06-17 18:45:05 +08:00
YunaiV	5eaf054646	code review：会员积分配置	2023-06-17 18:33:07 +08:00
YunaiV	023539b0db	Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev ... Conflicts: package.json src/utils/dict.ts	2023-06-17 17:40:29 +08:00
YunaiV	8666307d47	code review：处理字典数据的冲突	2023-06-17 17:38:20 +08:00
xiaqing	1dca8476b3	初始化积分模块 ... 1.积分设置管理 2.积分签到规则管理 3.用户积分记录管理 4.用户签到积分管理	2023-06-10 20:57:16 +08:00
puhui999	d31ade7a5f	fix: 完善 SPU 相关路由 review	2023-06-07 18:31:28 +08:00
puhui999	20f3f72670	fix: 数组操作添加 ? 可选操作符，避免属性值为 null 时报错	2023-06-07 08:59:03 +08:00
puhui999	b89db1af55	fix: review	2023-06-06 16:22:58 +08:00
xiaobai	e2d795f49d	add trade order 20230606	2023-06-06 01:36:22 +08:00
xiaobai	ec3b028d55	sync dev-20230606	2023-06-06 01:25:22 +08:00
xiaobai	985d764f62	20230606 add trade-order and details	2023-06-06 01:08:38 +08:00
puhui999	7fe8dee9ed	Merge remote-tracking branch 'yudao/dev' into dev-to-dev	2023-06-05 08:35:39 +08:00
YunaiV	51e76ffd53	code review：优惠劵管理	2023-06-03 23:15:11 +08:00
芋道源码	7c6d7e8061	!164 优惠券迁移vue3 ... Merge pull request !164 from dhb52/dev	2023-06-03 15:02:05 +00:00
puhui999	a1b45f80bc	fix: 优化 spu 相关路由配置	2023-06-03 21:21:43 +08:00
YunaiV	158585670c	code review：商品管理	2023-06-03 20:50:07 +08:00
芋道源码	541b23c8c1	!159 完善商品查看详情，修改了一些问题 ... Merge pull request !159 from puhui999/dev-to-dev	2023-06-03 12:09:43 +00:00
YunaiV	60c1604d49	code review：门店自提、快递运费	2023-06-03 19:52:14 +08:00
xiaobai	505f5cfa0c	临时提交	2023-06-02 16:10:33 +08:00
dhb52	c5a7d05821	style: 添加VO	2023-06-01 18:08:23 +08:00
puhui999	91a5f8044c	Merge remote-tracking branch 'yudao/dev' into dev-to-dev	2023-06-01 11:55:22 +08:00
puhui999	7fb6258bed	fix: 修复善品测试发现的问题	2023-06-01 11:54:39 +08:00
puhui999	6a10a81f58	fix: 引入 v-dompurify-html 指令解决 v-html 的安全隐患	2023-05-31 15:58:35 +08:00
puhui999	2ddb605076	fix: 完善 SPU 选择快递模版的功能	2023-05-31 15:37:26 +08:00
puhui999	39c92cb944	fix: 完善 SPU 查看详情	2023-05-31 14:42:45 +08:00
jason	000aa95012	新增门店自提管理	2023-05-30 21:21:04 +08:00
puhui999	e555977757	fix: 修改 review 提到的问题，完善分类选择层级校验、完整层级展示	2023-05-30 18:14:40 +08:00
芋道源码	fa6bcacaef	!157 合并商城部分功能 ... Merge pull request !157 from 芋道源码/dev	2023-05-29 15:03:34 +00:00
YunaiV	ee12fa01c9	Merge branch 'master' of https://github.com/yudaocode/yudao-ui-admin-vue3 ... Conflicts: package.json	2023-05-29 22:34:07 +08:00
lour6498	257ad9f79f	fix: 公告内容不能为空	2023-05-29 18:44:55 +08:00
dhb52	c3b0403ade	Merge remote-tracking branch 'yudao/dev' into dev	2023-05-29 18:23:18 +08:00
wangding	43f3c67434	add router search	2023-05-29 11:26:51 +08:00
wangding	6768cdea05	新增路由搜索功能	2023-05-29 11:05:46 +08:00
jason	70c5082776	运费模板区域改成多选	2023-05-27 11:32:16 +08:00
dhb52	ed9f042975	feat: mall 优惠券 初稿	2023-05-26 18:19:39 +08:00
YunaiV	b12aefe46e	review + mall：快递公司管理	2023-05-24 23:40:46 +08:00
YunaiV	349a39e72f	review + mall：商品管理	2023-05-24 20:32:38 +08:00
YunaiV	ae49aaffcf	Merge branch 'dev-to-dev' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev ... Conflicts: src/views/mall/product/spu/index.vue	2023-05-24 20:31:56 +08:00
YunaiV	0fba3fd503	review + mall：商品管理	2023-05-24 20:27:45 +08:00
puhui999	d877bfd26e	fix: 完善善品导出	2023-05-23 12:04:21 +08:00
jason	c296c9e53d	运费模板表格样式调整	2023-05-22 23:57:41 +08:00
jason	af2fb4bf5f	运费模板性能优化。区域选择使用懒加载	2023-05-22 23:10:22 +08:00
芋道源码	855e4d3d02	!153 提交商品管理第二版 ... Merge pull request !153 from puhui999/dev-to-dev	2023-05-21 16:01:53 +00:00
jason	4e69f15128	mall: 订单中心->运费模板(第一版 性能有问题)	2023-05-21 23:41:36 +08:00