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

apps/AppInfo/models.py

@@ -592,10 +592,11 @@ class Hotel_Info(models.Model):
 class Sightsee_Info(models.Model):
     name = models.CharField(u'景点名字', max_length=20, blank=True, null=True)
     price = models.CharField(u'景点价格', max_length=20, blank=True, null=True)
-    intro = models.CharField(u'景点简介',max_length=255, null=True, blank=True)
+    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_time = models.DateTimeField(u'景区开放时间',blank=True, null=True)
+    sightsee_stime = models.DateTimeField(u'景区开放时间',blank=True, null=True)
+    sightsee_etime = models.DateTimeField(u'景区结束时间',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

@@ -1332,7 +1332,8 @@ class Sightsee_Pub(ListView):
         price = request.POST.get('price')
         sightsee_tel = request.POST.get('mobile')
         sightsee_img = request.POST.get('img_url')
-        sightsee_time = request.POST.get('time')
+        sightsee_stime = request.POST.get('stime')
+        sightsee_etime = request.POST.get('etime')
         # 位置
         location = request.POST.get('location')
         addr = request.POST.get('addr')
@@ -1344,7 +1345,8 @@ class Sightsee_Pub(ListView):
             name=name,
             price=price,
             location=location,
-            sightsee_time=sightsee_time,
+            sightsee_stime=sightsee_stime,
+            sightsee_etime=sightsee_etime,
             sightsee_img=sightsee_img,
             sightsee_tel=sightsee_tel,
             addr=addr,