diff --git a/doc/_common.py b/doc/_common.py index 26a465b6..a5f3af1d 100644 --- a/doc/_common.py +++ b/doc/_common.py @@ -1319,4 +1319,8 @@ class MallGoods(object): ['item_num', '', '道具数量'], ['currency', '', "选用币种 目前只支持CEG USDC USDT"], ['price', '', '出售价格'], + ['selltime', 0, '上架时间'], + ['updatetime', 0, '修改时间(更新价格等)'], + ['cancel_countdown', 0, '可下架时间倒计时:-1不可下架'], + ['modifytime_countdown', 0, '可修改价格倒计时:-1不可修改价格'], ] diff --git a/sql/gamedb.sql b/sql/gamedb.sql index 68a99da2..f30195a2 100644 --- a/sql/gamedb.sql +++ b/sql/gamedb.sql @@ -1417,7 +1417,7 @@ DROP TABLE IF EXISTS `t_mall_buy_record`; CREATE TABLE `t_mall_buy_record` ( `idx` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增id', `order_id` varchar(255) NOT NULL DEFAULT '' COMMENT '订单id', - `buyer` varchar(60) NOT NULL DEFAULT '' COMMENT 'seller', + `buyer` varchar(60) NOT NULL DEFAULT '' COMMENT 'buyer', `price` varchar(255) NOT NULL DEFAULT '' COMMENT 'price', `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', diff --git a/webapp/controller/MallController.class.php b/webapp/controller/MallController.class.php index 7bb0074e..2bf95579 100644 --- a/webapp/controller/MallController.class.php +++ b/webapp/controller/MallController.class.php @@ -38,7 +38,7 @@ class MallController extends BaseAuthedController { ), array( 'page' => $page, - 'perPage' => 10, + 'perPage' => 6, 'filter' => array( 'data' => $queryData, 'fields' => array( diff --git a/webapp/controller/MarketController.class.php b/webapp/controller/MarketController.class.php index ede73a00..1d2ac2b4 100644 --- a/webapp/controller/MarketController.class.php +++ b/webapp/controller/MarketController.class.php @@ -44,7 +44,7 @@ class MarketController extends BaseAuthedController { ), array( 'page' => $page, - 'perPage' => 10, + 'perPage' => 6, 'filter' => array( 'data' => $queryData, 'fields' => array(