yf_zd пре 5 година
родитељ
комит
c14bb791a9

+ 11 - 3
apps/Equipment/urls.py

@@ -2,9 +2,9 @@ from django.conf.urls import url
 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,Farm_list,
-    Dorm_Pub, Equip_Check, Equip_Check_List, Equip_Photo, Equip_Pub,
+    Back_Manage, CKArticle_View, Contrast_View, CropCount, Cropdata,Farm_Check,Farm_Check_List,
+    Dorm_Check, Dorm_Check_List, Dorm_Detail, Dorm_Img, Dorm_List, Dorm_Photo,Farm_list,Sightsee_Check,Sightsee_Check_List,
+    Dorm_Pub, Equip_Check, Equip_Check_List, Equip_Photo, Equip_Pub,Sightsee_Pub,
     Equip_Show_Detail, Equip_Show_List, Equip_Test, Farm_Choice, Farm_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, 
@@ -142,6 +142,8 @@ urlpatterns = [
     url(r'^dorm_pub$', Dorm_Pub.as_view(), name='dorm_pub'),
     url(r'^news_pub$', News_Pub.as_view(), name='news_pub'),
 
+     url(r'^sightsee_pub$', Sightsee_Pub.as_view(), name='sightsee_pub'),
+
     
     url(r'^video_check$', Video_Check.as_view(), name='video_check'),#视频审核
     url(r'^video_check_list$', Video_Check_List.as_view(), name='video_check_list'),#视频审核未通过页面
@@ -162,6 +164,12 @@ urlpatterns = [
     url(r'^dorm_check$', Dorm_Check.as_view(), name='dorm_check'),#民宿审核
     url(r'^dorm_check_list$', Dorm_Check_List.as_view(), name='dorm_check_list'),#民宿审核页面
 
+    url(r'^farm_check$', Farm_Check.as_view(), name='farm_check'),#农场审核
+    url(r'^farm_check_list$', Farm_Check_List.as_view(), name='farm_check_list'),#农场审核页面
+
+    url(r'^sightsee_check$', Sightsee_Check.as_view(), name='dorm_check'),#景点审核
+    url(r'^sightsee_check_list$', Sightsee_Check_List.as_view(), name='sightsee_check_list'),#景点审核页面
+
     # 视频上传
     url(r'^video_upload$', Video_Upload.as_view(), name='video_upload'),
     url(r'^video_photo$', Video_Photo.as_view(), name='video_photo'),

Разлика између датотеке није приказан због своје велике величине
+ 215 - 0
apps/Equipment/views.py


+ 1 - 1
templates/backstageNet/info/sightseePub.html

@@ -204,7 +204,7 @@
             top: 0;
             width: 38%;
             border: 1px solid #e6e6e6;
-            height: 636px;
+            height: 500px;
         }
 
         #map {

+ 37 - 3
templates/backstageNet/infoManage/pickManage.html

@@ -6,7 +6,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>Document</title>
+    <title>采摘审核</title>
     <link rel="stylesheet" href="{% static '/lib/layui/css/layui.css' %}">
     <link rel="stylesheet" href="{% static '/lib/css/reset.css' %}">
     <style>
@@ -152,8 +152,9 @@
                         <thead>
                             <tr>
                                 <th>采摘名称</th>
-                                <th >采摘企业</th>
-                                <th>农场图片</th>
+                                <th>所属农场</th>
+                                <th>成熟期</th>
+                                <th>采摘地址</th>
                                 <th>采摘时间</th>
                                 <th>操作</th>
                             </tr>
@@ -349,6 +350,39 @@
             });
         }
 
+        // 推荐热门
+        function hatPush(id,flag){
+            $.ajax({
+                url: 'garden_check1',
+                type: 'post',
+                async: false,
+                data: {
+                    id: id,
+                    type: flag,
+                },
+                dataType: 'json',
+                success: function (data) {
+                    var hidden = $('.permission .active').data('type');
+                    var page = $(".layui-laypage-em").next().html();
+                    $.ajax({
+                        url: 'garden_check_list',
+                        type: 'get',
+                        data: { page: page,hidden: hidden },
+                        dataType: 'html',
+                        success: function (data) {
+                            $('#dataTable').children('tbody').html(data);
+                        },
+                        error: function (type) {
+                            console.log(type)
+                        }
+                    })
+                },
+                error:function(type){
+                    
+                }
+            })
+        }
+
         // 审核权限
         $('.permission').on('click', 'button', function () {
             if (!$(this).hasClass('active')) {

+ 10 - 2
templates/backstageNet/infoManage/pickManageList.html

@@ -6,12 +6,20 @@
     </td>
     <td>{{ msg.pick_img }}</td>
     <td>{{ msg.upl_time }}</td>
+    <td>{{ msg.upl_time }}</td>
     <td>
-        {% if msg.hidden == 0%}
+        {% 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>
+            {% 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>
+            {% endif %}
+            <span>|</span>
         {% endif %}
         <a href="JavaScript:;" class="delBtn" onclick="delFun('{{msg.id}}')">删除</a>
         |
@@ -23,7 +31,7 @@
 </tr>
 {% endfor %} {% else %}
 <tr>
-    <td colspan="5" style="text-align:center;">暂无数据</td>
+    <td colspan="6" style="text-align:center;">暂无数据</td>
 </tr>
 {% endif %}
 <input type="hidden" value="{{nums}}" id="totalPage">

+ 38 - 0
templates/backstageNet/limit/limit.html

@@ -206,6 +206,11 @@
                         "title": "民宿导览",
                         "url": "dorm_pub",
                     },
+                    {
+                        "id": 3.5,
+                        "title": "旅游景点",
+                        "url": "sightsee_pub",
+                    },
                 ]
             },
             {
@@ -386,6 +391,18 @@
                         "url": "dorm_check",
                         "disabled": "true",
                     },
+                    {
+                        "id": 11.6,
+                        "title": "旅游景点",
+                        "url": "sightsee_check",
+                        "disabled": "true",
+                    },
+                    {
+                        "id": 11.7,
+                        "title": "个人农场",
+                        "url": "farm_check",
+                        "disabled": "true",
+                    },
                 ]
             },
             {
@@ -417,6 +434,27 @@
                     }
                 ]
             },
+			{
+                "id": 13,
+                "title": "专家诊断",
+                "icon": "&#xe765;",
+                "url": "",
+                "disabled": "true",
+                "children": [
+                    {
+                        "id": 13.1,
+                        "title": "在线专家",
+                        "url": "expert",
+                        "disabled": "true",
+                    },
+                    {
+                        "id": 13.2,
+                        "title": "知识库",
+                        "url": "learning_depot",
+                        "disabled": "true",
+                    }
+                ]
+            },
         ]
         $.ajax({
             url: 'limit',

+ 17 - 0
templates/backstageNet/limit/limit_user_list.html

@@ -46,6 +46,11 @@
                         "title": "民宿导览",
                         "url": "dorm_pub",
                     },
+                    {
+                        "id": 3.5,
+                        "title": "旅游景点",
+                        "url": "sightsee_pub",
+                    },
                 ]
             },
             {
@@ -226,6 +231,18 @@
                         "url": "dorm_check",
                         "disabled": "true",
                     },
+                    {
+                        "id": 11.6,
+                        "title": "旅游景点",
+                        "url": "sightsee_check",
+                        "disabled": "true",
+                    },
+                    {
+                        "id": 11.7,
+                        "title": "个人农场",
+                        "url": "farm_check",
+                        "disabled": "true",
+                    },
                 ]
             },
             {