update merchant design
Merge branch 'tmp'
update merchant design
update switch style
update merchant new design
Merge branch 'tmp'