chengwl 4 vuotta sitten
vanhempi
commit
d387451d87

+ 6 - 6
application/controller/WigsOutCtrl.php

@@ -23,8 +23,8 @@ class WigsOutCtrl{
             $status = $this->common->my_filter_input($_GET['status']);
             $type = $this->common->my_filter_input($_GET['type']);
 	        $time_type=isset($_GET['time_type'])?$this->common->my_filter_input($_GET['time_type']):1;
-            $startDate = $_GET['startDate'] . ' 00:00:00';
-            $endDate = $_GET['endDate'].' 23:59:59';
+            $startDate = $_GET['startDate'] ;
+            $endDate = $_GET['endDate'];
             $key = $this->common->my_filter_input($_GET['key']);
             $pnsn = isset($_GET['pnsn'])?$this->common->my_filter_input($_GET['pnsn']):15;
         }
@@ -335,8 +335,8 @@ class WigsOutCtrl{
         if(!isset($_GET['startDate']) || !isset($_GET['endDate'])){
             return false;
         } else {
-            $startDate = $_GET['startDate'] . ' 00:00:00';
-            $endDate = $_GET['endDate'].' 23:59:59';
+            $startDate = $_GET['startDate'] ;
+            $endDate = $_GET['endDate'];
         }
         $time_type=isset($_GET['time_type'])?$this->common->my_filter_input($_GET['time_type']):1;
 	if($time_type==1){
@@ -395,8 +395,8 @@ class WigsOutCtrl{
             $status = $this->common->my_filter_input($_GET['status']);
             $type = $this->common->my_filter_input($_GET['type']);
 	        $time_type=isset($_GET['time_type'])?$this->common->my_filter_input($_GET['time_type']):1;
-            $startDate = $_GET['startDate'] . ' 00:00:00';
-            $endDate = $_GET['endDate'].' 23:59:59';
+            $startDate = $_GET['startDate'] ;
+            $endDate = $_GET['endDate'];
         }
         
 

+ 2 - 2
public/script/common_wigsout.js

@@ -7,8 +7,8 @@ window.onload = function(){
 //	var yesterday = myGetDate(-1);
 	var today = myGetDate(0);
 	var monthAgo = myGetDate(-30);
-	$(".start_date").val(monthAgo);
-	$(".end_date").val(today);
+	$(".start_date").val(monthAgo+" 00:00:00");
+	$(".end_date").val(today+" 23:59:59");
 	$(".top_start").html(monthAgo);
 	$(".top_end").html(today);
 	getOrdersInit();

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 2 - 0
public/script/laydate.js


BIN
public/script/theme/.DS_Store


BIN
public/script/theme/default/.DS_Store


BIN
public/script/theme/default/font/iconfont.eot


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 45 - 0
public/script/theme/default/font/iconfont.svg


BIN
public/script/theme/default/font/iconfont.ttf


BIN
public/script/theme/default/font/iconfont.woff


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 2 - 0
public/script/theme/default/laydate.css