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

apps/AppInfo/models.py

@@ -348,9 +348,9 @@ class Blog(models.Model):
 
 class CKArticle(models.Model):
     author = models.ForeignKey(MyUser,verbose_name=u'作者')
-    art_type = models.CharField(u'文章类型',max_length=10, blank=True, null=True)
+    art_type = models.CharField(u'文章类型',max_length=10, blank=True, null=True)  # 5 新闻资讯  6 视频资讯  7 产品展厅  8 四季采摘  9  民宿导览  10  旅游景点
     writer = models.CharField(u'发布人', max_length=10, blank=True, null=True)
-    title = models.CharField(max_length=254, null=True, blank=True)
+    title = models.CharField(max_length=254, null=True, blank=True)       
     video_url = models.FileField(upload_to="media/uploads/", null=True, blank=True, verbose_name="视频内容")
     intro = models.CharField(u'简介',max_length=255, null=True, blank=True)
     head_img = models.ImageField(u'封面图片',upload_to="media/uploads/" ,null=True, blank=True)
@@ -595,8 +595,8 @@ class Sightsee_Info(models.Model):
     desc = models.CharField(u'景点简介',max_length=255, null=True, blank=True)
     location = models.CharField(u'经纬度', max_length=50, blank=True, null=True)
     addr = models.CharField(u'景点位置', max_length=50, blank=True, null=True)
-    sightsee_stime = models.DateTimeField(u'景区开放时间',blank=True, null=True)
-    sightsee_etime = models.DateTimeField(u'景区结束时间',blank=True, null=True)
+    sightsee_stime = models.CharField(u'景区开放时间', max_length=50, blank=True, null=True)
+    sightsee_etime = models.CharField(u'景区结束时间', max_length=50, blank=True, null=True)
     sightsee_img = models.CharField(u'景点图片', max_length=200, blank=True, null=True)
     sightsee_tel = models.CharField(u'联系方式', max_length=20, blank=True, null=True)
     upl_time = models.DateTimeField(u'发布时间',default=timezone.now)

apps/Equipment/views.py

@@ -1334,10 +1334,10 @@ class Sightsee_Pub(ListView):
         sightsee_img = request.POST.get('img_url')
         sightsee_stime = request.POST.get('stime')
         sightsee_etime = request.POST.get('etime')
-        begindate = re.findall(r"\d+\.?\d*", sightsee_stime)
-        enddate = re.findall(r"\d+\.?\d*", sightsee_etime)
-        start_date = datetime.date(int(begindate[0]), int(begindate[1]), int(begindate[2]))
-        end_date = datetime.date(int(enddate[0]), int(enddate[1]), int(enddate[2]))
+        # begindate = re.findall(r"\d+\.?\d*", sightsee_stime)
+        # enddate = re.findall(r"\d+\.?\d*", sightsee_etime)
+        # start_date = datetime.date(int(begindate[0]), int(begindate[1]), int(begindate[2]))
+        # end_date = datetime.date(int(enddate[0]), int(enddate[1]), int(enddate[2]))
         # 位置
         location = request.POST.get('location')
         addr = request.POST.get('addr')
@@ -1349,8 +1349,8 @@ class Sightsee_Pub(ListView):
             name=name,
             price=price,
             location=location,
-            sightsee_stime=start_date,
-            sightsee_etime=end_date,
+            sightsee_stime=sightsee_stime,
+            sightsee_etime=sightsee_etime,
             sightsee_img=sightsee_img,
             sightsee_tel=sightsee_tel,
             addr=addr,
@@ -1370,7 +1370,18 @@ class My_Pub(ListView):
 #我的发布列表
 class My_Pub_List(ListView):
     def get(self,request):
-        return render(request, 'backstageNet/infoList/myPubList.html', context={})
+        page = int(request.GET.get("page",1))
+        hidden = request.GET.get("hidden")
+        _type = request.GET.get("type")
+        page = request.GET.get("hidden")
+        _list = CKArticle.objects.all()
+        if _type:
+            _list = _list.filter(art_type=_type)
+        if hidden:
+            _list = _list.filter(hidden=hidden)
+        nums = _list.count()
+        art_list = _list[(10*(page-1)):(page*10)]
+        return render(request, 'backstageNet/infoList/myPubList.html', context={"art_list":art_list,"nums":nums})
     def post(self,request):
         pass