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
763 Commits 2 Branches 32 Tags 340 MiB
e5b73fb261
Commit Graph

161 Commits

Author SHA1 Message Date
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
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
Vion
56ae1ef035 Merge branch 'sit-Carl' into sit-Leung 2022-01-20 22:21:41 +08:00
summation
e7b12f5e0b 产品详情页 2022-01-20 22:09:47 +08:00
952108534@qq.com
00ce4d7f07 更改 2022-01-20 21:42:02 +08:00
Vion
66c30b2dd3 Merge branch 'sit-Carl' into sit-Leung 2022-01-20 20:39:52 +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
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
Admin
1af28b2843
update rc-busness/assets/css/index.less. 2022-01-20 06:23:25 +00: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
Admin
f69bb1ede8
missing file 2022-01-20 04:47:31 +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
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
c391a20c23 Merge branch 'sit-Carl' of gitee.com:carl_Ming_1/smart-admin into sit-Leung 2022-01-20 03:36:54 +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
Admin
34a6a20223 Merge branch 'sit-Carl' of gitee.com:carl_Ming_1/smart-admin into sit-jiamin-v2 2022-01-19 14:08:08 +00:00
952108534@qq.com
ef1120ec7c 更改 2022-01-19 21:55:17 +08:00
Admin
f76d080da4 Merge branch 'sit-Carl' of gitee.com:carl_Ming_1/smart-admin into sit-Leung 2022-01-19 13:55:12 +00:00
952108534@qq.com
bcc04c1d11 更改 2022-01-19 21:54:21 +08:00
Vion
83d77cfaeb Hyperlink completed except products, working on address component 2022-01-19 21:45:04 +08:00
Admin
0dbc7aa50a Merge branch 'sit-Carl' of gitee.com:carl_Ming_1/smart-admin into sit-He 2022-01-19 12:17:29 +00:00
952108534@qq.com
b1822e57a3 更改样式与功能 2022-01-19 19:36:42 +08:00
summation
4d4cd4a564 sumt 2022-01-19 19:12:37 +08:00
summation
320c23dde5 sumt 2022-01-19 19:08:22 +08:00
952108534@qq.com
b2470f5da9 更改搜索页面样式功能的调整 2022-01-19 18:11:14 +08:00
952108534@qq.com
2de58d6dc1 样式更改 2022-01-19 15:09:06 +08:00
952108534@qq.com
bf7c8c05a5 更改样式细节 2022-01-19 11:38:57 +08:00
Admin
afca9ff37a
!38 2022-1-19 Jiamin 
Merge pull request !38 from Admin/sit-jiamin-v2
 2022-01-18 17:10:47 +00:00
Vion
37a7e4706d Index bug fixed 2022-01-18 22:57:23 +08:00
952108534@qq.com
4669e2b604 搜索按钮隐藏 2022-01-18 22:26:02 +08:00
952108534@qq.com
b67734b6ce 提交产品以及搜索 2022-01-18 21:50:16 +08:00
Admin
a1f6e32213
!27 2022-1-18 JiaMin 
Merge pull request !27 from Admin/sit-jiamin-v2
 2022-01-18 09:21:09 +00:00
Vion
9115a4738d Style correction 2022-01-18 17:18:39 +08:00
952108534@qq.com
becd40d550 加载图片 2022-01-18 12:25:39 +08:00
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
38e4cb44d7 Product list style updated 2022-01-17 19:44:56 +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
Vion
9595dedf34 Style updated 2022-01-17 19:18:17 +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
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
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
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
edee7534bc 更改首页 2022-01-13 17:10:36 +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
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
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
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