diff --git a/apps/article/urls.py b/apps/article/urls.py index d6c012f..44abb05 100644 --- a/apps/article/urls.py +++ b/apps/article/urls.py @@ -4,6 +4,9 @@ app_name='article' from . import views urlpatterns = [ + + path('', views.ArticleList, name='index'), + path('created/',views.Article_Add,name='created'), path('me/',views.ArticleMe,name='me'), path('',views.ArticleList,name='index'), diff --git a/apps/article/views.py b/apps/article/views.py index 28585a1..4c72379 100644 --- a/apps/article/views.py +++ b/apps/article/views.py @@ -37,6 +37,37 @@ from pure_pagination import Paginator, PageNotAnInteger +def Home(request): + """ + 首页 + :param request: + :return: + """ + recommend = Recommend.objects.filter(is_recommend=True)[:10] + #seo_list = get_object_or_404(Seo, name='首页') + qq = QQ.objects.all() + links = link.objects.all() + #user = Follow.objects.values('follow_id').distinct().order_by('-follow_id') + # user = Follows.objects.values('follow_id').distinct().order_by('-follow_id') + # item=[] + # for i in user: + # data={} + # #print(User.objects.filter(follow__follow__id=i['follow_id'])) + # data['data']=User.objects.filter(follow__follow__id=i['follow_id']).distinct() + # item.append(data) + try: + page = request.GET.get('page',1) + if page == '': + page = 1 + except PageNotAnInteger: + page = request.GET.get('page') + # Provide Paginator with the request object for complete querystring generation + article = Article.objects.filter(is_show=True) + p = Paginator(article,10,request=request) + people = p.page(page) + banners = Banners.objects.first() + return render(request, 'pc/index.html', {'article':people,'qq':qq,'recommend':recommend,'links':links,'banners':banners}) + def ArticleList(request): @@ -45,7 +76,7 @@ def ArticleList(request): :param request: :return: """ - seo_list = get_object_or_404(Seo, name='文章') + # seo_list = get_object_or_404(Seo, name='文章') article = Article.objects.filter(is_show=True) category = Category_Article.objects.all().order_by('order') type = request.GET.get('type', '') @@ -63,7 +94,7 @@ def ArticleList(request): headlines = Headlines.objects.all()[:30] banners = Banners.objects.first() - return render(request, 'pc/article.html', {'seo_list':seo_list,'article': people,'category':category,'Headlines':headlines,'banners':banners}) + return render(request, 'pc/article.html', {'article': people,'category':category,'Headlines':headlines,'banners':banners}) diff --git a/apps/course/views.py b/apps/course/views.py index db67ecf..32d1bef 100644 --- a/apps/course/views.py +++ b/apps/course/views.py @@ -25,8 +25,8 @@ def List(request): """TODO 教程列表 a标签根据uuid进 Detail视图渲染对应的所有文章""" course = Courses.objects.all() - seo_list =get_object_or_404(Seo,name='教程') - return render(request,'pc/course/index.html',{'course':course,'seo_list':seo_list}) + #seo_list =get_object_or_404(Seo,name='教程') + return render(request,'pc/course/index.html',{'course':course}) def Detail(request,course_id,list_id): diff --git a/apps/forum/views.py b/apps/forum/views.py index f5dfbec..5e68363 100644 --- a/apps/forum/views.py +++ b/apps/forum/views.py @@ -45,7 +45,7 @@ def index(request): :param request: :return: """ - seo_list = get_object_or_404(Seo, name='社区论坛') + #seo_list = get_object_or_404(Seo, name='社区论坛') plate = Forum_plate.objects.all() forum = Forum.objects.filter(hidden=False).exclude(priority=Priority.objects.first()) zd = Priority.objects.all() diff --git a/templates/pc/index.html b/templates/pc/index.html index 569717d..dd52f0f 100644 --- a/templates/pc/index.html +++ b/templates/pc/index.html @@ -1,40 +1,27 @@ {% extends 'pc/base.html' %} {% load static %} -{% load getDate %} {% load i18n %} {% block title %} - {{ seo_list.title }} +{{ seo_list.title }} {% endblock %} {% block authors %} - 冯金琪 +冯金琪 {% endblock %} {% block keywords %} - {{ seo_list.keywords }} +{{ seo_list.keywords }} {% endblock %} {% block desc %} - {{ seo_list.desc }} +{{ seo_list.desc }} {% endblock %} {% block css %} - {# #} - {% comment %}{% endcomment %} - - -{% endblock %} -{% block link_js %} - - - - - - - - - +{# #} +{% comment %}{% endcomment %} + {% endblock %} {% block content %}
-
- {% comment %}
+
+ {% comment %}
今日推荐

{{ recommend.first.recommends.category.name }}{{ recommend.first.recommends.title }}

@@ -55,131 +42,109 @@

{{ recommend.first.recommends.category.name }}

{% endcomment %} - {% comment %} {% endcomment %} - -
-
- -
- -
- -
-
- + +
+
+ +
+
+ {% for articles in article.object_list %} +
+
+

{{ articles.category.name }}{{ articles.title }}

+
+ {% if articles.list_pic %} +
+
+
+ {% endif %} - {% for item in dynamicPage.object_list %} -
-
- +

{{ articles.desc|truncatechars:135 }}

+
+
+
- -
- -
- -
-

- {% for foo in item.name.all %} - #{{ foo.title }} - {% endfor %} -

- {# {{ item.get_number }}#} - -
- - -
- {% empty %} -

暂无动态...

- {% endfor %} + {% endif %})no-repeat;"> + {{ articles.authors.username }} + + +
  • 发布于：{{ articles.add_time }}
    • +
  • {{ articles.click_nums }}
    • +
  • + {{ articles.get_number }} +
    • + +
    +
    +
    +
    + {% empty %} +

    暂无文章...

    + {% endfor %} -
    - {% if article.object_list.count >= 1 %} +
    + {% if article.object_list.count >= 1 %}
    -
      -
    • 首页
      • - {% if article.has_previous %} -
    • -
      • - {% else %} -
    • 上一页
      • - {% endif %} - {% for page in article.pages %} - {% if page %} - {% ifequal page article.number %} -
    • {{ page }}
      • - {% else %} -
    • {{ page }}
      • - {% endifequal %} - {% else %} -
    • ...
      • - {% endif %} - {% endfor %} - {% if article.has_next %} -
      • - {% else %} -
    • 下一页
      • - {% endif %} -
    • 尾页
      • -
    • 跳转到
      • -
    - 当前{{ article.number }}/总共{{ article.paginator.num_pages }}页 -
    - {% endif %} -
    -
    +
      +
    • 首页
      • + {% if article.has_previous %} +
      • + {% else %} +
    • 上一页
      • + {% endif %} + {% for page in article.pages %} + {% if page %} + {% ifequal page article.number %} +
    • {{ page }}
      • + {% else %} +
    • {{ page }}
      • + {% endifequal %} + {% else %} +
    • ...
      • + {% endif %} + {% endfor %} + {% if article.has_next %} +
      • + {% else %} +
    • 下一页
      • + {% endif %} +
    • 尾页
      • +
    • 跳转到
      • +
    + 当前{{ article.number }}/总共{{ article.paginator.num_pages }}页 +
    + {% endif %} + +
    -
    + +
    +
    +

    商务合作

    + +
    +
    + + {% endblock %} {% block js %} {% endblock %} diff --git a/website/urls.py b/website/urls.py index 4b09df5..5f75052 100644 --- a/website/urls.py +++ b/website/urls.py @@ -79,7 +79,9 @@ url(r'^captcha/', include('captcha.urls')), path('refresh/', captcha_refresh), # 这是生成验证码的图片 path('yan/', yan), # 这是生成验证码的图片 - path('', Home, name='home'), + # path('', Home, name='home'), + path('', views.Home, name='home'), + path('webapp/', TemplateView.as_view(template_name='webapp/index.html')), path('login/', login_view, name='index'), path('info/', get_message, name='info'),