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

apps/Equipment/urls.py

@@ -255,6 +255,7 @@ urlpatterns = [
     url(r'^product_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\product_photo'}), #本地
     url(r'^garden_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\garden_photo'}), #本地
     url(r'^guser_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\guser_photo'}), #本地
+    url(r'^map_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\map_photo'}), #本地
     
 
     # url(r'^hotel_photo/(?P<path>.*)', serve, {'document_root': '/home/web/second/second/hotel_photo'}), #本地

apps/Equipment/views.py

@@ -3441,6 +3441,8 @@ class Pic_locat(ListView):
         addr = request.POST.get('addr')
         locat_info = request.POST.get('locat_info')
         pic_center = request.POST.get('pic_center')
+        if Pic_Info.objects.filter(pic_user=user).exists():
+            return HttpResponse("0")
         try:
             Pic_Info.objects.create(pic_user=user,locat1=locat1,locat2=locat2,pic_center=pic_center,addr=addr,locat_info=locat_info)
             return HttpResponse("1")