757 Commits

Author SHA1 Message Date
shizhong
6e5552c02e fix: 解决右侧代码过长时不缩放啥也做不了的 bug 2023-09-19 20:55:35 +08:00
puhui999
1854e891cb fix: 完善砍价活动管理对齐后端
(cherry picked from commit 44be35b5ce3159b525d17ab7abbd931c114867e8)
2023-09-19 20:53:01 +08:00
zws
beb13d65d8 fix
https://gitee.com/yudaocode/yudao-ui-admin-vue3/issues/I7SZNW

(cherry picked from commit c368c9b232f8770171fbdd7a13905aa2c88e6619)
2023-09-19 20:52:42 +08:00
dhb52
d7c3f8f870 fix: 支付/示例 queryParams 为 reactive
(cherry picked from commit c7b8fdb88483e274e3eee0536e4c0ca311479eca)
2023-09-19 20:52:38 +08:00
dhb52
f87beb4da7 fix: 支付/回调 修复ElDescriptions对齐问题
(cherry picked from commit 5d364e268f1d2eec20a5bb04beb297d8ca27eb5d)
2023-09-19 20:52:33 +08:00
YunaiV
dddc6a2e0d 支付:修复支付应用的 mock 展示不正确
(cherry picked from commit e954ae6010ad9a4a1d4bc30f09267beb30180d39)
2023-09-19 20:52:26 +08:00
YunaiV
e4a6e3f94b 支付退款列表的 review
(cherry picked from commit c3a8479eca28e6179681ec9514937b22c3c33226)
2023-09-19 20:52:21 +08:00
dhb52
4cdbdae8c4 fix: 修复ElDescriptions对齐问题
(cherry picked from commit 10c121d62d622b3b3d46af3210170a1e1b103c99)
2023-09-19 20:51:39 +08:00
dhb52
149a463a6b fix: 支付管理/退款订单 对标 vue2
(cherry picked from commit 620a2009c3bd146ebda815bc7805fe369474cbb7)
2023-09-19 20:51:33 +08:00
YunaiV
cfef155ee2 商城:
1. 微调砍价活动的代码

(cherry picked from commit 7bf3e41c6189776b129670d44c9b40ecce2f86d5)
2023-09-19 20:50:54 +08:00
YunaiV
81d8e36ccc 商城:
1. 修复拼团活动,修改商品的拼团价格,会存在 *100 的问题

(cherry picked from commit 127e6b202edce8b41cdcd3e726eb4fde45b12441)
2023-09-19 20:50:49 +08:00
YunaiV
ffc797ae31 商城:
1. 修复秒杀活动,修改商品的秒杀价格,会存在 *100 的问题

(cherry picked from commit ff8bde207ddb0d46cc2bba1cbc03250242f7251e)
2023-09-19 20:50:41 +08:00
xingyu
3b21e610af chore: remove qrcode.vue use qrcode
(cherry picked from commit 2ec50bab155e29bdfc47dc7d4f3597f13e101e9a)
2023-09-19 20:50:27 +08:00
xingyu
e1b27dec11 fix: 提交后刷新列表
(cherry picked from commit b9477463fdd2945caabb0ef8d36a953272121f06)
2023-09-19 20:50:21 +08:00
YunaiV
0fd07c0cbc 商城:
1. 调整优惠劵的目录
2. 简化秒杀时间配置

(cherry picked from commit 9984de0dc7251779434a5bf95c3aa9aab3c4cd65)
2023-09-19 20:50:06 +08:00
YunaiV
00829471be 商城:优惠劵的前端完善
(cherry picked from commit 815897ca8b94f7b72b93286c6d5ba36c3933b9a1)
2023-09-19 20:49:56 +08:00
shizhong
49e28e7b02 修复时间检索,value format 错误,导致无法搜索的问题 2023-09-19 20:49:04 +08:00
YunaiV
4fb9e8ba4d code review:补全支付文档
(cherry picked from commit 19cad3b87386bd7106408f09d79b0660f6a7c5fb)
2023-09-19 20:45:32 +08:00
YunaiV
00c319ba41 code review:优化支付订单的实现
(cherry picked from commit bf667270093592d5209c59cfeefff4818ccbb503)
2023-09-19 20:45:25 +08:00
YunaiV
a7610dbab3 code review:优化支付通知的实现
(cherry picked from commit 1ab7ea0640e87d0525f2a0dcc2ee93134a1e3c14)
2023-09-19 20:45:22 +08:00
YunaiV
3af92d076e code review:优化示例订单的实现
(cherry picked from commit 26cf4ca64a728d0f198f01bb472735531db4a5c7)
2023-09-19 20:45:02 +08:00
YunaiV
db1e2beaf0 code review:优化收银台的实现,解决 TODO
(cherry picked from commit 7625e6757c92e5dc5cf76fdc33e31ff3625268d5)
2023-09-19 20:44:38 +08:00
lehug
caff8e4966 修复登录后通过登录页面无法再次登录的问题
(cherry picked from commit 280f734f80ce9f9308026604b4fbeb739d63d0c5)
2023-09-19 20:41:44 +08:00
xiaqing
bc8702c1dd 会员积分针对代码格式、功能优化
1.修改积分抵扣单位,按照分显示

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

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

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

