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
479 Commits 2 Branches 32 Tags 340 MiB
276c1bd403
Commit Graph

191 Commits

Author SHA1 Message Date
952108534@qq.com
3552ab3468 添加全局加载 2022-01-18 12:25:00 +08:00
952108534@qq.com
d6611ba681 Merge branch 'sit-Carl' into sit-jiamin-v2 2022-01-17 20:46:45 +08:00
Vion
5f8154bb63 Index style update 2022-01-17 20:46:31 +08:00
952108534@qq.com
2247515751 更改样式 2022-01-17 20:13:42 +08:00
Vion
a40446e8c2 Merge branch 'sit-Carl' into sit-Leung 2022-01-17 19:45:39 +08:00
Vion
07066297ef Merge branch 'sit-Carl' of https://gitee.com/carl_Ming_1/smart-admin into sit-Carl 2022-01-17 19:45:20 +08:00
Vion
38e4cb44d7 Product list style updated 2022-01-17 19:44:56 +08:00
Admin
ff64802eea
!24 2022-1-17 Carl 
Merge pull request !24 from Admin/sit-Carl-V3
 2022-01-17 11:42:57 +00:00
Carl
1ab577799d revert Leungs coding 2022-01-17 19:41:44 +08:00
Vion
8e4dba9c32 Merge branch 'sit-Leung' into sit-Carl 2022-01-17 19:23:41 +08:00
Vion
ef555b674e Product list style updated 2022-01-17 19:23:06 +08:00
Admin
2a1b670756
!23 2022-1-17 JiaMIn 
Merge pull request !23 from Admin/sit-jiamin-v2
 2022-01-17 11:22:25 +00:00
952108534@qq.com
f321d8c45c 更改产品列表 2022-01-17 19:20:54 +08:00
Vion
9595dedf34 Style updated 2022-01-17 19:18:17 +08:00
952108534@qq.com
566a8d6cfc 添加图片 2022-01-17 19:12:43 +08:00
952108534@qq.com
05271fb300 更改搜索 2022-01-17 19:10:04 +08:00
952108534@qq.com
fa9418b9f9 sit-Carl 2022-01-17 19:09:40 +08:00
Vion
9b2ee06486 Statics resources 2022-01-17 19:04:28 +08:00
Vion
cfbb7d1523 Merged with Carl 2022-01-17 18:48:28 +08:00
Vion
29f7a9e9a8 Merge branch 'sit-Carl' into sit-Leung 
# Conflicts:
#	rc-busness/pages/index.vue
 2022-01-17 18:33:39 +08:00
Admin
26ab95b656 Merge branch 'sit-Carl' of gitee.com:carl_Ming_1/smart-admin into sit-Leung 2022-01-17 10:23:09 +00:00
Vion
bea3c5faf7 Merge branch 'sit-Leung' of https://gitee.com/carl_Ming_1/smart-admin into sit-Leung 
# Conflicts:
#	rc-busness/components/header.vue
#	rc-busness/pages/index.vue
 2022-01-17 18:18:25 +08:00
Vion
476d1ce2cc Resources completed 2022-01-17 18:03:57 +08:00
Vion
bca2c24f98 Merge branch 'sit-Leung' into sit-Carl 
# Conflicts:
#	rc-busness/components/header.vue
#	rc-busness/pages/index.vue
 2022-01-17 17:56:37 +08:00
Vion
847e27bc4a Index updated 2022-01-17 16:14:32 +08:00
Admin
ecde2bd3fb Merge branch 'sit-Carl' of gitee.com:carl_Ming_1/smart-admin into sit-Leung 2022-01-17 03:00:21 +00:00
952108534@qq.com
8375664ba6 搜索以及优惠券 2022-01-17 10:57:01 +08:00
952108534@qq.com
d446ac1ba3 更改搜索以及优惠券 2022-01-17 10:54:51 +08:00
Leung
5c5b50b7ea Index error fixed, van-swiper unified 2022-01-16 20:42:14 +08:00
Admin
91fbeba1a4
回退 'Pull Request !14 : 2022-01-14' 2022-01-14 15:51:39 +00:00
Admin
3634764669 Merge branch 'sit-Carl' of gitee.com:carl_Ming_1/smart-admin into sit-Leung 2022-01-14 14:47:13 +00:00
Vion
d15130723a Login / Register flow done , index resources move to static 2022-01-14 20:11:10 +08:00
952108534@qq.com
30a6381d0e 更改优惠券 2022-01-13 21:21:01 +08:00
952108534@qq.com
f34631c9c4 更改优惠券 2022-01-13 21:20:43 +08:00
Vion
c5cabaa65f Merge branch 'sit-Leung' into sit-Carl 
# Conflicts:
#	rc-busness/assets/css/index.less
#	rc-busness/pages/index.vue
#	rc-busness/pages/personal/settlement.vue
 2022-01-13 19:32:31 +08:00
