xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-02 10:16:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
569 Commits 2 Branches 32 Tags 340 MiB
09f61bc114
Commit Graph

569 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Admin
09f61bc114
!101 2022-1-24Leung 
Merge pull request !101 from Admin/sit-Leung
 2022-01-24 12:43:42 +00:00
Vion
cd45fca6c0 Order confirm page refined 2022-01-24 20:42:51 +08:00
Admin
25a45f2e60
!100 2022-1-24 Leung 
Merge pull request !100 from Admin/sit-Leung
 2022-01-24 12:32:06 +00:00
Vion
d6d51f9f5d Coupon flow refined 2022-01-24 20:30:59 +08:00
Admin
65a32b5546
!99 2022-1-24 Carl 
Merge pull request !99 from Admin/sit-Carl-V3
 2022-01-24 10:44:22 +00:00
Admin
563b3d7c74
!98 2022-1-24 Jiamin 
Merge pull request !98 from Admin/sit-jiamin-v2
 2022-01-24 10:43:27 +00:00
Admin
97367c37e5
!97 2022-1-24 Leung 
Merge pull request !97 from Admin/sit-Leung
 2022-01-24 10:42:27 +00:00
Carl
bae8ab4422 modify coupon logic ,adding 3 verfiy 2022-01-24 18:24:58 +08:00
Vion
cab59567e8 Coupon % calculation refined 2022-01-24 18:17:07 +08:00
Vion
de8d67fc51 Coupon flow refined 2022-01-24 18:01:51 +08:00
952108534@qq.com
69c2664e21 更改 2022-01-24 17:41:52 +08:00
952108534@qq.com
438f85e398 只让优惠券未使用出现立即使用的按钮 2022-01-24 17:26:32 +08:00
952108534@qq.com
c64561457a 用户注册添加优惠券 2022-01-24 16:50:55 +08:00
Admin
72a1c2226b
!96 2022-1-24 Carl 
Merge pull request !96 from Admin/sit-Carl-V3
 2022-01-24 08:44:09 +00:00
Carl
ded0f746b0 Merge branch 'sit-Carl' of https://gitee.com/carl_Ming_1/smart-admin into sit-Carl-V3 2022-01-24 16:41:33 +08:00
Carl
dcf2ab1953 adding install cart verification 2022-01-24 16:41:26 +08:00
Admin
7b30bcfae8
!95 2022-1-24 Jiamin 
Merge pull request !95 from Admin/sit-jiamin-v2
 2022-01-24 07:37:14 +00:00
Admin
78038b2a78
!94 2022-1-24 Leung 
Merge pull request !94 from Admin/sit-Leung
 2022-01-24 07:35:50 +00:00
Vion
ab70862f63 Coupon flow completed 2022-01-24 15:28:57 +08:00
952108534@qq.com
adf7febb65 更改 2022-01-24 14:48:10 +08:00
952108534@qq.com
4be3eb430e 更改 2022-01-24 14:15:39 +08:00
Vion
fdac7a62b1 Error page hyperlink updated 2022-01-24 12:02:35 +08:00
Vion
d0addceabe iPhone font size fixed, index mobile video player added 2022-01-24 12:01:28 +08:00
Vion
8716e07403 Merge branch 'sit-Carl' of https://gitee.com/carl_Ming_1/smart-admin into sit-Carl 2022-01-24 10:18:11 +08:00
Admin
82bab052ce
!93 2022-1-23 Jiamin 
Merge pull request !93 from Admin/sit-jiamin-v2
 2022-01-23 14:39:05 +00:00
Vion
0b368d860a Merge branch 'sit-Carl' of https://gitee.com/carl_Ming_1/smart-admin into sit-Carl 2022-01-23 22:39:01 +08:00
Admin
c3d0f841cf
!92 2022-1-23 Leung 
Merge pull request !92 from Admin/sit-Leung
 2022-01-23 14:38:04 +00:00
Vion
25e5be80fb Payment bug fixed 2022-01-23 22:34:10 +08:00
Vion
9fda9e4478 Payment bug fixed 2022-01-23 22:30:57 +08:00
952108534@qq.com
42afa7dffa Merge branch 'sit-Carl' into sit-jiamin-v2 2022-01-23 22:15:37 +08:00
952108534@qq.com
9b03ea93b9 更改 2022-01-23 22:12:15 +08:00
Vion
a80acba99f Confirm btn removed 2022-01-23 22:05:40 +08:00
Admin
14bba229ea
!91 2022-1-23 JiaMin 
Merge pull request !91 from Admin/sit-jiamin-v2
 2022-01-23 13:49:02 +00:00
Admin
ee970415ea
!90 2022-1-23 Leung 
Merge pull request !90 from Admin/sit-Leung
 2022-01-23 13:46:07 +00:00
Admin
19c43e0de1
!89 2022-1-23 Carl 
Merge pull request !89 from Admin/sit-Carl-V3
 2022-01-23 13:43:15 +00:00
Carl
d59ae7cca5 后台增加以下功能： 
1：微信回调后自动获取商品积分
 2022-01-23 21:40:52 +08:00
952108534@qq.com
5b52ef02d4 更改 2022-01-23 21:35:49 +08:00
952108534@qq.com
74f4cc1a5f Merge branch 'sit-Leung' into sit-jiamin-v2 2022-01-23 21:11:26 +08:00
Vion
560d9b5c1c Payment bug fixed 2022-01-23 21:10:24 +08:00
952108534@qq.com
40223bf98c 更新 2022-01-23 21:08:30 +08:00
952108534@qq.com
a60fbe5921 更改 2022-01-23 19:52:05 +08:00
952108534@qq.com
42e06ba213 Merge remote-tracking branch 'origin/sit-Leung' into sit-jiamin-v2 2022-01-23 19:36:32 +08:00
952108534@qq.com
fcedb5d01e 更改提交 2022-01-23 19:32:59 +08:00
Vion
c5e5978615 Payment flow refined 2022-01-23 19:29:46 +08:00
Admin
64e16eb673
!88 2022-1-23 Carl 
Merge pull request !88 from Admin/sit-Carl-V3
 2022-01-23 10:27:45 +00:00
Carl
a7f61f9fb4 Merge branch 'sit-Carl' of https://gitee.com/carl_Ming_1/smart-admin into sit-Carl-V3 2022-01-23 18:25:50 +08:00
Carl
9fce9da12e 后台做以下更改： 
1：insertCartProductInfo 新增basePiont
2：getCartProductInfo 新增basePiont
3：新增借口监听支付回调royalcanin/monitorOrderNotify（入参为OrderNumber）
成功回调为 :{ "code": 1, "msg": "SUCCESS", "success": true, "data": null }
失败回调为：{ "code": 9009, "msg": "没有该订单回调数据！", "success": false, "data": null }
 2022-01-23 18:25:36 +08:00
952108534@qq.com
065db958c7 Merge remote-tracking branch 'origin/sit-Leung' into sit-jiamin-v2 2022-01-23 17:26:35 +08:00
952108534@qq.com
e0d50bf974 提交更改 2022-01-23 17:17:22 +08:00
Vion
8ff86279a0 Payment flow refine 2022-01-23 16:50:49 +08:00