@@ -63,9 +63,9 @@ urlpatterns += [  | 
            ||
| 63 | 63 | 
                 | 
            
| 64 | 64 | 
                # 群用户相关  | 
            
| 65 | 65 | 
                urlpatterns += [  | 
            
| 66 | 
                - url(r'^g/join$', groupuser_views.group_join_api, name='group_join_api'), # 成员申请加群  | 
            |
| 67 | 
                - url(r'^g/remove$', groupuser_views.group_remove_api, name='group_remove_api'), # 成员移除, 管理员主动, 群成员被动  | 
            |
| 68 | 
                - url(r'^g/quit$', groupuser_views.group_quit_api, name='group_quit_api'), # 成员退出,群成员主动  | 
            |
| 66 | 
                + url(r'^g/join$', groupuser_views.group_user_join_api, name='group_join_api'), # 成员申请加群  | 
            |
| 67 | 
                + url(r'^g/remove$', groupuser_views.group_user_remove_api, name='group_remove_api'), # 成员移除, 管理员主动, 群成员被动  | 
            |
| 68 | 
                + url(r'^g/quit$', groupuser_views.group_user_quit_api, name='group_quit_api'), # 成员退出,群成员主动  | 
            |
| 69 | 69 | 
                ]  | 
            
| 70 | 70 | 
                 | 
            
| 71 | 71 | 
                # 旅行团相关  | 
            
                @@ -20,7 +20,7 @@ r = settings.REDIS_CACHE  | 
            ||
| 20 | 20 | 
                 | 
            
| 21 | 21 | 
                 | 
            
| 22 | 22 | 
                @logit  | 
            
| 23 | 
                -def group_join_api(request):  | 
            |
| 23 | 
                +def group_user_join_api(request):  | 
            |
| 24 | 24 | 
                """ 申请加群 """  | 
            
| 25 | 25 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
| 26 | 26 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
                @@ -78,7 +78,7 @@ def group_join_api(request):  | 
            ||
| 78 | 78 | 
                 | 
            
| 79 | 79 | 
                 | 
            
| 80 | 80 | 
                @logit  | 
            
| 81 | 
                -def group_remove_api(request):  | 
            |
| 81 | 
                +def group_user_remove_api(request):  | 
            |
| 82 | 82 | 
                """ 成员移除 """  | 
            
| 83 | 83 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
| 84 | 84 | 
                     admin_id = request.POST.get('admin_id', '')
               | 
            
                @@ -119,7 +119,7 @@ def group_remove_api(request):  | 
            ||
| 119 | 119 | 
                 | 
            
| 120 | 120 | 
                 | 
            
| 121 | 121 | 
                @logit  | 
            
| 122 | 
                -def group_quit_api(request):  | 
            |
| 122 | 
                +def group_user_quit_api(request):  | 
            |
| 123 | 123 | 
                """ 成员退出 """  | 
            
| 124 | 124 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
| 125 | 125 | 
                     user_id = request.POST.get('user_id', '')
               |