农场导游导览完成

templates/backstageNet/info/sightseePub.html

@@ -297,7 +297,18 @@
                                     <input type="hidden" name="etime" id="pluckEdTime" value="">
                             </div>
                         </div>
-                        
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">导览图：</label>
+                            <div class="layui-input-inline">
+                                <button type="button" class="uploadImg uploadImgIcon" id="guideUpImg"></button>
+                                <!-- 隐藏的input -->
+                                <input type="hidden" id="guideUpimg_url" name="guideUpimg_url" value="" />
+                                <div class="layui-upload-list">
+                                    <img class="layui-upload-img" id="demo2">
+                                    <p id="demoText"></p>
+                                </div>
+                            </div>
+                        </div>
                         
                         
 
@@ -413,7 +424,7 @@
                 , field: 'sightsee_photos'
                 , xhr: function () { } //上传视频进度条
                 , before: function (obj) {
-                    $('.uploadImg').removeClass('uploadImgIcon')
+                    $('#newsUpImg').removeClass('uploadImgIcon')
                     //预读本地文件示例，不支持ie8
                     obj.preview(function (index, file, result) {
                         $('#demo1').attr('src', result); //图片链接（base64）
@@ -440,6 +451,40 @@
                 }
             });
 
+            //新闻图片上传
+            var uploadInst2 = upload.render({
+                elem: '#guideUpImg'
+                , url: 'sightsee_photo'
+                , field: 'sightsee_photos'
+                , xhr: function () { } //上传视频进度条
+                , before: function (obj) {
+                    $('#guideUpImg').removeClass('uploadImgIcon')
+                    //预读本地文件示例，不支持ie8
+                    obj.preview(function (index, file, result) {
+                        $('#demo2').attr('src', result); //图片链接（base64）
+                    });
+                }
+                , done: function (res) {
+                    //如果上传失败
+                    if (res.code == 0) {
+                        //上传成功
+                        document.getElementById("guideUpimg_url").value = res.data.src;
+                    } else {
+                        return layer.msg('上传失败');
+                    }
+
+
+                }
+                , error: function () {
+                    //演示失败状态，并实现重传
+                    var demoText = $('#demoText');
+                    demoText.html('<span style="color: #FF5722;">上传失败</span> <a class="layui-btn layui-btn-xs demo-reload">重试</a>');
+                    demoText.find('.demo-reload').on('click', function () {
+                        uploadInst.upload();
+                    });
+                }
+            });
+
             //监听提交
             form.on('submit(formDemo)', function (data) {
                 window.id = data.field.id

templates/outerNet/index2.html

@@ -339,90 +339,28 @@
                         </div>
                         <div class="haciendaBottom">
                             <ul class="haciendaList">
+                                {% for gardenItem in garden %}
                                 <li class="haciendaItem">
                                     <div class="haciendaImg">
                                         <img class="haciendaImg1" src="{% static 'imgs/1.jpg'%}" alt="">
-                                        <img class="haciendaImg2" src="{% static 'imgs/2.png'%}" alt="">
+                                        <img class="haciendaImg2" src="{% static 'imgs/22.png'%}" alt="">
                                     </div>
                                     <div class="haciendaTxt">
-                                        <h2>云飞农场</h2>
-                                        <div class="desc">位于和南沙鞥周三水电费，杀敌欧福布斯后撒粉红色的。阿时候发货萨芬，是大法师。</div>
+                                        <h2>{{gardenItem.name}}</h2>
+                                        <div class="desc">{{gardenItem.desc}}</div>
                                         <div>
-                                            <button class="btn1">观光路线</button>
-                                            <button class="btn2">导游导览</button>
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="haciendaItem">
-                                    <div class="haciendaImg">
-                                        <img class="haciendaImg1" src="http://www.xbxxnyggw.cn/file/upload/201901/23/112822951.jpg" alt="">
-                                        <img class="haciendaImg2" src="{% static 'imgs/2.png'%}" alt="">
-                                    </div>
-                                    <div class="haciendaTxt">
-                                        <h2>云飞农场</h2>
-                                        <div class="desc">位于和南沙鞥周三水电费，杀敌欧福布斯后撒粉红色的。阿时候发货萨芬，是大法师。</div>
-                                        <div>
-                                            <button class="btn1">观光路线</button>
-                                            <button class="btn2">导游导览</button>
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="haciendaItem">
-                                    <div class="haciendaImg">
-                                        <img class="haciendaImg1" src="{% static 'imgs/1.jpg'%}" alt="">
-                                        <img class="haciendaImg2" src="{% static 'imgs/2.png'%}" alt="">
-                                    </div>
-                                    <div class="haciendaTxt">
-                                        <h2>云飞农场</h2>
-                                        <div class="desc">位于和南沙鞥周三水电费，杀敌欧福布斯后撒粉红色的。阿时候发货萨芬，是大法师。</div>
-                                        <div>
-                                            <button class="btn1">观光路线</button>
-                                            <button class="btn2">导游导览</button>
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="haciendaItem">
-                                    <div class="haciendaImg">
-                                        <img class="haciendaImg1" src="{% static 'imgs/1.jpg'%}" alt="">
-                                        <img class="haciendaImg2" src="{% static 'imgs/2.png'%}" alt="">
-                                    </div>
-                                    <div class="haciendaTxt">
-                                        <h2>云飞农场</h2>
-                                        <div class="desc">位于和南沙鞥周三水电费，杀敌欧福布斯后撒粉红色的。阿时候发货萨芬，是大法师。</div>
-                                        <div>
-                                            <button class="btn1">观光路线</button>
-                                            <button class="btn2">导游导览</button>
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="haciendaItem">
-                                    <div class="haciendaImg">
-                                        <img class="haciendaImg1" src="{% static 'imgs/1.jpg'%}" alt="">
-                                        <img class="haciendaImg2" src="{% static 'imgs/2.png'%}" alt="">
-                                    </div>
-                                    <div class="haciendaTxt">
-                                        <h2>云飞农场</h2>
-                                        <div class="desc">位于和南沙鞥周三水电费，杀敌欧福布斯后撒粉红色的。阿时候发货萨芬，是大法师。</div>
-                                        <div>
-                                            <button class="btn1">观光路线</button>
-                                            <button class="btn2">导游导览</button>
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="haciendaItem">
-                                    <div class="haciendaImg">
-                                        <img class="haciendaImg1" src="{% static 'imgs/1.jpg'%}" alt="">
-                                        <img class="haciendaImg2" src="{% static 'imgs/2.png'%}" alt="">
-                                    </div>
-                                    <div class="haciendaTxt">
-                                        <h2>云飞农场</h2>
-                                        <div class="desc">位于和南沙鞥周三水电费，杀敌欧福布斯后撒粉红色的。阿时候发货萨芬，是大法师。</div>
-                                        <div>
-                                            <button class="btn1">观光路线</button>
-                                            <button class="btn2">导游导览</button>
+                                            <button class="btn1">
+                                                <input type="hidden" name="" value="{{gardenItem.guide_img}}" id="">
+                                                观光路线
+                                            </button>
+                                            <button class="btn2">
+                                                <input type="hidden" name="" value="{{gardenItem.location}}" id="">
+                                                导游导览
+                                            </button>
                                         </div>
                                     </div>
                                 </li>
+                                {% endfor %}
                             </ul>
                         </div>
                     </div>
@@ -526,51 +464,17 @@
                         <div class="title">火爆预定<span>火爆限定中</span></div>
                         <div>
                             <ul class="hotHotelList">
+                                {% for hotelItem in hotel2 %}
                                 <li class="hotHotelItem">
-                                    <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>
-                                            <div>苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄</div>
-                                        </div>
-                                    </a>
-                                </li>
-                                <li class="hotHotelItem">
-                                    <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>
-                                            <div>苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄</div>
-                                        </div>
-                                    </a>
-                                </li>
-                                <li class="hotHotelItem">
-                                    <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>
-                                            <div>苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄</div>
-                                        </div>
-                                    </a>
-                                </li>
-                                <li class="hotHotelItem">
-                                    <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="">
+                                    <a href="dorm_detail?id={{hotelItem.id}}" target="_blank">
+                                        <img src="http://192.168.1.9:8000/{{hotelItem.hotel_img}}" width="96px" height="80px" alt="">
                                         <div class="desc">
-                                            <h3>苍龙农庄</h3>
-                                            <div>苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄</div>
-                                        </div>
-                                    </a>
-                                </li>
-                                <li class="hotHotelItem">
-                                    <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>
-                                            <div>苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄苍龙农庄</div>
+                                            <h3>{{hotelItem.name}}</h3>
+                                            <div>{{hotelItem.intro}}</div>
                                         </div>
                                     </a>
                                 </li>
+                                {% endfor %}
                             </ul>
                         </div>
                     </div>
@@ -581,17 +485,21 @@
                         </div>
                         <div class="inner">
                             <ul class="recommendHotelList">
+                                {% for hotelItem in hotel %}
                                 <li class="recommendHotelItem">
-                                    <a href="dorm_detail?id=3" target="_blank">
-                                        <div class="recommendHotelImg">
-                                            <img src="http://www.nzlyw.com/file/upload/202007/22/103051841.jpg" alt="">
+                                    <a href="dorm_detail?id={{hotelItem.id}}" target="_blank">
+                                        <div style="height: 300px;">
+                                            <div class="recommendHotelImg">
+                                                <img src="http://192.168.1.9:8000/{{hotelItem.hotel_img}}" alt="">
+                                            </div>
+                                            <h1>{{hotelItem.name}}</h1>
+                                            <div class="area">{{hotelItem.intro}}</div>
+                                            <div class="sortNum">价格：<span>￥{{hotelItem.price}}</span></div>
                                         </div>
-                                        <h1>十三陵水园农庄大院</h1>
-                                        <div class="area">所属区域：<span>秦淮</span></div>
-                                        <div class="sortNum">推荐入住：<span>0</span></div>
                                     </a>
                                 </li>
-                                <li class="recommendHotelItem">
+                                {% endfor %}
+                                <!-- <li class="recommendHotelItem">
                                     <a href="dorm_detail?id=3" target="_blank">
                                         <div class="recommendHotelImg">
                                             <img src="http://www.nzlyw.com/file/upload/201909/30/152451841529.jpg" alt="">
@@ -600,47 +508,7 @@
                                         <div class="area">所属区域：<span>秦淮</span></div>
                                         <div class="sortNum">推荐入住：<span>0</span></div>
                                     </a>
-                                </li>
-                                <li class="recommendHotelItem">
-                                    <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>
-                                        <h1>十三陵水园农庄大院</h1>
-                                        <div class="area">所属区域：<span>秦淮</span></div>
-                                        <div class="sortNum">推荐入住：<span>0</span></div>
-                                    </a>
-                                </li>
-                                <li class="recommendHotelItem">
-                                    <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>
-                                        <h1>十三陵水园农庄大院</h1>
-                                        <div class="area">所属区域：<span>秦淮</span></div>
-                                        <div class="sortNum">推荐入住：<span>0</span></div>
-                                    </a>
-                                </li>
-                                <li class="recommendHotelItem">
-                                    <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>
-                                        <h1>十三陵水园农庄大院</h1>
-                                        <div class="area">所属区域：<span>秦淮</span></div>
-                                        <div class="sortNum">推荐入住：<span>0</span></div>
-                                    </a>
-                                </li>
-                                <li class="recommendHotelItem">
-                                    <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>
-                                        <h1>十三陵水园农庄大院</h1>
-                                        <div class="area">所属区域：<span>秦淮</span></div>
-                                        <div class="sortNum">推荐入住：<span>0</span></div>
-                                    </a>
-                                </li>
+                                </li> -->
                             </ul>
                         </div>
                     </div>
@@ -761,7 +629,7 @@
     <script src="{% static '/lib/js/jquery-2.1.4.min.js'%}"></script>
     <script src="{% static '/lib/js/swiper.min.js'%}"></script>
     <!-- <script src="{% static '/lib/js/video.min.js'%}"></script> -->
-    <script src="https://webapi.amap.com/maps?v=1.4.15&key=3939967b919a8003377dd113fc445a3d&plugin=AMap.Driving"></script>
+    <script src="https://webapi.amap.com/maps?v=1.4.15&key=3939967b919a8003377dd113fc445a3d&plugin=AMap.Driving&plugin=AMap.Geocoder"></script>
     <!-- <script src="{% static '/lib/layui/layui.js'%}"></script> -->
     <script src="{% static '/js/index2.js'%}"></script>
 </body>

templates/outerNet/tourist.html

@@ -58,7 +58,7 @@
                         <span class="layui-breadcrumb">
                             <a href="home">首页</a>
                             <a>
-                                <cite>采摘详情</cite>
+                                <cite>旅游导览</cite>
                             </a>
                         </span>
                     </div>
@@ -68,7 +68,7 @@
                         <div class="sendTime title">{{sightsee.upl_time}}</div>
                         <div class="prodectIntro">
                             <div class="prodectImg">
-                                <img src="http://192.168.1.9:8000/{{sightsee.sightisee_img}}" alt="">
+                                <img src="http://192.168.1.9:8000/{{sightsee.sightisee_img }}" alt="">
                             </div>
                             <div class="descTxt">
                                 <div><span>景点名称：</span>{{sightsee.name}}</div>
@@ -81,10 +81,10 @@
                         <div class="title">详细介绍</div>
                         <div class="touristDesc">
                             <div class="descTitle">介绍</div>
-                            <div>1</div>
+                            <div>{{sightsee.content|safe}}</div>
                             <div class="descTitle">景区导览图</div>
                             <div>
-                                <img src="http://192.168.1.9:8000/{{sightsee.guide_img}}" width="100%" alt="">
+                                <img src="http://192.168.1.9:8000/{{sightsee.sightisee_img }}" width="100%" alt="">
                             </div>
                         </div>
                     </div>

templates/static/css/index2.css

@@ -389,8 +389,9 @@ span.swiper-pagination-bullet-active{
 }
 .hacienda .haciendaItem .haciendaTxt .desc{
     letter-spacing: 2px;
-    height: 100px;
+    height: 82px;
     overflow: hidden;
+    margin-bottom: 20px;
 }
 .hacienda .haciendaItem .haciendaTxt button{
     color: #fff;
@@ -612,6 +613,9 @@ span.swiper-pagination-bullet-active{
     line-height: 14px;
     padding: 0 20px;
     color: #949494;
+    height: 30px;
+    overflow: hidden;
+    margin-bottom: 15px;
 }
 .recommendHotelItem .sortNum{
     text-align: right;

templates/static/js/index2.js

@@ -211,39 +211,39 @@ var map = new AMap.Map('map', {
     center: [113.397428, 39.90923] //初始化地图中心点
 });
 // var geoc = new AMap.Geocoder();
-function searchWay() {
-    clearWay()
-    var startPath = $("#startPath").val();
-    var endPath = $("#endPath").val();
+// function searchWay() {
+//     clearWay()
+//     var startPath = $("#startPath").val();
+//     var endPath = $("#endPath").val();
 
-    if (!startPath) {
-        $("#startPath").focus();
-        return;
-    }
-    if (!endPath) {
-        $("#endPath").focus();
-        return;
-    }
-    $('.guideMap').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();
-        }
-    });
-}
+//     if (!startPath) {
+//         $("#startPath").focus();
+//         return;
+//     }
+//     if (!endPath) {
+//         $("#endPath").focus();
+//         return;
+//     }
+//     $('.guideMap').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();
+//         }
+//     });
+// }
 
 function clearWay() {
     // 清除地图上所有添加的覆盖物
@@ -336,7 +336,8 @@ 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">')
+    var img = $(this).find('input').val();
+    $('.tourismShow .content').html('<div style="text-align:center;width:100%;height:100%"><img  style="width:100%;height:100%" src="'+img+'">')
     $('.tourismShow').show();
     $('.tourismShow').css('opacity',1)
 })
