From 5eb55d91956941fca8018992763a34dc73af20bc Mon Sep 17 00:00:00 2001
From: molong <ycgpp@126.com>
Date: Wed, 9 May 2018 11:03:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=95=B0=E6=8D=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=97=B6=E6=97=B6=E9=97=B4=E7=A9=BA=E9=97=B4=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=9B=B4=E6=96=B0=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/common/model/BaseModel.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/application/common/model/BaseModel.php b/application/common/model/BaseModel.php
index 2957eff7..99af5242 100644
--- a/application/common/model/BaseModel.php
+++ b/application/common/model/BaseModel.php
@@ -20,8 +20,8 @@ class BaseModel {
 
 	protected $data;
 	protected $autoWriteTimestamp = true;
-	protected $auto               = array('update_time');
-	protected $insert             = array('create_time');
+	protected $auto               = array();
+	protected $insert             = array();
 	protected $update             = array();
 	// 创建时间字段
 	protected $createTime = 'create_time';
@@ -60,6 +60,13 @@ class BaseModel {
 			if ($value['is_must'] == 1 && $value['is_show'] == 0) {
 				$this->data[$value['name']] = $value['value'];
 			}
+			if ($value['type'] == 'datetime' || $value['type'] == 'date') {
+				if (isset($data[$value['name']]) && $data[$value['name']]) {
+					$this->data[$value['name']] = strtotime($data[$value['name']]);
+				}else{
+					$this->data[$value['name']] = time();
+				}
+			}
 		}
 		$this->autoCompleteData($this->auto);
 		if (!empty($where)) {