(cherry picked from commit f310f65842ce05a391d463610e7f7ac7a86dbe2b)
2023-09-19 20:40:40 +08:00
dhb52
191d149959 feat: 支付功能迁移(初稿)
(cherry picked from commit a6eab3cc9a998cff2120a6db82f6938ab1c2f206)
2023-09-19 20:39:21 +08:00
puhui999
541fc97796 feat: 完善砍价活动管理
(cherry picked from commit 49477169837c87c5590ee4c31945d285792a7375)
2023-09-19 20:36:04 +08:00
dhb52
fd42c410b0 feat: 添加支付图标文件
(cherry picked from commit 64b40e7fdfaa0f71e4cbdd89833784ec2fbf36d4)
2023-09-19 20:35:57 +08:00
YunaiV
f9be77efd4 bugfix:分配角色菜单时,调用接口 404 问题
(cherry picked from commit ef31ec7aaf007054b18a4540d648b5c04f5ecc5b)
2023-09-19 20:35:42 +08:00
YunaiV
544adb9811 支付应用:模拟支付的添加代码优化
(cherry picked from commit a2fdff47df15822410ce53e7f6b9bfd5214e5bb9)
2023-09-19 20:32:24 +08:00
YunaiV
b613a69e5c 支付应用:微信支付的添加代码优化
(cherry picked from commit b3b1d9744720191ed7dc0528fe4c71e2b62d50e2)
2023-09-19 20:32:20 +08:00
YunaiV
77a5734a07 支付应用:支付宝的添加代码优化
(cherry picked from commit 86e0a375fabd62601613a87ee36c2a8118c65fdc)
2023-09-19 20:32:16 +08:00
xingyu
44f3359abb docs: up deps
(cherry picked from commit 945903d612a60d858a9610ba89d0e840c4fa9357)
2023-09-19 20:31:57 +08:00
xingyu
c4fd56dbcd fix: dialog
(cherry picked from commit 003751a41c46776fa6b17da3833fd2cf5ff0050b)
2023-09-19 20:31:53 +08:00
xingyu
f02bcfab3c chore: scripts
(cherry picked from commit 4417dc8700818677d6231843acc2dad128de39f1)
2023-09-19 20:29:20 +08:00
xingyu
338dcdc4fb fix: scripts preview
(cherry picked from commit 3c4f17a1aba13373d50bf606a072922d2324d2b6)
2023-09-19 20:29:14 +08:00
xingyu
2f359d0124 fix: eslint
(cherry picked from commit 71a874dfb4aa95bdbc382efe46f82e954643109c)
2023-09-19 20:25:45 +08:00
xingyu
9f4dfd7e4c chore: update deps
(cherry picked from commit 85f93804b5f42b4dba2f2d07983ccb232c156188)
2023-09-19 20:25:38 +08:00
dhb52
73cd024a5c typo: apiclient_key.perm => apiclient_key.pem
(cherry picked from commit 36268cf834e694941861f50a7a1cfcd9d3e21e04)
2023-09-19 20:25:33 +08:00
dhb52
3f479ecffc feat: 支付管理/应用信息(alpha)
(cherry picked from commit 323417b0d4afac0aa6aede6aae3c5d865efa47cb)
2023-09-19 20:25:26 +08:00
puhui999
da5ad39251 fix: combinationActivity 调整
(cherry picked from commit c327f79177f000edab15c8304d73ed5bc7c910bd)
2023-09-19 20:24:40 +08:00
puhui999
cace3d1743 fix: 修正合并代码后前端不能正常启动的问题
(cherry picked from commit 39df9be98837dfb4f91fa3d9547cae6013a41379)
2023-09-19 20:24:31 +08:00
linr
e3e2111324 request支持传递axios原生参数,例如超时:request(method:'GET',url:'',timeout:1000)
(cherry picked from commit 0c334ff4d69c3c5aff3bb08a6f11a217b092d9f3)
2023-09-19 20:24:21 +08:00
puhui999
67baf1e0a5 fix: 修正 combinationActivity.data.ts
(cherry picked from commit 73b918b4e9c2af6a571ced7f2653c254b6e0182c)
2023-09-19 20:24:15 +08:00
xingyu
e1b181f2d8 docs: unocss
(cherry picked from commit bc258dbb8c2422acf2169e88439249e1c9e58658)
2023-09-19 20:14:39 +08:00
xingyu
9ae54036fa fix: style
(cherry picked from commit 29d493e2dafad9a0f34caa3917bf8765a6287fb2)
2023-09-19 20:14:31 +08:00
xingyu
c50051d930 fix: eslint
(cherry picked from commit 2dcb73764fe1560f9fe692c4a4309b8f3b130fb0)
2023-09-19 20:14:25 +08:00