更改了颜色

更改了按钮的颜色
Merge branch 'master' of https://github.com/tianqu/4Sshop

Conflicts:

ProjectFor4SShop/ProjectFor4SShop.xcodeproj/project.xcworkspace/xcuserda
ta/lanou3g.xcuserdatad/UserInterfaceState.xcuserstate
	ProjectFor4SShop/ProjectFor4SShop/main.storyboard