add missing file
Merge remote-tracking branch 'origin/master'

* origin/master:
  更新样式
  添加商户列表和商户详情用户登录JS