793 Commits

Author SHA1 Message Date
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
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
c4fd56dbcd fix: dialog
(cherry picked from commit 003751a41c46776fa6b17da3833fd2cf5ff0050b)
2023-09-19 20:31:53 +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
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
xingyu
05c3245ea5 chore: unocss
(cherry picked from commit 9976850c46e57914e514ec21cf69d88c666ea9ea)
2023-09-19 20:09:09 +08:00
xingyu
4f81427aa0 wip: use unocss
(cherry picked from commit 4249465b7c328fb744a485a0741da26f7c5f6af6)
2023-09-19 20:08:38 +08:00
xingyu
c7d6d35642 fix: eslint
(cherry picked from commit 8e7897552193e6aa4112ac27d5a1dc76fae645e8)
2023-09-19 20:02:03 +08:00
YunaiV
4cef3e3e5f 登录时,直接从用户信息中,获取菜单。目的:加快首页的加载速度
(cherry picked from commit ee802d6335f7b5e785620c45053dd31f4a95f785)
2023-09-19 19:59:19 +08:00
shizhong
6704805af4 fix: 个人中心头像为空时不能修改 2023-09-11 16:35:04 +08:00
xingyu
bdaeb75ccc fix: 个人中心头像为空时不能修改
(cherry picked from commit e6a9dd0e4ca41d5ec36daf4614ec492e1a6dc88c)
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
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
shizhong
74aac991bc 发布 1.8.0 版本 2023-07-27 20:53:52 +08:00
YunaiV
2104de6a71 review 秒杀、拼团活动的 CRUD
(cherry picked from commit a003b59e3920dfd4a3536b7314857a5c2f5838fd)
2023-07-27 19:51:42 +08:00
shizhong
8641221274 !183 同步商城实现 Merge pull request !183 from 芋道源码/dev 2023-07-27 19:50:13 +08:00
puhui999
84d538ad69 fix: 完善拼团活动 CRUD
(cherry picked from commit dc39ad0cd1b5bc4a12983b971449ca1a6792d4b9)
2023-07-27 19:45:36 +08:00
water
e7e0c7a6b7 update src/views/Login/components/MobileForm.vue.
我发现,这个手机号登陆时,登陆成功了但是没有自动跳转,我手动路由到/,又自动跳转到登陆页面,应该是token没存进去,我就照这loginform的逻辑修改了一下

Signed-off-by: water <2778335106@qq.com>
(cherry picked from commit b061c8f32b06acc60b8003bbe08d240bad4a6b49)
2023-07-27 19:44:36 +08:00
puhui999
85cc7cdb46 fix: mall SeckillConfig
(cherry picked from commit 3fd9f1b43e42a10feb6fd04b2d9dbc2ab5f6edd6)
2023-07-27 19:43:51 +08:00
xingyu
5e0d09769d fix: login error
(cherry picked from commit 44efb13c0eb08d0b42c1bc62a6895538e05c582f)
2023-07-27 19:43:43 +08:00