jason
							
						 
					 | 
					
						
						
							
						
						bb5945958b
					 | 
					
						
						
							
							钱包 - 优化
						
						
						
						
						
						
						
						支付应用 - 证书模式增加应用私钥 
						
						
					 | 
					
						2023-10-21 15:33:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						63fd52828c
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2023-10-17 19:03:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jason
							
						 
					 | 
					
						
						
							
						
						90d6f4da9f
					 | 
					
						
						
							
							钱包- 钱包余额查询
						
						
						
						
						
						
					 | 
					
						2023-10-15 17:47:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						e04ca7aac7
					 | 
					
						
						
							
							fix: unocss eslint
						
						
						
						
						
						
					 | 
					
						2023-10-13 10:34:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						588ce1c9ae
					 | 
					
						
						
							
							trade:微调 order 列表界面
						
						
						
						
						
						
					 | 
					
						2023-10-01 23:44:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						3a96812d47
					 | 
					
						
						
							
							会员:会员配置的积分相关字段加上point前缀
						
						
						
						
						
						
					 | 
					
						2023-10-01 10:41:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						3ab1ed707f
					 | 
					
						
						
							
							会员:积分配置改为会员配置
						
						
						
						
						
						
					 | 
					
						2023-10-01 10:25:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						0066d79876
					 | 
					
						
						
							
							签到:签到后增加用户积分、经验
						
						
						
						
						
						
					 | 
					
						2023-10-01 09:53:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						4b7e57e67d
					 | 
					
						
						
							
							会员详情,修改会员积分
						
						
						
						
						
						
					 | 
					
						2023-09-30 15:50:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						940a102546
					 | 
					
						
						
							
							会员:会员详情-推广用户列表
						
						
						
						
						
						
					 | 
					
						2023-09-30 14:10:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						b48f19c646
					 | 
					
						
						
							
							会员:会员详情-优惠券列表
						
						
						
						
						
						
					 | 
					
						2023-09-30 13:55:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						675f3df5cb
					 | 
					
						
						
							
							会员详情,查询钱包信息
						
						
						
						
						
						
					 | 
					
						2023-09-30 12:40:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c6031ba2b2
					 | 
					
						
						
							
							增加 user detail 的 todo
						
						
						
						
						
						
					 | 
					
						2023-09-27 23:30:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						539f8a5bb5
					 | 
					
						
						
							
							修复 member 详情无法展示的问题
						
						
						
						
						
						
					 | 
					
						2023-09-24 12:10:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e489627748
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
						
						
						
						
						
						
						
						# Conflicts:
#	src/views/mall/trade/order/index.vue
#	src/views/member/user/detail/index.vue 
						
						
					 | 
					
						2023-09-24 12:00:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						2a58e3f691
					 | 
					
						
						
							
							style: unocss eslint
						
						
						
						
						
						
					 | 
					
						2023-09-22 17:49:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						5494756a66
					 | 
					
						
						
							
							fix: eslint
						
						
						
						
						
						
					 | 
					
						2023-09-11 17:08:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						0e2ea39591
					 | 
					
						
						
							
							code review:会员详情
						
						
						
						
						
						
					 | 
					
						2023-09-09 10:06:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						30f0c1b351
					 | 
					
						
						
							
							Merge branch 'dev' of https://gitee.com/ls0/yudao-ui-admin-vue3 into dev
						
						
						
						
						
						
						
						 Conflicts:
	src/utils/dict.ts 
						
						
					 | 
					
						2023-09-09 09:50:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						2ed5d12be8
					 | 
					
						
						
							
							trade: 分销业务从 member 模块 转移到 trade模块
						
						
						
						
						
						
					 | 
					
						2023-09-06 00:33:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						35664d1f32
					 | 
					
						
						
							
							trade: 增加交易中心配置表
						
						
						
						
						
						
					 | 
					
						2023-09-05 22:31:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								绮梦
							
						 
					 | 
					
						
						
							
						
						2318f176a6
					 | 
					
						
						
							
							新增用户详情下订单页面
						
						
						
						
						
						
					 | 
					
						2023-09-05 10:15:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								绮梦
							
						 
					 | 
					
						
						
							
						
						fe6cf7ce98
					 | 
					
						
						
							
							新增用户详情下成长值页面。
						
						
						
						
						
						
					 | 
					
						2023-09-04 15:02:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						73f8cef3b4
					 | 
					
						
						
							
							member: 佣金记录
						
						
						
						
						
						
					 | 
					
						2023-09-03 23:04:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						5a9764c08c
					 | 
					
						
						
							
							member: 分销配置
						
						
						
						
						
						
					 | 
					
						2023-09-03 21:14:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4f7d6793fd
					 | 
					
						
						
							
							code review:优惠劵逻辑
						
						
						
						
						
						
					 | 
					
						2023-09-02 00:12:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						190c6e384c
					 | 
					
						
						
							
							!225 优惠券
						
						
						
						
						
						
						
						Merge pull request !225 from 疯狂的世界/owen_dev 
						
						
					 | 
					
						2023-09-01 14:55:30 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						9507e2b687
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
						
						
						
						
						
						
						
						 Conflicts:
	src/views/member/user/detail/UserPointList.vue 
						
						
					 | 
					
						2023-08-27 21:02:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						beef6a0a94
					 | 
					
						
						
							
							mall: 完善后台发送优惠券
						
						
						
						
						
						
					 | 
					
						2023-08-26 22:29:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2d8d323767
					 | 
					
						
						
							
							code review:会员中心
						
						
						
						
						
						
					 | 
					
						2023-08-26 20:57:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								绮梦
							
						 
					 | 
					
						
						
							
						
						45a6b3bcc7
					 | 
					
						
						
							
							账户信息组件 增加等级、成长值和积分的显示。
						
						
						
						
						
						
						
						增加一些配套的svg 图标。
