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

编辑汇率时间控件修改

Application/Admin/View/MarketPercentage/edittaxratio.html

@@ -84,14 +84,27 @@
 			$('#timestart').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'
 			})