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

templates/backstageNet/home.html

@@ -268,16 +268,16 @@
         </div>
         <div class="navigation">
             <ul class="layui-nav layui-bg-blue">
-                <li class="layui-nav-item">
+                <!-- <li class="layui-nav-item">
                     <a href="">控制台
-                        <!-- <span class="layui-badge">9</span> -->
+                        <span class="layui-badge">9</span>
                     </a>
                 </li>
                 <li class="layui-nav-item">
                     <a href="">个人中心
-                        <!-- <span class="layui-badge-dot"></span> -->
+                        <span class="layui-badge-dot"></span>
                     </a>
-                </li>
+                </li> -->
                 <li class="layui-nav-item" lay-unselect="">
                     <a href="javascript:;">
                         <img src="{{current_user.user_picture}}" class="layui-nav-img">

templates/backstageNet/info/dormPub.html

@@ -565,6 +565,7 @@
             $('#demo1').removeAttr('src'); //图片链接（base64）
             fuzhi()
             if (window.id !== '') {
+                parent.getData('', parent.$('.layui-laypage-curr em').eq(1).html(), parent.$('.permission .active').data('type'))
                 var index = parent.layer.getFrameIndex(window.name);
                 parent.layer.close(index);//关闭当前页
             }
@@ -599,8 +600,9 @@
                 CKEDITOR.instances[instance].updateElement();
         }
 
