Commit Graph

237 Commits

Author SHA1 Message Date
Vion
d15130723a Login / Register flow done , index resources move to static 2022-01-14 20:11:10 +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
Admin
18b296803d
!11 2022-1-13 JiaMIn PC导航栏
Merge pull request !11 from Admin/sit-jiamin-v2
2022-01-13 09:43:26 +00: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
Admin
289db3a656
!10 2022 - 1- 13 Jiamin
Merge pull request !10 from Admin/sit-jiamin-v2
2022-01-13 07:14:18 +00: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
205cbc7728
!9 2022-1-13 JiaMIn
Merge pull request !9 from Admin/sit-jiamin-v2
2022-01-13 04:23:12 +00: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
Admin
dfec232020
!7 2022-1-12 Leung
Merge pull request !7 from Admin/sit-Leung
2022-01-12 12:04:35 +00: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
Admin
33a7c64291
!6 2022-1-12 Jiamin
Merge pull request !6 from Admin/sit-jiamin-v2
2022-01-12 09:46:42 +00:00
952108534@qq.com
99157a3946 更改首页 2022-01-12 17:41:58 +08:00
Admin
8c352508cd
!5 2022-1-12 Leung
Merge pull request !5 from Admin/sit-Leung
2022-01-12 09:06:41 +00:00
Vion
e3cd2e58ba userlogin / personal/mypersonal.vue / producted albumn updated 2022-01-12 17:02:35 +08:00
Admin
2342e2352c
!4 2022-1-12
Merge pull request !4 from Admin/sit-Leung
2022-01-12 03:01:01 +00: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
Carl
ac15aa35c9 bug fix 2022-01-11 16:40:02 +08:00
Carl
a1c3d1cb7e Merge branch 'sit-Carl' of https://gitee.com/carl_Ming_1/smart-admin into sit-Carl 2022-01-11 16:05:18 +08:00
Carl
8eea4568b5 bug fix 2022-01-11 15:57:55 +08:00
Admin
27db82a4b7
!1 add rc-busness.
Merge pull request !1 from 刘佳敏/N/A
2022-01-11 07:50:56 +00: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
Vion
82e02dbc0b Merge branch 'sit-Carl' of https://gitee.com/carl_Ming_1/smart-admin into sit-Carl 2022-01-08 11:11:47 +08:00
Vion
ae3f9a7d05 Package config file list 2022-01-08 11:08:13 +08:00
952108534@qq.com
06d5db8df7 test 2022-01-07 20:10:23 +08:00