Merge branch 'master' of http://119.23.72.7/liangjianmin/pcb
# Conflicts: # css/home/home.less # css/home/index.css
Showing
with
9498 additions
and
66 deletions
.idea/encodings.xml
0 → 100644
.idea/misc.xml
0 → 100644
.idea/modules.xml
0 → 100644
.idea/pcb.iml
0 → 100644
.idea/vcs.xml
0 → 100644
.idea/watcherTasks.xml
0 → 100644
.idea/workspace.xml
0 → 100644
advanced_pcb_manufacturing_capability.html
0 → 100644
cart.html
0 → 100644
confirmorder.html
0 → 100644
css/bootstrap.min.css
0 → 100644
css/cart/address.css
0 → 100644
css/cart/newcart.css
0 → 100644
css/cart/newmember.css
0 → 100644
css/common/font/demo.css
0 → 100644
css/common/font/demo_index.html
0 → 100644
css/common/font/iconfont.css
0 → 100644
css/common/font/iconfont.eot
0 → 100644
No preview for this file type
css/common/font/iconfont.js
0 → 100644
css/common/font/iconfont.json
0 → 100644
css/common/font/iconfont.svg
0 → 100644
css/common/font/iconfont.ttf
0 → 100644
No preview for this file type
css/common/font/iconfont.woff
0 → 100644
No preview for this file type
css/common/font/iconfont.woff2
0 → 100644
No preview for this file type
css/faq/index.css
0 → 100644
css/faq/index.css.map
0 → 100644
css/faq/index.less
0 → 100644
css/home/home.css.map
deleted
100644 → 0
css/home/index.css
0 → 100644
css/home/index.css.map
0 → 100644
css/home/index.less
0 → 100644
css/login/login.css
0 → 100644
css/login/login.css.map
0 → 100644
css/login/login.less
0 → 100644
css/piclist/index.css
0 → 100644
css/piclist/index.css.map
0 → 100644
css/piclist/index.less
0 → 100644
faq.html
0 → 100644
images/banner/picbanner.jpg
0 → 100644
63.1 KB
images/cart/check.png
0 → 100644
655 Bytes
images/cart/delete.png
0 → 100644
2.48 KB
images/cart/edit.png
0 → 100644
411 Bytes
images/cart/mdao (1).png
0 → 100644
2.35 KB
images/cart/mdao.png
0 → 100644
2.35 KB
images/cart/mincart.png
0 → 100644
376 Bytes
images/cart/pay.png
0 → 100644
2.53 KB
images/cart/pay1.png
0 → 100644
2.85 KB
images/cart/weiz.png
0 → 100644
672 Bytes
images/cart/xz.png
0 → 100644
622 Bytes
images/country/plane1_09.jpg
0 → 100644
1.57 KB
images/faq/arrow.png
0 → 100644
225 Bytes
images/faq/arrows.png
0 → 100644
226 Bytes
images/login/icon-email.png
0 → 100644
946 Bytes
images/login/icon-img-code.png
0 → 100644
1.04 KB
images/login/icon-password.png
0 → 100644
909 Bytes
images/login/login-bg.jpg
0 → 100644
295 KB
images/new/producelogo_h.png
0 → 100644
5.57 KB
images/new/upimg.png
0 → 100644
3.83 KB
images/pic/1.png
0 → 100644
138 KB
images/pic/11.png
0 → 100644
201 Bytes
images/pic/sta.png
0 → 100644
502 Bytes
images/pic/star.png
0 → 100644
445 Bytes
images/pic/stars.png
0 → 100644
447 Bytes
login.html
0 → 100644
pcb_assembly_capability.html
0 → 100644
picdetail.html
0 → 100644
piclist.html
0 → 100644
Please
register
or
sign in
to comment