Skip to content

Commit

Permalink
产品模型初始化bug修复
Browse files Browse the repository at this point in the history
测试数据文件时间格式修改
  • Loading branch information
nangge committed Apr 11, 2018
1 parent 7c0e277 commit 05b55f1
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion application/admin/controller/Product.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public function initialize()
{
parent::initialize();
$catgeroy = Category::where('modelid', 3)->order('id ASC')->select();
$this->assign('category', create_tree($catgeroy));
$this->assign('category', create_tree($catgeroy->toArray()));
}

/**
Expand Down
4 changes: 2 additions & 2 deletions public/install/inc/nonecms.sql
Original file line number Diff line number Diff line change
Expand Up @@ -350,8 +350,8 @@ CREATE TABLE `#none#_product` (
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;


DROP TABLE IF EXISTS `#none#_chat`;
CREATE TABLE `none_chat` (
DROP TABLE IF EXISTS `none_chat`;
CREATE TABLE `#none#_chat` (
`id` int(10) NOT NULL AUTO_INCREMENT,
`type` varchar(10) NOT NULL DEFAULT '' COMMENT '消息类型 say:广播;prisay:私聊',
`content` varchar(255) NOT NULL DEFAULT '' COMMENT '消息内容',
Expand Down
10 changes: 5 additions & 5 deletions public/install/inc/nonecms_data.sql
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ CREATE TABLE `#none#_admin` (
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;


DROP TABLE IF EXISTS `#none#_chat`;
CREATE TABLE `none_chat` (
DROP TABLE IF EXISTS `none_chat`;
CREATE TABLE `#none#_chat` (
`id` int(10) NOT NULL AUTO_INCREMENT,
`type` varchar(10) NOT NULL DEFAULT '' COMMENT '消息类型 say:广播;prisay:私聊',
`content` varchar(255) NOT NULL DEFAULT '' COMMENT '消息内容',
Expand Down Expand Up @@ -157,8 +157,8 @@ CREATE TABLE `#none#_banner` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`title` varchar(255) NOT NULL DEFAULT '' COMMENT 'banner 标题',
`type` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'banner 类型 1:banner大图;2:广告',
`start_time` datetime DEFAULT NULL COMMENT '广告开始时间',
`end_time` datetime DEFAULT NULL COMMENT '广告结束时间',
`start_time` int(10) DEFAULT NULL COMMENT '广告开始时间',
`end_time` ing(10) DEFAULT NULL COMMENT '广告结束时间',
`status` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否删除 0:否;1:是',
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
Expand Down Expand Up @@ -272,7 +272,7 @@ CREATE TABLE `#none#_comment` (
`email` varchar(255) DEFAULT '' COMMENT 'email',
`qq` varchar(15) DEFAULT '' COMMENT 'qq',
`content` varchar(255) NOT NULL COMMENT '留言内容',
`create_time` datetime NOT NULL COMMENT '创建时间',
`create_time` int(10) NOT NULL COMMENT '创建时间',
`rid` int(10) DEFAULT '0' COMMENT '回复id',
`status` tinyint(1) NOT NULL DEFAULT '0' COMMENT '评论状态 1:已删除',
`uid` int(10) DEFAULT '0' COMMENT '用户id',
Expand Down

0 comments on commit 05b55f1

Please sign in to comment.