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

558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carl
b7b9f99faf add reg or login logic . 2022-01-25 16:41:29 +08:00
Carl
f219facc4c seeting expire time 365 2022-01-25 12:26:27 +08:00
Carl
bae8ab4422 modify coupon logic ,adding 3 verfiy 2022-01-24 18:24:58 +08: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
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