Merge branch 'feature/market_percentage' of wmtx/platform into release

时间控件修改

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,
+                // minView:2,
-                autoclose:true
+                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'
             })