Merge branch 'feature/web' of git.dev.yoho.cn:web/yohobuy into feature/web
Conflicts: web-static/js/product/list.js web-static/sass/product/_index.scss
Showing
22 changed files
with
2043 additions
and
361 deletions
web-static/.spmignore
0 → 100644
No preview for this file type
No preview for this file type
No preview for this file type
web-static/img/index/logo-brand-line.png
0 → 100644
2.27 KB
web-static/js/common/linkage-slider.js
0 → 100644
web-static/js/common/slider2.js
0 → 100644
-
Please register or login to post a comment