-        function fuzhi() { //编辑器赋值
-            editor1.setData("");
+        function fuzhi(str) { //编辑器赋值
+            var str = str || "";
+            editor1.setData(str);
         }
 
         function insertText(value) { //插入文本

templates/backstageNet/info/gardenPub.html

@@ -268,6 +268,7 @@
     <script src="{% static 'lib/ckeditor/lang/zh-cn.js'%}"></script>
     <script src="{% static '/js/backstageNet/common.js'%}"></script>
     <script>
+        var ripe
         var element, form, upload, laydate, layer;
         layui.use(['element', 'form', 'upload', 'laydate', 'layer'], function () {
             element = layui.element;
@@ -281,7 +282,7 @@
             });
 
             //成熟日期
-            laydate.render({
+            ripe = laydate.render({
                 elem: '#matureTime' //指定元素
                 , type: 'month'
                 , format: 'M月' //可任意组合
@@ -290,7 +291,6 @@
                     $('#ripe').val(date.month)
                 }
             });
-
             //年月选择器
             laydate.render({
                 elem: '#pickTime' //指定元素
@@ -306,34 +306,7 @@
             });
 
             // 农场列表请求
-            $.ajax({
-                url: 'farm_choice',
-                type: 'post',
-                data: {},
-                dataType: 'json',
-                success: function (data) {
-                    if (data) {
-                        // layer.msg('发布成功,等待管理员审核', { icon: 1 })
-                        var html = '';
-                        if (data.length) {
-                            html += '<option value=""></option>';
-                            for (var i = 0; i < data.length; i++) {
-                                html += '<option value="' + data[i].name + '">' + data[i].name + '</option>'
-                            }
-                        } else {
-                            html = '<dd lay-value="" class="layui-select-tips layui-this">暂无农场</dd>';
-                        }
-                        $('#farmSelect').html(html)
-                        form.render('select'); //刷新select选择框渲染
-
-                    } else {
-                        layer.msg('发布失败', { icon: 2 })
-                    }
-                },
-                error: function (type) {
-                    console.log(type)
-                }
-            })
+            getFarm()
 
             //图片上传
             var uploadInst = upload.render({
@@ -423,6 +396,40 @@
             });
         });
 
+        function getFarm(curr){
+            var curr = curr || '';
+            $.ajax({
+                url: 'farm_choice',
+                type: 'post',
+                data: {},
+                dataType: 'json',
+                success: function (data) {
+                    if (data) {
+                        // layer.msg('发布成功,等待管理员审核', { icon: 1 })
+                        var html = '';
+                        if (data.length) {
+                            html += '<option value=""></option>';
+                            for (var i = 0; i < data.length; i++) {
+                                html += '<option value="' + data[i].name + '">' + data[i].name + '</option>'
+                            }
+                        } else {
+                            html = '<dd lay-value="" class="layui-select-tips layui-this">暂无农场</dd>';
+                        }
+                        $('#farmSelect').html(html)
+                        $('#farmSelect').val(curr)
+                        form.render('select'); //刷新select选择框渲染
+
+                    } else {
+                        layer.msg('发布失败', { icon: 2 })
+                    }
+                },
+                error: function (type) {
+                    console.log(type)
+                }
+            })
+
+        }
+
         // 示例1：设置工具栏为基本工具栏，高度为70
         var editor1 = CKEDITOR.replace('editor1',
             {
@@ -452,8 +459,9 @@
                 CKEDITOR.instances[instance].updateElement();
         }
 
-        function fuzhi() { //编辑器赋值
-            editor1.setData("");
+        function fuzhi(str) { //编辑器赋值
+            var str = str || "";
+            editor1.setData(str);
         }
 
         function insertText(value) { //插入文本
@@ -498,6 +506,8 @@
             $('#demo1').removeAttr('src'); //图片链接（base64）
             fuzhi()
             if (window.id !== '') {
+                parent.getData('', parent.$('.layui-laypage-curr em').eq(1).html(), parent.$('.permission .active').data('type'))
+                // parent.location.reload()
                 var index = parent.layer.getFrameIndex(window.name);
                 parent.layer.close(index);//关闭当前页
             }

templates/backstageNet/info/newsPub.html

@@ -342,6 +342,7 @@
             $('#demo1').removeAttr('src'); //图片链接（base64）
             fuzhi()
             if (window.id !== '') {
+                parent.getData('', parent.$('.layui-laypage-curr em').eq(1).html(), parent.$('.permission .active').data('type'))
                 var index = parent.layer.getFrameIndex(window.name);
                 parent.layer.close(index);//关闭当前页
                 sessionStorage.removeItem('biao')
@@ -380,8 +381,9 @@
                 CKEDITOR.instances[instance].updateElement();
         }
 
-        function fuzhi() { //编辑器赋值
-            editor1.setData("");
+        function fuzhi(str) { //编辑器赋值
+            var str = str || "";
+            editor1.setData(str);
         }
 
         function insertText(value) { //插入文本

templates/backstageNet/info/productPub.html

@@ -350,8 +350,9 @@
                 CKEDITOR.instances[instance].updateElement();
         }
 
-        function fuzhi() { //编辑器赋值
-            editor1.setData("");
+        function fuzhi(str) { //编辑器赋值
+            var str = str || "";
+            editor1.setData(str);
         }
 
         function insertText(value) { //插入文本
@@ -369,6 +370,7 @@
             $('#demo1').removeAttr('src'); //图片链接（base64）
             fuzhi()
             if (window.id !== '') {
+                parent.getData('', parent.$('.layui-laypage-curr em').eq(1).html(), parent.$('.permission .active').data('type'))
                 var index = parent.layer.getFrameIndex(window.name);
 			    parent.layer.close(index);//关闭当前页
                 sessionStorage.removeItem('biao')

templates/backstageNet/info/sightseePub.html

@@ -567,6 +567,7 @@
             $('#demo2').removeAttr('src'); //图片链接（base64）
             fuzhi()
             if (window.id !== '') {
+                parent.getData('', parent.$('.layui-laypage-curr em').eq(1).html(), parent.$('.permission .active').data('type'))
                 var index = parent.layer.getFrameIndex(window.name);
                 parent.layer.close(index);//关闭当前页
             }
@@ -601,8 +602,9 @@
                 CKEDITOR.instances[instance].updateElement();
         }
 
-        function fuzhi() { //编辑器赋值
-            editor1.setData("");
+        function fuzhi(str) { //编辑器赋值
+            var str = str || "";
+            editor1.setData(str);
         }
 
         function insertText(value) { //插入文本

templates/backstageNet/info/videoPub.html

@@ -391,6 +391,7 @@
             element.progress('progressBar', '0');
             $('#progressBar').hide();
             if (window.id !== '') {
+                parent.getData('', parent.$('.layui-laypage-curr em').eq(1).html(), parent.$('.permission .active').data('type'))
                 var index = parent.layer.getFrameIndex(window.name);
 			    parent.layer.close(index);//关闭当前页
                 sessionStorage.removeItem('biao')

templates/backstageNet/infoList/myPub.html

@@ -152,7 +152,6 @@
                             <label class="layui-form-label">发布类型：</label>
                             <div class="layui-input-inline">
                                 <select name="type" id="selectType" lay-verify="required" lay-filter="type">
-                                    <option value="">全部</option>
                                     <option value="5">新闻资讯</option>
                                     <option value="6">视频资讯</option>
                                     <option value="7">产品展厅</option>
@@ -210,7 +209,7 @@
             });
 
             //第一个实例
-            getData('my_pub_list', 1,0, '') //url,page，信息类型
+            getData('my_pub_list', 1,0, 5) //url,page，信息类型
 
             form.on('select(type)', function(data){
                 console.log(data)
@@ -418,9 +417,9 @@
                 var type = $(this).data('type'); //0待审核  1已通过
                 $('.permission button').removeClass('active');
                 $(this).addClass('active');
-                $('#selectType').val('');
+                // $('#selectType').val('');
                 form.render('select');
-                getData('my_pub_list', 1, type)
+                getData('my_pub_list', 1, type,$('#selectType').val())
             }
         })
 

templates/backstageNet/infoManage/dormManage.html

@@ -236,11 +236,11 @@
             });
 
             //第一个实例
-            getData('news_check_list', 1, 0) //url,page，信息类型
+            getData('dorm_check_list', 1, 0) //url,page，信息类型
 
             //监听提交
             form.on('submit(formDemo)', function (data) {
-                console.log(data)
+
                 layer.msg(JSON.stringify(data.field));
                 return false;
             });
@@ -263,6 +263,7 @@
                         // , count: 30
                         , count: $('#totalPage').val()
                         , theme: '#2ca9f9'
+                        , curr:page
                         , layout: ['prev', 'page', 'next', 'skip']
                         , jump: function (obj, first) {
                             if (!first) {
@@ -309,14 +310,12 @@
             var index = layer.open({
                 title: '民宿编辑',
                 type: 2,
-                area: ['850px', '560px'],
+                area: ['1000px', '600px'],
                 content: 'dorm_pub',
                 success: function (layero, index) {
                     // alert(2)
                     var body = layer.getChildFrame('body', index);
                     var iframeWin = window[layero.find('iframe')[0]['name']]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-                    // console.log(body.html()) //得到iframe页的body内容
-                    console.log(iframeWin) //得到iframe页的body内容
                     body.find('input[name="name"]').val(window.data[0].name) //名称
                     body.find('input[name="price"]').val(window.data[0].price) //价格
                     body.find('input[name="person"]').val(window.data[0].person) //法人代表
@@ -325,9 +324,30 @@
                     body.find('input[name="addr"]').val(window.data[0].addr) //民宿地址
                     body.find('input[name="location"]').val(window.data[0].location)
                     body.find('textarea[name="intro"]').val(window.data[0].intro) //民宿简介
-                    body.find('input[name="pic_list"]').val(window.data[0].pic_list) //民宿展示
-                    body.find('textarea[name="content"]').val(window.data[0].content) //详情说明
+                    body.find('textarea[id="editor1"]').val(window.data[0].content) //详情说明
+
+                    var w = $(layero).find("iframe")[0].contentWindow;//通过该对象可以获取iframe中的变量，调用iframe中的方法
+                    w.fuzhi(window.data[0].content);//调用iframe中的方法
+
+                    console.log(body.find('textarea[id="editor1"]'))
+                    console.log(window.data[0].content)
+                    console.log(body.find('textarea[id="editor1"]').val())
                     body.find('input[name="id"]').val(window.data[0].id) //id
+                    body.find('#demo1').attr('src',window.data[0].hotel_img) //图片
+                    body.find('#img_url').val(window.data[0].hotel_img) //图片
+                    var html ='';
+                    var photoList = '';
+                    for(var i = 1;i<window.data.length;i++){
+                        photoList += window.data[i].addr_photo;
+                        if(!(i == window.data.length-1)){
+                            photoList += ',';
+                        }
+                        html +='<div id="" class="file-iteme"><div class="handle" style="display: none;"><i class="layui-icon"></i></div><img style="width: 100px;height: 100px;" src="http://127.0.0.1:8000/'+window.data[i].addr_photo+'"><div class="info" style="display: none;">'+window.data[i].addr_photo+'</div></div>'
+                        if(i == window.data.length-1){
+                            body.find('#uploader-list').html(html) //图片
+                            body.find('input[name="pic_list"]').val(photoList)
+                        }
+                    }
                 }
             });
         }
@@ -350,7 +370,8 @@
                             layer.close(index);
                             // parent.layer.msg("操作成功!", {time: 1000}, function () {
                             //重新加载父页面
-                            location.reload();
+                            // location.reload();
+                            getData('dorm_check_list', $('.layui-laypage-curr em').eq(1).html(), $('.permission .active').data('type'))
                         }
                     }
                 })
@@ -376,7 +397,9 @@
                             layer.close(index);
                             // parent.layer.msg("操作成功!", {time: 1000}, function () {
                             //重新加载父页面
-                            location.reload();
+                            // location.reload();
+                            getData('dorm_check_list', $('.layui-laypage-curr em').eq(1).html(), $('.permission .active').data('type'))
+
                         }
                     }
                 })
