芋道源码
							
						 
					 | 
					
						
						
							
						
						a6fc5f775a
					 | 
					
						
						
							
							!176 mall seckillActivity
						
						
						
						
						
						
						
						Merge pull request !176 from puhui999/dev-to-dev 
						
						
					 | 
					
						2023-07-02 12:40:33 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						c0bf357d7a
					 | 
					
						
						
							
							!177 修复useTable在total为0时的bug
						
						
						
						
						
						
						
						Merge pull request !177 from nullcache/bug/add-fix-useTable 
						
						
					 | 
					
						2023-07-02 12:40:04 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						9f8e12de51
					 | 
					
						
						
							
							Merge pull request #10 from nullcache/bug/add-fix-useTable
						
						
						
						
						
						
						
						修复useTable在total为0时的bug 
						
						
					 | 
					
						2023-07-02 20:38:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						2e96b1c984
					 | 
					
						
						
							
							feat: mall CombinationActivity
						
						
						
						
						
						
					 | 
					
						2023-07-02 19:22:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaqing
							
						 
					 | 
					
						
						
							
						
						4251dc5d61
					 | 
					
						
						
							
							会员中心代码
						
						
						
						
						
						
						
						1.合并积分模块只member module
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码 
						
						
					 | 
					
						2023-06-28 22:50:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nullcache
							
						 
					 | 
					
						
						
							
						
						073679875b
					 | 
					
						
						
							
							修复useTable在total为0时的bug
						
						
						
						
						
						
					 | 
					
						2023-06-27 04:06:01 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nullcache
							
						 
					 | 
					
						
						
							
						
						69c4995b52
					 | 
					
						
						
							
							修复useTable在total为0时的bug
						
						
						
						
						
						
					 | 
					
						2023-06-27 11:54:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						341303b014
					 | 
					
						
						
							
							fix: 完善 mall seckillActivity add
						
						
						
						
						
						
					 | 
					
						2023-06-25 17:16:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						51e79f29cc
					 | 
					
						
						
							
							fix: 封装 SpuSelect SpuAndSkuList 为商品活动商品选择商品编辑通用组件
						
						
						
						
						
						
					 | 
					
						2023-06-25 16:43:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						76ccc54a35
					 | 
					
						
						
							
							fix: 修复 spu 详情查看错误,同步 mall seckill 组件 name 配置方式
						
						
						
						
						
						
					 | 
					
						2023-06-25 09:35:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5d613e69b3
					 | 
					
						
						
							
							review 营销活动
						
						
						
						
						
						
					 | 
					
						2023-06-24 18:53:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						fa71d3e7dd
					 | 
					
						
						
							
							!175 mall seckill
						
						
						
						
						
						
						
						Merge pull request !175 from puhui999/dev-to-dev 
						
						
					 | 
					
						2023-06-24 04:57:14 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						c9ae0fbdbe
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/dev' into dev-to-dev
						
						
						
						
						
						
					 | 
					
						2023-06-24 01:48:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						b1e7f14963
					 | 
					
						
						
							
							fix:完善秒杀活动管理①
						
						
						
						
						
						
					 | 
					
						2023-06-24 01:48:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						0395b8f138
					 | 
					
						
						
							
							review 订单
						
						
						
						
						
						
					 | 
					
						2023-06-23 21:28:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						70a6d28edd
					 | 
					
						
						
							
							!174 订单列表和详情 页面
						
						
						
						
						
						
						
						Merge pull request !174 from 矿泉水/dev 
						
						
					 | 
					
						2023-06-23 13:23:02 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e1b1c134d9
					 | 
					
						
						
							
							合并 master 代码的冲突
						
						
						
						
						
						
					 | 
					
						2023-06-23 14:08:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						b159240824
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
						
						
						
						
						
						
						
						 Conflicts:
	src/views/infra/build/index.vue
	src/views/mall/product/spu/components/DescriptionForm.vue
	src/views/mall/product/spu/components/OtherSettingsForm.vue
	src/views/mall/product/spu/components/ProductPropertyAddForm.vue
	src/views/mall/product/spu/components/SkuList.vue 
						
						
					 | 
					
						2023-06-23 13:54:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						3d47d6744e
					 | 
					
						
						
							
							feat:添加秒杀活动管理
						
						
						
						
						
						
					 | 
					
						2023-06-22 17:31:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						c1a4edf7b1
					 | 
					
						
						
							
							refactor: 统一 setup 格式
						
						
						
						
						
						
					 | 
					
						2023-06-21 19:35:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						9ac17b3ce2
					 | 
					
						
						
							
							chore: build size
						
						
						
						
						
						
					 | 
					
						2023-06-21 19:27:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						82c51e0c3e
					 | 
					
						
						
							
							fix: eslint
						
						
						
						
						
						
					 | 
					
						2023-06-21 19:27:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						d639401646
					 | 
					
						
						
							
							fix: style lint
						
						
						
						
						
						
					 | 
					
						2023-06-21 19:26:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						64dbcdabe0
					 | 
					
						
						
							
							docs: version
						
						
						
						
						
						
					 | 
					
						2023-06-21 19:24:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						33c460ad55
					 | 
					
						
						
							
							chore: remove vueSetupExtend
						
						
						
						
						
						
					 | 
					
						2023-06-21 19:24:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						f2992ce8e8
					 | 
					
						
						
							
							fix: eslint
						
						
						
						
						
						
					 | 
					
						2023-06-21 19:18:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						922f83d99c
					 | 
					
						
						
							
							refactor: vue3.3 defineOptions
						
						
						
						
						
						
					 | 
					
						2023-06-21 19:14:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						f3622d423a
					 | 
					
						
						
							
							fix: 使 Table 组件支持列宽和固定列配置
						
						
						
						
						
						
					 | 
					
						2023-06-21 15:27:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						5064845d4e
					 | 
					
						
						
							
							fix: 使 Dialog 组件支持 Dialog 内部嵌套另一个 Dialog,需要使用 append-to-body 属性
						
						
						
						
						
						
					 | 
					
						2023-06-21 15:26:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						a5c7c886ee
					 | 
					
						
						
							
							chore: stylelint
						
						
						
						
						
						
					 | 
					
						2023-06-21 11:15:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						c05fbd7fdc
					 | 
					
						
						
							
							fix: locales
						
						
						
						
						
						
					 | 
					
						2023-06-21 11:10:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						952f7b6268
					 | 
					
						
						
							
							chore: vscode setting
						
						
						
						
						
						
					 | 
					
						2023-06-21 11:07:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						37c41aeecc
					 | 
					
						
						
							
							chore: eslint
						
						
						
						
						
						
					 | 
					
						2023-06-21 11:07:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						3d39b42e96
					 | 
					
						
						
							
							chore: eslint
						
						
						
						
						
						
					 | 
					
						2023-06-21 10:55:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						2df15acb26
					 | 
					
						
						
							
							chore: vscode setting use pnpm
						
						
						
						
						
						
					 | 
					
						2023-06-21 10:50:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						458bb22163
					 | 
					
						
						
							
							docs: readme
						
						
						
						
						
						
					 | 
					
						2023-06-21 10:48:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						ca8238a84b
					 | 
					
						
						
							
							chore: packageManager use pnpm
						
						
						
						
						
						
					 | 
					
						2023-06-21 10:45:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						91a015828d
					 | 
					
						
						
							
							chore: update deps
						
						
						
						
						
						
					 | 
					
						2023-06-21 10:44:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaobai
							
						 
					 | 
					
						
						
							
						
						ca01b16096
					 | 
					
						
						
							
							提交订单列表和详情20230619
						
						
						
						
						
						
					 | 
					
						2023-06-19 15:57:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaobai
							
						 
					 | 
					
						
						
							
						
						42a7aec0b5
					 | 
					
						
						
							
							提交订单页面和详情页面 20230619
						
						
						
						
						
						
					 | 
					
						2023-06-19 12:42:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						f7b195b226
					 | 
					
						
						
							
							feat: 完事秒杀时段管理
						
						
						
						
						
						
					 | 
					
						2023-06-19 10:20:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						ee698fd8b2
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/dev' into dev-to-dev
						
						
						
						
						
						
					 | 
					
						2023-06-17 21:21:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						a75720ec06
					 | 
					
						
						
							
							feat: 秒杀时段管理
						
						
						
						
						
						
					 | 
					
						2023-06-17 21:20:28 +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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						1e49a8eaf0
					 | 
					
						
						
							
							!170 Expiration time should not set on the refresh token
						
						
						
						
						
						
						
						Merge pull request !170 from 呵呵大/N/A 
						
						
					 | 
					
						2023-06-17 11:02:27 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						226cc03d65
					 | 
					
						
						
							
							!167 修复授权类型选项bug
						
						
						
						
						
						
						
						Merge pull request !167 from wangzhaoqiang/dev_ 
						
						
					 | 
					
						2023-06-17 10:57:00 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						467256cece
					 | 
					
						
						
							
							修复 SmsChannelForm.vue 排版报错问题
						
						
						
						
						
						
					 | 
					
						2023-06-17 18:54:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ae69492b53
					 | 
					
						
						
							
							code review:spu todo 去掉
						
						
						
						
						
						
					 | 
					
						2023-06-17 18:48:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |