|
|
@@ -47,13 +47,17 @@
|
|
|
html .page .chooseTime .dateMake input {
|
|
|
display: inline-block;
|
|
|
width: 3.05rem;
|
|
|
- height: .72rem;
|
|
|
- line-height: .72rem;
|
|
|
- font-size: .33rem;
|
|
|
+ /*height: .72rem;
|
|
|
+ line-height: .72rem;*/
|
|
|
+ font-size: .28rem;
|
|
|
border: 1px solid #CECECE;
|
|
|
margin: .16rem .13rem;
|
|
|
border-radius: 0.02rem;
|
|
|
- text-align: center;
|
|
|
+ /*text-align: center;
|
|
|
+ padding-right: 0.15rem;*/
|
|
|
+ padding-top: 0.14rem;
|
|
|
+ padding-bottom: 0.14rem;
|
|
|
+ padding-left: 0.68rem;
|
|
|
}
|
|
|
html .page .chooseTime > i{
|
|
|
position: relative;
|
|
|
@@ -62,12 +66,27 @@
|
|
|
font-size: .3rem;
|
|
|
color: #888;
|
|
|
}
|
|
|
- html .page .chooseTime .dateMake i{
|
|
|
+ html .page .chooseTime .dateMake #first{
|
|
|
+ position: absolute;
|
|
|
+ left: 0.65rem;
|
|
|
+ top: 0rem;
|
|
|
+ font-size: .3rem;
|
|
|
+ }
|
|
|
+ html .page .chooseTime .dateMake #second{
|
|
|
position: relative;
|
|
|
- left: -139px;
|
|
|
- top: 1px;
|
|
|
+ left: -2.95rem;
|
|
|
+ top: 0rem;
|
|
|
font-size: .3rem;
|
|
|
}
|
|
|
+ .dateMake input::-webkit-input-placeholder {
|
|
|
+ color: #999;
|
|
|
+ }
|
|
|
+ .dateMake input:-moz-placeholder {
|
|
|
+ color: #999;
|
|
|
+ }
|
|
|
+ .dateMake input:-ms-input-placeholder {
|
|
|
+ color: #999;
|
|
|
+ }
|
|
|
</style>
|
|
|
<body>
|
|
|
<div class="page">
|
|
|
@@ -103,12 +122,12 @@
|
|
|
<li><span data-value="2017_toNow"></span></li>
|
|
|
<li><span data-value="2016_toNow"></span></li>
|
|
|
</ul>
|
|
|
- <i class="iconfont icon-rili"></i>
|
|
|
<div class="dateMake">
|
|
|
- <input id="starttime" placeholder="开始日期">
|
|
|
+ <i class="iconfont icon-rili" id="first"></i>
|
|
|
+ <input id="starttime" placeholder="开始日期" readonly="readonly">
|
|
|
<div class="heng">—</div>
|
|
|
- <input id="endtime" placeholder="截止日期" >
|
|
|
- <i class="iconfont icon-rili"></i>
|
|
|
+ <input id="endtime" placeholder="截止日期" readonly="readonly">
|
|
|
+ <i class="iconfont icon-rili" id="second"></i>
|
|
|
</div>
|
|
|
</div>
|
|
|
<!-- dateChooseEnd -->
|
|
|
@@ -168,6 +187,8 @@
|
|
|
</div>
|
|
|
|
|
|
<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/zepto.js"></script>
|
|
|
+ <script src="{{Msg "seo" "cdn"}}/js/common.js?v={{Msg "seo" "version"}}"></script>
|
|
|
+
|
|
|
<script>
|
|
|
$(function(){
|
|
|
//筛选日期选中
|
|
|
@@ -235,21 +256,36 @@
|
|
|
showOnTap: false,
|
|
|
maxDate:new Date(),
|
|
|
onSelect: function (valueText, inst) {//选择时事件（点击确定后），valueText 为选择的时间，
|
|
|
- $("#starttime").css({
|
|
|
- "color":"#24C0D7",
|
|
|
- "text-align":"right",
|
|
|
- "border":"1px solid #24C0D7"
|
|
|
- });
|
|
|
- $(".chooseTime > i").css("color","#24C0D7");
|
|
|
- $(".chooseTime ul li").removeClass('active');
|
|
|
+ var startFlag = true;
|
|
|
+ // 转化时间戳
|
|
|
+ var tval = valueText.replace("年","-").replace("月","-").replace("日","");
|
|
|
+ var val = new Date(tval).getTime();
|
|
|
+ // 判空
|
|
|
+ if ($("#endtime").val()!=""){
|
|
|
+ var ete = $("#endtime").val().replace("年","-").replace("月","-").replace("日","");
|
|
|
+ var enddate = new Date(ete).getTime();
|
|
|
+ if(val > enddate){
|
|
|
+ $("#starttime").val("");
|
|
|
+ EasyAlert.show("开始日期不能大于截止日期","",3000);
|
|
|
+ }
|
|
|
+ startFlag =false;
|
|
|
+ }
|
|
|
+ if (startFlag){
|
|
|
+ $("#starttime").addClass("timeSelect");
|
|
|
+ $("#endtime").addClass("timeSelect");
|
|
|
+ $(".dateMake").css({"color":"#24C0D7"});
|
|
|
+ $(".chooseTime ul li").removeClass('active');
|
|
|
+ }
|
|
|
+
|
|
|
},
|
|
|
onClear: function (inst) {
|
|
|
- $("#starttime").css({
|
|
|
- "color":"#000",
|
|
|
- "text-align":"center",
|
|
|
- "border":"1px solid #CECECE"
|
|
|
- });
|
|
|
- $(".chooseTime > i").css("color","#888");
|
|
|
+ if ($("#endtime").val()==""){
|
|
|
+ $("#endtime").removeClass("timeSelect");
|
|
|
+ $("#starttime").removeClass("timeSelect");
|
|
|
+ $(".dateMake").css({"color":"#000"});
|
|
|
+ $(".chooseTime > i").css("color","#888");
|
|
|
+ $(".chooseTime ul li:eq(0)").addClass('active');
|
|
|
+ }
|
|
|
}
|
|
|
});
|
|
|
|
|
|
@@ -283,23 +319,37 @@
|
|
|
|
|
|
},
|
|
|
onSelect: function (valueText, inst) {//选择时事件（点击确定后），valueText 为选择的时间，
|
|
|
- $("#endtime").text("");
|
|
|
- $("#endtime").append("<i class=\"iconfont icon-rili\"></i>"+valueText);
|
|
|
- $("#endtime").css({
|
|
|
- "color":"#24C0D7",
|
|
|
- "text-align":"right",
|
|
|
- "border":"1px solid #24C0D7"
|
|
|
- });
|
|
|
- $(".dateMake i").css("color","#24C0D7");
|
|
|
- $(".chooseTime ul li").removeClass('active');
|
|
|
+ //$("#endtime").text("");
|
|
|
+ //$("#endtime").append("<i class=\"iconfont icon-rili\"></i>"+valueText);
|
|
|
+ var endFlag = true;
|
|
|
+ // 转化时间戳
|
|
|
+ var tval = valueText.replace("年","-").replace("月","-").replace("日","");
|
|
|
+ var val = new Date(tval).getTime();
|
|
|
+ // 判空
|
|
|
+ if ($("#starttime").val()!=""){
|
|
|
+ var ste = $("#starttime").val().replace("年","-").replace("月","-").replace("日","");
|
|
|
+ var startdate = new Date(ste).getTime();
|
|
|
+ if(val < startdate){
|
|
|
+ $("#endtime").val("");
|
|
|
+ EasyAlert.show("截止日期不能小于开始日期","",3000);
|
|
|
+ }
|
|
|
+ endFlag =false;
|
|
|
+ }
|
|
|
+ if (endFlag){
|
|
|
+ $("#starttime").addClass("timeSelect");
|
|
|
+ $("#endtime").addClass("timeSelect");
|
|
|
+ $(".dateMake").css({"color":"#24C0D7"});
|
|
|
+ $(".chooseTime ul li").removeClass('active');
|
|
|
+ }
|
|
|
},
|
|
|
onClear: function (inst) {
|
|
|
- $("#endtime").css({
|
|
|
- "color":"#000",
|
|
|
- "text-align":"center",
|
|
|
- "border":"1px solid #CECECE"
|
|
|
- });
|
|
|
- $(".dateMake i").css("color","#888");
|
|
|
+ if ($("#starttime").val()==""){
|
|
|
+ $("#endtime").removeClass("timeSelect");
|
|
|
+ $("#starttime").removeClass("timeSelect");
|
|
|
+ $(".dateMake").css({"color":"#000"});
|
|
|
+ $(".chooseTime > i").css("color","#888");
|
|
|
+ $(".chooseTime ul li:eq(0)").addClass('active');
|
|
|
+ }
|
|
|
}
|
|
|
});
|
|
|
|
