Commit Graph

1085 Commits

Author SHA1 Message Date
lehug
caff8e4966 修复登录后通过登录页面无法再次登录的问题
(cherry picked from commit 280f734f80)
2023-09-19 20:41:44 +08:00
xiaqing
bc8702c1dd 会员积分针对代码格式、功能优化
1.修改积分抵扣单位,按照分显示

(cherry picked from commit f8a4df8b77)
2023-09-19 20:41:21 +08:00
xiaqing
9ab9344521 会员积分针对代码格式、功能优化
1.修改积分抵扣单位,按照分显示

(cherry picked from commit f2e029dca6)
2023-09-19 20:41:16 +08:00
xiaqing
817548c825 会员积分针对代码格式、功能优化
1.优化todo建议
2.删除无用代码

(cherry picked from commit de941ec6ba)
2023-09-19 20:41:09 +08:00
xingyu
b5a152ffb4 chore: update deps
(cherry picked from commit b3513f97f7)
2023-09-19 20:40:47 +08:00
xiaqing
0991528c17 会员签到针对代码格式、功能优化
1.优化todo建议
 2.删除无用代码

(cherry picked from commit f310f65842)
2023-09-19 20:40:40 +08:00
dhb52
191d149959 feat: 支付功能迁移(初稿)
(cherry picked from commit a6eab3cc9a)
2023-09-19 20:39:21 +08:00
puhui999
541fc97796 feat: 完善砍价活动管理
(cherry picked from commit 4947716983)
2023-09-19 20:36:04 +08:00
dhb52
fd42c410b0 feat: 添加支付图标文件
(cherry picked from commit 64b40e7fdf)
2023-09-19 20:35:57 +08:00
YunaiV
f9be77efd4 bugfix:分配角色菜单时,调用接口 404 问题
(cherry picked from commit ef31ec7aaf)
2023-09-19 20:35:42 +08:00
YunaiV
544adb9811 支付应用:模拟支付的添加代码优化
(cherry picked from commit a2fdff47df)
2023-09-19 20:32:24 +08:00
YunaiV
b613a69e5c 支付应用:微信支付的添加代码优化
(cherry picked from commit b3b1d97447)
2023-09-19 20:32:20 +08:00
YunaiV
77a5734a07 支付应用:支付宝的添加代码优化
(cherry picked from commit 86e0a375fa)
2023-09-19 20:32:16 +08:00
xingyu
44f3359abb docs: up deps
(cherry picked from commit 945903d612)
2023-09-19 20:31:57 +08:00
xingyu
c4fd56dbcd fix: dialog
(cherry picked from commit 003751a41c)
2023-09-19 20:31:53 +08:00
xingyu
f02bcfab3c chore: scripts
(cherry picked from commit 4417dc8700)
2023-09-19 20:29:20 +08:00
xingyu
338dcdc4fb fix: scripts preview
(cherry picked from commit 3c4f17a1ab)
2023-09-19 20:29:14 +08:00
xingyu
2f359d0124 fix: eslint
(cherry picked from commit 71a874dfb4)
2023-09-19 20:25:45 +08:00
xingyu
9f4dfd7e4c chore: update deps
(cherry picked from commit 85f93804b5)
2023-09-19 20:25:38 +08:00
dhb52
73cd024a5c typo: apiclient_key.perm => apiclient_key.pem
(cherry picked from commit 36268cf834)
2023-09-19 20:25:33 +08:00
dhb52
3f479ecffc feat: 支付管理/应用信息(alpha)
(cherry picked from commit 323417b0d4)
2023-09-19 20:25:26 +08:00
puhui999
da5ad39251 fix: combinationActivity 调整
(cherry picked from commit c327f79177)
2023-09-19 20:24:40 +08:00
puhui999
cace3d1743 fix: 修正合并代码后前端不能正常启动的问题
(cherry picked from commit 39df9be988)
2023-09-19 20:24:31 +08:00
linr
e3e2111324 request支持传递axios原生参数,例如超时:request(method:'GET',url:'',timeout:1000)
(cherry picked from commit 0c334ff4d6)
2023-09-19 20:24:21 +08:00
puhui999
67baf1e0a5 fix: 修正 combinationActivity.data.ts
(cherry picked from commit 73b918b4e9)
2023-09-19 20:24:15 +08:00
xingyu
e1b181f2d8 docs: unocss
(cherry picked from commit bc258dbb8c)
2023-09-19 20:14:39 +08:00
xingyu
9ae54036fa fix: style
(cherry picked from commit 29d493e2da)
2023-09-19 20:14:31 +08:00
xingyu
c50051d930 fix: eslint
(cherry picked from commit 2dcb73764f)
2023-09-19 20:14:25 +08:00
xingyu
2d4c3801f4 chore: setting
(cherry picked from commit 177d497588)
2023-09-19 20:09:22 +08:00
xingyu
05c3245ea5 chore: unocss
(cherry picked from commit 9976850c46)
2023-09-19 20:09:09 +08:00
xingyu
b6bf2f0d91 chore: unocss
(cherry picked from commit b19d31ce4e)
2023-09-19 20:09:06 +08:00
xingyu
e9b60d166a chore: unocss
(cherry picked from commit 5d9e713981)
2023-09-19 20:09:01 +08:00
xingyu
a7c1a98df1 docs: unocss
(cherry picked from commit e37fe5f4fe)
2023-09-19 20:08:55 +08:00
xingyu
fa4ac7420f chore: vscode config
(cherry picked from commit 34817269a4)
2023-09-19 20:08:52 +08:00
xingyu
4f81427aa0 wip: use unocss
(cherry picked from commit 4249465b7c)
2023-09-19 20:08:38 +08:00
xingyu
c7d6d35642 fix: eslint
(cherry picked from commit 8e78975521)
2023-09-19 20:02:03 +08:00
xingyu
9dd40c360a docs: preview
(cherry picked from commit 3f36b57363)
2023-09-19 20:00:08 +08:00
xingyu
4eccb44c88 docs: update deps
(cherry picked from commit 5037aa593e)
2023-09-19 19:59:39 +08:00
xingyu
a13e2f48ec chore: update deps
(cherry picked from commit af10ccb39a)
2023-09-19 19:59:31 +08:00
YunaiV
4cef3e3e5f 登录时,直接从用户信息中,获取菜单。目的:加快首页的加载速度
(cherry picked from commit ee802d6335)
2023-09-19 19:59:19 +08:00
芋道源码
9fd5a9d7f4
!242 fix: 个人中心头像为空时不能修改
Merge pull request !242 from clockdotnet/master-vxe
2023-09-11 12:19:21 +00:00
shizhong
6704805af4 fix: 个人中心头像为空时不能修改 2023-09-11 16:35:04 +08:00
xingyu
bdaeb75ccc fix: 个人中心头像为空时不能修改
(cherry picked from commit e6a9dd0e4c)
2023-09-11 16:10:27 +08:00
芋道源码
a15d777afb
!214 增加部门和菜单的详情,解决个人中心无法上传图片的问题
Merge pull request !214 from clockdotnet/master-vxe
2023-08-23 16:58:45 +00:00
周建
4d798c82df 密码提示问题 2023-08-23 13:51:04 +08:00
shizhong
b376e8e2a8 增加部门和菜单的详情,解决个人中心无法上传图片的问题 2023-08-22 17:33:04 +08:00
周建
7eced09de0 个人中心重置及校验问题,部分表单增加校验 2023-08-16 17:31:28 +08:00
芋道源码
fd46445147
!185 master-vxe分支合并master分支1.8.0版本的修改
Merge pull request !185 from clockdotnet/master-vxe
2023-07-28 00:48:31 +00:00
shizhong
5620a9da6a 发布 1.8.0 版本 2023-07-27 23:33:28 +08:00
shizhong
7b3b89fc9a 发布 1.8.0 版本 2023-07-27 22:11:53 +08:00