Merge branch 'feature/scroll' into 'test'

modify

See merge request !294

api/tag.py

@@ -240,6 +240,8 @@ class SearchDefaultKeyword(APIView):
         update = request.POST.get('update', '')
         try:
             data = self.rpc['venus/sun/tag/search_default_keyword/edit'](data=update, id=id).unwrap()
+            if data == "fail":
+                return {"message": "搜索关键词设置不能超过10个"}
         except Exception as e:
             error_logger.error(u'更新搜索默认关键字失败%s', e)
             raise