4 năm trước cách đây · b02149d529
--- a/apps/admin/tenant/serializers.py
+++ b/apps/admin/tenant/serializers.py
@@ -1,4 +1,5 @@
 
				 # coding=utf-8
			
 
				+import datetime
			
 
				 from rest_framework import serializers
			
 
				 from apps.tenant.models import Tenant
			
 
				 from apps.tenant.employee.models import Employee
			
@@ -17,6 +18,9 @@ class TenantSerializer(serializers.ModelSerializer) :
 
				         if Tenant.is_exist(validated_data['company_name']):
			
 
				             raise CustomError(u'名称为[%s]的租户已存在' % validated_data['company_name'])
			
 
				         instance = super(TenantSerializer, self).create(validated_data)
			
 
				+        instance.company_no = instance.get_no()
			
 
				+        instance.end_date = (datetime.datetime.now() + datetime.timedelta(days=30)).strftime('%Y-%m-%d')
			
 
				+        instance.save()
			
 
				         return instance
			
 
				 
			
 
				     def update(self, instance, validated_data):
			
--- a/apps/tenant/models.py
+++ b/apps/tenant/models.py
@@ -3,6 +3,7 @@ from django.db import models
 
				 from django.conf import settings
			
 
				 from django.db.models import Q
			
 
				 from utils.exceptions import CustomError
			
 
				+from django.utils import timezone
			
 
				 
			
 
				 class Tenant(models.Model):
			
 
				     REPAIR_ORDER = 1
			
@@ -11,16 +12,16 @@ class Tenant(models.Model):
 
				         (REPAIR_ORDER, '报修工单'),
			
 
				         (INSPECTION_ORDER, '巡检转报修工单')
			
 
				     )
			
 
				-    company_no = models.CharField(max_length=10, verbose_name=u'单位编号')
			
 
				+    company_no = models.CharField(max_length=10, verbose_name=u'单位编号', blank=True, null=True)
			
 
				     company_name = models.CharField(max_length=200, verbose_name=u'单位名称')
			
 
				     organ_code = models.CharField(max_length=200, verbose_name=u'组织代码')
			
 
				     # images = models.ForeignKey(Upload, verbose_name='营业执照图片',on_delete=models.PROTECT, blank=True)
			
 
				     name = models.CharField(max_length=20, verbose_name=u'联系人名称')
			
 
				     tel = models.CharField(max_length=20, verbose_name=u'联系人电话')
			
 
				     create_time = models.DateTimeField(verbose_name=u'申请时间', auto_now_add=True, editable=False)
			
 
				-    end_date = models.DateField(verbose_name=u'到期时间', editable=False)
			
 
				+    end_date = models.DateField(verbose_name=u'到期时间', editable=False, blank=True, null=True)
			
 
				     status = models.PositiveSmallIntegerField(choices=settings.CHECK_STATE_CHOICES, verbose_name=u'审核状态',
			
 
				-                                                  default=REPAIR_ORDER)
			
 
				+                                              default=settings.DEFAULT)
			
 
				     delete = models.BooleanField(verbose_name=u'删除', default=False, editable=False)
			
 
				 
			
 
				     class Meta:
			
@@ -29,6 +30,11 @@ class Tenant(models.Model):
 
				         verbose_name = '租户'
			
 
				         default_permissions = ()
			
 
				 
			
 
				+    def get_no(self):
			
 
				+        now = timezone.now()
			
 
				+        no = '{0}{1}'.format(self.id, now.strftime('%H%M%S'))
			
 
				+        return no
			
 
				+
			
 
				     @staticmethod
			
 
				     def is_exist(company_name, exclude_id=None):
			
 
				         rows = Tenant.objects.filter(delete=False, company_name=company_name)
			
@@ -42,11 +48,7 @@ class Tenant(models.Model):
 
				             id = int(id)
			
 
				         except:
			
 
				             raise CustomError(u'无效的租户id！')
			
 
				-        tenant = Tenant.objects.filter(id=id,delete=False).first()
			
 
				+        tenant = Tenant.objects.filter(id=id, delete=False).first()
			
 
				         if not tenant:
			
 
				             raise CustomError(u'未找到相应的租户信息！')
			
 
				         return tenant
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
--- a/uis/zzlyadmin/applet/index.html
+++ b/uis/zzlyadmin/applet/index.html
@@ -1,436 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <meta charset="utf-8">
			
 
				-    <title>租户管理</title>
			
 
				-    <meta name="renderer" content="webkit">
			
 
				-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			
 
				-    <meta name="viewport"
			
 
				-          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"/>
			
 
				-    <style type="text/css">
			
 
				-    .LAY-btns .layui-nav {padding-left:0;padding-right:10px;top:-4px;margin: 0 10px;border: 0;background-color: #009688;}
			
 
				-    .LAY-btns .layui-nav .layui-nav-item{line-height: 30px;}
			
 
				-    .LAY-btns .layui-nav .layui-nav-child{top:34px;}
			
 
				-    .LAY-btns .layui-nav .layui-nav-bar{display: none;}
			
 
				-    .LAY-btns .layui-nav .layui-nav-child dd.layui-this a{color:#333;background-color:#fff;}
			
 
				-    .LAY-btns .layui-nav .layui-nav-child dd.layui-this a:hover {background-color: #f2f2f2;color: #000;}
			
 
				-    .seach_items {display:inline-block;margin-right: 5px; margin-top: 5px;}
			
 
				-  </style>
			
 
				-</head>
			
 
				-<body>
			
 
				-
			
 
				-<div class="layui-fluid">
			
 
				-    <div class="layui-card">
			
 
				-        <div class="layui-card-body" pad15>
			
 
				-            <div class="layui-row layui-col-space15">
			
 
				-                <div class="layui-col-md12">
			
 
				-                    <div class="layui-row LAY-btns" style="margin-bottom: 10px;">
			
 
				-                        <div class="layui-col-md5">
			
 
				-                            <button class="layui-btn" style="margin-bottom: 10px" id="btn_batch"><i
			
 
				-                                    class="layui-icon layui-icon-upload"></i>批量上传代码
			
 
				-                            </button>
			
 
				-                            <button class="layui-btn" style="margin-bottom: 10px" id="btn_update"><i
			
 
				-                                    class="layui-icon layui-icon-edit"></i>更新状态
			
 
				-                            </button>
			
 
				-                            <button class="layui-btn" style="margin-bottom: 10px" id="btn_unit"><i
			
 
				-                                    class="layui-icon layui-icon-add-1"></i>添加插件
			
 
				-                            </button>
			
 
				-                            <button class="layui-btn" style="margin-bottom: 10px" id="btn_release"><i
			
 
				-                                    class="layui-icon layui-icon-add-1"></i>发布
			
 
				-                            </button>
			
 
				-                            <button class="layui-btn" style="margin-bottom: 10px" id="btn_cert"><i
			
 
				-                                    class="layui-icon layui-icon-add-1"></i>上传证书
			
 
				-                            </button>
			
 
				-                        </div>
			
 
				-                        <div class="layui-col-md7">
			
 
				-                            <form class="layui-form" lay-filter="query-form-element">
			
 
				-                                <div class="seach_items">
			
 
				-                                    <input type="text" name="tenant_name" autocomplete="off" class="layui-input"
			
 
				-                                           placeholder="租户"/>
			
 
				-                                </div>
			
 
				-                                <div class="seach_items">
			
 
				-                                    <input type="text" name="user_version" autocomplete="off" class="layui-input"
			
 
				-                                           placeholder="当前版本"/>
			
 
				-                                </div>
			
 
				-                                <div class="seach_items">
			
 
				-                                    <select name="audit_status" style="width: 40px;">
			
 
				-                                        <option value="">审核状态</option>
			
 
				-                                        <option value="0">审核通过</option>
			
 
				-                                        <option value="1">审核拒绝</option>
			
 
				-                                        <option value="2">审核中</option>
			
 
				-                                        <option value="3">已撤回</option>
			
 
				-                                        <option value="4">审核延后</option>
			
 
				-                                    </select>
			
 
				-                                </div>
			
 
				-                                <div class="seach_items">
			
 
				-                                    <input type="text" name="wait_audit_version" autocomplete="off" class="layui-input"
			
 
				-                                           placeholder="待审核版本"/>
			
 
				-                                </div>
			
 
				-                                <div class="seach_items">
			
 
				-                                    <input type="text" name="wait_audit_template" autocomplete="off" class="layui-input"
			
 
				-                                           placeholder="待审核模板"/>
			
 
				-                                </div>
			
 
				-
			
 
				-                                <div class="seach_items">
			
 
				-                                    <button class="layui-btn" lay-submit lay-filter="query-form-element"><i
			
 
				-                                            class="layui-icon layui-icon-search"></i>查询
			
 
				-                                    </button>
			
 
				-                                </div>
			
 
				-                            </form>
			
 
				-                        </div>
			
 
				-                        <div style="clear: both;"></div>
			
 
				-
			
 
				-                    </div>
			
 
				-                    <table class="layui-hide" id="datagrid" lay-filter="datagrid-operate"></table>
			
 
				-
			
 
				-                    <script type="text/html" id="datagrid-operate-bar">
			
 
				-                        <div class="layui-btn-group">
			
 
				-                            <a class="layui-btn layui-btn-xs" lay-event="upload">上传代码</a>
			
 
				-                        </div>
			
 
				-                        <div class="layui-btn-group">
			
 
				-                            <a class="layui-btn layui-btn-xs" lay-event="update">更新状态</a>
			
 
				-                        </div>
			
 
				-                        <div class="layui-btn-group">
			
 
				-                            <a class="layui-btn layui-btn-xs" lay-event="key">设置秘钥</a>
			
 
				-                        </div>
			
 
				-                        <!--div class="layui-btn-group">
			
 
				-                            <a class="layui-btn layui-btn-xs" lay-event="tenant">设置商户</a>
			
 
				-                        </div-->
			
 
				-                        <div class="layui-btn-group">
			
 
				-                            <a class="layui-btn layui-btn-xs" lay-event="unit">添加插件</a>
			
 
				-                        </div>
			
 
				-                        <div class="layui-btn-group">
			
 
				-                            <a class="layui-btn layui-btn-xs" lay-event="release">发布</a>
			
 
				-                        </div>
			
 
				-                    </script>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-        </div>
			
 
				-    </div>
			
 
				-</div>
			
 
				-
			
 
				-<script src="../../layuiadmin/layui/layui.js?t=1"></script>
			
 
				-<script>
			
 
				-    layui.config({
			
 
				-        base: '../../../layuiadmin/' //静态资源所在路径
			
 
				-    }).extend({
			
 
				-        index: 'lib/index' //主入口模块
			
 
				-        , formSelects: 'formSelects-v4'
			
 
				-    }).use(['index', 'table', 'form', 'upload'], function () {
			
 
				-        var $ = layui.$
			
 
				-            , table = layui.table
			
 
				-            , admin = layui.admin
			
 
				-            , form = layui.form;
			
 
				-        table.render({
			
 
				-            elem: '#datagrid'
			
 
				-            , url: '/admin/wechatapp/'
			
 
				-            , cols: [[
			
 
				-                {type: 'checkbox', width: 50}
			
 
				-                , {field: 'tenant_name', title: '租户名称', width: 100}
			
 
				-                , {field: 'principal_name', title: '主体名称', width: 100}
			
 
				-                , {field: 'user_version', title: '当前程序版本', width: 150}
			
 
				-                , {field: 'template_id', title: '当前模板', width: 100}
			
 
				-                , {field: 'audit_status_text', title: '审核状态', width: 100}
			
 
				-                , {field: 'reject_reason', title: '拒绝原因', width: 100}
			
 
				-                , {field: 'auditid', title: '待审核ID', width: 100}
			
 
				-                , {field: 'wait_audit_version', title: '待审核版本', width: 100}
			
 
				-                , {field: 'wait_audit_template', title: '待审核模板', width: 100}
			
 
				-                , {field: 'nick_name', title: '昵称', width: 100}
			
 
				-                , {field: 'authorize_text', title: '授权', width: 80}
			
 
				-                , {field: 'authorizer_appid', title: '授权方appid', width: 150}
			
 
				-                , {field: 'access_token_gtime', title: '获取令牌时间', width: 200}
			
 
				-                , {field: 'expires_in', title: '令牌有效期', width: 100}
			
 
				-                , {title: "操作", width: 360, align: 'left', fixed: 'right', toolbar: '#datagrid-operate-bar'}
			
 
				-            ]]
			
 
				-            , page: true
			
 
				-            , height: 'full-108'
			
 
				-        });
			
 
				-        var _params;
			
 
				-        form.on('submit(query-form-element)', function (data) {
			
 
				-            //layer.msg(JSON.stringify(data.field));
			
 
				-            _params = data.field;
			
 
				-            table.reload('datagrid', {
			
 
				-                where: data.field
			
 
				-                , page: {curr: 1}
			
 
				-            });
			
 
				-            layer.closeAll();
			
 
				-            return false;
			
 
				-        });
			
 
				-        //监听工具条
			
 
				-        table.on('tool(datagrid-operate)', function (obj) {
			
 
				-            var data = obj.data;
			
 
				-            table.editdata = data;
			
 
				-            if (obj.event === 'upload') {
			
 
				-                layer.open({
			
 
				-                    type: 2,
			
 
				-                    title: '上传代码',
			
 
				-                    shadeClose: false,
			
 
				-                    area: ['550px', '400px'],
			
 
				-                    btn: ['保存', '取消'],
			
 
				-                    yes: function (index, dom) {
			
 
				-                        layui.onSubmitChild = function (data) {
			
 
				-                            // 关闭当前弹层
			
 
				-                            layer.close(index);
			
 
				-                            table.reload("datagrid", {});
			
 
				-                        };
			
 
				-                        layui.submitChild()
			
 
				-                    },
			
 
				-                    btn2: function (index, layero) {
			
 
				-                        layer.close(index);//关闭当前按钮
			
 
				-                    },
			
 
				-                    content: 'upload.html?id=' + data.id
			
 
				-                });
			
 
				-            } else if (obj.event === 'key') {
			
 
				-                layer.open({
			
 
				-                    type: 2,
			
 
				-                    title: '设置密钥',
			
 
				-                    shadeClose: false,
			
 
				-                    area: ['550px', '300px'],
			
 
				-                    btn: ['保存', '取消'],
			
 
				-                    yes: function (index, dom) {
			
 
				-                        layui.submitChild();
			
 
				-                    },
			
 
				-                    btn2: function (index, layero) {
			
 
				-                        layer.close(index);//关闭当前按钮
			
 
				-                    },
			
 
				-                    content: 'set_key.html?id=' + data.id
			
 
				-                });
			
 
				-            } else if (obj.event === 'tenant') {
			
 
				-                layer.open({
			
 
				-                    type: 2,
			
 
				-                    title: '设置商户',
			
 
				-                    shadeClose: false,
			
 
				-                    area: ['550px', '300px'],
			
 
				-                    btn: ['保存', '取消'],
			
 
				-                    yes: function (index, dom) {
			
 
				-                        layui.onSubmitChild = function (data) {
			
 
				-                            layer.close(index);
			
 
				-                            table.reload('datagrid', {});
			
 
				-                        };
			
 
				-                        layui.submitChild();
			
 
				-                    },
			
 
				-                    btn2: function (index, layero) {
			
 
				-                        layer.close(index);//关闭当前按钮
			
 
				-                    },
			
 
				-                    content: 'set_tenant.html?id=' + data.id
			
 
				-                });
			
 
				-            } else if (obj.event === "update") {
			
 
				-                layer.confirm('确定要更新吗？', function (index) {
			
 
				-                    layer.close(index);
			
 
				-                    var ids = [];
			
 
				-                    ids.push(data.id);
			
 
				-                    layui.admin.req({
			
 
				-                        url: '/admin/wechatapp/refresh_audit_status/',
			
 
				-                        data: {ids: JSON.stringify(ids)},
			
 
				-                        type: 'post'
			
 
				-                        , done: function (res) {
			
 
				-                            layer.msg('更新成功！', {icon: 6});
			
 
				-                            table.reload('datagrid', {});
			
 
				-                        }
			
 
				-                    });
			
 
				-                });
			
 
				-            } else if (obj.event === 'unit') {
			
 
				-                layer.confirm('确定要上传插件吗？', function (index) {
			
 
				-                    layer.close(index);
			
 
				-                    var ids = [];
			
 
				-                    ids.push(data.id);
			
 
				-                    layui.admin.req({
			
 
				-                        url: '/admin/wechatapp/add_plugin/',
			
 
				-                        data: {ids: JSON.stringify(ids)},
			
 
				-                        type: 'post'
			
 
				-                        , done: function (res) {
			
 
				-                            layer.msg('更新成功！', {icon: 6});
			
 
				-                            table.reload('datagrid', {});
			
 
				-                        }
			
 
				-                    });
			
 
				-                });
			
 
				-            } else if (obj.event === 'release') {
			
 
				-                layer.confirm('确定要发布吗？', function (index) {
			
 
				-                    layer.close(index);
			
 
				-                    var ids = [];
			
 
				-                    ids.push(data.id);
			
 
				-                    layui.admin.req({
			
 
				-                        url: '/admin/wechatapp/release/',
			
 
				-                        data: {ids: JSON.stringify(ids)},
			
 
				-                        type: 'post'
			
 
				-                        , done: function (res) {
			
 
				-                            layer.msg('发布成功！', {icon: 6});
			
 
				-                            table.reload('datagrid', {});
			
 
				-                        }
			
 
				-                    });
			
 
				-                });
			
 
				-            }
			
 
				-        });
			
 
				-
			
 
				-        $('#btn_add').on('click', function () {
			
 
				-            layer.open({
			
 
				-                type: 2,
			
 
				-                title: '添加',
			
 
				-                shadeClose: false,
			
 
				-                area: ['450px', '250px'],
			
 
				-                btn: ['保存', '取消'],
			
 
				-                yes: function (index, dom) {
			
 
				-                    layui.onSubmitChild = function (data) {
			
 
				-                        layer.close(index);
			
 
				-                        table.reload('datagrid', {});
			
 
				-                    };
			
 
				-                    layui.submitChild();
			
 
				-                },
			
 
				-                btn2: function (index, layero) {
			
 
				-                    layer.close(index);//关闭当前按钮
			
 
				-                },
			
 
				-                content: 'edit.html'
			
 
				-            });
			
 
				-        });
			
 
				-
			
 
				-        //批量上传代码
			
 
				-        $('#btn_batch').on('click', function () {
			
 
				-            var ids = [];
			
 
				-            for (var i in table.cache['datagrid']) {
			
 
				-                if (table.cache['datagrid'][i].LAY_CHECKED) {
			
 
				-                    ids.push(table.cache['datagrid'][i].id)
			
 
				-                }
			
 
				-            }
			
 
				-
			
 
				-            if (ids.length === 0) {
			
 
				-                layer.msg('请至少选择一条记录！', {icon: 5});
			
 
				-                return;
			
 
				-            }
			
 
				-
			
 
				-            layer.open({
			
 
				-                type: 2,
			
 
				-                title: '上传代码',
			
 
				-                shadeClose: false,
			
 
				-                area: ['550px', '400px'],
			
 
				-                btn: ['保存', '取消'],
			
 
				-                yes: function (index, dom) {
			
 
				-                    layui.onSubmitChild = function (data) {
			
 
				-                        layer.close(index);
			
 
				-                        table.reload('datagrid', {});
			
 
				-                    };
			
 
				-                    layui.submitChild();
			
 
				-                },
			
 
				-                btn2: function (index, layero) {
			
 
				-                    layer.close(index);//关闭当前按钮
			
 
				-                },
			
 
				-                content: 'upload.html?ids=' + ids
			
 
				-            });
			
 
				-        });
			
 
				-
			
 
				-
			
 
				-        //更新状态
			
 
				-        $('#btn_update').on('click', function () {
			
 
				-            var update_ids = [];
			
 
				-            for (var i in table.cache['datagrid']) {
			
 
				-                if (table.cache['datagrid'][i].LAY_CHECKED) {
			
 
				-                    update_ids.push(table.cache['datagrid'][i].id)
			
 
				-                }
			
 
				-            }
			
 
				-
			
 
				-            if (update_ids.length === 0) {
			
 
				-                layer.msg('请至少选择一条记录！', {icon: 5});
			
 
				-                return false;
			
 
				-            }
			
 
				-
			
 
				-            layer.confirm('确定要更新吗？', function (index) {
			
 
				-                layer.close(index);
			
 
				-                admin.req({
			
 
				-                    url: '/admin/wechatapp/refresh_audit_status/',
			
 
				-                    data: {ids: JSON.stringify(update_ids)},
			
 
				-                    type: 'post',
			
 
				-                    done: function (res) {
			
 
				-                        table.reload('datagrid', {});
			
 
				-                        layer.msg('更新成功！', {icon: 6});
			
 
				-                    }
			
 
				-                });
			
 
				-            });
			
 
				-        });
			
 
				-
			
 
				-        //添加插件
			
 
				-        $('#btn_unit').on('click', function () {
			
 
				-            var update_ids = [];
			
 
				-            for (var i in table.cache['datagrid']) {
			
 
				-                if (table.cache['datagrid'][i].LAY_CHECKED) {
			
 
				-                    update_ids.push(table.cache['datagrid'][i].id)
			
 
				-                }
			
 
				-            }
			
 
				-
			
 
				-            if (update_ids.length === 0) {
			
 
				-                layer.msg('请至少选择一条记录！', {icon: 5});
			
 
				-                return false;
			
 
				-            }
			
 
				-
			
 
				-            layer.confirm('确定要添加插件吗？', function (index) {
			
 
				-                layer.close(index);
			
 
				-                admin.req({
			
 
				-                    url: '/admin/wechatapp/add_plugin/',
			
 
				-                    data: {ids: JSON.stringify(update_ids)},
			
 
				-                    type: 'post',
			
 
				-                    done: function (res) {
			
 
				-                        table.reload('datagrid', {});
			
 
				-                        layer.msg('更新成功！', {icon: 6});
			
 
				-                    }
			
 
				-                });
			
 
				-            });
			
 
				-        });
			
 
				-
			
 
				-        $('#btn_release').on('click', function () {
			
 
				-            var update_ids = [];
			
 
				-            for (var i in table.cache['datagrid']) {
			
 
				-                if (table.cache['datagrid'][i].LAY_CHECKED) {
			
 
				-                    update_ids.push(table.cache['datagrid'][i].id)
			
 
				-                }
			
 
				-            }
			
 
				-
			
 
				-            if (update_ids.length === 0) {
			
 
				-                layer.msg('请至少选择一条记录！', {icon: 5});
			
 
				-                return false;
			
 
				-            }
			
 
				-
			
 
				-            layer.confirm('确定要发布吗？', function (index) {
			
 
				-                layer.close(index);
			
 
				-                admin.req({
			
 
				-                    url: '/admin/wechatapp/release/',
			
 
				-                    data: {ids: JSON.stringify(update_ids)},
			
 
				-                    type: 'post',
			
 
				-                    done: function (res) {
			
 
				-                        table.reload('datagrid', {});
			
 
				-                        layer.msg('发布成功！', {icon: 6});
			
 
				-                    }
			
 
				-                });
			
 
				-            });
			
 
				-        });
			
 
				-
			
 
				-        $('#btn_cert').on('click', function () {
			
 
				-            var checkStatus = table.checkStatus('datagrid')
			
 
				-                , data = checkStatus.data;
			
 
				-            if (data.length !== 1) {
			
 
				-                layer.msg('请选择一条记录', {icon: 5});
			
 
				-                return false;
			
 
				-            }
			
 
				-            layer.open({
			
 
				-                type: 2,
			
 
				-                title: '上传',
			
 
				-                area: ['600px', '450px'],
			
 
				-                btn: ['保存', '取消'],
			
 
				-                yes: function (index, dom) {
			
 
				-                    layui.onSubmitChild = function (data) {
			
 
				-                        layer.close(index);
			
 
				-                        table.reload('datagrid', {});
			
 
				-                    };
			
 
				-                    layui.submitChild();
			
 
				-                },
			
 
				-                btn2: function (index, layero) {
			
 
				-                    layer.close(index);//关闭当前按钮
			
 
				-                },
			
 
				-                content: 'upload_cert.html?id=' + data[0].id
			
 
				-            });
			
 
				-        });
			
 
				-    });
			
 
				-</script>
			
 
				-</body>
			
 
				-</html>
			
 
				-
			
--- a/uis/zzlyadmin/applet/set_key.html
+++ b/uis/zzlyadmin/applet/set_key.html
@@ -1,78 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<html>
			
 
				-<head>
			
 
				-  <meta charset="utf-8">
			
 
				-  <title>设置秘钥</title>
			
 
				-  <meta name="renderer" content="webkit">
			
 
				-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			
 
				-  <meta name="viewport" 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>
			
 
				-
			
 
				-  <div class="layui-fluid">
			
 
				-    <div class="layui-row layui-col-space15">
			
 
				-      <div class="layui-col-md6">
			
 
				-        <div class="layui-card">
			
 
				-
			
 
				-          <div class="layui-card-body">
			
 
				-            <form class="layui-form" action="" lay-filter="component-form-element">
			
 
				-              <div class="layui-row layui-col-space10 layui-form-item">
			
 
				-
			
 
				-                <div class="layui-col-lg6">
			
 
				-                  <label class="layui-form-label"><font color='red' size="4">*</font>密钥：</label>
			
 
				-                  <div class="layui-input-block">
			
 
				-                    <input type="text" name="secret" lay-verify="required" placeholder="请输入密钥" autocomplete="off" class="layui-input">
			
 
				-                  </div>
			
 
				-                </div>
			
 
				-                <button class="layui-btn" id="id_save" lay-submit lay-filter="component-form-element" style="display: none">保存</button>
			
 
				-              </div>
			
 
				-            </form>
			
 
				-          </div>
			
 
				-        </div>
			
 
				-      </div>
			
 
				-    </div>
			
 
				-  </div>
			
 
				-
			
 
				-
			
 
				-  <script src="../../layuiadmin/layui/layui.js"></script>
			
 
				-  <script>
			
 
				-  layui.config({
			
 
				-    base: '../../../layuiadmin/' //静态资源所在路径
			
 
				-  }).extend({
			
 
				-    index: 'lib/index',
			
 
				-  }).use(['index', 'form', 'utils'], function(){
			
 
				-    var $ = layui.$
			
 
				-    ,admin = layui.admin
			
 
				-    ,form = layui.form;
			
 
				-    var id = layui.view.getParameterByName('id');
			
 
				-
			
 
				-    var editdata = JSON.parse(JSON.stringify(parent.layui.table.editdata)); // 框架有Bug所以这么转换
			
 
				-    form.val("component-form-element", editdata);
			
 
				-
			
 
				-    form.on('submit(component-form-element)', function(data){
			
 
				-      //layer.msg(JSON.stringify(data.field));
			
 
				-      var submitData = data.field;
			
 
				-      admin.req({
			
 
				-        url: '/admin/wechatapp/' + id + '/set_secret/'
			
 
				-        ,data: submitData
			
 
				-        ,type: 'post'
			
 
				-        ,done: function(res){
			
 
				-            layer.msg('设置成功！', {icon: 6});
			
 
				-            parent.layer.closeAll('iframe');
			
 
				-            parent.layui.table.reload('datagrid',{});
			
 
				-        }
			
 
				-      });
			
 
				-
			
 
				-      return false;
			
 
				-    });
			
 
				-
			
 
				-    parent.layui.submitChild = function () {
			
 
				-      $("#id_save").click();
			
 
				-    };
			
 
				-  });
			
 
				-  </script>
			
 
				-</body>
			
 
				-</html>
			
--- a/uis/zzlyadmin/applet/set_key2.html
+++ b/uis/zzlyadmin/applet/set_key2.html
@@ -1,79 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<html>
			
 
				-<head>
			
 
				-  <meta charset="utf-8">
			
 
				-  <title>设置秘钥</title>
			
 
				-  <meta name="renderer" content="webkit">
			
 
				-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			
 
				-  <meta name="viewport" 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>
			
 
				-
			
 
				-  <div class="layui-fluid">
			
 
				-    <div class="layui-row layui-col-space15">
			
 
				-      <div class="layui-col-md6">
			
 
				-        <div class="layui-card">
			
 
				-
			
 
				-          <div class="layui-card-body">
			
 
				-            <form class="layui-form" action="" lay-filter="component-form-element">
			
 
				-              <div class="layui-row layui-col-space10 layui-form-item">
			
 
				-
			
 
				-                <div class="layui-col-lg6">
			
 
				-                  <label class="layui-form-label"><font color='red' size="4">*</font>密钥：</label>
			
 
				-                  <div class="layui-input-block">
			
 
				-                    <input type="text" name="secret" lay-verify="required" placeholder="请输入密钥" autocomplete="off" class="layui-input">
			
 
				-                  </div>
			
 
				-                </div>
			
 
				-                  <button id="id_save" class="layui-btn" lay-submit lay-filter="component-form-element"
			
 
				-                                style="display: none">保存
			
 
				-                        </button>
			
 
				-              </div>
			
 
				-            </form>
			
 
				-          </div>
			
 
				-        </div>
			
 
				-      </div>
			
 
				-    </div>
			
 
				-  </div>
			
 
				-
			
 
				-
			
 
				-  <script src="../../layuiadmin/layui/layui.js"></script>
			
 
				-  <script>
			
 
				-  layui.config({
			
 
				-    base: '../../../layuiadmin/' //静态资源所在路径
			
 
				-  }).extend({
			
 
				-    index: 'lib/index',
			
 
				-  }).use(['index', 'form', 'utils'], function(){
			
 
				-    var $ = layui.$
			
 
				-    ,admin = layui.admin
			
 
				-    ,form = layui.form;
			
 
				-    var id = layui.view.getParameterByName('id');
			
 
				-
			
 
				-    var editdata = JSON.parse(JSON.stringify(parent.layui.table.editdata)); // 框架有Bug所以这么转换
			
 
				-    form.val("component-form-element", editdata);
			
 
				-
			
 
				-    form.on('submit(component-form-element)', function(data){
			
 
				-      var submitData = data.field;
			
 
				-      admin.req({
			
 
				-        url: '/admin/wechatapp/' + id + '/set_secret/'
			
 
				-        ,data: submitData
			
 
				-        ,type: 'post'
			
 
				-        ,done: function(res){
			
 
				-            layer.msg('设置成功！', {icon: 6});
			
 
				-            parent.layer.closeAll('iframe');
			
 
				-            parent.layui.table.reload('datagrid',{});
			
 
				-        }
			
 
				-      });
			
 
				-
			
 
				-      return false;
			
 
				-    });
			
 
				-
			
 
				-    parent.layui.submitChild = function () {
			
 
				-      $("#id_save").click();
			
 
				-    };
			
 
				-  });
			
 
				-  </script>
			
 
				-</body>
			
 
				-</html>
			
--- a/uis/zzlyadmin/applet/set_tenant.html
+++ b/uis/zzlyadmin/applet/set_tenant.html
@@ -1,84 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<html>
			
 
				-<head>
			
 
				-  <meta charset="utf-8">
			
 
				-  <title>添加员工信息</title>
			
 
				-  <meta name="renderer" content="webkit">
			
 
				-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			
 
				-  <meta name="viewport" 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>
			
 
				-
			
 
				-  <div class="layui-fluid">
			
 
				-    <div class="layui-row layui-col-space15">
			
 
				-      <div class="layui-col-md6">
			
 
				-        <div class="layui-card">
			
 
				-
			
 
				-          <div class="layui-card-body">
			
 
				-            <form class="layui-form" action="" lay-filter="component-form-element">
			
 
				-              <div class="layui-row layui-col-space10 layui-form-item">
			
 
				-
			
 
				-                <div class="layui-col-lg6">
			
 
				-                  <label class="layui-form-label"><font color='red' size="4">*</font>商户号：</label>
			
 
				-                  <div class="layui-input-block">
			
 
				-                    <input type="text" name="tenant_num" lay-verify="required" placeholder="请输入商户号" autocomplete="off" class="layui-input">
			
 
				-                  </div>
			
 
				-                </div>
			
 
				-                <div class="layui-col-lg6">
			
 
				-                  <label class="layui-form-label"><font color='red' size="4">*</font>商户密钥：</label>
			
 
				-                  <div class="layui-input-block">
			
 
				-                    <input type="text" name="tenant_key" lay-verify="required" placeholder="请输入商户密钥" autocomplete="off" class="layui-input">
			
 
				-                  </div>
			
 
				-                </div>
			
 
				-                <button class="layui-btn" id="id_save" lay-submit lay-filter="component-form-element" style="display: none">保存</button>
			
 
				-              </div>
			
 
				-            </form>
			
 
				-          </div>
			
 
				-        </div>
			
 
				-      </div>
			
 
				-    </div>
			
 
				-  </div>
			
 
				-
			
 
				-
			
 
				-  <script src="../../layuiadmin/layui/layui.js"></script>
			
 
				-  <script>
			
 
				-  layui.config({
			
 
				-    base: '../../../layuiadmin/' //静态资源所在路径
			
 
				-  }).extend({
			
 
				-    index: 'lib/index',
			
 
				-  }).use(['index', 'form', 'utils'], function(){
			
 
				-    var $ = layui.$
			
 
				-    ,admin = layui.admin
			
 
				-    ,form = layui.form;
			
 
				-    var id = layui.view.getParameterByName('id');
			
 
				-
			
 
				-    var editdata = JSON.parse(JSON.stringify(parent.layui.table.editdata)); // 框架有Bug所以这么转换
			
 
				-    form.val("component-form-element", editdata);
			
 
				-
			
 
				-    form.on('submit(component-form-element)', function(data){
			
 
				-      //layer.msg(JSON.stringify(data.field));
			
 
				-      var submitData = data.field;
			
 
				-      admin.req({
			
 
				-        url: '/admin/wechatapp/' + id + '/set_merchant/'
			
 
				-        ,data: submitData
			
 
				-        ,type: 'post'
			
 
				-        ,done: function(res){
			
 
				-            layer.msg('设置成功！', {icon: 6});
			
 
				-            parent.layer.closeAll('iframe');
			
 
				-            parent.layui.table.reload('datagrid',{});
			
 
				-        }
			
 
				-      });
			
 
				-
			
 
				-      return false;
			
 
				-    });
			
 
				-
			
 
				-    parent.layui.submitChild = function () {
			
 
				-      $("#id_save").click();
			
 
				-    };
			
 
				-  });
			
 
				-  </script>
			
 
				-</body>
			
 
				-</html>
			
--- a/uis/zzlyadmin/applet/upload.html
+++ b/uis/zzlyadmin/applet/upload.html
@@ -1,127 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<html>
			
 
				-<head>
			
 
				-  <meta charset="utf-8">
			
 
				-  <title>添加项目</title>
			
 
				-  <meta name="renderer" content="webkit">
			
 
				-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			
 
				-  <meta name="viewport" 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">
			
 
				-</head>
			
 
				-<body>
			
 
				-
			
 
				-<div class="layui-fluid">
			
 
				-    <div class="layui-card">
			
 
				-        <div class="layui-card-body" pad15>
			
 
				-            <div class="layui-row layui-col-space15">
			
 
				-                <div class="layui-col-md12">
			
 
				-                    <div class="layui-col-md12">
			
 
				-                        <table id="dataTable" lay-filter="dataTable" class="layui-hide"></table>
			
 
				-                    </div>
			
 
				-                    <button class="layui-btn" lay-submit id="btn_search_ok" style="display: none">确定</button>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-        </div>
			
 
				-    </div>
			
 
				-</div>
			
 
				-
			
 
				-  <script src="../../layuiadmin/layui/layui.js"></script>
			
 
				-  <script>
			
 
				-
			
 
				-  layui.config({
			
 
				-    base: '../../../layuiadmin/' //静态资源所在路径
			
 
				-  }).extend({
			
 
				-    index: 'lib/index' //主入口模块
			
 
				-  }).use(['index', 'table'], function(){
			
 
				-      var $ = layui.$
			
 
				-      ,admin = layui.admin
			
 
				-      ,table = layui.table;
			
 
				-      var id = layui.view.getParameterByName('id');
			
 
				-      var ids = layui.view.getParameterByName('ids');
			
 
				-
			
 
				-      if (id) {
			
 
				-          var url = '/admin/wechatapp/' + id + '/upload_code/';
			
 
				-      }else if (ids) {
			
 
				-          ids = ids.split(',');
			
 
				-          url = '/admin/wechatapp/batch_upload_code/';
			
 
				-      }
			
 
				-
			
 
				-      $('#btn_search_ok').on('click', function () {
			
 
				-        //   选择一个代码版本进行上传
			
 
				-          var oldData = table.cache[layTableId];
			
 
				-          var checked = false;
			
 
				-          var data = {template_id: null, user_version: null, user_desc: null};
			
 
				-          for (var i in oldData){
			
 
				-              if(oldData[i].LAY_CHECKED) {
			
 
				-                  data['template_id'] = oldData[i].id;
			
 
				-                  data['user_version'] = oldData[i].user_version;
			
 
				-                  data['user_desc'] = oldData[i].user_desc;
			
 
				-                  checked = true;
			
 
				-                  break;
			
 
				-              }
			
 
				-          }
			
 
				-
			
 
				-          if (!checked){
			
 
				-              layer.msg('请选择一个版本', {icon: 5});
			
 
				-              return;
			
 
				-          }
			
 
				-          if (ids) {
			
 
				-              data['ids'] = JSON.stringify(ids);
			
 
				-          }
			
 
				-          admin.req({
			
 
				-            url: url
			
 
				-            ,data: data
			
 
				-            ,type: 'post'
			
 
				-            ,done: function(res){
			
 
				-                layer.msg('上传成功！', {icon: 6});
			
 
				-                parent.layer.closeAll('iframe');
			
 
				-                parent.layui.table.reload('datagrid',{});
			
 
				-            }
			
 
				-          });
			
 
				-
			
 
				-      });
			
 
				-      parent.layui.submitChild = function () {
			
 
				-          $("#btn_search_ok").click();
			
 
				-      };
			
 
				-    //   获取当前的所有小程序版本
			
 
				-      admin.req({
			
 
				-          url: '/admin/wechatapp/templates/',
			
 
				-          done: function (res) {
			
 
				-              var data = res.data;
			
 
				-              var oldData = [];
			
 
				-              for (var i in data) {
			
 
				-                var item = data[i];
			
 
				-                var newRow = {
			
 
				-                  id: item.template_id,
			
 
				-                  user_version: item.user_version,
			
 
				-                  user_desc: item.user_desc
			
 
				-                };
			
 
				-                oldData.push(newRow);
			
 
				-              }
			
 
				-              tableIns.reload({
			
 
				-                  data : oldData
			
 
				-              });
			
 
				-          }
			
 
				-      });
			
 
				-
			
 
				-		var layTableId = "layTable";
			
 
				-		var tableIns = table.render({
			
 
				-			elem: '#dataTable',
			
 
				-			id: layTableId,
			
 
				-            page:false,
			
 
				-            limit: 100,
			
 
				-			data: [],
			
 
				-			loading: true,
			
 
				-			even: true, //不开启隔行背景
			
 
				-			cols: [[
			
 
				-				{type: 'radio'},
			
 
				-                {field: 'user_version', title: '版本', width: 150},
			
 
				-                {field: 'user_desc', title: '说明', minWidth: 150}
			
 
				-			]]
			
 
				-		});
			
 
				- });
			
 
				-
			
 
				-  </script>
			
 
				-</body>
			
 
				-</html>
			
--- a/uis/zzlyadmin/applet/upload_cert.html
+++ b/uis/zzlyadmin/applet/upload_cert.html
@@ -1,129 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<html>
			
 
				-<head>
			
 
				-  <meta charset="utf-8">
			
 
				-  <title>上传证书</title>
			
 
				-  <meta name="renderer" content="webkit">
			
 
				-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			
 
				-  <meta name="viewport" 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">
			
 
				-       <style type="text/css">
			
 
				-        .table-overlay .layui-table-view,
			
 
				-        .table-overlay .layui-table-header,
			
 
				-        .table-overlay .layui-table-box,
			
 
				-        .table-overlay .layui-table-body{overflow: visible;}
			
 
				-        .table-overlay .layui-table-cell{height: auto; overflow: visible;}
			
 
				-    </style>
			
 
				-</head>
			
 
				-<body>
			
 
				-
			
 
				-<div class="layui-fluid">
			
 
				-    <div class="layui-card">
			
 
				-        <div class="layui-card-body" pad15>
			
 
				-            <div class="layui-row layui-col-space15">
			
 
				-                <div class="layui-col-md12">
			
 
				-
			
 
				-                    <form class="layui-form" action="" lay-filter="component-form-element">
			
 
				-                        <button type="button" class="layui-btn layui-btn-normal" id="testList">选择文件</button>
			
 
				-                          <div class="layui-upload-list">
			
 
				-                            <table class="layui-table">
			
 
				-                              <thead>
			
 
				-                                <tr><th>文件名</th>
			
 
				-                                <th>大小</th>
			
 
				-                                <th>状态</th>
			
 
				-                                <th>操作</th>
			
 
				-                              </tr></thead>
			
 
				-                              <tbody id="demoList"></tbody>
			
 
				-                            </table>
			
 
				-                          </div>
			
 
				-
			
 
				-                        <button class="layui-btn" id="purchase-order-submit" lay-submit lay-filter="component-form-element" style="display: none">开始上传</button>
			
 
				-                    </form>
			
 
				-
			
 
				-                </div>
			
 
				-            </div>
			
 
				-        </div>
			
 
				-    </div>
			
 
				-</div>
			
 
				-
			
 
				-  <script src="../../layuiadmin/layui/layui.js"></script>
			
 
				-  <script>
			
 
				-
			
 
				-  //layui.link('../../../layuiadmin/style/autocomplete.css');
			
 
				-  layui.config({
			
 
				-    base: '../../../layuiadmin/' //静态资源所在路径
			
 
				-  }).extend({
			
 
				-    index: 'lib/index',
			
 
				-    autocomplete: 'autocomplete'
			
 
				-  }).use(['index','utils', 'form', 'element', 'upload'], function(){
			
 
				-    var $ = layui.$
			
 
				-    ,admin = layui.admin
			
 
				-    ,element = layui.element
			
 
				-    ,form = layui.form
			
 
				-    ,upload = layui.upload;
			
 
				-
			
 
				-    var id = layui.view.getParameterByName('id');
			
 
				-
			
 
				-    form.render(null, 'component-form-element');
			
 
				-    // 面包屑动态刷新数据
			
 
				-    element.render('breadcrumb', 'breadcrumb');
			
 
				-    form.on('submit(component-form-element)', function(data){
			
 
				-        if (!data.field.file){
			
 
				-            layer.msg('请选择文件');
			
 
				-             return false;
			
 
				-        }
			
 
				-      return false;
			
 
				-    });
			
 
				-    var demoListView = $('#demoList')
			
 
				-    ,uploadListIns = upload.render({
			
 
				-        elem: '#testList'
			
 
				-        ,url: '/admin/wechatapp/'+ id + '/upload_cert/'
			
 
				-        ,accept: 'file'
			
 
				-        ,multiple: true
			
 
				-        ,data: {}
			
 
				-        ,auto: false
			
 
				-        ,bindAction: '#purchase-order-submit'
			
 
				-        ,choose: function(obj){
			
 
				-          var files = this.files = obj.pushFile(); //将每次选择的文件追加到文件队列
			
 
				-          //读取本地文件
			
 
				-          obj.preview(function(index, file, result){
			
 
				-            var tr = $(['<tr id="upload-'+ index +'">'
			
 
				-              ,'<td>'+ file.name +'</td>'
			
 
				-              ,'<td>'+ (file.size/1014).toFixed(1) +'kb</td>'
			
 
				-              ,'<td>等待上传</td>'
			
 
				-              ,'<td>'
			
 
				-                ,'<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">删除</button>'
			
 
				-              ,'</td>'
			
 
				-            ,'</tr>'].join(''));
			
 
				-
			
 
				-            //删除
			
 
				-            tr.find('.demo-delete').on('click', function(){
			
 
				-              delete files[index]; //删除对应的文件
			
 
				-              tr.remove();
			
 
				-              uploadListIns.config.elem.next()[0].value = ''; //清空 input file 值，以免删除后出现同名文件不可选
			
 
				-            });
			
 
				-
			
 
				-            demoListView.append(tr);
			
 
				-          });
			
 
				-        }
			
 
				-        ,done: function(res, index, upload){
			
 
				-          if(res.code == 0){ //上传成功
			
 
				-            parent.layui.onSubmitChild();
			
 
				-            return delete this.files[index]; //删除文件队列已经上传成功的文件
			
 
				-          }
			
 
				-          this.error(index, upload);
			
 
				-        }
			
 
				-        ,error: function(index, upload){
			
 
				-            layer.msg('上传失败');
			
 
				-        }
			
 
				-    });
			
 
				-
			
 
				-    parent.layui.submitChild = function () {
			
 
				-      $("#purchase-order-submit").click();
			
 
				-    };
			
 
				-  });
			
 
				-
			
 
				-  </script>
			
 
				-</body>
			
 
				-</html>
			
--- a/uis/zzlyadmin/index.html
+++ b/uis/zzlyadmin/index.html
@@ -79,12 +79,6 @@
 
				                             <dd data-name="nav">
			
 
				                                 <a lay-href="employee/index.html">用户管理</a>
			
 
				                             </dd>
			
 
				-                            <dd data-name="nav">
			
 
				-                                <a lay-href="applet/index.html">小程序管理</a>
			
 
				-                            </dd>
			
 
				-                            <dd data-name="nav">
			
 
				-                                <a lay-href="thirdPart/index.html">第三方平台</a>
			
 
				-                            </dd>
			
 
				                         </dl>
			
 
				                     </li>
			
 
				                 </ul>
			
--- a/uis/zzlyadmin/tenant/edit.html
+++ b/uis/zzlyadmin/tenant/edit.html
@@ -1,134 +1,118 @@
 
				 <!DOCTYPE html>
			
 
				 <html>
			
 
				 <head>
			
 
				-  <meta charset="utf-8">
			
 
				-  <title>添加租户信息</title>
			
 
				-  <meta name="renderer" content="webkit">
			
 
				-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			
 
				-  <meta name="viewport" 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"/>
			
 
				+    <meta charset="utf-8">
			
 
				+    <title>添加租户信息</title>
			
 
				+    <meta name="renderer" content="webkit">
			
 
				+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			
 
				+    <meta name="viewport"
			
 
				+          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>
			
 
				 
			
 
				-  <div class="layui-fluid">
			
 
				+<div class="layui-fluid">
			
 
				     <div class="layui-row layui-col-space15">
			
 
				-      <div class="layui-col-md6">
			
 
				-        <div class="layui-card">
			
 
				-
			
 
				-          <div class="layui-card-body">
			
 
				-            <form class="layui-form" action="" lay-filter="component-form-element">
			
 
				-            <!-- 单位名称 -->
			
 
				-             <div class="layui-form-item">
			
 
				-               <label class="layui-form-label"><font color='red' size="4">*</font>单位名称：</label>
			
 
				-              <div class="layui-input-block">
			
 
				-                <input type="text" name="company" lay-verify="required" placeholder="请输入单位名称" autocomplete="off" class="layui-input">
			
 
				-              </div>
			
 
				-            </div>
			
 
				-
			
 
				-            <div class="layui-form-item">
			
 
				-              <label class="layui-form-label"><font color='red' size="4">*</font>组织代码：</label>
			
 
				-              <div class="layui-input-block">
			
 
				-                <input type="text" name="code" lay-verify="required" placeholder="请输入组织代码" autocomplete="off" class="layui-input">
			
 
				-              </div>
			
 
				-            </div>
			
 
				-
			
 
				-            <div class="layui-form-item">
			
 
				-              <label class="layui-form-label"><font color='red' size="4">*</font>联系人姓名：</label>
			
 
				-              <div class="layui-input-block">
			
 
				-                <input type="text" name="username" lay-verify="required" placeholder="请输入联系人姓名" autocomplete="off" class="layui-input">
			
 
				-              </div>
			
 
				+        <div class="layui-col-md6">
			
 
				+            <div class="layui-card">
			
 
				+
			
 
				+                <div class="layui-card-body">
			
 
				+                    <form class="layui-form" action="" lay-filter="component-form-element">
			
 
				+                        <!-- 单位名称 -->
			
 
				+                        <div class="layui-form-item">
			
 
				+                            <label class="layui-form-label"><font color='red' size="4">*</font>单位名称：</label>
			
 
				+                            <div class="layui-input-block">
			
 
				+                                <input type="text" name="company_name" lay-verify="required" placeholder="请输入单位名称"
			
 
				+                                       autocomplete="off" class="layui-input">
			
 
				+                            </div>
			
 
				+                        </div>
			
 
				+
			
 
				+                        <div class="layui-form-item">
			
 
				+                            <label class="layui-form-label"><font color='red' size="4">*</font>组织代码：</label>
			
 
				+                            <div class="layui-input-block">
			
 
				+                                <input type="text" name="organ_code" lay-verify="required" placeholder="请输入组织代码"
			
 
				+                                       autocomplete="off" class="layui-input">
			
 
				+                            </div>
			
 
				+                        </div>
			
 
				+
			
 
				+                        <div class="layui-form-item">
			
 
				+                            <label class="layui-form-label"><font color='red' size="4">*</font>联系人姓名：</label>
			
 
				+                            <div class="layui-input-block">
			
 
				+                                <input type="text" name="name" lay-verify="required" placeholder="请输入联系人姓名"
			
 
				+                                       autocomplete="off" class="layui-input">
			
 
				+                            </div>
			
 
				+                        </div>
			
 
				+
			
 
				+                        <div class="layui-form-item">
			
 
				+                            <label class="layui-form-label "><font color='red' size="4">*</font>联系人电话：</label>
			
 
				+                            <div class="layui-input-block">
			
 
				+                                <input type="text" name="tel" lay-verify="required" placeholder="请输入联系人电话"
			
 
				+                                       autocomplete="off" class="layui-input">
			
 
				+                            </div>
			
 
				+                        </div>
			
 
				+
			
 
				+                        <button class="layui-btn" id="id_save" lay-submit lay-filter="component-form-element"
			
 
				+                                style="display: none">保存
			
 
				+                        </button>
			
 
				+                    </form>
			
 
				+                </div>
			
 
				             </div>
			
 
				-
			
 
				-            <div class="layui-form-item">
			
 
				-              <label class="layui-form-label "><font color='red' size="4">*</font>联系人电话：</label>
			
 
				-              <div class="layui-input-block">
			
 
				-                <input type="text" name="phone" lay-verify="required" placeholder="请输入联系人电话" autocomplete="off" class="layui-input">
			
 
				-              </div>
			
 
				-            </div>
			
 
				-
			
 
				-            <div class="layui-form-item">
			
 
				-              <label class="layui-form-label"><font color='red' size="4">*</font>联系人电话：</label>
			
 
				-              <div class="layui-input-block">
			
 
				-                <input type="text" name="phone" lay-verify="required" placeholder="请输入联系人电话" autocomplete="off" class="layui-input">
			
 
				-              </div>
			
 
				-            </div>
			
 
				-
			
 
				-            <button class="layui-btn" id="id_user_save" lay-submit lay-filter="component-form-element" style="display: none">保存</button>
			
 
				-            </form>
			
 
				-          </div>
			
 
				         </div>
			
 
				-      </div>
			
 
				     </div>
			
 
				-  </div>
			
 
				-
			
 
				-
			
 
				-  <script src="../../layuiadmin/layui/layui.js"></script>
			
 
				-  <script>
			
 
				-  layui.config({
			
 
				-    base: '../../../layuiadmin/' //静态资源所在路径
			
 
				-  }).extend({
			
 
				-    index: 'lib/index',
			
 
				-    formSelects: 'formSelects-v4'
			
 
				-  }).use(['index', 'form', 'utils', 'laydate'], function(){
			
 
				-    var $ = layui.$
			
 
				-    ,laydate = layui.laydate
			
 
				-    ,admin = layui.admin
			
 
				-    ,form = layui.form;
			
 
				-    var id = layui.view.getParameterByName('id');
			
 
				-
			
 
				-    form.render(null, 'component-form-element');
			
 
				-
			
 
				-    if(id){
			
 
				-        var editdata = JSON.parse(JSON.stringify(parent.layui.table.editdata)); // 框架有Bug所以这么转换
			
 
				-        form.val("component-form-element", editdata);
			
 
				-    }
			
 
				-
			
 
				-    //执行一个laydate实例
			
 
				-      laydate.render({
			
 
				-        elem: '#due_date' //指定元素
			
 
				-        ,type: 'date'
			
 
				-      });
			
 
				-     laydate.render({
			
 
				-        elem: '#apply_date' //指定元素
			
 
				-        ,type: 'date'
			
 
				-      });
			
 
				-
			
 
				-     laydate.render({
			
 
				-     elem: '#renew_time'
			
 
				-     ,type: 'datetime'
			
 
				-     });
			
 
				-
			
 
				-    form.on('submit(component-form-element)', function(data){
			
 
				-      //layer.msg(JSON.stringify(data.field));
			
 
				-      var submitData = data.field;
			
 
				-
			
 
				-      return;
			
 
				-      if (id) {
			
 
				-          var url = '/admin/tenant/'+id+'/';
			
 
				-          var type = 'put';
			
 
				-      }else{
			
 
				-          url = '/admin/tenant/';
			
 
				-          type = 'post';
			
 
				-      }
			
 
				-      admin.req({
			
 
				-        url: url
			
 
				-        ,data: submitData
			
 
				-        ,type: type
			
 
				-        ,done: function(res){
			
 
				-            parent.layer.closeAll('iframe');
			
 
				-            parent.layui.table.reload('datagrid',{});
			
 
				+</div>
			
 
				+
			
 
				+
			
 
				+<script src="../../layuiadmin/layui/layui.js"></script>
			
 
				+<script>
			
 
				+    layui.config({
			
 
				+        base: '../../../layuiadmin/' //静态资源所在路径
			
 
				+    }).extend({
			
 
				+        index: 'lib/index',
			
 
				+        formSelects: 'formSelects-v4'
			
 
				+    }).use(['index', 'form', 'utils', 'laydate'], function () {
			
 
				+        var $ = layui.$
			
 
				+            , laydate = layui.laydate
			
 
				+            , admin = layui.admin
			
 
				+            , form = layui.form;
			
 
				+        var id = layui.view.getParameterByName('id');
			
 
				+
			
 
				+        form.render(null, 'component-form-element');
			
 
				+
			
 
				+        if (id) {
			
 
				+            var editdata = JSON.parse(JSON.stringify(parent.layui.table.editdata)); // 框架有Bug所以这么转换
			
 
				+            form.val("component-form-element", editdata);
			
 
				         }
			
 
				-      });
			
 
				 
			
 
				-      return false;
			
 
				+        form.on('submit(component-form-element)', function (data) {
			
 
				+            //layer.msg(JSON.stringify(data.field));
			
 
				+            var submitData = data.field;
			
 
				+            if (id) {
			
 
				+                var url = '/admin/tenant/' + id + '/';
			
 
				+                var type = 'put';
			
 
				+            } else {
			
 
				+                url = '/admin/tenant/';
			
 
				+                type = 'post';
			
 
				+            }
			
 
				+            console.log(33333333333, url, submitData)
			
 
				+            admin.req({
			
 
				+                url: url
			
 
				+                , data: submitData
			
 
				+                , type: type
			
 
				+                , done: function (res) {
			
 
				+                    parent.layer.closeAll('iframe');
			
 
				+                    parent.layui.table.reload('datagrid', {});
			
 
				+                }
			
 
				+            });
			
 
				+
			
 
				+            return false;
			
 
				+        });
			
 
				+
			
 
				+        parent.layui.submitChild = function () {
			
 
				+            $("#id_save").click();
			
 
				+        };
			
 
				     });
			
 
				-
			
 
				-    parent.layui.submitChild = function () {
			
 
				-      $("#id_user_save").click();
			
 
				-    };
			
 
				-  });
			
 
				-  </script>
			
 
				+</script>
			
 
				 </body>
			
 
				 </html>
			
--- a/uis/zzlyadmin/tenant/index.html
+++ b/uis/zzlyadmin/tenant/index.html
@@ -1,214 +1,230 @@
 
				 <!DOCTYPE html>
			
 
				 <html>
			
 
				 <head>
			
 
				-  <meta charset="utf-8">
			
 
				-  <title>租户管理</title>
			
 
				-  <meta name="renderer" content="webkit">
			
 
				-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			
 
				-  <meta name="viewport" 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"/>
			
 
				+    <meta charset="utf-8">
			
 
				+    <title>租户管理</title>
			
 
				+    <meta name="renderer" content="webkit">
			
 
				+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			
 
				+    <meta name="viewport"
			
 
				+          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">
			
 
				     <style type="text/css">
			
 
				-    .LAY-btns .layui-nav {padding-left:0;padding-right:10px;top:-4px;margin: 0 10px;border: 0;background-color: #009688;}
			
 
				-    .LAY-btns .layui-nav .layui-nav-item{line-height: 30px;}
			
 
				-    .LAY-btns .layui-nav .layui-nav-child{top:34px;}
			
 
				-    .LAY-btns .layui-nav .layui-nav-bar{display: none;}
			
 
				-    .LAY-btns .layui-nav .layui-nav-child dd.layui-this a{color:#333;background-color:#fff;}
			
 
				-    .LAY-btns .layui-nav .layui-nav-child dd.layui-this a:hover {background-color: #f2f2f2;color: #000;}
			
 
				-    .seach_items {display:inline-block;margin-right: 5px; margin-top: 5px;}
			
 
				-  </style>
			
 
				+        .LAY-btns .layui-nav {
			
 
				+            padding-left: 0;
			
 
				+            padding-right: 10px;
			
 
				+            top: -4px;
			
 
				+            margin: 0 10px;
			
 
				+            border: 0;
			
 
				+            background-color: #009688;
			
 
				+        }
			
 
				+
			
 
				+        .LAY-btns .layui-nav .layui-nav-item {
			
 
				+            line-height: 30px;
			
 
				+        }
			
 
				+
			
 
				+        .LAY-btns .layui-nav .layui-nav-child {
			
 
				+            top: 34px;
			
 
				+        }
			
 
				+
			
 
				+        .LAY-btns .layui-nav .layui-nav-bar {
			
 
				+            display: none;
			
 
				+        }
			
 
				+
			
 
				+        .LAY-btns .layui-nav .layui-nav-child dd.layui-this a {
			
 
				+            color: #333;
			
 
				+            background-color: #fff;
			
 
				+        }
			
 
				+
			
 
				+        .LAY-btns .layui-nav .layui-nav-child dd.layui-this a:hover {
			
 
				+            background-color: #f2f2f2;
			
 
				+            color: #000;
			
 
				+        }
			
 
				+
			
 
				+        .seach_items {
			
 
				+            display: inline-block;
			
 
				+            margin-right: 5px;
			
 
				+            margin-top: 5px;
			
 
				+        }
			
 
				+    </style>
			
 
				 </head>
			
 
				 <body>
			
 
				 
			
 
				-  <div class="layui-fluid">
			
 
				+<div class="layui-fluid">
			
 
				     <div class="layui-card">
			
 
				         <div class="layui-card-body" pad15>
			
 
				-        <div class="layui-row layui-col-space15">
			
 
				-          <div class="layui-col-md12">
			
 
				-            <div class="LAY-btns" style="margin-bottom: 10px;">
			
 
				-              <div style="float:left; margin-right: 5px; margin-top: 5px;">
			
 
				-                    <button class="layui-btn" id="btn_add"><i class="layui-icon layui-icon-add-circle"></i>添加</button>
			
 
				-                </div>
			
 
				-                <div style="float:right;">
			
 
				-                    <form class="layui-form" lay-filter="query-form-element">
			
 
				-                        <div class="seach_items">
			
 
				-                            <input type="text"  name="company" autocomplete="off" class="layui-input" placeholder="单位名称"/>
			
 
				+            <div class="layui-row layui-col-space15">
			
 
				+                <div class="layui-col-md12">
			
 
				+                    <div class="LAY-btns" style="margin-bottom: 10px;">
			
 
				+                        <div style="float:left; margin-right: 5px; margin-top: 5px;">
			
 
				+                            <button class="layui-btn" id="btn_add"><i class="layui-icon layui-icon-add-circle"></i>添加
			
 
				+                            </button>
			
 
				                         </div>
			
 
				-                        <div class="seach_items">
			
 
				-                            <input type="text"  name="name" autocomplete="off" class="layui-input" placeholder="联系人姓名"/>
			
 
				+                        <div style="float:right;">
			
 
				+                            <form class="layui-form" lay-filter="query-form-element">
			
 
				+                                <div class="seach_items">
			
 
				+                                    <input type="text" name="company" autocomplete="off" class="layui-input"
			
 
				+                                           placeholder="单位名称"/>
			
 
				+                                </div>
			
 
				+                                <div class="seach_items">
			
 
				+                                    <input type="text" name="name" autocomplete="off" class="layui-input"
			
 
				+                                           placeholder="联系人姓名"/>
			
 
				+                                </div>
			
 
				+                                <div class="seach_items">
			
 
				+                                    <input type="text" name="name" autocomplete="off" class="layui-input"
			
 
				+                                           placeholder="联系人电话"/>
			
 
				+                                </div>
			
 
				+                                <div class="seach_items">
			
 
				+                                    <button class="layui-btn" lay-submit lay-filter="query-form-element"><i
			
 
				+                                            class="layui-icon layui-icon-search"></i>查询
			
 
				+                                    </button>
			
 
				+                                </div>
			
 
				+                            </form>
			
 
				                         </div>
			
 
				-                        <div class="seach_items">
			
 
				-                            <button class="layui-btn" lay-submit lay-filter="query-form-element"><i class="layui-icon layui-icon-search"></i>查询</button>
			
 
				-                        </div>
			
 
				-                    </form>
			
 
				-                </div>
			
 
				-                <div style="clear: both;"></div>
			
 
				+                        <div style="clear: both;"></div>
			
 
				 
			
 
				-            </div>
			
 
				-            <table class="layui-hide" id="datagrid" lay-filter="datagrid-operate"></table>
			
 
				+                    </div>
			
 
				+                    <table class="layui-hide" id="datagrid" lay-filter="datagrid-operate"></table>
			
 
				 
			
 
				-            <script type="text/html" id="datagrid-operate-bar">
			
 
				-                <div class="layui-btn-group">
			
 
				-                  <a class="layui-btn layui-btn-xs" style="margin-right: 10px" lay-event="edit">修改</a>
			
 
				-                </div>
			
 
				-                <div class="layui-btn-group">
			
 
				-                  {{# if(d.is_bind_app == false){ }}
			
 
				-                  <a class="layui-btn layui-btn-xs" style="margin-right: 10px" lay-event="bind">绑定小程序</a>
			
 
				-                  {{#  } }}
			
 
				-                </div>
			
 
				-                <div class="layui-btn-group">
			
 
				-                  <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="super">添加超级管理员</a>
			
 
				+                    <script type="text/html" id="datagrid-operate-bar">
			
 
				+                        <div class="layui-btn-group">
			
 
				+                            <a class="layui-btn layui-btn-xs" lay-event="view">查看</a>
			
 
				+                        </div>
			
 
				+                        <div class="layui-btn-group">
			
 
				+                            <a class="layui-btn layui-btn-xs" lay-event="edit">修改</a>
			
 
				+                        </div>
			
 
				+                        <div class="layui-btn-group">
			
 
				+                            <a class="layui-btn layui-btn-xs" lay-event="check">审核</a>
			
 
				+                        </div>
			
 
				+                        <div class="layui-btn-group">
			
 
				+                            <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="super">添加管理员</a>
			
 
				+                        </div>
			
 
				+                    </script>
			
 
				                 </div>
			
 
				-            </script>
			
 
				-          </div>
			
 
				-        </div>
			
 
				+            </div>
			
 
				         </div>
			
 
				     </div>
			
 
				-  </div>
			
 
				+</div>
			
 
				 
			
 
				-  <div id="dlg_bind" align="center" style="display: none; height: 100%;overflow-y: hidden;">
			
 
				-      <div align="center">
			
 
				-          <h3 style="margin-top: 5px;color: red;">请使用微信小程序扫描二维码绑定</h3>
			
 
				-      </div>
			
 
				+<div id="dlg_bind" align="center" style="display: none; height: 100%;overflow-y: hidden;">
			
 
				+    <div align="center">
			
 
				+        <h3 style="margin-top: 5px;color: red;">请使用微信小程序扫描二维码绑定</h3>
			
 
				+    </div>
			
 
				 
			
 
				-      <iframe  id="iframe_code"
			
 
				-              style="width: 95%;border-radius: 2px; height: 85%; margin-top: 10px; border-width: 1px; border-color: lightgray;
			
 
				+    <iframe id="iframe_code"
			
 
				+            style="width: 95%;border-radius: 2px; height: 85%; margin-top: 10px; border-width: 1px; border-color: lightgray;
			
 
				                           border-style: solid;"
			
 
				-      ></iframe>
			
 
				-  </div>
			
 
				+    ></iframe>
			
 
				+</div>
			
 
				 
			
 
				-  <script src="../../layuiadmin/layui/layui.js?t=1"></script>
			
 
				-  <script>
			
 
				-  layui.config({
			
 
				-    base: '../../../layuiadmin/' //静态资源所在路径
			
 
				-  }).extend({
			
 
				-    index: 'lib/index' //主入口模块
			
 
				-     ,formSelects: 'formSelects-v4'
			
 
				-  }).use(['index', 'table', 'form', 'formSelects', 'upload'], function(){
			
 
				-    var $ = layui.$
			
 
				-        ,table = layui.table
			
 
				-        ,admin = layui.admin
			
 
				-        ,form = layui.form;
			
 
				+<script src="../../layuiadmin/layui/layui.js?t=1"></script>
			
 
				+<script>
			
 
				+    layui.config({
			
 
				+        base: '../../../layuiadmin/' //静态资源所在路径
			
 
				+    }).extend({
			
 
				+        index: 'lib/index' //主入口模块
			
 
				+    }).use(['index', 'table', 'form', 'upload'], function () {
			
 
				+        var $ = layui.$
			
 
				+            , table = layui.table
			
 
				+            , admin = layui.admin
			
 
				+            , form = layui.form;
			
 
				 
			
 
				-    table.render({
			
 
				-      elem: '#datagrid'
			
 
				-      ,url: '../../api/tenant.json'
			
 
				-      ,cols: [[
			
 
				-        {field:'company', title:'单位名称',width: 200}
			
 
				-       ,{field:'code', title:'组织代码',width: 150}
			
 
				-       ,{field:'username', title:'联系人姓名',width: 200}
			
 
				-       ,{field:'phone', title:'联系人电话',width: 200}
			
 
				-       ,{field:'due_date', title:'租户到期日期',width: 200}
			
 
				-       ,{field:'apply_date', title:'申请日期',width: 200}
			
 
				-       ,{field:'check_status_text', title:'审核状态',width: 200}
			
 
				-       ,{field:'renew_time', title:'续费时间',width: 200}
			
 
				-       ,{field:'renew_amount', title:'续费金额',width: 200}
			
 
				-        ,{title: "操作", width:300, align:'left', fixed: 'right', toolbar: '#datagrid-operate-bar'}
			
 
				-      ]]
			
 
				-      ,page: true
			
 
				-      ,height: 'full-108'
			
 
				-    });
			
 
				-    var _params;
			
 
				-    form.on('submit(query-form-element)', function(data){
			
 
				-      //layer.msg(JSON.stringify(data.field));
			
 
				-      _params = data.field;
			
 
				-      table.reload('datagrid', {
			
 
				-          where: data.field
			
 
				-          ,page:{curr:1}
			
 
				-      });
			
 
				-      layer.closeAll();
			
 
				-      return false;
			
 
				-    });
			
 
				-    //监听工具条
			
 
				-    table.on('tool(datagrid-operate)', function(obj){
			
 
				-      var data = obj.data;
			
 
				-      if(obj.event === 'edit'){
			
 
				-        table.editdata = data;
			
 
				-        layer.open({
			
 
				-          type: 2,
			
 
				-          title: '修改',
			
 
				-          shadeClose: false,
			
 
				-          area: ['700px', '450px'],
			
 
				-          btn: ['保存', '取消'],
			
 
				-          yes: function (index, dom) {
			
 
				-            layui.submitChild();
			
 
				-            },
			
 
				-            btn2: function (index, layero) {
			
 
				-                layer.close(index);//关闭当前按钮
			
 
				-            },
			
 
				-          content: 'edit.html?id='+data.id
			
 
				+        table.render({
			
 
				+            elem: '#datagrid'
			
 
				+            , url: '/admin/tenant/'
			
 
				+            , cols: [[
			
 
				+                {field: 'company_no', title: '单位编号', width: 100}
			
 
				+                , {field: 'company_name', title: '单位名称', width: 200}
			
 
				+                , {field: 'organ_code', title: '组织代码', width: 150}
			
 
				+                , {field: 'name', title: '联系人姓名', width: 100}
			
 
				+                , {field: 'tel', title: '联系人电话', width: 120}
			
 
				+                , {field: 'end_date', title: '租户到期日期', width: 120}
			
 
				+                , {field: 'create_time', title: '申请时间', width: 160}
			
 
				+                , {field: 'status_text', title: '审核状态', width: 120}
			
 
				+                , {field: 'renew_time', title: '续费时间', width: 160}
			
 
				+                , {field: 'renew_amount', title: '续费金额', width: 120}
			
 
				+                , {title: "操作", width: 260, align: 'left', fixed: 'right', toolbar: '#datagrid-operate-bar'}
			
 
				+            ]]
			
 
				+            , page: true
			
 
				+            , height: 'full-108'
			
 
				+        });
			
 
				+        var _params;
			
 
				+        form.on('submit(query-form-element)', function (data) {
			
 
				+            //layer.msg(JSON.stringify(data.field));
			
 
				+            _params = data.field;
			
 
				+            table.reload('datagrid', {
			
 
				+                where: data.field
			
 
				+                , page: {curr: 1}
			
 
				+            });
			
 
				+            layer.closeAll();
			
 
				+            return false;
			
 
				+        });
			
 
				+        //监听工具条
			
 
				+        table.on('tool(datagrid-operate)', function (obj) {
			
 
				+            var data = obj.data;
			
 
				+            if (obj.event === 'edit') {
			
 
				+                table.editdata = data;
			
 
				+                layer.open({
			
 
				+                    type: 2,
			
 
				+                    title: '修改',
			
 
				+                    shadeClose: false,
			
 
				+                    area: ['700px', '450px'],
			
 
				+                    btn: ['保存', '取消'],
			
 
				+                    yes: function (index, dom) {
			
 
				+                        layui.submitChild();
			
 
				+                    },
			
 
				+                    btn2: function (index, layero) {
			
 
				+                        layer.close(index);//关闭当前按钮
			
 
				+                    },
			
 
				+                    content: 'edit.html?id=' + data.id
			
 
				+                });
			
 
				+            }  else {
			
 
				+                // 执行添加超级管理员操作
			
 
				+                layer.open({
			
 
				+                    type: 2,
			
 
				+                    title: "添加超级管理员",
			
 
				+                    shadeClose: false,
			
 
				+                    area: ['450px', '300px'],
			
 
				+                    btn: ['保存', '取消'],
			
 
				+                    yes: function (index, dom) {
			
 
				+                        layui.submitChild();
			
 
				+                    },
			
 
				+                    btn2: function (index, layero) {
			
 
				+                        layer.close(index); //关闭当前按钮
			
 
				+                    },
			
 
				+                    content: "add_super_admin.html?id=" + data.id
			
 
				+                })
			
 
				+            }
			
 
				         });
			
 
				-      }else if(obj.event === 'bind'){
			
 
				-        // 执行绑定小程序的操作
			
 
				-        layer.open({
			
 
				-          title: "绑定小程序",
			
 
				-          shadeClose: false,
			
 
				-          btn: ['保存', '取消'],
			
 
				-          yes: function(index, dom) {
			
 
				-            admin.req({
			
 
				-            url: '/admin/tenant/'+data.id+'/bind_wechat_tp/',
			
 
				-            type: 'post',
			
 
				-            done: function (res) {
			
 
				-                if (res.data.length > 0) {
			
 
				-                    bindApp(res.data)
			
 
				-                    layer.close(index); //关闭当前按钮
			
 
				-                }
			
 
				-              }
			
 
				-          });
			
 
				-          },
			
 
				-          btn2: function(index, layero) {
			
 
				-            layer.close(index); //关闭当前按钮
			
 
				-          },
			
 
				-          content: "<p>确定要绑定小程序？</p>"
			
 
				-        })
			
 
				-      }else{
			
 
				-        // 执行添加超级管理员操作
			
 
				-        layer.open({
			
 
				-          type: 2,
			
 
				-          title: "添加超级管理员",
			
 
				-          shadeClose: false,
			
 
				-          area: ['450px', '300px'],
			
 
				-          btn: ['保存', '取消'],
			
 
				-          yes: function(index, dom) {
			
 
				-            layui.submitChild();
			
 
				-          },
			
 
				-          btn2: function(index, layero) {
			
 
				-            layer.close(index); //关闭当前按钮
			
 
				-          },
			
 
				-          content: "add_super_admin.html?id="+ data.id
			
 
				-        })
			
 
				-      }
			
 
				-    });
			
 
				 
			
 
				-    $('#btn_add').on('click', function(){
			
 
				-        layer.open({
			
 
				-          type: 2,
			
 
				-          title: '添加',
			
 
				-          shadeClose: false,
			
 
				-          btn: ['保存', '取消'],
			
 
				-          area: ['700px', '450px'],
			
 
				-          yes: function (index, dom) {
			
 
				-            layui.submitChild();
			
 
				-            },
			
 
				-            btn2: function (index, layero) {
			
 
				-                layer.close(index);//关闭当前按钮
			
 
				-            },
			
 
				-          content: 'edit.html'
			
 
				+        $('#btn_add').on('click', function () {
			
 
				+            layer.open({
			
 
				+                type: 2,
			
 
				+                title: '添加',
			
 
				+                shadeClose: false,
			
 
				+                btn: ['保存', '取消'],
			
 
				+                area: ['700px', '450px'],
			
 
				+                yes: function (index, dom) {
			
 
				+                    layui.submitChild();
			
 
				+                },
			
 
				+                btn2: function (index, layero) {
			
 
				+                    layer.close(index);//关闭当前按钮
			
 
				+                },
			
 
				+                content: 'edit.html'
			
 
				+            });
			
 
				         });
			
 
				+        var bindApp = function (data) {
			
 
				+            $('#iframe_code').attr('src', data);
			
 
				+            layer.open({
			
 
				+                type: 1,
			
 
				+                shadeClose: false,
			
 
				+                area: ['70%', '90%'],
			
 
				+                title: '绑定',
			
 
				+                content: $('#dlg_bind')
			
 
				+            });
			
 
				+        };
			
 
				     });
			
 
				-    var bindApp = function (data) {
			
 
				-        $('#iframe_code').attr('src', data);
			
 
				-        layer.open({
			
 
				-          type: 1,
			
 
				-          shadeClose: false,
			
 
				-          area: ['70%', '90%'],
			
 
				-          title: '绑定',
			
 
				-          content: $('#dlg_bind')
			
 
				-        });
			
 
				-    };
			
 
				-  });
			
 
				-  </script>
			
 
				+</script>
			
 
				 </body>
			
 
				 </html>
			
 
				 
			
--- a/uis/zzlyadmin/thirdPart/index.html
+++ b/uis/zzlyadmin/thirdPart/index.html
@@ -1,105 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<html>
			
 
				-<head>
			
 
				-  <meta charset="utf-8">
			
 
				-  <title>第三方平台</title>
			
 
				-  <meta name="renderer" content="webkit">
			
 
				-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			
 
				-  <meta name="viewport" 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">
			
 
				-</head>
			
 
				-<body>
			
 
				-
			
 
				-    <div class="layui-fluid">
			
 
				-        <div class="layui-card">
			
 
				-            <div class="layui-card-body" pad15>
			
 
				-            <div class="layui-row layui-col-space15">
			
 
				-              <div class="layui-col-md12">
			
 
				-                <form class="layui-form" action="" lay-filter="component-form-element">
			
 
				-                  <div class="layui-row layui-col-space10 layui-form-item">
			
 
				-                   <div class="layui-form-item">
			
 
				-                      <label class="layui-form-label"><font color='red' size="4">*</font>第三方平台appid：</label>
			
 
				-                      <div class="layui-input-block">
			
 
				-                        <input type="text" name="component_appid" lay-verify="required" autocomplete="off" class="layui-input">
			
 
				-                      </div>
			
 
				-                    </div>
			
 
				-                    <div class="layui-form-item">
			
 
				-                      <label class="layui-form-label"><font color='red' size="4">*</font>第三方平台appsecret：</label>
			
 
				-                      <div class="layui-input-block">
			
 
				-                        <input type="text" name="component_appsecret" lay-verify="required" autocomplete="off" class="layui-input">
			
 
				-                      </div>
			
 
				-                    </div>
			
 
				-                     <div class="layui-form-item">
			
 
				-                      <label class="layui-form-label"><font color='red' size="4">*</font>消息加密key：</label>
			
 
				-                      <div class="layui-input-block">
			
 
				-                        <input type="text" name="m_encode_key" lay-verify="required" autocomplete="off" class="layui-input">
			
 
				-                      </div>
			
 
				-                    </div>
			
 
				-                     <div class="layui-form-item">
			
 
				-                      <label class="layui-form-label"><font color='red' size="4">*</font>消息校验token：</label>
			
 
				-                      <div class="layui-input-block">
			
 
				-                        <input type="text" name="m_token" lay-verify="required" autocomplete="off" class="layui-input">
			
 
				-                      </div>
			
 
				-                    </div>
			
 
				-                  <div class="layui-form-item">
			
 
				-                    <div class="layui-input-block">
			
 
				-                      <button class="layui-btn" lay-submit lay-filter="component-form-element">保存</button>
			
 
				-                    </div>
			
 
				-                  </div>
			
 
				-                  </div>
			
 
				-                </form>
			
 
				-              </div>
			
 
				-            </div>
			
 
				-          </div>
			
 
				-        </div>
			
 
				-      </div>
			
 
				-
			
 
				-<script src="../../layuiadmin//layui/layui.js"></script>
			
 
				-<script>
			
 
				-    layui.config({
			
 
				-        base: '../../../layuiadmin/' //静态资源的所在路径
			
 
				-    }).extend({
			
 
				-        index: 'lib/index' //主入口模块
			
 
				-    }).use(['index', 'form'], function(){
			
 
				-        var $ = layui.$
			
 
				-        ,admin = layui.admin
			
 
				-        ,element = layui.element
			
 
				-        ,form = layui.form;
			
 
				-        form.render(null, 'component-form-element');
			
 
				-        element.render('breadcrumb', 'breadcrumb');
			
 
				-        admin.req({
			
 
				-        url: '/admin/wechattp/',
			
 
				-        done: function (res) {
			
 
				-            form.val("component-form-element", res.data);
			
 
				-            form.render();
			
 
				-        }
			
 
				-    });
			
 
				-
			
 
				-        form.on('submit(component-form-element)', function(data){
			
 
				-      admin.req({
			
 
				-        url: '/admin/wechattp/'
			
 
				-        ,data: data.field
			
 
				-        ,type: 'post'
			
 
				-        ,done: function(res){
			
 
				-            layer.open({
			
 
				-                 type: 1
			
 
				-                ,content: '<div style="padding: 20px 100px;">保存成功</div>'
			
 
				-                ,btn: '关闭'
			
 
				-                ,btnAlign: 'c' //按钮居中
			
 
				-                ,shade: 0 //不显示遮罩
			
 
				-                ,yes: function(){
			
 
				-                  layer.closeAll();
			
 
				-                  //admin.exit();
			
 
				-                }
			
 
				-            });
			
 
				-        }
			
 
				-      });
			
 
				-
			
 
				-      return false;
			
 
				-    });
			
 
				-
			
 
				-    })
			
 
				-</script>
			
 
				-</body>
			
 
				-</html>