Commit Graph

1402 Commits

Author SHA1 Message Date
YunaiV
dddc6a2e0d 支付:修复支付应用的 mock 展示不正确
(cherry picked from commit e954ae6010)
2023-09-19 20:52:26 +08:00
YunaiV
e4a6e3f94b 支付退款列表的 review
(cherry picked from commit c3a8479eca)
2023-09-19 20:52:21 +08:00
dhb52
4cdbdae8c4 fix: 修复ElDescriptions对齐问题
(cherry picked from commit 10c121d62d)
2023-09-19 20:51:39 +08:00
dhb52
149a463a6b fix: 支付管理/退款订单 对标 vue2
(cherry picked from commit 620a2009c3)
2023-09-19 20:51:33 +08:00
YunaiV
cfef155ee2 商城:
1. 微调砍价活动的代码

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

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

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

(cherry picked from commit 9984de0dc7)
2023-09-19 20:50:06 +08:00
YunaiV
00829471be 商城:优惠劵的前端完善
(cherry picked from commit 815897ca8b)
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 19cad3b873)
2023-09-19 20:45:32 +08:00
YunaiV
00c319ba41 code review:优化支付订单的实现
(cherry picked from commit bf66727009)
2023-09-19 20:45:25 +08:00
YunaiV
a7610dbab3 code review:优化支付通知的实现
(cherry picked from commit 1ab7ea0640)
2023-09-19 20:45:22 +08:00
YunaiV
3af92d076e code review:优化示例订单的实现
(cherry picked from commit 26cf4ca64a)
2023-09-19 20:45:02 +08:00
YunaiV
db1e2beaf0 code review:优化收银台的实现,解决 TODO
(cherry picked from commit 7625e6757c)
2023-09-19 20:44:38 +08:00
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