外网展示页面开发

apps/Equipment/urls.py

@@ -3,10 +3,10 @@ from django.views.static import serve
 
 from apps.Equipment.views import (
     Back_Manage, CKArticle_View, Contrast_View, CropCount, Cropdata,
-    Dorm_Check, Dorm_Check_List, Dorm_Detail, Dorm_Img, Dorm_List, Dorm_Photo,
+    Dorm_Check, Dorm_Check_List, Dorm_Detail, Dorm_Img, Dorm_List, Dorm_Photo,Farm_list,
     Dorm_Pub, Equip_Check, Equip_Check_List, Equip_Photo, Equip_Pub,
     Equip_Show_Detail, Equip_Show_List, Equip_Test, Farm_Choice, Farm_List,
-    Farm_Mark, Garden_Check, Garden_Check_List, Garden_Detail, Garden_List,
+    Farm_Mark, Garden_Check, Garden_Check_List, Garden_Detail,Garden_Intro, Garden_List,Tourist,Tourist_List,
     Garden_Manage_New, Garden_Manage_View, Garden_Pub, 
     Garden_User_New, Garden_User_View, Garden_View, Industry_Data, Info_Manage,
     Info_Pub, JKlist, JKManage_View, Limit, Map_Test, News_Check,
@@ -64,6 +64,12 @@ urlpatterns = [
     url(r'^garden_view$', Garden_View.as_view(), name='garden_view'),
     url(r'^garden_list$', Garden_List.as_view(), name='garden_list'),
     url(r'^garden_detail$', Garden_Detail.as_view(), name='garden_detail'),
+    url(r'^garden_intro$', Garden_Intro.as_view(), name='garden_intro'),
+
+    #旅游导览
+    url(r'^tourist$', Tourist.as_view(), name='tourist'),
+    url(r'^touristList$', Tourist_List.as_view(), name='touristList'),
+
     # 生产管理
     url(r'^garden_manage_view$', Garden_Manage_View.as_view(), name='garden_manage_view'),
     
@@ -90,6 +96,9 @@ urlpatterns = [
     url(r'^dorm_photo$', Dorm_Photo.as_view(), name='dorm_photo'),
     url(r'^dorm_list$', Dorm_List.as_view(), name='dorm_list'),
     url(r'^dorm_detail$', Dorm_Detail.as_view(), name='dorm_detail'),
+    # 农场导览 
+    url(r'^farm_list$', Farm_list.as_view(), name='farm_list'),
+
     # 视频接口
     url(r'^video_list$', Video_List.as_view(), name='video_list'),
     url(r'^video_detail$', Video_Detail.as_view(), name='video_detail'),

apps/Equipment/views.py

@@ -275,6 +275,12 @@ class Garden_View(ListView):
         return render(request, 'outerNet/fourPick.html', context={})
     def post(self,request):
         pass
+# 主页四级采摘进入的介绍页
+class Garden_Intro(ListView):
+    def get(self,request):
+        return render(request, 'outerNet/pickIntro.html', context={})
+    def post(self,request):
+        pass
 
 
 # 四季采摘-园区详情
@@ -295,7 +301,18 @@ class Garden_Detail(ListView):
         data = json.dumps(data)
         return HttpResponse(data)
 
-
+#旅游导览
+class Tourist(ListView):
+    def get(self,request):
+        return render(request, 'outerNet/tourist.html', context={})
+    def post(self,request):
+        pass
+#旅游导览
+class Tourist_List(ListView):
+    def get(self,request):
+        return render(request, 'outerNet/touristList.html', context={})
+    def post(self,request):
+        pass
 
 # 民宿列表
 class Dorm_List(ListView):
@@ -323,6 +340,20 @@ class Dorm_Detail(ListView):
         pass
 
 
+# 农场导览  
+class Farm_list(ListView):
+    def get(self,request):
+        page = int(request.GET.get("page"))
+        con = request.GET.get("condition")
+        hotel_list = Hotel_Info.objects.all()
+        if con:
+            hotel_list = Hotel_Info.objects.filter(name__contains=con)
+        nums = hotel_list.count()
+        hotel = hotel_list[(10*(page-1)):(page*10)]
+        return render(request, 'outerNet/farmList.html', context={"nums":nums,"hotel":hotel,"page":page,"con":con})
+    def post(self,request):
+        pass
+
 # 视频列表
 class Video_List(ListView):
     def get(self,request):

second_pro/settings.py

@@ -29,7 +29,7 @@ DEBUG = True
 ALLOWED_HOSTS = ['127.0.0.1', 'localhost', 
                 '120.27.222.26','.yfzhwlw.com','.zgzhwlw.com','iot.hnyfkj.cn',
                 '39.104.94.153', '.yfznscd.com',
-                '192.168.1.8'#手机app开发用端口
+                '192.168.1.7'#手机app开发用端口
                 ]
 
 

templates/outerNet/index2.html

@@ -11,6 +11,7 @@
     <link rel="stylesheet" href="{% static '/lib/font/fontIcon/iconfont.css' %}">
     <link rel="stylesheet" href="{% static '/lib/font-awesome/4.5.0/css/font-awesome.css' %}">
     <!-- <link rel="stylesheet" href="{% static '/lib/css/video-js.min.css' %}"> -->
+    <link rel="stylesheet" href="{% static '/lib/layui/css/layui.css' %}">
     <link rel="stylesheet" href="https://a.amap.com/jsapi_demos/static/demo-center/css/demo-center.css">
     <link rel="stylesheet" href="{% static '/lib/css/reset.css' %}">
     <link rel="stylesheet" href="{% static '/css/common.css' %}">
@@ -34,16 +35,104 @@
             </div>
             <div class="LocateCover">
                 <div class="currCity">
-                    <span>全国</span>
+                    <div class="maskLine"></div>
                     <i class="fa fa-map-marker" aria-hidden="true"></i>
-                </div>
-                <div class="selectCityCover">
-                    <ul>
-                        <li>河南</li>
-                        <li>河南</li>
-                        <li>河南</li>
-                        <li>河南</li>
-                    </ul>
+                    <span>全国</span>
+                    <i class="fa fa-chevron-down" aria-hidden="true"></i>
+                    <div class="selectCityCover">
+                        <div class="hot_address">
+                            <a href="javascript:;" onclick="city_change(this,25,'bj')">北京</a>
+                            <a href="javascript:;" onclick="city_change(this,347,'sh')">上海</a>
+                            <a href="javascript:;" onclick="city_change(this,375,'tj')">天津</a>
+                            <a href="javascript:;" onclick="city_change(this,355,'xa')">西安</a>
+                            <a href="javascript:;" onclick="city_change(this,338,'nj')">南京</a>
+                            <a href="javascript:;" onclick="city_change(this,389,'wh')">武汉</a>
+                            <a href="javascript:;" onclick="city_change(this,260,'hz')">杭州</a>
+                        </div>
+                        <div class="hot_address_er">
+                            <div class="left">华北：</div>
+                            <div class="right">
+                                <a href="javascript:;" onclick="city_change(this,25,'bj')">北京</a>
+                                <a href="javascript:;" onclick="city_change(this,375,'tj')">天津</a>
+                                <a href="javascript:;" onclick="city_change(this,356,'sjz')">石家庄</a>
+                                <a href="javascript:;" onclick="city_change(this,377,'ts')">唐山</a>
+                                <a href="javascript:;" onclick="city_change(this,365,'qd')">青岛</a>
+                                <a href="javascript:;" onclick="city_change(this,371,'jn')">济南</a>
+                                <a href="javascript:;" onclick="city_change(this,379,'ty')">太原</a>
+                                <a href="javascript:;" onclick="city_change(this,5423,'lf')">廊坊</a>
+                                <a href="javascript:;" onclick="city_change(this,5738,'wlcb')">乌兰察布</a>
+                            </div>
+                        </div>
+                        <div class="hot_address_er">
+                            <div class="left">东北：</div>
+                            <div class="right">
+                                <a href="javascript:;" onclick="city_change(this,351,'sy')">沈阳</a>
+                                <a href="javascript:;" onclick="city_change(this,235,'dl')">大连</a>
+                                <a href="javascript:;" onclick="city_change(this,218,'cc')">长春</a>
+                                <a href="javascript:;" onclick="city_change(this,268,'heb')">哈尔滨</a>
+                                <a href="javascript:;" onclick="city_change(this,5689,'hlbe')">呼伦贝尔</a>
+                            </div>
+                        </div>
+                        <div class="hot_address_er">
+                            <div class="left">华东：</div>
+                            <div class="right">
+                                <a href="javascript:;" onclick="city_change(this,347,'sh')">上海</a>
+                                <a href="javascript:;" onclick="city_change(this,338,'nj')">南京</a>
+                                <a href="javascript:;" onclick="city_change(this,363,'sz')">苏州</a>
+                                <a href="javascript:;" onclick="city_change(this,260,'hz')">杭州</a>
+                                <a href="javascript:;" onclick="city_change(this,336,'nb')">宁波</a>
+                                <a href="javascript:;" onclick="city_change(this,391,'wx')">无锡</a>
+                                <a href="javascript:;" onclick="city_change(this,298,'nc')">南昌</a>
+                                <a href="javascript:;" onclick="city_change(this,900,'hf')">合肥</a>
+                                <a href="javascript:;" onclick="city_change(this,229,'cz')">常州</a>
+                            </div>
+                        </div>
+                        <div class="hot_address_er">
+                            <div class="left">华中：</div>
+                            <div class="right">
+                                <a href="javascript:;" onclick="city_change(this,217,'zz')">郑州</a>
+                                <a href="javascript:;" onclick="city_change(this,226,'cs')">长沙</a>
+                                <a href="javascript:;" onclick="city_change(this,389,'wh')">武汉</a>
+                            </div>
+                        </div>
+                        <div class="hot_address_er">
+                            <div class="left">华南：</div>
+                            <div class="right">
+                                <a href="javascript:;" onclick="city_change(this,399,'xm')">厦门</a>
+                                <a href="javascript:;" onclick="city_change(this,254,'hk')">海口</a>
+                                <a href="javascript:;" onclick="city_change(this,305,'gy')">贵阳</a>
+                                <a href="javascript:;" onclick="city_change(this,7047,'qs')">宿迁市</a>
+                                <a href="javascript:;" onclick="city_change(this,340,'nn')">南宁</a>
+                                <a href="javascript:;" onclick="city_change(this,314,'lj')">丽江</a>
+                                <a href="javascript:;" onclick="city_change(this,5548,'bs')">保山</a>
+                                <a href="javascript:;" onclick="city_change(this,5517,'qf')">曲阜</a>
+                                <a href="javascript:;" onclick="city_change(this,286,'jj')">九江</a>
+                                <a href="javascript:;" onclick="city_change(this,207,'as')">安顺</a>
+                            </div>
+                        </div>
+                        <div class="hot_address_er">
+                            <div class="left">西南：</div>
+                            <div class="right">
+                                <a href="javascript:;" onclick="city_change(this,227,'cd')">成都</a>
+                                <a href="javascript:;" onclick="city_change(this,223,'cq')">重庆</a>
+                            </div>
+                        </div>
+                        <div class="hot_address_er">
+                            <div class="left">西北：</div>
+                            <div class="right">
+                                <a href="javascript:;" onclick="city_change(this,355,'xa')">西安</a>
+                                <a href="javascript:;" onclick="city_change(this,5578,'xn')">西宁</a>
+                                <a href="javascript:;" onclick="city_change(this,5537,'yl')">伊犁</a>
+                                <a href="javascript:;" onclick="city_change(this,312,'lz')">兰州</a>
+                                <a href="javascript:;" onclick="city_change(this,296,'ks')">喀什</a>
+                                <a href="javascript:;" onclick="city_change(this,237,'dh')">敦煌</a>
+                                <a href="javascript:;" onclick="city_change(this,278,'yc')">银川</a>
+                                <a href="javascript:;" onclick="city_change(this,5487,'yb')">延边</a>
+                                <a href="javascript:;" onclick="city_change(this,5581,'zws')">宁夏回族自治区</a>
+                                <a href="javascript:;" onclick="city_change(this,380,'wlmq')">乌鲁木齐</a>
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </div>
             <div class="searchCover">
@@ -52,10 +141,32 @@
                     <button>搜索</button>
                 </div>
             </div>
-            <div class="loginCover">
+            <!-- <div class="not_loginCover">
                 <a href="login2" target="_blank">登录</a>
                 <a href="" target="_blank">注册</a>
-            </div>
+            </div> -->
+            <div class="yet_loginCover">
+                <div class="person">
+                    <div class="userHeadImg">
+                        <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
+                    </div>
+                    <div class="userCtrl">
+                        <div class="userCtrlTop">
+                            <div class="userInfo">
+                                <div>
+                                    <span>admin</span>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="userCtrlBtm"><a href="back_manage" target="_blank">进入后台管理</a></div>
+                     </div>
+                     <div class="exit">
+                         <a href="">
+                             <i class="fa fa-power-off" aria-hidden="true"></i>
+                         </a>
+                     </div>
+                </div>
+             </div>
         </div>
         <!-- 轮播 -->
         <div class="sliderBox advImg">
@@ -86,8 +197,8 @@
                                     <div class="orangTitle">优秀示范点</div>
                                 </div>
                                 <div class="ctrlBtn">
-                                    <button><i class="fa fa-angle-left" aria-hidden="true"></i></button>
-                                    <button><i class="fa fa-angle-right" aria-hidden="true"></i></button>
+                                    <button onclick="farmsScroll('-')"><i class="fa fa-angle-left" aria-hidden="true"></i></button>
+                                    <button onclick="farmsScroll('+')"><i class="fa fa-angle-right" aria-hidden="true"></i></button>
                                 </div>
                             </div>
                             <div class="farmsbottom">
@@ -104,94 +215,94 @@
                                     <div class="farmsSwiper">
                                         <ul class="farmsUl">
                                             <li class="farm-item">
-                                                <img src="http://www.nzlyw.com/file/upload/202007/15/093517211.jpg" alt="">
-                                                <div class="news-item-txt">
-                                                    <div class="title">
-                                                        <h1>
-                                                            <a href="" target="_blank">吉林省举办,旅游体育消费年吉林省举办旅游体育。消费年吉林省举办旅游体育消费年”吉林省举办“旅游体育消费年”</a>
-                                                        </h1>
-                                                    </div>
-                                                    <div class="desc">
-                                                        央广网长春7月3日消息（记者刘源源）“吉林旅游体育消费年”近日启动。将陆续陆续陆续陆续陆续陆续陆续陆续陆续陆续推出“周”游吉林主题活动，打造一批优质自质自质自驾游、生态游、健康游线路，包括吉林东线游长白山、西线游查干湖等经典线路。还新推出了“...
-                                                    </div>
-                                                </div>
-                                            </li>
-                                            <li class="farm-item">
-                                                <img src="http://www.nzlyw.com/file/upload/202007/16/161349721.jpg" alt="">
-                                                <div class="news-item-txt">
-                                                    <div class="title">
-                                                        <a href="" target="_blank">打工皇帝更换你的</a>
-                                                    </div>
-                                                    <div class="desc">
-                                                        央广网长春7月3日消息（记者刘源源）“吉林旅游体育消费年”近日启动。将陆续推出“周”游吉林主题活动，打造一批优质自驾游、生态游、健康游线路，包括吉林东线游长白山、西线游查干湖等经典线路。还新推出了“...
-                                                    </div>
-                                                </div>
-                                            </li>
-                                            <li class="farm-item">
-                                                <img src="http://www.nzlyw.com/file/upload/202007/15/093857151.jpg" alt="">
-                                                <div class="news-item-txt">
-                                                    <div class="title">
-                                                        <a href="" target="_blank">那个号码规范</a>
-                                                    </div>
-                                                    <div class="desc">
-                                                        央广网长春7月3日消息（记者刘源源）“吉林旅游体育消费年”近日启动。将陆续推出“周”游吉林主题活动，打造一批优质自驾游、生态游、健康游线路，包括吉林东线游长白山、西线游查干湖等经典线路。还新推出了“...
-                                                    </div>
-                                                </div>
+                                                <a target="_blank" href="person_farm?name=admin">
+                                                  <img src="http://www.nzlyw.com/file/upload/202007/15/093517211.jpg" alt="">
+                                                    <div class="news-item-txt">
+                                                        <div class="title">
+                                                            <h1>
+                                                                1,旅游体育消费年吉林省举办旅游体育。消费年吉林省举办旅游体育消费年”吉林省举办“旅游体育消费年”
+                                                            </h1>
+                                                        </div>
+                                                        <div class="desc">
+                                                            央广网长春7月3日消息（记者刘源源）“吉林旅游体育消费年”近日启动。将陆续陆续陆续陆续陆续陆续陆续陆续陆续陆续推出“周”游吉林主题活动，打造一批优质自质自质自驾游、生态游、健康游线路，包括吉林东线游长白山、西线游查干湖等经典线路。还新推出了“...
+                                                        </div>
+                                                    </div>  
+                                                </a>
                                             </li>
                                             <li class="farm-item">
-                                                <img src="http://www.nzlyw.com/file/upload/202007/15/101622551.jpg" alt="">
-                                                <div class="news-item-txt">
-                                                    <div class="title">
-                                                        <a href="" target="_blank">森岛帆高森岛帆高</a>
-                                                    </div>
-                                                    <div class="desc">
-                                                        央广网长春7月3日消息（记者刘源源）“吉林旅游体育消费年”近日启动。将陆续推出“周”游吉林主题活动，打造一批优质自驾游、生态游、健康游线路，包括吉林东线游长白山、西线游查干湖等经典线路。还新推出了“...
-                                                    </div>
-                                                </div>
+                                                <a target="_blank" href="person_farm?name=admin">
+                                                  <img src="http://www.nzlyw.com/file/upload/202007/16/161349721.jpg" alt="">
+                                                    <div class="news-item-txt">
+                                                        <div class="title">
+                                                            <h1>
+                                                                2,打工皇帝更换你的
+                                                            </h1>
+                                                        </div>
+                                                        <div class="desc">
+                                                            央广网长春7月3日消息（记者刘源源）“吉林旅游体育消费年”近日启动。将陆续陆续陆续陆续陆续陆续陆续陆续陆续陆续推出“周”游吉林主题活动，打造一批优质自质自质自驾游、生态游、健康游线路，包括吉林东线游长白山、西线游查干湖等经典线路。还新推出了“...
+                                                        </div>
+                                                    </div>  
+                                                </a>
                                             </li>
                                             <li class="farm-item">
-                                                <img src="http://www.nzlyw.com/file/upload/202007/23/134836301.jpg" alt="">
-                                                <div class="news-item-txt">
-                                                    <div class="title">
-                                                        <a href="" target="_blank">是个很划算的发生大幅度发</a>
-                                                    </div>
-                                                    <div class="desc">
-                                                        央广网长春7月3日消息（记者刘源源）“吉林旅游体育消费年”近日启动。将陆续推出“周”游吉林主题活动，打造一批优质自驾游、生态游、健康游线路，包括吉林东线游长白山、西线游查干湖等经典线路。还新推出了“...
-                                                    </div>
-                                                </div>
+                                                <a target="_blank" href="person_farm?name=admin">
+                                                  <img src="http://www.nzlyw.com/file/upload/202007/15/093857151.jpg" alt="">
+                                                    <div class="news-item-txt">
+                                                        <div class="title">
+                                                            <h1>
+                                                                3那个号码规范
+                                                            </h1>
+                                                        </div>
+                                                        <div class="desc">
+                                                            央广网长春7月3日消息（记者刘源源）“吉林旅游体育消费年”近日启动。将陆续陆续陆续陆续陆续陆续陆续陆续陆续陆续推出“周”游吉林主题活动，打造一批优质自质自质自驾游、生态游、健康游线路，包括吉林东线游长白山、西线游查干湖等经典线路。还新推出了“...
+                                                        </div>
+                                                    </div>  
+                                                </a>
                                             </li>
                                             <li class="farm-item">
-                                                <img src="http://www.nzlyw.com/file/upload/202007/28/091646681.jpg" alt="">
-                                                <div class="news-item-txt">
-                                                    <div class="title">
-                                                        <a href="" target="_blank">VN南大光电电饭锅时代光华的复合管</a>
-                                                    </div>
-                                                    <div class="desc">
-                                                        央广网长春7月3日消息（记者刘源源）“吉林旅游体育消费年”近日启动。将陆续推出“周”游吉林主题活动，打造一批优质自驾游、生态游、健康游线路，包括吉林东线游长白山、西线游查干湖等经典线路。还新推出了“...
-                                                    </div>
-                                                </div>
+                                                <a target="_blank" href="person_farm?name=admin">
+                                                  <img src="http://www.nzlyw.com/file/upload/202007/15/101622551.jpg" alt="">
+                                                    <div class="news-item-txt">
+                                                        <div class="title">
+                                                            <h1>
+                                                                4森岛帆高森岛帆高
+                                                            </h1>
+                                                        </div>
+                                                        <div class="desc">
+                                                            央广网长春7月3日消息（记者刘源源）“吉林旅游体育消费年”近日启动。将陆续陆续陆续陆续陆续陆续陆续陆续陆续陆续推出“周”游吉林主题活动，打造一批优质自质自质自驾游、生态游、健康游线路，包括吉林东线游长白山、西线游查干湖等经典线路。还新推出了“...
+                                                        </div>
+                                                    </div>  
+                                                </a>
                                             </li>
                                             <li class="farm-item">
-                                                <img src="http://www.nzlyw.com/file/upload/202007/27/154331831.jpg" alt="">
-                                                <div class="news-item-txt">
-                                                    <div class="title">
-                                                        <a href="" target="_blank">电饭锅森岛帆高八十多分公司的风格吧</a>
-                                                    </div>
-                                                    <div class="desc">
-                                                        央广网长春7月3日消息（记者刘源源）“吉林旅游体育消费年”近日启动。将陆续推出“周”游吉林主题活动，打造一批优质自驾游、生态游、健康游线路，包括吉林东线游长白山、西线游查干湖等经典线路。还新推出了“...
-                                                    </div>
-                                                </div>
+                                                <a target="_blank" href="person_farm?name=admin">
+                                                  <img src="http://www.nzlyw.com/file/upload/202007/15/093517211.jpg" alt="">
+                                                    <div class="news-item-txt">
+                                                        <div class="title">
+                                                            <h1>
+                                                                5吉林省举办,旅游体育消费年吉林省举办旅游体育。消费年吉林省举办旅游体育消费年”吉林省举办“旅游体育消费年”
+                                                            </h1>
+                                                        </div>
+                                                        <div class="desc">
+                                                            央广网长春7月3日消息（记者刘源源）“吉林旅游体育消费年”近日启动。将陆续陆续陆续陆续陆续陆续陆续陆续陆续陆续推出“周”游吉林主题活动，打造一批优质自质自质自驾游、生态游、健康游线路，包括吉林东线游长白山、西线游查干湖等经典线路。还新推出了“...
+                                                        </div>
+                                                    </div>  
+                                                </a>
                                             </li>
                                             <li class="farm-item">
-                                                <img src="http://www.nzlyw.com/file/upload/202006/24/102113281659.jpg" alt="">
-                                                <div class="news-item-txt">
-                                                    <div class="title">
-                                                        <a href="" target="_blank">222222222</a>
-                                                    </div>
-                                                    <div class="desc">
-                                                        央广网长春7月3日消息（记者刘源源）“吉林旅游体育消费年”近日启动。将陆续推出“周”游吉林主题活动，打造一批优质自驾游、生态游、健康游线路，包括吉林东线游长白山、西线游查干湖等经典线路。还新推出了“...
-                                                    </div>
-                                                </div>
+                                                <a target="_blank" href="person_farm?name=admin">
+                                                  <img src="http://www.nzlyw.com/file/upload/202007/28/091646681.jpg" alt="">
+                                                    <div class="news-item-txt">
+                                                        <div class="title">
+                                                            <h1>
+                                                                6吉林省举办,旅游体育消费年吉林省举办旅游体育。消费年吉林省举办旅游体育消费年”吉林省举办“旅游体育消费年”
+                                                            </h1>
+                                                        </div>
+                                                        <div class="desc">
+                                                            央广网长春7月3日消息（记者刘源源）“吉林旅游体育消费年”近日启动。将陆续陆续陆续陆续陆续陆续陆续陆续陆续陆续推出“周”游吉林主题活动，打造一批优质自质自质自驾游、生态游、健康游线路，包括吉林东线游长白山、西线游查干湖等经典线路。还新推出了“...
+                                                        </div>
+                                                    </div>  
+                                                </a>
                                             </li>
                                         </ul>
                                     </div>
@@ -203,36 +314,36 @@
                     <div class="news">
                         <div class="newsTitle">
                             <span>焦点新闻</span>
-                            <button class="more">更多</button>
+                            <a href="newslist_view?page=1&type=0" target="_blank" class="more">更多</a>
                         </div>
                         <div class="newsContent">
                             <ul class="news-txt-list">
                                 <li class="news-txt-item">
-                                    <a href="">田园乡村旅游攻略！一起来个田园乡村旅游吧。</a>
+                                    <a href="news_view?id=61" target="_blank">田园乡村旅游攻略！一起来个田园乡村旅游吧。</a>
                                 </li>
                                 <li class="news-txt-item">
-                                    <a href="">英吉沙“杏”福路越走越宽</a>
+                                    <a href="news_view?id=61" target="_blank">英吉沙“杏”福路越走越宽</a>
                                 </li>
                                 <li class="news-txt-item">
-                                    <a href="">一起来个田园乡村旅游吧。</a>
+                                    <a href="news_view?id=61" target="_blank">一起来个田园乡村旅游吧。</a>
                                 </li>
                                 <li class="news-txt-item">
-                                    <a href="">情暖建昌：百年董氏公司助力乡村党建工作</a>
+                                    <a href="news_view?id=61" target="_blank">情暖建昌：百年董氏公司助力乡村党建工作</a>
                                 </li>
                                 <li class="news-txt-item">
-                                    <a href="">围绕乡村振兴战略总体要求和全市美丽乡村示范建设行动部署。</a>
+                                    <a href="news_view?id=61" target="_blank">围绕乡村振兴战略总体要求和全市美丽乡村示范建设行动部署。</a>
                                 </li>
                                 <li class="news-txt-item">
-                                    <a href="">让母猪营养更精准——智能饲喂化解猪场双疫期尴尬</a>
+                                    <a href="news_view?id=61" target="_blank">让母猪营养更精准——智能饲喂化解猪场双疫期尴尬</a>
                                 </li>
                                 <li class="news-txt-item">
-                                    <a href="">机场送“杏”福 感恩援疆情</a>
+                                    <a href="news_view?id=61" target="_blank">机场送“杏”福 感恩援疆情</a>
                                 </li>
                                 <li class="news-txt-item">
-                                    <a href="">金银花要怎么种？金银花的种植技术介绍</a>
+                                    <a href="news_view?id=61" target="_blank">金银花要怎么种？金银花的种植技术介绍</a>
                                 </li>
                                 <li class="news-txt-item">
-                                    <a href="">脐橙采果后要怎么施肥？脐橙施肥技术</a>
+                                    <a href="news_view?id=61" target="_blank">脐橙采果后要怎么施肥？脐橙施肥技术</a>
                                 </li>
                                 <li class="news-txt-item">
                                     <a href="">黄鳝为什么会变性？黄鳝是怎么变性的呢？</a>
@@ -265,7 +376,7 @@
                     <div class="farmPick">
                         <div class="farmPickTop">
                             <span class="orangTitle">采购信息</span>
-                            <a href="">更多>></a>
+                            <a href="garden_view" target="_blank">更多>></a>
                         </div>
                         <div class="farmPickBottom">
                             <div class="product">
@@ -274,35 +385,35 @@
                                     <ul class="productList">
                                         <li class="productItem">
                                             <div>
-                                                <a href="">
+                                                <a href="garden_intro" target="_blank">
                                                     <img src="http://www.zhopera.com/uploadfile/2020/0629/thumb_264_150_20200629110152202.jpg" alt="">
                                                 </a>
                                             </div>
-                                            <p><a href="">甘蔗</a></p>
+                                            <p><a href="garden_intro" target="_blank">甘蔗</a></p>
                                         </li>
                                         <li class="productItem">
                                             <div>
-                                                <a href="">
+                                                <a href="garden_intro" target="_blank">
                                                     <img src="http://www.nzlyw.com/file/upload/202004/30/101216952031.png" alt="">
                                                 </a>
                                             </div>
-                                            <p><a href="">甘蔗</a></p>
+                                            <p><a href="garden_intro" target="_blank">甘蔗</a></p>
                                         </li>
                                         <li class="productItem">
                                             <div>
-                                                <a href="">
+                                                <a href="garden_intro" target="_blank">
                                                     <img src="http://www.nzlyw.com/file/upload/201912/11/102405641521.jpg" alt="">
                                                 </a>
                                             </div>
-                                            <p><a href="">甘蔗</a></p>
+                                            <p><a href="garden_intro" target="_blank">甘蔗</a></p>
                                         </li>
                                         <li class="productItem">
                                             <div>
-                                                <a href="">
+                                                <a href="garden_intro" target="_blank">
                                                     <img src="http://www.nzlyw.com/file/upload/201911/29/141509191527.jpg" alt="">
                                                 </a>
                                             </div>
-                                            <p><a href="">甘蔗</a></p>
+                                            <p><a href="garden_intro" target="_blank">甘蔗</a></p>
                                         </li>
                                         <li class="productItem">
                                             <div>
@@ -345,27 +456,27 @@
                                 <ul >
                                     <li>
                                         <span class="sort-number sort-number-top">1</span>
-                                        <a href="">农场一农场一农场一农场一农场一农场一农场一农场一农场一农场一农场一农场一</a>
+                                        <a href="person_farm?name=admin" target="_blank">农场一农场一农场一农场一农场一农场一农场一农场一农场一农场一农场一农场一</a>
                                     </li>
                                     <li>
                                         <span class="sort-number sort-number-top">2</span>
-                                        <a href="">农场二</a>
+                                        <a href="person_farm?name=admin" target="_blank">农场二</a>
                                     </li>
                                     <li>
                                         <span class="sort-number sort-number-top">3</span>
-                                        <a href="">农场三</a>
+                                        <a href="person_farm?name=admin" target="_blank">农场三</a>
                                     </li>
                                     <li>
                                         <span class="sort-number">4</span>
-                                        <a href="">农场四</a>
+                                        <a href="person_farm?name=admin" target="_blank">农场四</a>
                                     </li>
                                     <li>
                                         <span class="sort-number">5</span>
-                                        <a href="">农场五</a>
+                                        <a href="person_farm?name=admin" target="_blank">农场五</a>
                                     </li>
                                     <li>
                                         <span class="sort-number">6</span>
-                                        <a href="">农场五</a>
+                                        <a href="person_farm?name=admin" target="_blank">农场五</a>
                                     </li>
                                     <li>
                                         <span class="sort-number">7</span>
@@ -406,7 +517,7 @@
                     <div class="hacienda">
                         <div class="haciendaTop">
                             <span class="orangTitle">农场详情</span>
-                            <a href="">更多+</a>
+                            <a href="farm_list?page=1" target="_blank">更多+</a>
                         </div>
                         <div class="haciendaBottom">
                             <ul class="haciendaList">
@@ -516,13 +627,13 @@
                     <div class="hacienda">
                         <div class="haciendaTop">
                             <span class="orangTitle">旅游导览</span>
-                            <a href="">更多+</a>
+                            <a href="touristList?page=1" target="_blank">更多+</a>
                         </div>
                         <div class="travelCover">
                             <div class="haciendaBottom travelLeft">
                                 <ul class="travelList">
                                     <li class="travelItem">
-                                        <a href="">
+                                        <a href="tourist" target="_blank">
                                             <div class="travelImg">
                                                 <img class="haciendaImg1" src="https://www.cnnyly.com/upload/goods/20200509/9806f6bba92a29186a82d7851221ec552.jpg" alt="">
                                                 <img class="haciendaImg2" src="{% static 'imgs/22.png'%}" alt="">
@@ -596,7 +707,7 @@
                                 </ul>
                             </div>
                             <div class="travelRight">
-                                <a href="">
+                                <a href="http://www.weather.com.cn/weather/101180101.shtml" target="_blank">
                                     <div class="travelGuide travelGuide1">
                                         <img src="{% static 'imgs/travel1.png'%}" alt="">
                                         <div>
@@ -605,7 +716,7 @@
                                         </div>
                                     </div>
                                 </a>
-                                <a href="">
+                                <a href="https://www.12306.cn/index/" target="_blank">
                                     <div class="travelGuide travelGuide2">
                                         <img src="{% static 'imgs/travel2.png'%}" alt="">
                                         <div>
@@ -614,7 +725,7 @@
                                         </div>
                                     </div>
                                 </a>
-                                <a href="">
+                                <a href="https://zz.meituan.com/" target="_blank">
                                     <div class="travelGuide travelGuide3">
                                         <img src="{% static 'imgs/travel3.png'%}" alt="">
                                         <div>
@@ -623,7 +734,7 @@
                                         </div>
                                     </div>
                                 </a>
-                                <a href="">
+                                <a href="https://baike.baidu.com/" target="_blank">
                                     <div class="travelGuide travelGuide4">
                                         <img src="{% static 'imgs/travel4.png'%}" alt="">
                                         <div>
@@ -656,7 +767,7 @@
                         <div>
                             <ul class="hotHotelList">
                                 <li class="hotHotelItem">
-                                    <a href="">
+                                    <a href="dorm_detail?id=3" target="_blank">
                                         <img src="https://www.cnnyly.com/upload/goods/20200509/122cc4b63d1c23b8f54457aa893fc0862.jpg" width="96px" height="80px" alt="">
                                         <div class="desc">
                                             <h3>苍龙农庄</h3>
@@ -665,7 +776,7 @@
                                     </a>
                                 </li>
                                 <li class="hotHotelItem">
-                                    <a href="">
+                                    <a href="dorm_detail?id=3" target="_blank">
                                         <img src="https://www.cnnyly.com/upload/goods/20200509/fcb7c51e60507e4ee71757d3d9f585682.jpg" width="96px" height="80px" alt="">
                                         <div class="desc">
                                             <h3>苍龙农庄</h3>
@@ -674,7 +785,7 @@
                                     </a>
                                 </li>
                                 <li class="hotHotelItem">
-                                    <a href="">
+                                    <a href="dorm_detail?id=3" target="_blank">
                                         <img src="https://www.cnnyly.com/upload/goods/20200509/39a56227ce0f1e4ceeb092f4ac9c43112.jpg" width="96px" height="80px" alt="">
                                         <div class="desc">
                                             <h3>苍龙农庄</h3>
@@ -683,7 +794,7 @@
                                     </a>
                                 </li>
                                 <li class="hotHotelItem">
-                                    <a href="">
+                                    <a href="dorm_detail?id=3" target="_blank">
                                         <img src="http://www.nzlyw.com/file/upload/201910/26/164647211497.jpg" width="96px" height="80px" alt="">
                                         <div class="desc">
                                             <h3>苍龙农庄</h3>
@@ -692,7 +803,7 @@
                                     </a>
                                 </li>
                                 <li class="hotHotelItem">
-                                    <a href="">
+                                    <a href="dorm_detail?id=3" target="_blank">
                                         <img src="http://www.nzlyw.com/file/upload/201909/24/161657621488.jpg" width="96px" height="80px" alt="">
                                         <div class="desc">
                                             <h3>苍龙农庄</h3>
@@ -706,12 +817,12 @@
                     <div class="recommendHotel">
                         <div class="titel">
                             <div>用户推荐</div>
-                            <a href="" class="more">更多+</a>
+                            <a href="dorm_list?page=1" target="_blank" class="more">更多+</a>
                         </div>
                         <div class="inner">
                             <ul class="recommendHotelList">
                                 <li class="recommendHotelItem">
-                                    <a href="">
+                                    <a href="dorm_detail?id=3" target="_blank">
                                         <div class="recommendHotelImg">
                                             <img src="http://www.nzlyw.com/file/upload/202007/22/103051841.jpg" alt="">
                                         </div>
@@ -721,7 +832,7 @@
                                     </a>
                                 </li>
                                 <li class="recommendHotelItem">
-                                    <a href="">
+                                    <a href="dorm_detail?id=3" target="_blank">
                                         <div class="recommendHotelImg">
                                             <img src="http://www.nzlyw.com/file/upload/201909/30/152451841529.jpg" alt="">
                                         </div>
@@ -731,7 +842,7 @@
                                     </a>
                                 </li>
                                 <li class="recommendHotelItem">
-                                    <a href="">
+                                    <a href="dorm_detail?id=3" target="_blank">
                                         <div class="recommendHotelImg">
                                             <img src="http://www.nzlyw.com/file/upload/201912/11/101406421520.jpg" alt="">
                                         </div>
@@ -741,7 +852,7 @@
                                     </a>
                                 </li>
                                 <li class="recommendHotelItem">
-                                    <a href="">
+                                    <a href="dorm_detail?id=3" target="_blank">
                                         <div class="recommendHotelImg">
                                             <img src="http://www.nzlyw.com/file/upload/201911/29/105534521526.jpg" alt="">
                                         </div>
@@ -751,7 +862,7 @@
                                     </a>
                                 </li>
                                 <li class="recommendHotelItem">
-                                    <a href="">
+                                    <a href="dorm_detail?id=3" target="_blank">
                                         <div class="recommendHotelImg">
                                             <img src="http://www.nzlyw.com/file/upload/201911/29/141509191527.jpg" alt="">
                                         </div>
@@ -761,7 +872,7 @@
                                     </a>
                                 </li>
                                 <li class="recommendHotelItem">
-                                    <a href="">
+                                    <a href="dorm_detail?id=3" target="_blank">
                                         <div class="recommendHotelImg">
                                             <img src="http://www.nzlyw.com/file/upload/201912/11/102405641521.jpg" alt="">
                                         </div>
@@ -873,6 +984,15 @@
             </div>
         </div>
     </div>
+    <!-- 农场导览弹框 -->
+    <div class="tourismShow">
+        <div class="title">
+            <span>观光路线</span>
+            <div class="tourismShowCloseBtn"><i class="layui-icon layui-icon-close"></i></div>
+        </div>
+        <div class="line"></div>
+        <div class="content"></div>
+    </div>
     <!-- 返回顶部 -->
     <div id="back2top" class="back2top" style="display: block;">
         <a href="javascript:void(0);" onclick="goUp()" title="返回顶部">&nbsp;</a>

templates/outerNet/login2.html

@@ -21,24 +21,117 @@
 <body>
     <div class="header">
         <div class="headerTop wrapper">
+            <!-- <div class="wrapper">
+                <a href="home" style="float: right;color: #fff;">切换首页</a>
+                <p class="logoNameCn">休闲农业旅游网</p>
+                <p class="logoNameEn">Leisure agricultural tourism network</p>
+            </div> -->
             <div class="logoTxt">
                 <a href="">
-                    <h1>休闲农业旅游网</h1>
-                    <p>www.XXNYLY.CN</p>
+                   <h1>休闲农业旅游网</h1>
+                    <p>www.XXNYLY.CN</p> 
                 </a>
             </div>
             <div class="LocateCover">
                 <div class="currCity">
-                    <span>全国</span>
+                    <div class="maskLine"></div>
                     <i class="fa fa-map-marker" aria-hidden="true"></i>
-                </div>
-                <div class="selectCityCover">
-                    <ul>
-                        <li>河南</li>
-                        <li>河南</li>
-                        <li>河南</li>
-                        <li>河南</li>
-                    </ul>
+                    <span>全国</span>
+                    <i class="fa fa-chevron-down" aria-hidden="true"></i>
+                    <div class="selectCityCover">
+                        <div class="hot_address">
+                            <a href="javascript:void();" onclick="city_change(this,25,'bj')">北京</a>
+                            <a href="javascript:void();" onclick="city_change(this,347,'sh')">上海</a>
+                            <a href="javascript:void();" onclick="city_change(this,375,'tj')">天津</a>
+                            <a href="javascript:void();" onclick="city_change(this,355,'xa')">西安</a>
+                            <a href="javascript:void();" onclick="city_change(this,338,'nj')">南京</a>
+                            <a href="javascript:void();" onclick="city_change(this,389,'wh')">武汉</a>
+                            <a href="javascript:void();" onclick="city_change(this,260,'hz')">杭州</a>
+                        </div>
+                        <div class="hot_address_er">
+                            <div class="left">华北：</div>
+                            <div class="right">
+                                <a href="javascript:void();" onclick="city_change(this,25,'bj')">北京</a>
+                                <a href="javascript:void();" onclick="city_change(this,375,'tj')">天津</a>
+                                <a href="javascript:void();" onclick="city_change(this,356,'sjz')">石家庄</a>
+                                <a href="javascript:void();" onclick="city_change(this,377,'ts')">唐山</a>
+                                <a href="javascript:void();" onclick="city_change(this,365,'qd')">青岛</a>
+                                <a href="javascript:void();" onclick="city_change(this,371,'jn')">济南</a>
+                                <a href="javascript:void();" onclick="city_change(this,379,'ty')">太原</a>
+                                <a href="javascript:void();" onclick="city_change(this,5423,'lf')">廊坊</a>
+                                <a href="javascript:void();" onclick="city_change(this,5738,'wlcb')">乌兰察布</a>
+                            </div>
+                        </div>
+                        <div class="hot_address_er">
+                            <div class="left">东北：</div>
+                            <div class="right">
+                                <a href="javascript:void();" onclick="city_change(this,351,'sy')">沈阳</a>
+                                <a href="javascript:void();" onclick="city_change(this,235,'dl')">大连</a>
+                                <a href="javascript:void();" onclick="city_change(this,218,'cc')">长春</a>
+                                <a href="javascript:void();" onclick="city_change(this,268,'heb')">哈尔滨</a>
+                                <a href="javascript:void();" onclick="city_change(this,5689,'hlbe')">呼伦贝尔</a>
+                            </div>
+                        </div>
+                        <div class="hot_address_er">
+                            <div class="left">华东：</div>
+                            <div class="right">
+                                <a href="javascript:void();" onclick="city_change(this,347,'sh')">上海</a>
+                                <a href="javascript:void();" onclick="city_change(this,338,'nj')">南京</a>
+                                <a href="javascript:void();" onclick="city_change(this,363,'sz')">苏州</a>
+                                <a href="javascript:void();" onclick="city_change(this,260,'hz')">杭州</a>
+                                <a href="javascript:void();" onclick="city_change(this,336,'nb')">宁波</a>
+                                <a href="javascript:void();" onclick="city_change(this,391,'wx')">无锡</a>
+                                <a href="javascript:void();" onclick="city_change(this,298,'nc')">南昌</a>
+                                <a href="javascript:void();" onclick="city_change(this,900,'hf')">合肥</a>
+                                <a href="javascript:void();" onclick="city_change(this,229,'cz')">常州</a>
+                            </div>
+                        </div>
+                        <div class="hot_address_er">
+                            <div class="left">华中：</div>
+                            <div class="right">
+                                <a href="javascript:void();" onclick="city_change(this,217,'zz')">郑州</a>
+                                <a href="javascript:void();" onclick="city_change(this,226,'cs')">长沙</a>
+                                <a href="javascript:void();" onclick="city_change(this,389,'wh')">武汉</a>
+                            </div>
+                        </div>
+                        <div class="hot_address_er">
+                            <div class="left">华南：</div>
+                            <div class="right">
+                                <a href="javascript:void();" onclick="city_change(this,399,'xm')">厦门</a>
+                                <a href="javascript:void();" onclick="city_change(this,254,'hk')">海口</a>
+                                <a href="javascript:void();" onclick="city_change(this,305,'gy')">贵阳</a>
+                                <a href="javascript:void();" onclick="city_change(this,7047,'qs')">宿迁市</a>
+                                <a href="javascript:void();" onclick="city_change(this,340,'nn')">南宁</a>
+                                <a href="javascript:void();" onclick="city_change(this,314,'lj')">丽江</a>
+                                <a href="javascript:void();" onclick="city_change(this,5548,'bs')">保山</a>
+                                <a href="javascript:void();" onclick="city_change(this,5517,'qf')">曲阜</a>
+                                <a href="javascript:void();" onclick="city_change(this,286,'jj')">九江</a>
+                                <a href="javascript:void();" onclick="city_change(this,207,'as')">安顺</a>
+                            </div>
+                        </div>
+                        <div class="hot_address_er">
+                            <div class="left">西南：</div>
+                            <div class="right">
+                                <a href="javascript:void();" onclick="city_change(this,227,'cd')">成都</a>
+                                <a href="javascript:void();" onclick="city_change(this,223,'cq')">重庆</a>
+                            </div>
+                        </div>
+                        <div class="hot_address_er">
+                            <div class="left">西北：</div>
+                            <div class="right">
+                                <a href="javascript:void();" onclick="city_change(this,355,'xa')">西安</a>
+                                <a href="javascript:void();" onclick="city_change(this,5578,'xn')">西宁</a>
+                                <a href="javascript:void();" onclick="city_change(this,5537,'yl')">伊犁</a>
+                                <a href="javascript:void();" onclick="city_change(this,312,'lz')">兰州</a>
+                                <a href="javascript:void();" onclick="city_change(this,296,'ks')">喀什</a>
+                                <a href="javascript:void();" onclick="city_change(this,237,'dh')">敦煌</a>
+                                <a href="javascript:void();" onclick="city_change(this,278,'yc')">银川</a>
+                                <a href="javascript:void();" onclick="city_change(this,5487,'yb')">延边</a>
+                                <a href="javascript:void();" onclick="city_change(this,5581,'zws')">宁夏回族自治区中卫市</a>
+                                <a href="javascript:void();" onclick="city_change(this,380,'wlmq')">乌鲁木齐</a>
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </div>
             <div class="searchCover">
@@ -47,9 +140,31 @@
                     <button>搜索</button>
                 </div>
             </div>
-            <div class="loginCover">
+            <!-- <div class="not_loginCover">
                 <a href="login2" target="_blank">登录</a>
                 <a href="" target="_blank">注册</a>
+            </div> -->
+            <div class="yet_loginCover">
+               <div class="person">
+                   <div class="userHeadImg">
+                       <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
+                   </div>
+                   <div class="userCtrl">
+                       <div class="userCtrlTop">
+                           <div class="userInfo">
+                               <div>
+                                   <span>admin</span>
+                               </div>
+                           </div>
+                       </div>
+                       <div class="userCtrlBtm"><a href="back_manage" target="_blank">进入后台管理</a></div>
+                    </div>
+                    <div class="exit">
+                        <a href="">
+                            <i class="fa fa-power-off" aria-hidden="true"></i>
+                        </a>
+                    </div>
+               </div>
             </div>
         </div>
         <!-- 登录内容 -->

templates/static/css/header.css

@@ -21,26 +21,113 @@
 /* 定位 */
 .LocateCover{
     width: 155px;
+    position: relative;
+    text-align: center;
 }
 .LocateCover .currCity{
+    display: inline-block;
     font-size: 14px;
     margin: 0 auto;
     margin-top: 5px;
-    width: 88px;
+    min-width: 88px;
     height: 28px;
     line-height: 25px;
     text-align: center;
     cursor: pointer;
     background-color: #fdfdfd;
-    color: red;
+    color: #61a830;
     border: 1px solid #f5f5f5;
 }
-.LocateCover .currCity i{
-    color: #3c3c3c;
-    margin-left: 10px;
+.LocateCover .currCity:hover{
+    background-color: #fff;
+    position: relative;
+    z-index: 9999;
+    border-bottom: 0;
+}
+.LocateCover .currCity:hover .selectCityCover{
+    display: block;
+}
+.LocateCover .currCity:hover .maskLine{
+    display: block;
+}
+.LocateCover .currCity .maskLine{
+    display: none;
+    height: 6px;
+    width: 100%;
+    background-color: #fff;
+    z-index: 10;
+    top: 21px;
+    left: 0;
+    position: absolute;
+    background: white;
+}
+
+.LocateCover .currCity i.fa-map-marker{
+    margin-left: 5px;
+    font-size: 14px;
+    color: #61a830;
+}
+.LocateCover .currCity:hover .fa-chevron-down{
+    color: #61a830;
+}
+
+.LocateCover .currCity i.fa-chevron-down{
+    color: #cfcfcf;
+    margin-left: 13px;
+    font-size: 12px;;
 }
 .selectCityCover{
+    position: absolute;
+    z-index: 9;
     display: none;
+    position: absolute;
+    top: 25px;
+    left: -1px;
+    width: 426px;
+    background-color: #fff;
+    border: 1px solid #f1f1f1;
+    -webkit-box-shadow: 2px 4px 10px rgba(0,0,0,.15);
+    -moz-box-shadow: 2px 4px 10px rgba(0,0,0,.15);
+    -o-box-shadow: 2px 4px 10px rgba(0,0,0,.15);
+    box-shadow: 2px 4px 10px rgba(0,0,0,.15);
+    padding: 20px;
+    border-radius: 12px;
+    z-index: 9;
+    border-top-left-radius: 0;
+    cursor: default;
+}
+.selectCityCover .hot_address{
+    border-bottom: 1px solid #ececec;
+    padding: 0 5px 6px;
+    text-align: left;
+}
+.selectCityCover .hot_address a{
+    color: #fd9907;
+    font-size: 12px;
+    padding-right: 11px;
+}
+.selectCityCover .hot_address_er{
+    padding: 7px 5px 5px;
+    overflow: hidden;
+}
+.selectCityCover .hot_address_er .left{
+    float: left;
+    width: 40px;
+    line-height: 22px;
+    font-size: 12px;
+    font-weight: 700;
+    cursor: default;
+}
+.selectCityCover .hot_address_er .right{
+    overflow: hidden;
+    float: left;
+    width: 332px;
+}
+.selectCityCover .hot_address_er .right a{
+    float: left;
+    margin-right: 16px;
+    line-height: 22px;
+    font-size: 12px;
 }
 /* 搜素 */
 .searchCover{
@@ -78,11 +165,11 @@
     background: #3c7b10;
 }
 /* 登录 */
-.loginCover{
+.not_loginCover{
     flex: 1;
     text-align: center;
 }
-.loginCover a{
+.not_loginCover a{
     width: 118px;
     height: 38px;
     line-height: 34px;
@@ -91,10 +178,57 @@
     margin: 0 8px;
     display: inline-block;
 }
-.loginCover a:active{
+.not_loginCover a:active{
     background-color: #ffe8bb;
 
 }
+.yet_loginCover{
+    flex: 1;
+}
+.yet_loginCover .person{
+    display: flex;
+    align-items: center;
+    float: right;
+}
+.yet_loginCover .person .userHeadImg{
+    width: 40px;
+    height: 40px;
+    overflow: hidden;
+    border-radius: 50%;
+    background: red;
+    margin-right: 10px;
+}
+.yet_loginCover .person .userHeadImg img{
+    width: 100%;
+    height: 100%;
+}
+.userCtrl .userCtrlTop{
+    position: relative;
+}
+.userCtrl .userCtrlTop .userInfo{
+    display: flex;
+    align-items: baseline;
+    cursor: pointer;
+}
+.userCtrlTop .userInfo >div{
+    max-width: 83px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    margin-bottom: 3px;
+}
+
+.userCtrl .userCtrlBtm a{
+    color: #3c7b10;
+}
+.yet_loginCover .person .exit a{
+    font-size: 24px;
+    margin-left: 10px;
+    border-left: 1px solid #d3d3d3;
+    padding-left: 10px;
+    color: #4fa414;
+    cursor: pointer;
+}
 
 /* 内容-合作伙伴 */
 .partnerCover{

templates/static/css/index2.css

@@ -106,9 +106,15 @@ span.swiper-pagination-bullet-active{
     width: 600px;
 }
 .farmsSwiper{
-    height: 416px;
+    height: 404px;
     overflow: hidden;
     padding: 20px;
+    position: relative;
+}
+.farmsSwiper .farmsUl{
+    position: absolute;
+    top: 0;
+    transition: all 1s ease 0s;
 }
 .farmsUl .farm-item{
     /* height: 62px; */
@@ -131,8 +137,6 @@ span.swiper-pagination-bullet-active{
     white-space: nowrap;
     text-overflow: ellipsis;
     line-height: 28px;
-}
-.farmsUl .farm-item .news-item-txt a{
     font-size: 16px;
     color: #60a830;
 }
@@ -627,4 +631,84 @@ span.swiper-pagination-bullet-active{
     border-left: 3px solid #ff6a28;
     padding-left: 8px;
     font-size: 16px;
+}
+
+/* 农场导览弹出观光样式 */
+.tourismShow{
+    position: relative;
+    z-index: 999;
+    opacity: 0;
+    display: none;
+    position: fixed;
+    top: 25%;
+    left: 50%;
+    margin-left: -300px;
+    width: 600px;
+    min-height: 400px;
+    background-color: #fff;
+    border: 1px solid #f1f1f1;
+    -webkit-box-shadow: 2px 4px 10px rgba(0,0,0,.15);
+    -moz-box-shadow: 2px 4px 10px rgba(0,0,0,.15);
+    -o-box-shadow: 2px 4px 10px rgba(0,0,0,.15);
+    box-shadow: 2px 4px 10px rgba(0,0,0,.15);
+    padding: 20px;
+    border-radius: 12px;
+    z-index: 9;
+    border-top-left-radius: 0;
+    cursor: default;
+    border-top-right-radius: 0;
+    transition: all .5s;
+}
+.tourismShow .title{
+    border-left: 3px solid #ff6a28;
+    padding-left: 8px;
+    font-size: 16px;
+}
+.tourismShow .line{
+    border-bottom: 1px solid #ddd;
+    margin-top: 10px;
+}
+.tourismShow .content{
+    height: 430px;
+    padding-top: 20px;
+}
+.tourismShow .tourismShowCloseBtn{
+    position: absolute;
+    right: 15px;
+    top: 11px;
+    border-radius: 50%;
+    border: 2px solid #ddd;
+    width: 25px;
+    height: 25px;
+    line-height: 20px;
+    text-align: center;
+    cursor: pointer;
+}
+.tourismShow .content .guideForm>input{
+    width: 40%;
+}
+.tourismShow .content .guideForm>button{
+    color: #fff;
+    padding: 5px 6px;
+    border-radius: 5px;
+    vertical-align: middle;
+    margin-left: 10px;
+    background: #1eaeed;
+}
+.tourismShow .content .guideForm>button{
+    color: #fff;
+    padding: 5px 6px;
+    border-radius: 5px;
+    vertical-align: middle;
+    margin-left: 10px;
+    background: #1eaeed;
+}
+.tourismShow .content #map{
+    height: 373px;
+    margin-top: 10px;
+}
+.tourismShow .loadDiv{
+    position: absolute;
+    left: 45%;
+    top: 45%;
 }

templates/static/js/index2.js

@@ -9,6 +9,8 @@ $(function () {
         },
     })
 
+ 
+
      // 轮播
     //  var banner = new Swiper('.farmsSwiper', {
     //     autoplay: true,//可选选项，自动滑动
@@ -150,6 +152,59 @@ $(function () {
 
 })
 
+// 定位
+function city_change(obj){
+    var txt = $(obj).html();
+    alert(txt)
+    $('.currCity span').html(txt);
+}
+
+// 示范区滚动
+var currTop = 0;
+for(var i = 0; i<4;i++){
+    var cloneEle = $('.farmsUl li').eq(i).clone();
+    $('.farmsUl').append(cloneEle)
+}
+var farmsautoplay = setInterval(() => {
+    farmsScroll('+')
+}, 2000);
+$('.farms').mouseover(function(){
+    clearInterval(farmsautoplay)
+});
+$('.farms').mouseout(function(){
+    farmsautoplay = setInterval(() => {
+        farmsScroll('+')
+    }, 2000);
+});
+function handMove(){
+    clearInterval(farmsautoplay)
+}
+function farmsScroll(flag){
+    var allHeight = parseInt($('.farmsUl').height());
+    var oneHeight = parseInt($('.farmsUl li').outerHeight());
+    if(flag == '+'){
+        if(currTop > -(allHeight-oneHeight*4)){
+            currTop = currTop - oneHeight;
+            $('.farmsUl').css('transition','all 1s ease 0s')
+            $('.farmsUl').css('top',currTop);
+    }else{
+            currTop = 0
+            $('.farmsUl').css('top',currTop);
+            $('.farmsUl').css('transition','none')
+        }
+    }else if(flag == '-'){
+        if(currTop >= 0){
+            currTop = -(allHeight-oneHeight*4);
+            $('.farmsUl').css('top',currTop);
+            $('.farmsUl').css('transition','none')
+    }else{
+            currTop = currTop + oneHeight;
+            $('.farmsUl').css('top',currTop);
+            $('.farmsUl').css('transition','all 1s ease 0s')
+        }
+    }
+}
+
 var map = new AMap.Map('map', {
     resizeEnable: true, //是否监控地图容器尺寸变化
     zoom: 11, //初始化地图层级
@@ -276,4 +331,86 @@ function show() {
         }
     });
 }
-show();
+show();
+
+// 农场导览弹框
+$('.haciendaTxt .btn1').on('click',function(){
+    $('.tourismShow .title span').html('观光路线')
+    $('.tourismShow .content').html('<div style="text-align:center;width:100%;height:100%"><img  style="width:100%;height:100%" src="http://127.0.0.1:8000/static/imgs/banner2.jpg">')
+    $('.tourismShow').show();
+    $('.tourismShow').css('opacity',1)
+})
+$('.tourismShowCloseBtn').on('click',function(){
+    $('.tourismShow .content').html('')
+    $('.tourismShow').css('opacity',0)
+    setTimeout(function(){
+        $('.tourismShow').hide();
+    },500)
+})
+var map;
+$('.haciendaTxt .btn2').on('click',function(){
+    $('.tourismShow .title span').html('导游导览');
+    var html = '<div class="">'+
+                '<div class="guideForm">起始地点：<input type="text" id="startPath"><button onclick="searchWay()">确定</button></div>'+
+                '<div id="map">地图</div>'+
+                '</div>'
+    $('.tourismShow .content').html(html);
+    map = new AMap.Map('map', {
+        resizeEnable: true, //是否监控地图容器尺寸变化
+        zoom: 11, //初始化地图层级
+        center: [113.397428, 39.90923] //初始化地图中心点
+    });
+    var startIcon = new AMap.Icon({
+        // 图标尺寸
+        size: new AMap.Size(25, 34),
+        // 图标的取图地址
+        image: '//a.amap.com/jsapi_demos/static/demo-center/icons/dir-marker.png',
+        // 图标所用图片大小
+        imageSize: new AMap.Size(135, 40),
+        // 图标取图偏移量
+        imageOffset: new AMap.Pixel(-9, -3)
+    });
+    var endIcon = new AMap.Icon({
+        size: new AMap.Size(25, 34),
+        image: '//a.amap.com/jsapi_demos/static/demo-center/icons/dir-marker.png',
+        imageSize: new AMap.Size(135, 40),
+        imageOffset: new AMap.Pixel(-95, -3)
+    });
+    var marker = new AMap.Marker({
+        icon:endIcon,
+        position: new AMap.LngLat(113.397428, 39.90923),   // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+        title: '北京'
+    });
+    map.add(marker); 
+    $('.tourismShow').show();
+    $('.tourismShow').css('opacity',1)
+})
+function searchWay() {
+    map.clearMap();
+    var startPath = $("#startPath").val();
+    var endPath = '北京';
+
+    if (!startPath) {
+        $("#startPath").focus();
+        return;
+    }
+    $('.tourismShow .content').append('<div class="loadDiv"><img src="../static/imgs/timg.gif" /></div>')
+    //构造路线导航类
+    var driving = new AMap.Driving({
+        map: map,
+        // panel: "panel"
+    });
+    // 根据起终点名称规划驾车导航路线
+    driving.search([
+        { keyword: startPath, city: '' },
+        { keyword: endPath, city: '' }
+    ], function (status, result) {
+        if (status === 'complete') {
+            // log.success('绘制驾车路线完成');
+            $('.loadDiv').remove();
+        } else {
+            alert('获取驾车数据失败：' + result)
+            $('.loadDiv').remove();
+        }
+    });
+}