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

apps/AppInfo/admin.py

@@ -562,7 +562,7 @@ class GardenManageAdmin(admin.ModelAdmin):
 @admin.register(GardenArea)
 class GardenAreaAdmin(admin.ModelAdmin):
     # 列表页面显示字段
-    list_display = ['name','user','garden','manage','location','addr','area','mobile','img','desc','upl_time']
+    list_display = ['name','user','garden','manage','location','addr','area','mobile','img','desc','upl_time','hidden']
     # 搜索项：
     search_fields = ['name']
 

apps/AppInfo/models.py

@@ -409,6 +409,7 @@ class GardenArea(models.Model):
     desc = models.CharField(u'地块介绍', max_length=350, blank=True,null=True)
     guide_img = models.CharField(u'导览图片', max_length=200, blank=True, null=True)
     upl_time = models.DateTimeField(u'创建时间', blank=True, null=True)
+    hidden = models.BooleanField(default=False,verbose_name="是否隐藏")
 
     class Meta:
         verbose_name = '园区分地表'

apps/Equipment/views.py

@@ -1813,7 +1813,7 @@ class Farm_Check_List(ListView):
     def get(self,request):
         hidden = request.GET.get('hidden')
         page = int(request.GET.get('page'))
-        art_list = FarmList.objects.filter(hidden=hidden)
+        art_list = GardenArea.objects.filter(hidden=hidden)
         nums = art_list.count()
         art = art_list[(10*(page-1)):(page*10)]
         return render(request, 'backstageNet/infoManage/farmManageList.html', context={"art":art,"nums":nums})