From 5dc522209135c2c6a52ffc0a896be186224c73de Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Mon, 6 Jul 2020 16:09:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=8E=A7=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../View/MarketPercentage/showbonuslist.html  | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/View/MarketPercentage/showbonuslist.html b/Application/Admin/View/MarketPercentage/showbonuslist.html
index 9c796789c..332adc445 100644
--- a/Application/Admin/View/MarketPercentage/showbonuslist.html
+++ b/Application/Admin/View/MarketPercentage/showbonuslist.html
@@ -182,6 +182,16 @@
                 }else{
                     url += '?' + query;
                 }
+
+                var start = $("#time_start").val();
+                var end =   $("#time_end").val();
+                if(start !='' && end != ''){
+                    if (Date.parse(start) > Date.parse(end)){
+                        layer.msg('开始时间必须小于等于结束时间');
+                        return false;
+                    }
+                }
+
                 window.location.href = url;
             });
             $(".paixu").click(function(){
@@ -280,14 +290,27 @@
             $('#time_start').datetimepicker({
                 format: 'yyyy-mm',
                 language:"zh-CN",
-                minView:2,
-                autoclose:true
+                // minView:2,
+                weekStart: 1,
+                todayBtn: true,
+                todayHighlight: false,
+                startView: 3,
+                minView: 3,
+                forceParse: 0,
+                autoclose:true,
+                pickerPosition:'bottom-left'
             });
 
             $('#datetimepicker').datetimepicker({
                 format: 'yyyy-mm',
                 language:"zh-CN",
-                minView:2,
+                // minView:2,
+                weekStart: 1,
+                todayBtn: true,
+                todayHighlight: false,
+                startView: 3,
+                minView: 3,
+                forceParse: 0,
                 autoclose:true,
                 pickerPosition:'bottom-left'
             })