all done

src/manage/views.py

@@ -1392,6 +1392,7 @@ class BaikeDetailView(cv.AdminView):
         if mse:
             raise ce.TipException(mse)
         try:
+            need_params.extend(["editor"])
             vals = ccf.get_need_params(*need_params,**qdata)
             vals["cid"] = 0
             vals["cname"] = u"系统管理员"
@@ -1416,6 +1417,7 @@ class BaikeDetailView(cv.AdminView):
         if mse:
             raise ce.TipException(mse)
         try:
+            need_params.extend(["editor"])
             vals = ccf.get_need_params(*need_params,**qdata)
             if qdata.get("action") == "publish":
                 vals["status"] = 1

src/weixin/controls.py

@@ -1986,7 +1986,6 @@ def do_wx_pay(request):
     phone = qdata.get("phone")
     phcode = qdata.get("phcode")
     match_group = qdata.get("match_group")
-    print(qdata)
     signup_name = qdata.get("signup_name")
     if not signup_name:
         signup_name = user_name
@@ -2223,7 +2222,6 @@ def get_user_consult_list(request):
             reply_list = cm.WanzhuConsult.objects.filter(Q(pid=item["id"])).values()
             for iitem in reply_list:
                 data.append(iitem)
-    print(data)
     data = sorted(data,key=lambda x:x["id"])
     #分页
     page = int(kwargs.get("page",1))
@@ -2232,6 +2230,12 @@ def get_user_consult_list(request):
         total,data = ccf.get_page_list(data,page,page_size)
     else:
         total = len(data)
+
+    for item in data:
+        user_id = item["user_id"]
+        user = cm.UserInfo.objects.filter(id=user_id).first()
+        if user:
+            item["usercode"] = user.usercode
     return total,data
 
 def get_user_zans(request):
@@ -2824,11 +2828,6 @@ def get_wanzhu_consult_list(**kwargs):
     if kwargs.get("content"):
         qset = qset.filter(Q(content__icontains=kwargs.get("content"))|Q(reply_content__icontains=kwargs.get("content")))
     data = list(qset.values())
-    for item in data:
-        user_id = item["user_id"]
-        userinfo = get_user_info(user_id)
-        if userinfo:
-            item["user_code"] = userinfo.get("usercode")
 
     #分页
     page = int(kwargs.get("page",1))
@@ -2837,6 +2836,12 @@ def get_wanzhu_consult_list(**kwargs):
         total,data = ccf.get_page_list(data,page,page_size)
     else:
         total = len(data)
+
+    for item in data:
+        user_id = item["user_id"]
+        userinfo = get_user_info(user_id)
+        if userinfo:
+            item["user_code"] = userinfo.get("usercode")
     return total,data
 
 
@@ -2886,6 +2891,9 @@ def reply_wanzhu_consult(**kwargs):
     content = kwargs.get("reply_content")
     user_id = kwargs.get("user_id")
     action = kwargs.get("action")
+    width = kwargs.get("width")
+    height = kwargs.get("height")
+
     if action == "send":
         user = cm.UserInfo.objects.filter(id=user_id).first()
         user_name = user.username
@@ -2907,6 +2915,9 @@ def reply_wanzhu_consult(**kwargs):
             user_name = user_name, 
             user_avatar = user_avatar
         )
+        wanzhu_obj.width = width
+        wanzhu_obj.height = height
+        wanzhu_obj.save()
 
         wanzhu_obj_1 = cm.WanzhuConsult.objects.create(
             reply_content = content,
@@ -2915,7 +2926,10 @@ def reply_wanzhu_consult(**kwargs):
             reply_user_id = user_id,
             pid = wanzhu_obj.id
         )
-        cm.Consult.objects.filter(user_id=user_id).update(reply_status=1,reply_content=content,ctime=datetime.datetime.now())
+        wanzhu_obj_1.width = width
+        wanzhu_obj_1.height = height
+        wanzhu_obj_1.save()
+        cm.Consult.objects.filter(user_id=user_id).update(reply_status=1,view_status=1,reply_content=content,ctime=datetime.datetime.now())
 
 
     else:
@@ -2926,7 +2940,7 @@ def reply_wanzhu_consult(**kwargs):
             player_id = 0,
             reply_user_id = user_id
         )
-        cm.Consult.objects.filter(user_id=user_id).update(reply_status=1,reply_content=content,ctime=datetime.datetime.now())
+        cm.Consult.objects.filter(user_id=user_id).update(reply_status=1,view_status=1,reply_content=content,ctime=datetime.datetime.now())
     #发送消息提醒
     if cm.UserInfo.objects.filter(id=user_id).exists():
         user = cm.UserInfo.objects.filter(id=user_id).first()

src/weixin/views.py

@@ -1339,7 +1339,7 @@ class WanzhuConsultReplyView(cv.AuthView):
         if mse:
             raise ce.TipException(mse)
         try:
-            need_params.extend(["pid","action"])
+            need_params.extend(["pid","action","width","height"])
             vals = ccf.get_need_params(*need_params,**qdata)
             rst = ctl.reply_wanzhu_consult(**vals)
             return cv.to_suc(rst)