Commit Graph

54 Commits

Author SHA1 Message Date
Vion
560d9b5c1c Payment bug fixed 2022-01-23 21:10:24 +08:00
Vion
c5e5978615 Payment flow refined 2022-01-23 19:29:46 +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
Vion
2f5ef11c15 Breadcrumbs added except : order list / shopping cart / coupon list / address management 2022-01-23 12:44:49 +08:00
Vion
fcb6dc26bd Breadcrumbs 0 version 2022-01-23 11:30:31 +08:00
Vion
358f0f66b9 Rx goods modified 2022-01-22 23:04:56 +08:00
Vion
0833e998ea Bug list updated 2022-01-22 21:34:50 +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
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
Vion
60c6a6b8b4 Floating right component added, personal pages style fixed 2022-01-21 23:34:49 +08:00
Vion
64d4b856c0 Merged and product list bug fixed 2022-01-21 22:16:11 +08:00
Vion
8e464641d3 Product list & search list completed 2022-01-21 20:48:13 +08:00
Vion
f3c9a9c65b addressInput error fixed 2022-01-21 19:28:46 +08:00
Vion
4a1d1b9dd6 Product list function completed 2022-01-21 18:12:45 +08:00
summation
e7b12f5e0b 产品详情页 2022-01-20 22:09:47 +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
b907a6292c 更改 2022-01-20 12:13:02 +08:00
Admin
4bfd884a9b
回退 'Pull Request !42 : 1-19 He' 2022-01-20 02:47:36 +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
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
e133d3e778 sumt 2022-01-19 19:11:18 +08:00
952108534@qq.com
405401da7a 去除引用jq 2022-01-19 11:40:25 +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
952108534@qq.com
9e4ca15f5d 更改样式和数据 2022-01-18 22:21:47 +08:00
952108534@qq.com
b67734b6ce 提交产品以及搜索 2022-01-18 21:50:16 +08:00
Vion
38e4cb44d7 Product list style updated 2022-01-17 19:44:56 +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
952108534@qq.com
fa9418b9f9 sit-Carl 2022-01-17 19:09:40 +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
952108534@qq.com
8375664ba6 搜索以及优惠券 2022-01-17 10:57:01 +08: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
151ad0235e 更改图片以及修改底部 2022-01-13 18:27:31 +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
b93b2f1180 Homepage / Product list / Product Detail / header / footer / RoyalCanin css,js added 2022-01-11 19:08:04 +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