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
615 Commits 2 Branches 32 Tags 340 MiB
31fe06b2c2
Commit Graph

615 Commits

This Branch
This Branch
All Branches
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
Admin
53d71fe478
!116 2022-1-26 Carl 
Merge pull request !116 from Admin/sit-Carl-V3
 2022-01-26 11:21:17 +00:00
Carl
59b505dd8f add sale value 1 2022-01-26 19:20:10 +08:00
Admin
edaf520a86
!115 2022-1-26 Carl 
Merge pull request !115 from Admin/sit-Carl-V3
 2022-01-26 11:02:58 +00:00
Carl
e41361dc6c add sale value 1 2022-01-26 19:00:05 +08:00
Admin
14f71dfd26
!114 2022-1-26 Carl 
Merge pull request !114 from Admin/sit-Carl-V3
 2022-01-26 09:53:04 +00:00
Carl
4b73d6585b add sale value 1 2022-01-26 17:51:45 +08:00
Admin
3adbcddf03
!113 2022-1-26 Carl 
Merge pull request !113 from Admin/sit-Carl-V3
 2022-01-26 09:36:53 +00:00
Carl
17deaa4f01 add sale value 1 2022-01-26 17:34:52 +08:00
Admin
81f9b9b18f
!112 2022-1-26 Carl 
Merge pull request !112 from Admin/sit-Carl-V3
 2022-01-26 09:14:37 +00:00
Carl
0bec34a4e3 add sale value 1 2022-01-26 17:13:25 +08:00
Admin
3eef3b59cc
!111 2022-1-26 Carl 
Merge pull request !111 from Admin/sit-Carl-V3
 2022-01-26 08:38:35 +00:00
Carl
67adc6cd85 Merge branch 'sit-Carl' of https://gitee.com/carl_Ming_1/smart-admin into sit-Carl-V3 2022-01-26 16:34:00 +08:00
Carl
6cae48231c adding H5 wxpay 2022-01-26 16:31:21 +08:00
Vion
0e87e84f9e Baidu tracking code initialized 2022-01-26 12:11:44 +08:00
Admin
ed2129afa9
!110 2022-1-26 Jiamin 
Merge pull request !110 from Admin/sit-jiamin-v2
 2022-01-26 03:24:22 +00:00
Vion
9c5f2f812b Merge branch 'sit-Carl' into sit-Leung 2022-01-26 11:11:41 +08:00
952108534@qq.com
8d77715414 支付 2022-01-25 19:58:10 +08:00
Admin
4a05db7e12
!109 2022-1-25 Carl 
Merge pull request !109 from Admin/sit-Carl-V3
 2022-01-25 10:38:35 +00:00
Carl
b405adfaa8 add sale value 1 2022-01-25 18:37:40 +08:00
Admin
e6acd8b55f
!108 2022-1-25 Carl 
Merge pull request !108 from Admin/sit-Carl-V3
 2022-01-25 10:28:15 +00:00
Carl
0e47b968e3 add sale value 1 2022-01-25 18:26:18 +08:00
Admin
ce44cedecf
!107 2022-1-25 Carl 
Merge pull request !107 from Admin/sit-Carl-V3
 2022-01-25 08:43:28 +00:00
Carl
217afb123f Merge branch 'sit-Carl' of https://gitee.com/carl_Ming_1/smart-admin into sit-Carl-V3 2022-01-25 16:41:39 +08:00
Carl
b7b9f99faf add reg or login logic . 2022-01-25 16:41:29 +08:00
952108534@qq.com
924738c8b6 Merge branch 'sit-Carl' into sit-jiamin-v2 2022-01-25 15:07:21 +08:00
952108534@qq.com
9d0737234b 样式的更改 2022-01-25 15:06:20 +08:00
Vion
5453d0bc69 Merge branch 'sit-Carl' into sit-Leung 2022-01-25 15:04:22 +08:00
Vion
78671d35b6 Default images added in product list / search 2022-01-25 12:46:59 +08:00
Admin
21b2c364e8
!106 2022-1-25 Leung 
Merge pull request !106 from Admin/sit-Leung
 2022-01-25 04:29:26 +00:00
Admin
d6a4e6715c
!105 2022-1-25 Carl 
Merge pull request !105 from Admin/sit-Carl-V3
 2022-01-25 04:28:18 +00:00
Carl
f219facc4c seeting expire time 365 2022-01-25 12:26:27 +08:00
Vion
ccae9db727 Displaying error fixed 2022-01-25 12:25:47 +08:00
Vion
a4e066d2db Displaying name update 2022-01-25 11:16:52 +08:00
Vion
fde896d43b Style update 2022-01-25 11:11:24 +08:00
Admin
d255a56845
!104 2022-1-24 Leung 
Merge pull request !104 from Admin/sit-Leung
 2022-01-24 14:39:39 +00: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
4b8a9c3666
!102 2022-1-24 Jiamin 
Merge pull request !102 from Admin/sit-jiamin-v2
 2022-01-24 12:44:34 +00: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
952108534@qq.com
fb61b06bde Merge branch 'sit-Leung' into sit-jiamin-v2 2022-01-24 20:01:51 +08:00
952108534@qq.com
a2a6ca14bd 更改样式 2022-01-24 19:29:33 +08:00