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

250 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Admin
91fbeba1a4
回退 'Pull Request !14 : 2022-01-14' 2022-01-14 15:51:39 +00:00
Admin
05a17d897f
!14 2022-01-14 
Merge pull request !14 from Admin/sit-Leung
 2022-01-14 14:47:56 +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
Admin
2d9968c3c0
!13 2022-1-14 Carl 
Merge pull request !13 from Admin/sit-Carl-V3
 2022-01-14 10:34:46 +00:00
Carl
d6e668a5ea remove msgNum on SMSscript 2022-01-14 18:29:31 +08:00
Carl
6fe7737ddb Merge branch 'sit-Carl' of https://gitee.com/carl_Ming_1/smart-admin into sit-Carl-V3 2022-01-14 18:23:16 +08:00
Admin
34d4fe3070
!12 2022-1-13 Jiamin 
Merge pull request !12 from Admin/sit-jiamin-v2
 2022-01-13 15:13:46 +00: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
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
Carl
b25845cba0 Merge branch 'sit-Carl' of https://gitee.com/carl_Ming_1/smart-admin into sit-Carl-V3 2022-01-12 20:04:46 +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
Carl
fed64ec868 Merge branch 'sit-Carl' of https://gitee.com/carl_Ming_1/smart-admin into sit-Carl-V3 2022-01-12 17:46:56 +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
Carl
4e53691ef5 adding 2 more coupon type ID calculation 2022-01-12 17:29:24 +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