Merge branch 'v3.0-app' of http://118.190.145.217:3000/xiaojincai/wanzb_v3_api into v3.0-app

src/weixin/controls.py

@@ -1739,7 +1739,7 @@ def update_user_style(**kwargs):
     """
     user_id = kwargs.pop("user_id")
     #player_id = kwargs.pop("player_id")
-    #init_fund = kwargs.pop("init_fund")
+    init_fund = kwargs.pop("init_fund")
     #avatar = kwargs.pop("avatar")
 
     cm.UserInfo.objects.filter(id=user_id).update(**kwargs)
@@ -1794,8 +1794,12 @@ def get_stock_players(**kwargs):
     else:
         total = len(data)
 
-    return total,data
+    #return total,data
     #return data
+    if kwargs.get("v3"):
+        return total,data
+    else:
+        return data
         
 
 def update_user_fund(**kwargs):

src/weixin/views.py

@@ -1155,6 +1155,7 @@ class V3StockPlayersListView(cv.AuthView):
             vals = ccf.get_need_params(*need_params,**qdata)
             vals["user_id"] = request.user.get("id")
             vals["stock_id"] = vals.get("id")
+            vals["v3"] = 1
             total,rst = ctl.get_stock_players(**vals)
             return cv.to_suc({"total":total,"list":rst})
             #return cv.to_suc(rst)
@@ -1302,7 +1303,7 @@ class BaikeDetailView(cv.AuthView):
             return cv.to_fail(e)
 
 
-class V3AuthinfoView(cv.AuthView):
+class V3AuthinfoView(cv.BaseView):
     def get(self,request):
         """#获取用户信息(小程序)
         """