From 854ab9f509b7238a769c83e5e6703f7620fdd116 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Tue, 18 Feb 2020 14:58:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E4=BD=9C=E6=96=B9=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E4=B8=8D=E6=89=93=E5=BC=80=E6=96=B0=E7=AA=97=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/Partner/add.html   | 10 ++++++----
 Application/Admin/View/Partner/lists.html | 12 +++++++++++-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Application/Admin/View/Partner/add.html b/Application/Admin/View/Partner/add.html
index 23b709497..a65ba38e2 100644
--- a/Application/Admin/View/Partner/add.html
+++ b/Application/Admin/View/Partner/add.html
@@ -244,9 +244,10 @@
     <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
     <script type="text/javascript">
         $('.time1').datetimepicker({
-            format: 'yyyy-mm-dd hh:ii',
+            format: 'yyyy-mm-dd',
             language:"zh-CN",
-            minView:0,startDate:new Date(),
+            minView: "month",
+            startDate:new Date(),
             autoclose:true
         }).change(function(){
             var start = new Date($(this).val()).getTime();
@@ -260,9 +261,10 @@
         });
 
         $('.time2').datetimepicker({
-            format: 'yyyy-mm-dd hh:ii',
+            format: 'yyyy-mm-dd',
             language:"zh-CN",
-            minView:0,startDate:new Date(),
+            minView: "month",
+            startDate:new Date(),
             autoclose:true
         }).change(function(){
             var end = new Date($(this).val()).getTime();
diff --git a/Application/Admin/View/Partner/lists.html b/Application/Admin/View/Partner/lists.html
index 391321a57..a7cb8fdfe 100644
--- a/Application/Admin/View/Partner/lists.html
+++ b/Application/Admin/View/Partner/lists.html
@@ -264,7 +264,17 @@
     $(function(){
         $("#downloadexcel").on("click",function(){
             var url = $(this).attr("url");
-            window.open(url, "blank");
+            var title =  '合作方导出';
+            layer.open({
+                type: 2,
+                title: title,
+                shadeClose: true,
+                shade: 0,
+                area: ['40%', '60%'],
+                content: url,
+                zIndex :-5
+            });
+            // window.open(url, "blank");
         });
         $('#time-start').datetimepicker({
             format: 'yyyy-mm-dd',