Merge pull request #7 from zjjott/develop

Merge pull request #6 from zjjott/master
Merge pull request #8 from zjjott/feature

Feature
Merge pull request #12 from zjjott/feature

Feature
Merge pull request #17 from zjjott/feature

Feature ->Master
Update main.js

果壳颜色功能已经被干掉,暂时隐藏颜色选择器
果壳颜色功能已经被干掉,暂时隐藏颜色选择器

果壳颜色功能已经被干掉,暂时隐藏颜色选择器
Merge pull request #19 from zjjott/feature

果壳颜色功能已经被干掉,暂时隐藏颜色选择器
Merge pull request #20 from zjjott/develop

Merge pull request #18 from zjjott/feature
Merge pull request #21 from zjjott/master

果壳颜色功能已经被干掉,暂时隐藏颜色选择器