merge
fix conflicts
weibo js 授权弹出层