首页 发现 帮助
注册 登录
wushaodong
/
ly_baoxiu_admin
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

轮播管理

wushaodong 4 年之前
父节点
0f44931b72
当前提交
94c34d1e35
共有 5 个文件被更改，包括 37 次插入 和 10 次删除
分列视图 显示文件统计
  1. 1 0
      apps/wxapp/urls.py
  2. 24 0
      apps/wxapp/views.py
  3. 8 6
      uis/zzlyadmin/banner/edit.html
  4. 3 3
      uis/zzlyadmin/banner/index.html
  5. 1 1
      uis/zzlyadmin/user/index.html

+ 1 - 0
apps/wxapp/urls.py
查看文件 

@@ -12,6 +12,7 @@ urlpatterns = [
 
     url(r'^wxbind/$', WxBindView.as_view()),
 
 
     url(r'^home/$', HomeView.as_view()),
 
+    url(r'^poster/$', PosterView.as_view()),
 
     url(r'^dict/$', DictView.as_view()),
 
     url(r'^get_building/$', BuildingView.as_view()),
 
     url(r'^notices/$', NoticesView.as_view()),  # 通知

+ 24 - 0
apps/wxapp/views.py
查看文件 

@@ -6,6 +6,7 @@ from django.db import transaction
 
 from rest_framework.views import APIView
 
 from rest_framework import generics
 
 from rest_framework.decorators import action
 
+from django.db.models import Q
 
 from rest_framework_jwt.views import ObtainJSONWebToken,VerifyJSONWebToken,RefreshJSONWebToken
 
 from rest_framework.serializers import ValidationError
 
 from apps.WechatApplet.models import WechatApplet
 
@@ -19,6 +20,7 @@ from apps.tenant.notices.serializers import NoticesWXSerializer
 
 from apps.tenant.notices.filters import NoticesFilter
 
 from utils.permission import isLogin
 
 from utils.wx.WXBizDataCrypt import WXBizDataCrypt
 
+from apps.tenant.poster.serializer import PosterSerializer, Poster
 
 
 from .serializers import *
 
 
@@ -114,6 +116,28 @@ class HomeView(generics.ListAPIView):
 
             return response_ok([])
 
         return data
 
 
+class PosterView(generics.ListAPIView):
 
+    '''小程序首页数据'''
 
+
 
+    queryset = Poster.objects.filter(enable=True)
 
+    serializer_class = PosterSerializer
 
+
 
+    def filter_queryset(self, queryset):
 
+        is_auth = False
 
+        if self.request.user and self.request.user.is_authenticated:
 
+            is_auth = True
 
+        queryset = queryset.filter(tenant__isnull=True)
 
+        if is_auth:
 
+            queryset = queryset.filter(Q(tenant__isnull=True) | Q(tenant=self.request.user.employee.tenant))
 
+        return queryset
 
+
 
+    def list(self, request, *args, **kwargs):
 
+        try:
 
+            data = super(PosterView, self).list(request)
 
+        except NotFound:
 
+            return response_ok([])
 
+        return data
 
+
 
 class DictView(APIView):
 
 
     def get(self, request):

+ 8 - 6
uis/zzlyadmin/banner/edit.html
查看文件 

@@ -9,7 +9,6 @@
 
           content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
 
     <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
 
     <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
 
-    <link rel="stylesheet" type="text/css" href="../../layuiadmin/style/formSelects-v4.css"/>
 
 </head>
 
 <body>
 
 
@@ -80,16 +79,14 @@
 
         base: '../../../layuiadmin/' //静态资源所在路径
 
     }).extend({
 
         index: 'lib/index',
 
-        formSelects: 'formSelects-v4'
 
-    }).use(['index', 'form', 'utils', 'laydate', 'upload', 'layedit'], function () {
 
+    }).use(['index', 'form', 'utils', 'upload', 'layedit'], function () {
 
         var $ = layui.$
 
-            , laydate = layui.laydate
 
             , admin = layui.admin
 
             ,upload = layui.upload
 
             ,layedit = layui.layedit
 
             , form = layui.form;
 
-        var id = layui.view.getParameterByName('id');
 
 
+        var id = layui.view.getParameterByName('id');
 
 
         var editIndex = layedit.build('content_demo', {
 
             height: 180,
 
@@ -175,7 +172,9 @@
 
             }
 
             //富文本中的内容
 
             data.field.content = layedit.getContent(editIndex);
 
-
 
+            if(!data.field.enable){
 
+                data.field.enable = 0
 
+            }
 
             if (!id) {
 
                 if (!data.field.banner_img) {
 
                     layer.msg('请选择轮播图图片');
 
@@ -183,16 +182,19 @@
 
                 }
 
                 form_data = data.field
 
                 delete form_data.banner_img
 
+                delete form_data.file
 
                 setTimeout($('#upload_image').click(), 30000)
 
             } else {
 
                 if (data.field.banner_img) { // 修改了图片
 
                     form_data = data.field
 
                     delete form_data.banner_img
 
+                    delete form_data.file
 
                     setTimeout($('#upload_image').click(), 30000)
 
                 } else {
 
                     // 没有修改了图片
 
                     form_data = data.field
 
                     delete form_data.banner_img
 
+                    delete form_data.file
 
                     admin.req({
 
                         url: url
 
                         , data: {data:JSON.stringify(form_data)}

+ 3 - 3
uis/zzlyadmin/banner/index.html
查看文件 

@@ -108,7 +108,7 @@
 
             , url: '/admin/poster/'
 
             , cols: [[
 
                 {field: 'title', title: '标题', width: 100}
 
-                ,{field: 'content', title: '内容', width: 100}
 
+                ,{field: 'content', title: '内容', width: 280}
 
                 ,{field: 'location_text', title: '位置', width: 100}
 
                 ,{field: 'create_user_name', title: '添加人', width: 100}
 
                 ,{field: 'create_time', title: '添加时间', width: 200}
 
@@ -147,7 +147,7 @@
 
                     type: 2,
 
                     title: '修改',
 
                     shadeClose: false,
 
-                    area: ['700px', '600px'],
 
+                    area: ['700px', '700px'],
 
                     btn: ['保存', '取消'],
 
                     yes: function (index, dom) {
 
                         layui.submitChild();
 
@@ -166,7 +166,7 @@
 
                 title: '添加',
 
                 shadeClose: false,
 
                 btn: ['保存', '取消'],
 
-                area: ['700px', '600px'],
 
+                area: ['700px', '700px'],
 
                 yes: function (index, dom) {
 
                     layui.submitChild();
 
                 },

+ 1 - 1
uis/zzlyadmin/user/index.html
查看文件 

@@ -73,7 +73,7 @@
 
       elem: '#datagrid'
 
       ,url: '/admin/user/'
 
       ,cols: [[
 
-        {field:'username', title:'账号',width: 100}
 
+        {field:'username', title:'账号',width: 150}
 
        ,{field:'date_joined', title:'注册时间',width: 200}
 
        ,{field:'active_text', title:'是否在用',width: 100}
 
         ,{width:140, align:'center', fixed: 'right', toolbar: '#datagrid-operate-bar'}