增加tab 的懒加载。 
						
						
					 | 
					
						2023-08-26 13:48:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1b6c9b2e29
					 | 
					
						
						
							
							code review:用户详情
						
						
						
						
						
						
					 | 
					
						2023-08-26 01:59:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						415309469c
					 | 
					
						
						
							
							Merge branch 'dev' of https://gitee.com/ls0/yudao-ui-admin-vue3 into dev
						
						
						
						
						
						
						
						 Conflicts:
	src/views/member/user/index.vue 
						
						
					 | 
					
						2023-08-26 01:24:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								绮梦
							
						 
					 | 
					
						
						
							
						
						28951fb31d
					 | 
					
						
						
							
							重命名组件名称,增加用户地址查看api和页面、统一组件的props userId 变量名。
						
						
						
						
						
						
					 | 
					
						2023-08-25 11:27:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								绮梦
							
						 
					 | 
					
						
						
							
						
						f17bb9a7eb
					 | 
					
						
						
							
							重命名组件名称
						
						
						
						
						
						
					 | 
					
						2023-08-23 13:40:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								绮梦
							
						 
					 | 
					
						
						
							
						
						d1bb736973
					 | 
					
						
						
							
							会员详情页的跳转携带参数方式改为params
						
						
						
						
						
						
					 | 
					
						2023-08-23 13:12:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						e30d5559e6
					 | 
					
						
						
							
							fix: 路径错误
						
						
						
						
						
						
					 | 
					
						2023-08-23 10:40:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								绮梦
							
						 
					 | 
					
						
						
							
						
						451458eb1e
					 | 
					
						
						
							
							会员列表页面增加详情页的跳转。
						
						
						
						
						
						
					 | 
					
						2023-08-23 10:23:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						2e68a5239d
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into member_dev
						
						
						
						
						
						
						
						# Conflicts:
#	src/views/member/user/UserForm.vue 
						
						
					 | 
					
						2023-08-23 10:22:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						e9120f06cf
					 | 
					
						
						
							
							会员: 会员等级取消分页功能
						
						
						
						
						
						
					 | 
					
						2023-08-23 10:12:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						55772cbba0
					 | 
					
						
						
							
							code review:用户详情
						
						
						
						
						
						
					 | 
					
						2023-08-23 01:41:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						746bf864d9
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
						
						
						
						
						
						
						
						 Conflicts:
	src/views/mall/promotion/combination/record/index.vue 
						
						
					 | 
					
						2023-08-23 00:49:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						cfbc2ed74c
					 | 
					
						
						
							
							code review:订单列表、订单详情
						
						
						
						
						
						
					 | 
					
						2023-08-23 00:43:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						bb0c1cb536
					 | 
					
						
						
							
							code review:会员等级
						
						
						
						
						
						
					 | 
					
						2023-08-22 21:59:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								绮梦
							
						 
					 | 
					
						
						
							
						
						c1a40e7c98
					 | 
					
						
						
							
							用户详情-积分tab 去除无用的组件。
						
						
						
						
						
						
					 | 
					
						2023-08-22 16:28:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								绮梦
							
						 
					 | 
					
						
						
							
						
						10d9f11fba
					 | 
					
						
						
							
							增加用户详情页以及 签到、积分等用户详情下的子tab页。
						
						
						
						
						
						
						
						增加 用户、签到、积分 接口的VO,方便在组件中使用。 
						
						
					 | 
					
						2023-08-22 16:14:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						40711c0eb8
					 | 
					
						
						
							
							!209 会员:增加用户等级功能
						
						
						
						
						
						
						
						Merge pull request !209 from 疯狂的世界/member_dev 
						
						
					 | 
					
						2023-08-22 04:59:46 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						51738f8f6e
					 | 
					
						
						
							
							会员: 修改会员等级,使用单独的表单、接口
						
						
						
						
						
						
					 | 
					
						2023-08-22 11:23:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						c5a703f488
					 | 
					
						
						
							
							会员:等级下拉框显示图标
						
						
						
						
						
						
					 | 
					
						2023-08-22 01:48:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						78917cd2be
					 | 
					
						
						
							
							会员:增加用户分组
						
						
						
						
						
						
					 | 
					
						2023-08-21 23:59:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |