From 2f854cd97488634842e82f92f36033290ee3eeab Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 7 Aug 2023 17:02:11 +0800 Subject: [PATCH] 1 --- doc/_common.py | 2 +- webapp/controller/MallController.class.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/_common.py b/doc/_common.py index a5f3af1d..6d293429 100644 --- a/doc/_common.py +++ b/doc/_common.py @@ -1322,5 +1322,5 @@ class MallGoods(object): ['selltime', 0, '上架时间'], ['updatetime', 0, '修改时间(更新价格等)'], ['cancel_countdown', 0, '可下架时间倒计时:-1不可下架'], - ['modifytime_countdown', 0, '可修改价格倒计时:-1不可修改价格'], + ['modify_countdown', 0, '可修改价格倒计时:-1不可修改价格'], ] diff --git a/webapp/controller/MallController.class.php b/webapp/controller/MallController.class.php index 2bf95579..3a2f99f1 100644 --- a/webapp/controller/MallController.class.php +++ b/webapp/controller/MallController.class.php @@ -46,6 +46,8 @@ class MallController extends BaseAuthedController { ), //'orderBy' => $orderBy, 'handle' => function ($row) use(&$out) { + $cancelCd = -1; + $modifyCd = -1; array_push($out['rows'], array( 'goods_uuid' => $row['goods_uuid'], @@ -55,6 +57,8 @@ class MallController extends BaseAuthedController { 'item_num' => $row['item_num'], 'currency' => $row['currency'], 'price' => $row['price'], + 'cancel_countdown' => $cancelCd, + 'modify_countdown' => $modifyCd )); } ),