Commit Graph

896 Commits

Author SHA1 Message Date
puhui999
79413e0ae2 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-08-06 20:23:19 +08:00
puhui999
4947716983 feat: 完善砍价活动管理 2023-08-06 18:12:07 +08:00
dhb52
64b40e7fdf feat: 添加支付图标文件 2023-08-06 16:54:12 +08:00
YunaiV
0139443909 Merge remote-tracking branch 'origin/master' 2023-08-05 14:32:25 +08:00
YunaiV
ef31ec7aaf bugfix:分配角色菜单时,调用接口 404 问题 2023-08-05 14:32:16 +08:00
芋道源码
2ed13a2958
!189 同步最新商城的代码
Merge pull request !189 from 芋道源码/dev
2023-08-05 06:22:42 +00:00
芋道源码
7c87f94985
!187 修正合并代码后前端不能正常启动的问题
Merge pull request !187 from puhui999/dev-to-dev
2023-08-05 06:20:20 +00:00
YunaiV
a2fdff47df 支付应用:模拟支付的添加代码优化 2023-08-05 14:15:10 +08:00
YunaiV
b3b1d97447 支付应用:微信支付的添加代码优化 2023-08-05 14:01:11 +08:00
YunaiV
86e0a375fa 支付应用:支付宝的添加代码优化 2023-08-05 13:50:02 +08:00
芋道源码
dae9bc131c
!188 feat: 支付管理/应用信息
Merge pull request !188 from dhb52/master
2023-08-05 05:25:39 +00:00
芋道源码
d12887b60a
Merge pull request #18 from SupGiant/master
request支持传递axios原生参数,例如超时:request(method:'GET',url:'',timeout:1000)
2023-08-05 12:23:33 +08:00
xingyu
945903d612 docs: up deps 2023-08-04 21:47:37 +08:00
xingyu
003751a41c fix: dialog 2023-08-04 21:44:55 +08:00
xingyu
4417dc8700 chore: scripts 2023-08-04 21:44:44 +08:00
xingyu
3c4f17a1ab fix: scripts preview 2023-08-04 21:34:02 +08:00
xingyu
784a1be8a1 chore: stylelint(use pnpm lint:style) 2023-08-04 21:33:00 +08:00
xingyu
71a874dfb4 fix: eslint 2023-08-04 21:32:38 +08:00
xingyu
85f93804b5 chore: update deps 2023-08-04 21:32:28 +08:00
dhb52
36268cf834 typo: apiclient_key.perm => apiclient_key.pem 2023-08-03 23:32:15 +08:00
dhb52
323417b0d4 feat: 支付管理/应用信息(alpha) 2023-08-03 23:07:22 +08:00
puhui999
c327f79177 fix: combinationActivity 调整 2023-08-02 23:58:32 +08:00
puhui999
39df9be988 fix: 修正合并代码后前端不能正常启动的问题 2023-08-02 23:05:45 +08:00
puhui999
0b06f36aa2 Merge remote-tracking branch 'yudao/master' into dev-to-dev 2023-08-02 21:14:06 +08:00
linr
0c334ff4d6 request支持传递axios原生参数,例如超时:request(method:'GET',url:'',timeout:1000) 2023-08-02 16:55:28 +08:00
puhui999
73b918b4e9 fix: 修正 combinationActivity.data.ts 2023-08-01 10:23:15 +08:00
xingyu
bc258dbb8c docs: unocss 2023-07-29 16:03:47 +08:00
xingyu
29d493e2da fix: style 2023-07-29 15:54:44 +08:00
xingyu
2dcb73764f fix: eslint 2023-07-29 15:51:45 +08:00
xingyu
177d497588 chore: setting 2023-07-29 15:49:27 +08:00
xingyu
9976850c46 chore: unocss 2023-07-29 15:47:16 +08:00
xingyu
b19d31ce4e chore: unocss 2023-07-29 15:47:11 +08:00
xingyu
5d9e713981 chore: unocss 2023-07-29 15:47:06 +08:00
xingyu
e37fe5f4fe docs: unocss 2023-07-29 15:46:58 +08:00
xingyu
34817269a4 chore: vscode config 2023-07-29 14:44:16 +08:00
xingyu
4249465b7c wip: use unocss 2023-07-29 14:40:55 +08:00
xingyu
8e78975521 fix: eslint 2023-07-29 12:55:51 +08:00
xingyu
3f36b57363 docs: preview 2023-07-29 12:55:43 +08:00
xingyu
5037aa593e docs: update deps 2023-07-29 12:55:10 +08:00
xingyu
af10ccb39a chore: update deps 2023-07-29 12:55:02 +08:00
YunaiV
ee802d6335 登录时,直接从用户信息中,获取菜单。目的:加快首页的加载速度 2023-07-29 09:28:45 +08:00
YunaiV
40a93caf89 发布 1.8.0 版本 2023-07-27 07:59:57 +08:00
芋道源码
b41d8f06ce
!184 同步最新商城实现
Merge pull request !184 from 芋道源码/dev
2023-07-26 23:32:27 +00:00
YunaiV
a003b59e39 review 秒杀、拼团活动的 CRUD 2023-07-26 19:22:26 +08:00
芋道源码
d7f0554f97
!179 完成拼团活动和秒杀活动相关表单操作和列表展示
Merge pull request !179 from puhui999/dev-to-dev
2023-07-26 04:59:47 +00:00
芋道源码
f908c12963
!183 同步商城实现
Merge pull request !183 from 芋道源码/dev
2023-07-26 04:56:22 +00:00
芋道源码
59de1d68ba
!182 update src/views/Login/components/MobileForm.vue.
Merge pull request !182 from water/N/A
2023-07-26 04:52:34 +00:00
芋道源码
399d8af0b1
!180 定时任务,删除功能报错
Merge pull request !180 from 死歌/master
2023-07-26 04:50:22 +00:00
puhui999
dc39ad0cd1 fix: 完善拼团活动 CRUD 2023-07-14 17:35:35 +08:00
water
b061c8f32b
update src/views/Login/components/MobileForm.vue.
我发现,这个手机号登陆时,登陆成功了但是没有自动跳转,我手动路由到/,又自动跳转到登陆页面,应该是token没存进去,我就照这loginform的逻辑修改了一下

Signed-off-by: water <2778335106@qq.com>
2023-07-12 07:35:48 +00:00