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

apps/Equipment/views.py

@@ -1141,7 +1141,7 @@ class Garden_Pub(ListView):
             except Exception as e:
                 print("-----------报错信息为-------------")
                 print(e)
-                data = ("0")
+                data = "0"
             return HttpResponse(data)
 
 

apps/Home/views.py

@@ -107,7 +107,7 @@ class Login_View(View):
                     else:
                         if returnUrl == "":
                             print("returnUrl is empty")
-                            return render(request, 'outerNet/index.html')
+                            return render(request, 'outerNet/index2.html')
                         elif returnUrl != "":
                             print("returnUrl is not empty")
                             return render(request, 'outerNet/index.html')
@@ -138,7 +138,7 @@ class Home(View):
             print('user=', curr_user.username)
         else:
             curr_user = ""
-        return render(request, 'outerNet/index.html', context={"user_news": user_news,"zero_news": zero_news, "one_news": one_news,
+        return render(request, 'outerNet/index2.html', context={"user_news": user_news,"zero_news": zero_news, "one_news": one_news,
                                                                "two_news": two_news, "video_news": video_news,"hotel":hotel,
                                                                "product": product, "pick": pick, "farm": farm, "curr_user": curr_user})