update

src/common/models.py

@@ -596,6 +596,7 @@ class BaikeDetail(models.Model):
     content = models.TextField(u"词条详情", max_length=255, blank=True,null=True)  
     cid = models.IntegerField(u"创建人id",blank=True,null=True)                
     cname = models.CharField(u"创建人名称", max_length=255, blank=True,null=True)  
+    editor = models.CharField(u"editor", max_length=255, blank=True,null=True)  
     status = models.SmallIntegerField(u"0/待发布,1/已发布",default=0)
                                                                                    
     ctime = models.DateTimeField(u"创建时间",auto_now_add=True)                    

src/manage/controls.py

@@ -1021,16 +1021,16 @@ def get_sub_category(pid):
     if qdata:
         for subitem in qdata:
             subitem["type"] = "ent"
+            subitem["label"] = subitem["name"]
             subitem["children"] = get_sub_category(subitem["id"])                                                                    
     return qdata
 
 def get_baike_category_tree(**kwargs):
-	"""
-	"""
-	parents = list(cm.BaikeCategory.objects.filter(parent_id__isnull=True).values())
-	for item in parents:
-		item["children"] = get_sub_category(item["id"])
-	return parents
+    parents = list(cm.BaikeCategory.objects.filter(parent_id__isnull=True).values())
+    for item in parents:
+        item["label"] = item["name"]
+        item["children"] = get_sub_category(item["id"])
+    return parents
 
 
 def get_baike_list_by_category(**kwargs):

src/utils/aliyunpush.py

@@ -15,6 +15,7 @@ class AliyunPush(object):
         self.request.set_accept_format("json")
         self.request.set_iOSApnsEnv('DEV')
         self.request.set_AppKey("333793060")
+        print(dir(self.request),1111111111)
 
     def push_notice_by_userid(self,user_id,title,body,params):
         self.request.set_PushType("NOTICE")

src/weixin/views.py

@@ -1293,6 +1293,7 @@ class BaikeDetailView(cv.AuthView):
         if mse:
             raise ce.TipException(mse)
         try:
+            need_params.extend(["editor"])
             vals = ccf.get_need_params(*need_params,**qdata)
             vals["cid"] = request.user.get("id",0)
             vals["cname"] = request.user.get("username","")