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
540 Commits 2 Branches 32 Tags 340 MiB
c3d0f841cf
Commit Graph

540 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Vion
9b4f71074a Merge branch 'sit-Carl' into sit-Leung 
# Conflicts:
#	rc-busness/pages/personal/settlement.vue
#	rc-busness/pages/personal/userpay.vue
 2022-01-23 15:08:04 +08:00
Vion
477d0e8602 Error page template added 2022-01-23 14:55:21 +08:00
Admin
e072f56de3
!87 he 
Merge pull request !87 from Admin/sit-He-v3
 2022-01-23 06:40:42 +00:00
Admin
924a83a7e0 Merge branch 'sit-Carl' of gitee.com:carl_Ming_1/smart-admin into sit-He-v3 2022-01-23 06:40:06 +00:00
summation
2ff3a5d256 changemessage 2022-01-23 13:46:22 +08:00
Admin
92b2aa9346
!85 2022-1-22 Jiamin 
Merge pull request !85 from Admin/sit-jiamin-v2
 2022-01-23 05:07:59 +00:00
952108534@qq.com
7455d73e63 Merge branch 'sit-Leung' into sit-jiamin-v2 2022-01-23 12:59:13 +08:00
Vion
2f5ef11c15 Breadcrumbs added except : order list / shopping cart / coupon list / address management 2022-01-23 12:44:49 +08:00
952108534@qq.com
0617f2461c 更改 2022-01-23 11:32:06 +08:00
Vion
fcb6dc26bd Breadcrumbs 0 version 2022-01-23 11:30:31 +08:00
Admin
43857121c4
!84 2022-1-23 Leung 
Merge pull request !84 from Admin/sit-Leung
 2022-01-22 16:38:30 +00:00
Admin
08c6c0cae9
!83 2022-1-23 Carl 
Merge pull request !83 from Admin/sit-Carl-V3
 2022-01-22 16:33:37 +00:00
Carl
4a54185c01 搞定了，后台更新了以下几点： 
1：getCartProductInfo 新增了“leftAllotment”字段
2：insertCartProductInfo 新增了“leftAllotment”字段
3：generateOrderWX 入参新增了“basePoint”
4：updateOrderWX微信回调方法，新增了自动增加该账户积分信息。
 2022-01-23 00:27:22 +08:00
952108534@qq.com
9df46a5ab3 地址样式修改 2022-01-22 23:21:22 +08:00
Vion
358f0f66b9 Rx goods modified 2022-01-22 23:04:56 +08:00
952108534@qq.com
4b27f68340 d 2022-01-22 22:55:40 +08:00
952108534@qq.com
3403570766 更改地址以及其它 2022-01-22 22:54:24 +08:00
952108534@qq.com
a17b8204db 更改 2022-01-22 22:26:44 +08:00
Vion
144e0820bf Removing cart item API param corrected 2022-01-22 22:04:06 +08:00
952108534@qq.com
46417f10ff Merge branch 'sit-jiamin-v2' of https://gitee.com/carl_Ming_1/smart-admin into sit-jiamin-v2 2022-01-22 22:02:51 +08:00
952108534@qq.com
bfa62a1cd9 添加 2022-01-22 21:58:34 +08:00
Admin
df498f597a
!82 2022-1-22 Jiamin 
Merge pull request !82 from Admin/sit-jiamin-v2
 2022-01-22 13:54:35 +00:00
Admin
cac6711624
!81 2022-1-22 Leung 
Merge pull request !81 from Admin/sit-Leung
 2022-01-22 13:52:42 +00:00
952108534@qq.com
09ed52dcfc 更改 2022-01-22 21:44:49 +08:00
952108534@qq.com
2abc052087 提交 2022-01-22 21:44:49 +08:00
952108534@qq.com
faa6511d6e 地址修改 2022-01-22 21:44:49 +08:00
952108534@qq.com
d4ca5020a0 更改地址 2022-01-22 21:44:49 +08:00
952108534@qq.com
d311233774 更改 2022-01-22 21:40:38 +08:00
952108534@qq.com
ba07129304 提交 2022-01-22 21:40:23 +08:00