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

111 Commits

Author SHA1 Message Date
Vion
31fe06b2c2 Merge branch 'sit-Carl' into sit-Leung 
# Conflicts:
#	rc-busness/pages/personal/userpay.vue
 2022-01-27 09:52:47 +08:00
Vion
8ef3530438 Payment flow refined 2022-01-27 09:42:33 +08:00
Vion
f058f0a1e0 temp payment method integration 2022-01-26 19:39:20 +08:00
952108534@qq.com
8d77715414 支付 2022-01-25 19:58:10 +08:00
Vion
ccae9db727 Displaying error fixed 2022-01-25 12:25:47 +08:00
Vion
fde896d43b Style update 2022-01-25 11:11:24 +08:00
Vion
eed41ae763 Merge branch 'sit-Carl' into sit-Leung 2022-01-24 22:36:48 +08:00
Vion
178b29601b Coupon bug fixed 2022-01-24 22:35:13 +08:00
Vion
d19c462775 Coupon bug fixed 2022-01-24 22:33:08 +08:00
Admin
36066986fd
!103 2022-1-24 Carl 
Merge pull request !103 from Admin/sit-Leung
 2022-01-24 14:14:19 +00:00
Vion
b9c0a1394e Coupon calculation refined 2022-01-24 22:10:15 +08:00
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
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
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
438f85e398 只让优惠券未使用出现立即使用的按钮 2022-01-24 17:26:32 +08:00
952108534@qq.com
c64561457a 用户注册添加优惠券 2022-01-24 16:50:55 +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
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
d0addceabe iPhone font size fixed, index mobile video player added 2022-01-24 12:01:28 +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
a80acba99f Confirm btn removed 2022-01-23 22:05:40 +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
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
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
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
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
952108534@qq.com
bfa62a1cd9 添加 2022-01-22 21:58:34 +08:00