Vion
6f18acd491 Layout bug fix 2022-01-13 18:42:55 +08:00
952108534@qq.com
151ad0235e 更改图片以及修改底部 2022-01-13 18:27:31 +08:00
952108534@qq.com
7661e6e6da 添加一些面包屑 2022-01-13 17:34:16 +08:00
952108534@qq.com
edee7534bc 更改首页 2022-01-13 17:10:36 +08:00
952108534@qq.com
a2ad500537 更改 2022-01-13 15:10:33 +08:00
952108534@qq.com
890bdc8e8a 更改 2022-01-13 15:10:09 +08:00
952108534@qq.com
d747c659fd 积分样式 2022-01-13 14:55:30 +08:00
952108534@qq.com
782738fc9a 积分兑换样式 2022-01-13 14:54:23 +08:00
952108534@qq.com
0034377d03 Merge branch 'sit-jiamin-v2' of https://gitee.com/carl_Ming_1/smart-admin into sit-jiamin-v2 2022-01-13 14:34:49 +08:00
952108534@qq.com
25a06260a7 剩余其他页面 2022-01-13 14:32:47 +08:00
Admin
58ec97bd15 Merge branch 'sit-Carl' of gitee.com:carl_Ming_1/smart-admin into sit-jiamin-v2 2022-01-13 04:22:37 +00:00
952108534@qq.com
5e49a44f2b 首页 2022-01-13 12:17:01 +08:00
952108534@qq.com
df4a5dc21a 首页 2022-01-13 12:12:39 +08:00
952108534@qq.com
bc0b762d88 a 2022-01-13 12:11:28 +08:00
Vion
f201c66fc7 rc-top spacing updated 2022-01-12 19:58:15 +08:00
Vion
37702c7601 Order review updated 2022-01-12 19:48:50 +08:00
952108534@qq.com
99157a3946 更改首页 2022-01-12 17:41:58 +08:00
Vion
e3cd2e58ba userlogin / personal/mypersonal.vue / producted albumn updated 2022-01-12 17:02:35 +08:00
Vion
abd4ea6a6b Merged 0 version 2022-01-11 20:36:54 +08:00
Vion
115d1510d8 Merge branch 'sit-JiaMin' of https://gitee.com/carl_Ming_1/smart-admin into sit-JiaMin 2022-01-11 19:08:38 +08:00
Vion
b93b2f1180 Homepage / Product list / Product Detail / header / footer / RoyalCanin css,js added 2022-01-11 19:08:04 +08:00
952108534@qq.com
205e143d8e Merge branch 'sit-JiaMin' of https://gitee.com/carl_Ming_1/smart-admin into sit-JiaMin 2022-01-11 15:26:14 +08:00
952108534@qq.com
629f8f0085 搜索筛选功能数据对接 2022-01-11 15:24:00 +08:00
Vion
016080859d temp version for index patch 2022-01-11 11:57:54 +08:00
Vion
1d659446ae Complete images 2022-01-11 11:09:57 +08:00
952108534@qq.com
88d2a49740 去除axios 2022-01-10 22:13:34 +08:00
952108534@qq.com
fa088fcc36 Merge branch 'sit-JiaMin' of https://gitee.com/carl_Ming_1/smart-admin into sit-JiaMin 2022-01-10 22:11:08 +08:00
952108534@qq.com
be96454365 添加面包屑以及其它 2022-01-10 22:01:29 +08:00
Vion
a94b184ef2 Merge branch 'sit-JiaMin' of https://gitee.com/carl_Ming_1/smart-admin into sit-JiaMin 2022-01-10 20:24:34 +08:00
Vion
baad9d2555 Desktop Menu / Product detail page layout update 2022-01-10 20:23:58 +08:00
952108534@qq.com
069d6d2531 修改底部页 2022-01-10 11:16:15 +08:00
952108534@qq.com
9c43246e1c 修改导航页 2022-01-10 11:15:16 +08:00
952108534@qq.com
8d00674559 添加中间件 2022-01-10 11:09:10 +08:00
Vion
f1b7b7c501 Merge branch 'sit-Carl' into sit-JiaMin 2022-01-08 20:43:03 +08:00
Vion
15c71d6348 Layout fixed 2022-01-08 20:29:31 +08:00
952108534@qq.com
06d5db8df7 test 2022-01-07 20:10:23 +08:00
952108534@qq.com
b9fe222ef1 a 2022-01-07 20:06:25 +08:00
952108534@qq.com
3417aed848 shiyan 2022-01-07 20:02:08 +08:00
Admin
176fa3b55c
修改域名 2022-01-07 11:59:50 +00:00
952108534@qq.com
6e6ef1ec73 shiyan 2022-01-07 19:57:19 +08:00
952108534@qq.com
a49efd47b2 2 2022-01-07 19:48:22 +08:00
952108534@qq.com
bd6e653dc1 11 2022-01-07 19:42:21 +08:00
952108534@qq.com
0493293759 test 2022-01-07 19:38:55 +08:00
Vion
989bec826e Env setup 2022-01-07 19:12:40 +08:00
Vion
802f98d8a5 0 version 2022-01-07 18:23:25 +08:00
Carl
8773b12691 adding JiaMin coding 2022-01-06 11:32:40 +08:00
Admin
6210bb2010
missing file 2022-01-06 03:27:48 +00:00
Admin
ea25c14aa3
missing file 2022-01-06 03:27:21 +00:00
Admin
ea6dec3032
missing file 2022-01-06 03:27:07 +00:00
Admin
885fa025a0
missing file 2022-01-06 03:26:59 +00:00
Admin
cbafddfb9c
missing file 2022-01-06 03:26:40 +00:00
Admin
489c93b060
missing file 2022-01-06 03:26:23 +00:00
Admin
44e33e7925
missing file 2022-01-06 03:26:13 +00:00
Admin
f0b4c7b728
missing file 2022-01-06 03:25:50 +00:00
Admin
2c52684c1f
missing file 2022-01-06 03:25:11 +00:00
Carl
4afa25d02b adding JiaMin coding 2022-01-05 16:14:02 +08:00