xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-04 11:16:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
876 Commits 2 Branches 32 Tags 340 MiB
94f9c34ff7
Commit Graph

365 Commits

Author SHA1 Message Date
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
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
69c2664e21 更改 2022-01-24 17:41:52 +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
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
9b03ea93b9 更改 2022-01-23 22:12:15 +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
Vion
477d0e8602 Error page template added 2022-01-23 14:55:21 +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
Vion
fcb6dc26bd Breadcrumbs 0 version 2022-01-23 11:30:31 +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
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
Vion
0833e998ea Bug list updated 2022-01-22 21:34:50 +08:00
952108534@qq.com
51c5e9b763 地址修改 2022-01-22 21:05:00 +08:00
952108534@qq.com
07a61c642e 更改地址 2022-01-22 21:00:10 +08:00
Admin
2bf308092d
!80 2022-1-22 
Merge pull request !80 from Admin/sit-jiamin-v2
 2022-01-22 12:21:38 +00:00
952108534@qq.com
99926260b9 更改 2022-01-22 20:11:58 +08:00
Admin
d2e2d45395
!79 2022-01-22 Jiamin 
Merge pull request !79 from Admin/sit-jiamin-v2
 2022-01-22 11:56:03 +00:00
952108534@qq.com
95614b9c66 订单 2022-01-22 19:22:17 +08:00
Vion
c6267a73ee Rx goods supported / Product detail multi-specification added / "window" in fetch removed 2022-01-22 19:20:04 +08:00
Admin
79ff28e63d
!77 2022-1-22 He 
Merge pull request !77 from Admin/sit-He-v3
 2022-01-22 07:25:47 +00:00
Admin
791bca1277 Merge branch 'sit-Carl' of gitee.com:carl_Ming_1/smart-admin into sit-Leung 2022-01-22 07:24:35 +00:00
Vion
011a9b2c58 Page style update 2022-01-22 15:21:17 +08:00
summation
760fd769c4 细节优化 2022-01-22 14:08:34 +08:00
Vion
debf618d7e Index content / bug completed, method of login checking in store/index.js added 2022-01-22 13:29:19 +08:00
summation
1c3d930a35 购物车地址管理 2022-01-22 00:14:01 +08:00
Vion
60c6a6b8b4 Floating right component added, personal pages style fixed 2022-01-21 23:34:49 +08:00
952108534@qq.com
38792ccbd6 提交更改 2022-01-21 23:32:15 +08:00
Vion
64d4b856c0 Merged and product list bug fixed 2022-01-21 22:16:11 +08:00
Vion
323ca9bce9 Header login link added 2022-01-21 22:01:11 +08:00
Vion
5abe70012d Address page style updated 2022-01-21 21:34:56 +08:00
Vion
41565c38aa Merge branch 'sit-Leung' of https://gitee.com/carl_Ming_1/smart-admin into sit-Leung 2022-01-21 20:49:02 +08:00
Vion
8e464641d3 Product list & search list completed 2022-01-21 20:48:13 +08:00
952108534@qq.com
e1e67e9ae2 地址 2022-01-21 19:46:45 +08:00
Admin
3a8b447ba7 Merge branch 'sit-Carl' of gitee.com:carl_Ming_1/smart-admin into sit-Leung 2022-01-21 11:30:40 +00:00
Vion
f3c9a9c65b addressInput error fixed 2022-01-21 19:28:46 +08:00
Admin
3a3c169acc
!72 2022-1-21 Leung 
Merge pull request !72 from Admin/sit-Leung
 2022-01-21 11:24:09 +00:00
Admin
c206c2d882
!71 2022-1-21 He 
Merge pull request !71 from Admin/sit-He-v3
 2022-01-21 10:59:02 +00:00
