调整数据表

apps/Home/urls.py

@@ -8,7 +8,7 @@ app_name = 'Home'
 urlpatterns = [
     url(r'^home_test$', Home_Test.as_view(), name='home_test'),
     url(r'^home$', Home.as_view(), name='home'),
-    url(r'^home2$', Home2.as_view(), name='home2'),
+    # url(r'^home2$', Home2.as_view(), name='home2'),
     url(r'^$', Home.as_view(), name='home'),
     url(r'^login$',Login_View.as_view(), name='login'),
     url(r'^login2$',Login2_View.as_view(), name='login2'),

apps/Home/views.py

@@ -165,33 +165,33 @@ class Home(View):
     def post(self, request):
         pass
 
-# 外网首页2
-class Home2(View):
-    def get(self, request):
-        user_news = CKArticle.objects.filter(art_type=5)[0:10]
-        zero_news = CKArticle.objects.filter(art_type=0)[0:10]
-        one_news = CKArticle.objects.filter(art_type=1)[0:10]
-        two_news = CKArticle.objects.filter(art_type=2)[0:10]
-        video_news = Video_data.objects.all()[0:4]
-        product = Product.objects.all()[0:8]
-        pick = Pick_Pub.objects.all()[0:6]
-        garden = GardenArea.objects.all()
-        farm = FarmList.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)
-            print('user_name=', user_name)
-            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,"farm":farm,
-                                                               "two_news": two_news, "video_news": video_news,"hotel":hotel,"article":article,
-                                                               "product": product, "pick": pick, "garden": garden, "curr_user": curr_user})
-
-    def post(self, request):
-        pass
+# # 外网首页2-------------暂时不用
+# class Home2(View):
+#     def get(self, request):
+#         user_news = CKArticle.objects.filter(art_type=5)[0:10]
+#         zero_news = CKArticle.objects.filter(art_type=0)[0:10]
+#         one_news = CKArticle.objects.filter(art_type=1)[0:10]
+#         two_news = CKArticle.objects.filter(art_type=2)[0:10]
+#         video_news = Video_data.objects.all()[0:4]
+#         product = Product.objects.all()[0:8]
+#         pick = Pick_Pub.objects.all()[0:6]
+#         garden = GardenArea.objects.all()
+#         farm = FarmList.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)
+#             print('user_name=', user_name)
+#             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,"farm":farm,
+#                                                                "two_news": two_news, "video_news": video_news,"hotel":hotel,"article":article,
+#                                                                "product": product, "pick": pick, "garden": garden, "curr_user": curr_user})
+
+#     def post(self, request):
+#         pass
 
 
 # 首页设备显示