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

696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carl
d31b4b45b3 debugger 2022-02-02 15:42:04 +08:00
Carl
6d01393632 Merge remote-tracking branch 'origin/pro-Carl' into pro-Carl 2022-02-02 00:20:49 +08:00
Carl
3005334e56 debugger 2022-02-02 00:20:37 +08:00
Admin
b500d2403d
!133 2022-2-1 Leung 
Merge pull request !133 from Admin/sit-Leung
 2022-02-01 02:02:58 +00:00
Leung
d1995c9238 Order displaying & coupon calculating issue fixed 2022-02-01 00:22:44 +08:00
Carl
a57cbe705a debugger 2022-01-30 20:05:23 +08:00
Carl
caaaac4ac6 Merge remote-tracking branch 'origin/pro-Carl' into pro-Carl 2022-01-30 18:31:31 +08:00
Admin
3b74e9aa6d
!132 2022-1-30 Leung 
Merge pull request !132 from Admin/sit-Leung
 2022-01-30 10:30:16 +00:00
Carl
79c1156767 debugger 2022-01-30 18:28:57 +08:00
Vion
44766ef791 Discount updated 2022-01-30 17:14:41 +08:00
Admin
ba76c5a28c
!131 2022-1-30 Leung 
Merge pull request !131 from Admin/sit-Leung
 2022-01-30 08:09:34 +00:00
Vion
ea82294c4c RxGoods displaying issue fixed 2022-01-30 16:07:54 +08:00
Carl
e75e2149dc debugger 2022-01-30 16:04:13 +08:00
Carl
36d2aaf21c Merge remote-tracking branch 'origin/pro-Carl' into pro-Carl 2022-01-30 15:52:55 +08:00
Carl
3ca9cbe111 debugger 2022-01-30 15:52:41 +08:00
Vion
8eef8b3495 Payment method validation updated 2022-01-30 15:42:27 +08:00
Admin
8a08254909
!130 2022-1-30 Leung 
Merge pull request !130 from Admin/sit-Leung
 2022-01-30 07:13:23 +00:00
Vion
2fdfb0e9c1 Frontend layout fixed 2022-01-30 15:07:06 +08:00
Carl
3deeab7bc2 debugger 2022-01-30 13:26:41 +08:00
Carl
59c3378371 Merge remote-tracking branch 'origin/pro-Carl' into pro-Carl 2022-01-30 12:49:04 +08:00
Carl
a48ebf09cd debugger 2022-01-30 12:48:45 +08:00
Admin
f37aea01d9
!129 2022-1-30 Leung 
Merge pull request !129 from Admin/sit-Leung
 2022-01-29 18:46:35 +00:00
Carl
1831007a0b debugger 2022-01-30 02:44:51 +08:00
Carl
801ac2979c debugger 2022-01-29 19:40:10 +08:00
Carl
990743412a debugger 2022-01-29 19:29:22 +08:00
Carl
bb2c4903ce debugger 2022-01-29 19:25:33 +08:00
Carl
0c5e6bc33a debugger 2022-01-29 19:14:35 +08:00
Carl
80ac6d1cef debugger 2022-01-29 19:08:12 +08:00
Vion
b3c21bb35f Removing domain at prd env 2022-01-29 15:24:05 +08:00
Vion
3672d64473 Merge branch 'sit-Carl' into sit-Leung 
# Conflicts:
#	rc-busness/pages/index.vue
#	rc-busness/pages/productdetails/producted.vue
 2022-01-29 15:02:58 +08:00
Vion
17e2df0019 Env data updated 2022-01-29 11:50:10 +08:00
Admin
9903ba3816
!128 2022-1-29 Jiamin 
Merge pull request !128 from Admin/sit-jiamin-v2
 2022-01-29 03:43:32 +00:00
Carl
177b49f4fd debugger 2022-01-29 02:28:57 +08:00
Carl
47c5c1b785 debugger 2022-01-29 02:21:44 +08:00
Carl
49abd63ff9 debugger 2022-01-29 02:14:05 +08:00
Carl
2274267b6f debugger 2022-01-29 02:11:18 +08:00
952108534@qq.com
c0d3a3fbd1 页面 2022-01-28 18:51:02 +08:00
Admin
68156909be
!127 2022-1-28 Leung 
Merge pull request !127 from Admin/sit-Leung
 2022-01-28 10:21:30 +00:00
Vion
8c8ee3f4f0 ENV setting file 2022-01-28 18:20:09 +08:00
952108534@qq.com
8baf7eb678 更改 2022-01-28 18:19:40 +08:00
Vion
6725fb9961 Web code updated 2022-01-28 18:19:40 +08:00
Carl
035d392e76 fix The server time zone value 'Coordinated Universal Time' is unrecognized or represents more than one 2022-01-28 18:05:26 +08:00
Carl
0eb02c313b fix The server time zone value 'Coordinated Universal Time' is unrecognized or represents more than one 2022-01-28 17:58:00 +08:00
Carl
99f4df3c1f fix The server time zone value 'Coordinated Universal Time' is unrecognized or represents more than one 2022-01-28 17:13:18 +08:00
Carl
6496bd0083 fix without basePoint and paytype 2022-01-28 17:00:14 +08:00
Admin
fbe893551a
!126 2022-1-28 Carl 
Merge pull request !126 from Admin/sit-Carl-V3
 2022-01-28 08:24:50 +00:00
Carl
505bf618ac fix without basePoint and paytype 2022-01-28 16:23:11 +08:00
Admin
7c70711caf
!125 2022-1-28 Carl 
Merge pull request !125 from Admin/sit-Carl-V3
 2022-01-28 07:52:37 +00:00
Carl
d42c9546ec add paymentAmount logic 2022-01-28 15:47:23 +08:00
952108534@qq.com
cbe204d689 Merge branch 'sit-Leung' into sit-jiamin-v2 2022-01-28 15:06:58 +08:00