hhyykk/ipms-sjy-ui
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy-ui.git synced 2025-11-04 12:18:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
971 Commits 8 Branches 0 Tags
8a51c9c771472ebe7ccf21ad986d03c4e4b354e4
Commit Graph

971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xingyu
2ec50bab15 chore: remove qrcode.vue use qrcode 2023-08-12 12:23:36 +08:00
xingyu
b9477463fd fix: 提交后刷新列表 2023-08-12 12:23:17 +08:00
xingyu
e262ab9504 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-08-12 12:06:00 +08:00
YunaiV
9984de0dc7 商城： 
1. 调整优惠劵的目录
2. 简化秒杀时间配置
 2023-08-12 11:39:29 +08:00
YunaiV
815897ca8b 商城：优惠劵的前端完善 2023-08-12 11:09:12 +08:00
YunaiV
98477ef433 修复时间检索，value format 错误，导致无法搜索的问题 2023-08-12 10:13:32 +08:00
YunaiV
90f22934da Merge remote-tracking branch 'origin/dev' into dev 2023-08-12 09:43:01 +08:00
YunaiV
19cad3b873 code review：补全支付文档 2023-08-11 09:22:44 +08:00
YunaiV
bf66727009 code review：优化支付订单的实现 2023-08-11 08:59:08 +08:00
YunaiV
1ab7ea0640 code review：优化支付通知的实现 2023-08-11 07:58:08 +08:00
YunaiV
26cf4ca64a code review：优化示例订单的实现 2023-08-11 00:02:52 +08:00
YunaiV
7625e6757c code review：优化收银台的实现，解决 TODO 2023-08-10 23:30:37 +08:00
YunaiV
551ebbd41d Merge branch 'master' of https://gitee.com/dhb52/yudao-ui-admin-vue3 
 Conflicts:
	src/utils/constants.ts
 2023-08-10 22:21:55 +08:00
YunaiV
b0e27b2201 Merge branch 'master' of https://github.com/yudaocode/yudao-ui-admin-vue3 2023-08-10 22:19:22 +08:00
芋道源码
6e5286f94d !195 修复登录后通过登录页面无法再次登录的问题 
Merge pull request !195 from lehug/master
 2023-08-10 13:22:56 +00:00
芋道源码
bcca3ee01f !193 update src/views/infra/fileConfig/FileConfigForm.vue. 
Merge pull request !193 from 账号已删除/N/A
 2023-08-10 13:21:11 +00:00
lehug
280f734f80 修复登录后通过登录页面无法再次登录的问题 2023-08-10 17:51:57 +08:00
xiaqing
f8a4df8b77 会员积分针对代码格式、功能优化 
1.修改积分抵扣单位，按照分显示
 2023-08-09 22:33:09 +08:00
xiaqing
f2e029dca6 会员积分针对代码格式、功能优化 
1.修改积分抵扣单位，按照分显示
 2023-08-09 22:32:13 +08:00
xiaqing
de941ec6ba 会员积分针对代码格式、功能优化 
1.优化todo建议
2.删除无用代码
 2023-08-09 20:59:54 +08:00
xingyu
b3513f97f7 chore: update deps 2023-08-09 19:28:25 +08:00
xiaqing
f310f65842 会员签到针对代码格式、功能优化 
1.优化todo建议
 2.删除无用代码
 2023-08-09 16:14:00 +08:00
账号已删除
ad97fcb583 update src/views/infra/fileConfig/FileConfigForm.vue. 
FTP传输模式错误

Signed-off-by: 账号已删除 <1100014+leniy@user.noreply.gitee.com>
 2023-08-09 00:26:02 +00:00
芋道源码
ac0f387322 !190 完善砍价活动管理 
Merge pull request !190 from puhui999/dev-to-dev
 2023-08-07 11:31:37 +00:00
dhb52
a6eab3cc9a feat: 支付功能迁移（初稿） 2023-08-06 23:25:07 +08:00
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