Vion
33647c2f6c File merging 2022-01-21 18:21:36 +08:00
Vion
4a1d1b9dd6 Product list function completed 2022-01-21 18:12:45 +08:00
952108534@qq.com
7f9a290662 地址的更改 2022-01-21 15:30:50 +08:00
summation
71937467f0 手机端调整 2022-01-21 11:41:49 +08:00
952108534@qq.com
e730b1210b 更改 2022-01-21 11:25:00 +08:00
Admin
77a37e89f0 Merge branch 'sit-Carl' of gitee.com:carl_Ming_1/smart-admin into sit-jiamin-v2 2022-01-21 02:49:44 +00:00
952108534@qq.com
de8b55f99a 提交 2022-01-21 10:47:09 +08:00
Admin
44d5271207
update rc-busness/pages/useraddress/addaddress.vue. 2022-01-20 16:42:08 +00:00
Admin
1a3d52fac6
update rc-busness/pages/useraddress/addaddress.vue. 2022-01-20 16:36:19 +00:00
Vion
55e23ac305 Accepting incoming values : fixed 2022-01-20 23:53:53 +08:00
Vion
56ae1ef035 Merge branch 'sit-Carl' into sit-Leung 2022-01-20 22:21:41 +08:00
Vion
1c3bbaf0ea Area list semi-final 2022-01-20 22:20:52 +08:00
summation
e7b12f5e0b 产品详情页 2022-01-20 22:09:47 +08:00
Vion
f93c3c38cc Pre-combine with JiaMin 2022-01-20 21:46:46 +08:00
952108534@qq.com
00ce4d7f07 更改 2022-01-20 21:42:02 +08:00
952108534@qq.com
ebc95312fb 更改 2022-01-20 21:41:53 +08:00
Vion
66c30b2dd3 Merge branch 'sit-Carl' into sit-Leung 2022-01-20 20:39:52 +08:00
952108534@qq.com
4fc8741cbd 更改 2022-01-20 20:39:04 +08:00
952108534@qq.com
943c20c7f7 Merge remote-tracking branch 'origin/sit-Leung' into sit-jiamin-v2 2022-01-20 20:04:06 +08:00
952108534@qq.com
1059e75bfe 地址以及数据 2022-01-20 19:57:51 +08:00
Vion
7721e92d5f Global style updated / Header footer hyperlink completed / addressInput component bug fixed 2022-01-20 19:56:52 +08:00
summation
4809866df6 购物车 2022-01-20 19:22:35 +08:00
952108534@qq.com
3a954530d7 产品列表数据 2022-01-20 14:59:31 +08:00
952108534@qq.com
afee12993f 更改 2022-01-20 14:41:22 +08:00
952108534@qq.com
4ff39ff36a Merge branch 'sit-jiamin-v2' of https://gitee.com/carl_Ming_1/smart-admin into sit-jiamin-v2 2022-01-20 14:40:59 +08:00
952108534@qq.com
309e2036f8 样式更改 2022-01-20 14:35:53 +08:00
Admin
4a9d874f7b Merge branch 'sit-Carl' of gitee.com:carl_Ming_1/smart-admin into sit-jiamin-v2 2022-01-20 06:30:46 +00:00
952108534@qq.com
bf3dd9219e 图片 2022-01-20 14:30:09 +08:00
952108534@qq.com
ab916cbde9 提交 2022-01-20 14:28:17 +08:00
Admin
1af28b2843
update rc-busness/assets/css/index.less. 2022-01-20 06:23:25 +00:00
952108534@qq.com
5cf7ebfe00 地址的更改 2022-01-20 14:10:19 +08:00
952108534@qq.com
4d41716532 地址 2022-01-20 14:04:43 +08:00
Admin
8c4a8f4964
!53 2022-1-20 Jiamin 
Merge pull request !53 from Admin/sit-jiamin-v2
 2022-01-20 05:49:09 +00:00
Vion
77c7189b38 pre-combine version 2022-01-20 12:56:28 +08:00
Vion
18a5cc37bf Merge branch 'sit-Carl' into sit-Leung 2022-01-20 12:49:36 +08:00
Vion
5973aab916 addressInput bug fixed 2022-01-20 12:49:07 +08:00
Admin
f69bb1ede8
missing file 2022-01-20 04:47:31 +00:00
Admin
d44eaa6ba2
update rc-busness/pages/useraddress/openaddress.vue. 2022-01-20 04:45:37 +00:00
Admin
6e4ffd31c4
update rc-busness/pages/index.vue. 2022-01-20 04:44:29 +00:00
Admin
ebe8b80f93
update rc-busness/components/rc-footer.vue. 2022-01-20 04:43:20 +00:00
Admin
f21b1e530c
update rc-busness/components/header.vue. 2022-01-20 04:42:51 +00:00
Admin
dc67785fcb
update rc-busness/assets/css/openaddress.less. 2022-01-20 04:40:32 +00:00
Admin
0268fb9a5e
update rc-busness/assets/css/login.less. 2022-01-20 04:39:50 +00:00
Admin
7d7f4e9e27
update rc-busness/assets/css/global.less. 2022-01-20 04:39:34 +00:00
Admin
01854f3022
update rc-busness/assets/css/index.less. 2022-01-20 04:37:57 +00:00
952108534@qq.com
b907a6292c 更改 2022-01-20 12:13:02 +08:00
952108534@qq.com
d3682fa241 更改 2022-01-20 12:12:53 +08:00
Admin
7837fadc8e Merge branch 'sit-Carl' of gitee.com:carl_Ming_1/smart-admin into sit-jiamin-v2 2022-01-20 03:57:08 +00:00
952108534@qq.com
e86acd1e85 更改 2022-01-20 11:52:43 +08:00
Admin
9d922f3fb9 Merge branch 'sit-Carl' of gitee.com:carl_Ming_1/smart-admin into sit-Leung 2022-01-20 03:46:20 +00:00
Admin
986d4ab9b3
Leung 2022-01-20 03:45:57 +00:00
Vion
78519363df Re-submit addressInput.vue 2022-01-20 11:38:51 +08:00
Admin
c391a20c23 Merge branch 'sit-Carl' of gitee.com:carl_Ming_1/smart-admin into sit-Leung 2022-01-20 03:36:54 +00:00
Admin
c0dab8b55d
删除文件 rc-busness/components/addressInput.vue 2022-01-20 03:32:45 +00:00
952108534@qq.com
bfe208efb6 Merge branch 'sit-jiamin-v2' of https://gitee.com/carl_Ming_1/smart-admin into sit-jiamin-v2 2022-01-20 11:27:39 +08:00
952108534@qq.com
e6cd88d6a2 地址页面 2022-01-20 11:27:21 +08:00
Vion
b284755a09 ￥ added in index, star products text centralized 2022-01-20 11:19:31 +08:00
Admin
4bfd884a9b
回退 'Pull Request !42 : 1-19 He' 2022-01-20 02:47:36 +00:00
Admin
b6787145e4
回退 'Pull Request !43 : 2022-1-19 Leung' 2022-01-20 02:45:55 +00:00
Admin
b0ae1cbe94
回退 'Pull Request !44 : 2022-1-19 Jiamin' 2022-01-20 02:44:19 +00:00