@@ -350,15 +351,17 @@ $('.tourismShowCloseBtn').on('click',function(){
 var map;
 $('.haciendaTxt .btn2').on('click',function(){
     $('.tourismShow .title span').html('导游导览');
+    var lng = $(this).find('input').val().split(',')[0];
+    var lat = $(this).find('input').val().split(',')[1];
     var html = '<div class="">'+
-                '<div class="guideForm">起始地点：<input type="text" id="startPath"><button onclick="searchWay()">确定</button></div>'+
+                '<div class="guideForm">起始地点：<input type="text" id="startPath"><button onclick="searchWay(\''+lng+'\',\''+lat+'\')">确定</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] //初始化地图中心点
+        center: [lng, lat] //初始化地图中心点
     });
     var startIcon = new AMap.Icon({
         // 图标尺寸
@@ -378,17 +381,21 @@ $('.haciendaTxt .btn2').on('click',function(){
     });
     var marker = new AMap.Marker({
         icon:endIcon,
-        position: new AMap.LngLat(113.397428, 39.90923),   // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-        title: '北京'
+        position: new AMap.LngLat(lng, lat),   // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
     });
     map.add(marker); 
     $('.tourismShow').show();
-    $('.tourismShow').css('opacity',1)
+    $('.tourismShow').css('opacity',1);
+    geocoder = new AMap.Geocoder({
+        city: "010", //城市设为北京，默认：“全国”
+        radius: 1000 //范围，默认：500
+    });
 })
-function searchWay() {
+function searchWay(lng,lat) {
     map.clearMap();
     var startPath = $("#startPath").val();
     var endPath = '北京';
+    
 
     if (!startPath) {
         $("#startPath").focus();
@@ -400,17 +407,25 @@ function searchWay() {
         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();
+    geocoder.getAddress([lng,lat], function(status, result) {
+        if (status === 'complete'&&result.regeocode) {
+            var address = result.regeocode.formattedAddress;
+            // 根据起终点名称规划驾车导航路线
+            driving.search([
+                { keyword: startPath, city: '' },
+                { keyword: address, city: '' }
+            ], function (status, result) {
+                if (status === 'complete') {
+                    // log.success('绘制驾车路线完成');
+                    $('.loadDiv').remove();
+                } else {
+                    alert('获取驾车数据失败：' + result)
+                    $('.loadDiv').remove();
+                }
+            });
+        }else{
+            log.error('根据经纬度查询地址失败')
         }
     });
+    
 }