首页农场信息

apps/Equipment/views.py

@@ -200,10 +200,16 @@ class Newslist_View(ListView):
     def get(self,request):
         con = request.GET.get("condition")
         page = int(request.GET.get("page"))
-        art_type = int(request.GET.get("type"))
-        art_list = CKArticle.objects.filter(art_type=art_type)
-        if con:
-            art_list = CKArticle.objects.filter(art_type=art_type,title__contains=con)
+        try:
+            art_type = int(request.GET.get("type"))
+            art_list = CKArticle.objects.filter(art_type=art_type)
+            if con:
+                art_list = CKArticle.objects.filter(art_type=art_type,title__contains=con)
+        except:
+            art_list = CKArticle.objects.all()
+            if con:
+                art_list = CKArticle.objects.filter(title__contains=con)
+        
         nums = art_list.count()
         art = art_list[(5*(page-1)):(page*5)]
         return render(request, 'outerNet/newsList.html', context={'art':art,"nums":nums,"con":con,"page":page})

apps/Home/views.py

@@ -132,6 +132,7 @@ class Home(View):
         farm = FarmList.objects.all()
         garden = GardenArea.objects.all()
         hotel = Hotel_Info.objects.all()[0:5]
+        article = CKArticle.objects.all()[0:12]
         if request.user.is_authenticated():
             user_name = request.user.username
             curr_user = MyUser.objects.get(username=user_name)
@@ -139,7 +140,7 @@ class Home(View):
             print('user=', curr_user.username)
         else:
             curr_user = ""
-        return render(request, 'outerNet/index2.html', context={"user_news": user_news,"zero_news": zero_news, "one_news": one_news,
+        return render(request, 'outerNet/index2.html', context={"user_news": user_news,"zero_news": zero_news, "one_news": one_news,"article":article,
                                                                "two_news": two_news, "video_news": video_news,"hotel":hotel,"garden":garden,
                                                                "product": product, "pick": pick, "farm": farm, "curr_user": curr_user})