Merge branch 'master' of http://39.104.94.153:3000/yf_zd/second

apps/Equipment/views.py

@@ -1865,36 +1865,16 @@ class Sightsee_Check_List(ListView):
     def get(self,request):
         hidden = request.GET.get('hidden')
         page = int(request.GET.get('page'))
-        art_list = Pick_Pub.objects.filter(hidden=hidden)
-        nums = art_list.count()
-        art = art_list[(10*(page-1)):(page*10)]
-        return render(request, 'backstageNet/infoManage/sightseeManageList.html', context={"art":art,"nums":nums})
+        sightsee = Sightsee_Info.objects.filter(hidden=hidden)
+        nums = sightsee.count()
+        sightsee = sightsee[(10*(page-1)):(page*10)]
+        return render(request, 'backstageNet/infoManage/sightseeManageList.html', context={"sightsee":sightsee,"nums":nums})
     def post(self,request):
-        art_id = request.POST.get('id')
-        req = request.POST.get('req')
-        art_obj = Pick_Pub.objects.filter(id=art_id)
-        # 编辑
-        if req == "edit":
-            data = []
-            for i in art_obj:
-                data.append({
-                    "id":i.id,
-                    "name":i.name,
-                    "company":i.company,
-                    "pick_img":i.pick_img,
-                    "time": i.upl_time,
-                    "farm":i.farm.name
-                    })
-        #删除
-        elif req == "del":
-            art_obj.delete()
-            data = "1"
-        #审核通过
-        elif req == "check":
-            art_obj = Pick_Pub.objects.get(id=art_id)
-            art_obj.hidden = True
-            art_obj.save()
-            data = "1"
+        s_id = request.POST.get('id')
+        # req = request.POST.get('req')
+        i = Sightsee_Info.objects.get(id=s_id)
+        data = {"name":i.name,"price":i.price,"desc":i.desc,"location":i.location,"addr":i.addr,"sightsee_stime":i.sightsee_stime,"sightsee_etime":i.sightsee_etime,
+                "sightsee_img":i.sightsee_img,"sightsee_tel":i.sightsee_tel,"upl_time":i.upl_time,"guide_img":i.guide_img,"content":i.content}
         data = json.dumps(data,ensure_ascii=False)
         return HttpResponse(data)