@@ -453,7 +476,7 @@
                 // alert(type)
                 $('.permission button').removeClass('active');
                 $(this).addClass('active');
-                getData('news_check_list', 1, type)
+                getData('dorm_check_list', 1, type)
             }
         })
 

templates/backstageNet/infoManage/dormManageList.html

@@ -25,7 +25,7 @@
 </tr>
 {% endfor %} {% else %}
 <tr>
-    <td colspan="10" style="text-align:center;">暂无数据</td>
+    <td colspan="6" style="text-align:center;">暂无数据</td>
 </tr>
 {% endif %}
 <input type="hidden" value="{{nums}}" id="totalPage">

templates/backstageNet/infoManage/farmManage.html

@@ -152,10 +152,10 @@
                         <thead>
                             <tr>
                                 <th>农场名称</th>
-                                <th>地址</th>
-                                <th>面积</th>
                                 <th>负责人</th>
                                 <th>联系电话</th>
+                                <th>面积</th>
+                                <th>地址</th>
                                 <th>操作</th>
                             </tr>
                         </thead>
@@ -191,7 +191,7 @@
             });
 
             //第一个实例
-            getData('news_check_list', 1, 0) //url,page，信息类型
+            getData('farm_check_list', 1, 0) //url,page，信息类型
 
             //监听提交
             form.on('submit(formDemo)', function (data) {
@@ -204,7 +204,7 @@
 
         function getData(url, page, hidden) {
             $.ajax({
-                url: 'garden_check_list',
+                url: 'farm_check_list',
                 type: 'get',
                 data: {
                     page: page,
@@ -218,11 +218,12 @@
                         // , count: 30
                         , count: $('#totalPage').val()
                         , theme: '#2ca9f9'
+                        , curr:page
                         , layout: ['prev', 'page', 'next', 'skip']
                         , jump: function (obj, first) {
                             if (!first) {
                                 $.ajax({
-                                    url: 'garden_check_list',
+                                    url: 'farm_check_list',
                                     type: 'get',
                                     data: { page: obj.curr,hidden: hidden },
                                     dataType: 'html',
@@ -246,7 +247,7 @@
         // 编辑
         function editFun(id) {
             $.ajax({
-                url: 'garden_check_list',
+                url: 'farm_check_list',
                 type: 'post',
                 data: {
                     id: id,
@@ -276,14 +277,19 @@
         }
 
         // 通过
-        function passFun(id) {
-            layer.confirm('是否通过此信息',{title:'通过'}, function (index) {
+        function passFun(id,req) {
+            if(req == 'check1'){
+                var title = '是否通过此信息';
+            }else{
+                var title = '是否驳回此信息';
+            }
+            layer.confirm(title,{title:'提示'}, function (index) {
                 $.ajax({
-                    url: 'garden_check_list',
+                    url: 'farm_check_list',
                     type: 'post',
                     data: {
                         id: id,
-                        req: 'check'
+                        req: req
                     },
                     dataType: 'json',
                     success: function (data) {
@@ -291,7 +297,9 @@
                             layer.close(index);
                             // parent.layer.msg("操作成功!", {time: 1000}, function () {
                             //重新加载父页面
-                            location.reload();
+                            // location.reload();
+                            getData('farm_check_list', $('.layui-laypage-curr em').eq(1).html(), $('.permission .active').data('type'))
+
                         }
                     }
                 })
@@ -300,55 +308,9 @@
             });
         }
 
-        // 删除
-        function delFun(id) {
-            layer.confirm('真的删除行么',{title:'删除'}, function (index) {
-                $.ajax({
-                    url: 'garden_check_list',
-                    type: 'post',
-                    data: {
-                        req: 'del',
-                        id: id,
-                    },
-                    dataType: 'json',
-                    success: function (data) {
-                        if (data) {
-                            location.reload();
-                        }
-                    }
-                })
-                layer.close(index);
-            });
-        }
 
 
-        //查看
-        function lokFun(id) {
-            layer.open({
-                type: 0,
-                id: 'Layer',
-                title: '农场查看',
-                area: ['740px', '500px'],
-                shade: 0,
-                anim: -1,
-                content: '<div class="table"></div>',
-                success: function(layero, index) {
-                    $.ajax({
-                        url: 'garden_check',
-                        type: 'post',
-                        async: false,
-                        data: {
-                            ids: id,
-                        },
-                        dataType: 'json',
-                        success: function (data) {
-                            window.data = data[0]
-                            layero.find('.table').html(window.data.content)
-                        }
-                    })
-                }
-            });
-        }
+       
 
         // 推荐热门
         function hatPush(id,flag){
@@ -365,7 +327,7 @@
                     var hidden = $('.permission .active').data('type');
                     var page = $(".layui-laypage-em").next().html();
                     $.ajax({
-                        url: 'garden_check_list',
+                        url: 'farm_check_list',
                         type: 'get',
                         data: { page: page,hidden: hidden },
                         dataType: 'html',

templates/backstageNet/infoManage/farmManageList.html

@@ -2,31 +2,19 @@
 <tr>
     <td>{{ msg.name }}</td>
     <td>
-        {{ msg.company }}
+        {{ msg.manage }}
     </td>
-    <td>{{ msg.pick_img }}</td>
-    <td>{{ msg.upl_time }}</td>
-    <td>{{ msg.upl_time }}</td>
+    <td>{{ msg.mobile }}</td>
+    <td>{{ msg.area }}</td>
+    <td>{{ msg.addr }}</td>
     <td>
-        {% if msg.hidden == 0 %}
-        <a href="JavaScript:;" class="editBtn" onclick="editFun('{{msg.id}}')">编辑</a>
-        |
-        <a href="JavaScript:;" class="passBtn"  onclick="passFun('{{msg.id}}')">通过</a>
-        |
-        {% else %}
-            {% if msg.hatType == 1 %}
-            <button type="button" onclick="hatPush('{{msg.id}}',1)" class="layui-btn layui-btn-xs layui-btn-danger hatPush"><i class="layui-icon layui-icon-fire"></i></button>
+        {% if msg.hidden == 0%}
+            <a href="JavaScript:;" class="passBtn"  onclick="passFun('{{msg.id}}','check1')">通过</a>
             {% else %}
-            <button type="button" onclick="hatPush('{{msg.id}}',0)" class="layui-btn layui-btn-xs layui-btn-primary rejectBtn"><i class="layui-icon layui-icon-fire"></i></button>
+            <a href="JavaScript:;" class="delBtn" onclick="passFun('{{msg.id}}','check0')">驳回</a>
             {% endif %}
-            <span>|</span>
-        {% endif %}
-        <a href="JavaScript:;" class="delBtn" onclick="delFun('{{msg.id}}')">删除</a>
-        |
-        <a href="person_farm?name=admin" target="_blank" class="lokBtn" >查看</a>
-        <!-- <button type="button" class="layui-btn layui-btn-sm layui-btn-normal">编辑</button>
-        <button type="button" class="layui-btn layui-btn-sm ">通过</button>
-        <button type="button" class="layui-btn layui-btn-sm ">{{msg.id}}</button> -->
+            |
+            <a href="person_farm?name={{msg.user.username}}" target="_blank" class="lokBtn" >查看</a>
     </td>
 </tr>
 {% endfor %} {% else %}

templates/backstageNet/infoManage/newsManage.html

@@ -272,12 +272,13 @@
                     // alert(2)
                     var body = layer.getChildFrame('body', index);
                     var iframeWin = window[layero.find('iframe')[0]['name']]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-                    body.find('input[name= "id"]').val(window.data.id) //id
-                    body.find('input[name= "title"]').val(window.data.title) //标题
-                    body.find('input[name= "writer"]').val(window.data.writer) //发布人
-                    body.find('input[name= "intro"]').val(window.data.intro) //文章简介
-                    body.find('textarea[name= "intro"]').val(window.data.intro) //文章简介
-                    body.find('textarea[id= "editor1"]').val(window.data.content) //文章正文
+                    body.find('input[name="id"]').val(window.data.id) //id
+                    body.find('input[name="title"]').val(window.data.title) //标题
+                    body.find('input[name="writer"]').val(window.data.writer) //发布人
+                    body.find('input[name="intro"]').val(window.data.intro) //文章简介
+                    body.find('textarea[name="intro"]').val(window.data.intro) //文章简介
+                    var w = $(layero).find("iframe")[0].contentWindow;//通过该对象可以获取iframe中的变量，调用iframe中的方法
+                    w.fuzhi(window.data.content);//调用iframe中的方法
                     body.find('#demo1').attr('src',window.data.head_img) //图片
                     body.find('#img_url').val(window.data.head_img) //图片
                 }

templates/backstageNet/infoManage/pickManage.html

@@ -153,6 +153,7 @@
                             <tr>
                                 <th>采摘名称</th>
                                 <th>所属农场</th>
+                                <th>规模</th>
                                 <th>成熟期</th>
                                 <th>采摘地址</th>
                                 <th>采摘时间</th>
@@ -191,7 +192,7 @@
             });
 
             //第一个实例
-            getData('news_check_list', 1, 0) //url,page，信息类型
+            getData('garden_check_list', 1, 0) //url,page，信息类型
 
             //监听提交
             form.on('submit(formDemo)', function (data) {
@@ -265,12 +266,27 @@
                 success: function (layero, index,data) {
                     var body = layer.getChildFrame('body', index);
                     var iframeWin = window[layero.find('iframe')[0]['name']]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                    var w = $(layero).find("iframe")[0].contentWindow;//通过该对象可以获取iframe中的变量，调用iframe中的方法
+                    setTimeout(function(){
+                        w.getFarm(window.data.farm);//调用iframe中的方法
+                    },300)
                     body.find('input[name="name"]').val(window.data.name) //采摘名称
-                    body.find('input[name="company"]').val(window.data.company) //采摘企业
+                    var unit = /[\u4E00-\u9FA5]+/;
+                    var number = /^[0-9]*/;
+                    body.find('input[name="scale"]').val(window.data.scale.match(number)) //采摘规模
+                    body.find('input[name="unit"]').val(window.data.scale.match(unit)) //单位
+                    body.find('#matureTime').val(window.data.ripe_time+'月') //成熟日期
+                    body.find('#ripe').val(window.data.ripe_time) 
+                    body.find('#pickTime').val(window.data.pick_s+'月 - '+window.data.pick_e+'月') //成熟日期
+                    body.find('#pluckStTime').val(window.data.pick_s) 
+                    body.find('#pluckEdTime').val(window.data.pick_e) 
+                    body.find('input[name="addr"]').val(window.data.addr) //地址
                     body.find('input[name="img_url"]').val(window.data.pick_img) //采摘图片
-                    body.find('input[name="time"]').val(window.data.time) //采摘时间
-                    // $('#farmSelect').next().children().eq(0).children().eq(0).val($('#farmSelect').find("option:selected").text(data[0].farm_name));
+                    body.find('#demo1').attr('src',window.data.pick_img) //采摘图片
+                    var w = $(layero).find("iframe")[0].contentWindow;//通过该对象可以获取iframe中的变量，调用iframe中的方法
+                    w.fuzhi(window.data.content);//调用iframe中的方法
                     body.find('input[name="id"]').val(window.data.id) //id
+                    form.render();
                 }
             });
         }
@@ -291,7 +307,8 @@
                             layer.close(index);
                             // parent.layer.msg("操作成功!", {time: 1000}, function () {
                             //重新加载父页面
-                            location.reload();
+                            // location.reload();
+                            getData('garden_check_list', $('.layui-laypage-curr em').eq(1).html(), $('.permission .active').data('type'))
                         }
                     }
                 })
@@ -313,7 +330,8 @@
                     dataType: 'json',
                     success: function (data) {
                         if (data) {
-                            location.reload();
+                            // location.reload();
+                            getData('garden_check_list', $('.layui-laypage-curr em').eq(1).html(), $('.permission .active').data('type'))
                         }
                     }
                 })
@@ -334,11 +352,12 @@
                 content: '<div class="table"></div>',
                 success: function(layero, index) {
                     $.ajax({
-                        url: 'garden_check',
+                        url: 'garden_check_list',
                         type: 'post',
                         async: false,
                         data: {
-                            ids: id,
+                            id: id,
+                            req: 'edit'
                         },
                         dataType: 'json',
                         success: function (data) {

templates/backstageNet/infoManage/pickManageList.html

@@ -2,11 +2,12 @@
 <tr>
     <td>{{ msg.name }}</td>
     <td>
-        {{ msg.company }}
+        {{ msg.farm }}
     </td>
-    <td>{{ msg.pick_img }}</td>
-    <td>{{ msg.upl_time }}</td>
-    <td>{{ msg.upl_time }}</td>
+    <td>{{ msg.scale }}</td>
+    <td>{{ msg.ripe_time }}</td>
+    <td>{{ msg.addr }}</td>
+    <td>{{ msg.pick_s }}月~{{ msg.pick_e }}月</td>
     <td>
         {% if msg.hidden == 0 %}
         <a href="JavaScript:;" class="editBtn" onclick="editFun('{{msg.id}}')">编辑</a>

templates/backstageNet/infoManage/productManage.html

@@ -314,7 +314,9 @@
                     body.find('input[name="title"]').val(window.data.title) //产品名称
                     body.find('input[name="intro"]').val(window.data.intro) //生产企业
                     body.find('input[name="mobile"]').val(window.data.mobile) //联系电话
-                    body.find('textarea[id="editor1"]').val(window.data.content) //产品详情
+                    // body.find('textarea[id="editor1"]').val(window.data.content) //产品详情
+                    var w = $(layero).find("iframe")[0].contentWindow;//通过该对象可以获取iframe中的变量，调用iframe中的方法
+                    w.fuzhi(window.data.content);//调用iframe中的方法
                     body.find('input[name="id"]').val(window.data.id) //id
                     body.find('#demo1').attr('src',window.data.head_img) //图片
                     body.find('#img_url').val(window.data.head_img) //图片

templates/backstageNet/infoManage/sightseeManage.html

@@ -154,6 +154,7 @@
                                 <th>景点名称</th>
                                 <th>地址</th>
                                 <th>价格</th>
+                                <th>联系方式</th>
                                 <th>开放时间</th>
                                 <th>发布时间</th>
                                 <th>操作</th>
@@ -191,7 +192,7 @@
             });
 
             //第一个实例
-            getData('news_check_list', 1, 0) //url,page，信息类型
+            getData('sightsee_check_list', 1, 0) //url,page，信息类型
 
             //监听提交
             form.on('submit(formDemo)', function (data) {
@@ -204,7 +205,7 @@
 
         function getData(url, page, hidden) {
             $.ajax({
-                url: 'garden_check_list',
+                url: 'sightsee_check_list',
                 type: 'get',
                 data: {
                     page: page,
@@ -218,11 +219,12 @@
                         // , count: 30
                         , count: $('#totalPage').val()
                         , theme: '#2ca9f9'
+                        , curr:page
                         , layout: ['prev', 'page', 'next', 'skip']
                         , jump: function (obj, first) {
                             if (!first) {
                                 $.ajax({
-                                    url: 'garden_check_list',
+                                    url: 'sightsee_check_list',
                                     type: 'get',
                                     data: { page: obj.curr,hidden: hidden },
                                     dataType: 'html',
@@ -246,7 +248,7 @@
         // 编辑
         function editFun(id) {
             $.ajax({
-                url: 'garden_check_list',
+                url: 'sightsee_check_list',
                 type: 'post',
                 data: {
                     id: id,
@@ -254,23 +256,36 @@
                 },
                 dataType: 'json',
                 success: function (data) {
-                    window.data = data[0]
+                    window.data = data
                 }
             })
             var index = layer.open({
                 title: '四季编辑',
                 type: 2,
                 area: ['850px', '560px'],
-                content: 'garden_pub',
+                content: 'sightsee_pub',
                 success: function (layero, index,data) {
                     var body = layer.getChildFrame('body', index);
                     var iframeWin = window[layero.find('iframe')[0]['name']]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
                     body.find('input[name="name"]').val(window.data.name) //采摘名称
-                    body.find('input[name="company"]').val(window.data.company) //采摘企业
-                    body.find('input[name="img_url"]').val(window.data.pick_img) //采摘图片
-                    body.find('input[name="time"]').val(window.data.time) //采摘时间
-                    // $('#farmSelect').next().children().eq(0).children().eq(0).val($('#farmSelect').find("option:selected").text(data[0].farm_name));
-                    body.find('input[name="id"]').val(window.data.id) //id
+                    body.find('#demo1').attr('src',window.data.sightsee_img) //图片
+                    body.find('#img_url').val(window.data.sightsee_img) //图片
+                    body.find('input[name="addr"]').val(window.data.addr) 
+                    body.find('input[name="location"]').val(window.data.location) 
+                    body.find('input[name="mobile"]').val(window.data.sightsee_tel) 
+                    body.find('input[name="price"]').val(window.data.price) 
+                    body.find('input[name="stime"]').val(window.data.sightsee_stime) 
+                    body.find('input[name="etime"]').val(window.data.sightsee_etime) 
+                    body.find('input[name="time1"]').val(window.data.sightsee_stime) 
+                    body.find('textarea[name="desc"]').val(window.data.desc) 
+                    body.find('#demo2').attr('src',window.data.guide_img) //图片
+                    body.find('#guideUpimg_url').val(window.data.guide_img) //图片
+                    // body.find('textarea[id="editor1"]').val(window.data.content) //文章正文
+                    var w = $(layero).find("iframe")[0].contentWindow;//通过该对象可以获取iframe中的变量，调用iframe中的方法
+                    w.fuzhi(window.data.content);//调用iframe中的方法
+                    body.find('input[name="id"]').val(id) //id
+                    console.log(window.data.content)
+                    console.log(body.find('#editor1'))
                 }
             });
         }
@@ -279,7 +294,7 @@
         function passFun(id) {
             layer.confirm('是否通过此信息',{title:'通过'}, function (index) {
                 $.ajax({
-                    url: 'garden_check_list',
+                    url: 'sightsee_check_list',
                     type: 'post',
                     data: {
                         id: id,
@@ -291,7 +306,8 @@
                             layer.close(index);
                             // parent.layer.msg("操作成功!", {time: 1000}, function () {
                             //重新加载父页面
-                            location.reload();
+                            // location.reload();
+                            getData('sightsee_check_list', $('.layui-laypage-curr em').eq(1).html(), $('.permission .active').data('type'))
                         }
                     }
                 })
@@ -304,7 +320,7 @@
         function delFun(id) {
             layer.confirm('真的删除行么',{title:'删除'}, function (index) {
                 $.ajax({
-                    url: 'garden_check_list',
+                    url: 'sightsee_check_list',
                     type: 'post',
                     data: {
                         req: 'del',
@@ -313,7 +329,8 @@
                     dataType: 'json',
                     success: function (data) {
                         if (data) {
-                            location.reload();
+                            // location.reload();
+                            getData('sightsee_check_list', $('.layui-laypage-curr em').eq(1).html(), $('.permission .active').data('type'))
                         }
                     }
                 })
@@ -334,17 +351,18 @@
                 content: '<div class="table"></div>',
                 success: function(layero, index) {
                     $.ajax({
-                        url: 'garden_check',
+                        url: 'sightsee_check_list',
                         type: 'post',
                         async: false,
                         data: {
-                            ids: id,
+                            id: id,
+                            req: 'edit',
                         },
                         dataType: 'json',
                         success: function (data) {
-                            window.data = data[0]
-                            var html = '<div><p>景点导览图</p><img src="127.0.0.1:8000/'+window.data.img+'"/></div>'
-                            layero.find('.table').html(window.data.content)
+                            window.data = data
+                            var html = '<div><p style="line-height: 14px;padding-left: 10px;border-left: 3px solid #23a3ee;">景点导览图</p><img src="127.0.0.1:8000/'+window.data.guide_img+'"/></div>'
+                            layero.find('.table').html('<p style="line-height: 14px;padding-left: 10px;border-left: 3px solid #23a3ee;">详细介绍</p>'+window.data.content)
                             layero.find('.table').append(html)
                         }
                     })
@@ -367,7 +385,7 @@
                     var hidden = $('.permission .active').data('type');
                     var page = $(".layui-laypage-em").next().html();
                     $.ajax({
-                        url: 'garden_check_list',
+                        url: 'sightsee_check_list',
                         type: 'get',
                         data: { page: page,hidden: hidden },
                         dataType: 'html',
@@ -392,7 +410,7 @@
                 // alert(type)
                 $('.permission button').removeClass('active');
                 $(this).addClass('active');
-                getData('news_check_list', 1, type)
+                getData('sightsee_check_list', 1, type)
             }
         })
 

templates/backstageNet/infoManage/sightseeManageList.html

@@ -1,11 +1,12 @@
-{% if art|length %} {% for msg in art %}
+{% if sightsee|length %} {% for msg in sightsee %}
 <tr>
     <td>{{ msg.name }}</td>
     <td>
-        {{ msg.company }}
+        {{ msg.addr }}
     </td>
-    <td>{{ msg.pick_img }}</td>
-    <td>{{ msg.upl_time }}</td>
+    <td>{{ msg.price }}</td>
+    <td>{{ msg.sightsee_tel }}</td>
+    <td>{{ msg.sightsee_stime}}:00~{{ msg.sightsee_etime }}:00</td>
     <td>{{ msg.upl_time }}</td>
     <td>
         {% if msg.hidden == 0 %}
@@ -31,7 +32,7 @@
 </tr>
 {% endfor %} {% else %}
 <tr>
-    <td colspan="5" style="text-align:center;">暂无数据</td>
+    <td colspan="7" style="text-align:center;">暂无数据</td>
 </tr>
 {% endif %}
 <input type="hidden" value="{{nums}}" id="totalPage">

templates/static/js/limit/limit.js

@@ -115,7 +115,7 @@ var navList = [
     {
         "id": 8,
         "title": "开心农场",
-        "icon": "",
+        "icon": "",
         "url": "",
         "children": [
             {
@@ -158,7 +158,7 @@ var navList = [
     {
         "id": 9,
         "title": "数据中心",
-        "icon": "",
+        "icon": "",
         "url": "",
         "children": [
             {
@@ -181,7 +181,7 @@ var navList = [
     {
         "id": 10,
         "title": "通知公告",
-        "icon": "",
+        "icon": "",
         "url": "",
         "disabled": "true",
         "children": [
@@ -202,7 +202,7 @@ var navList = [
     {
         "id": 11,
         "title": "信息审核",
-        "icon": "",
+        "icon": "",
         "url": "",
         "disabled": "true",
         "children": [
@@ -254,7 +254,7 @@ var navList = [
     {
         "id": 12,
         "title": "权限",
-        "icon": "",
+        "icon": "",
         "url": "limit_view",
         "disabled": "true",
         "children": []
@@ -262,7 +262,7 @@ var navList = [
     {
         "id": 13,
         "title": "系统设置",
-        "icon": "",
+        "icon": "",
         "url": "",
         "disabled": "true",
         "children": [
@@ -283,7 +283,7 @@ var navList = [
     {
         "id": 14,
         "title": "专家诊断",
-        "icon": "",
+        "icon": "",
         "url": "",
         "disabled": "true",
         "children": [