diff --git a/crmeb/app/adminapi/controller/v1/product/StoreCategory.php b/crmeb/app/adminapi/controller/v1/product/StoreCategory.php index e908140c0..3b1c213b1 100644 --- a/crmeb/app/adminapi/controller/v1/product/StoreCategory.php +++ b/crmeb/app/adminapi/controller/v1/product/StoreCategory.php @@ -57,7 +57,11 @@ class StoreCategory extends AuthController /** * 商品分类搜索 + * @param $type * @return mixed + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ public function tree_list($type) { @@ -103,6 +107,9 @@ class StoreCategory extends AuthController /** * 保存新增分类 * @return mixed + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ public function save() { @@ -133,6 +140,9 @@ class StoreCategory extends AuthController * 更新分类 * @param $id * @return mixed + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ public function update($id) { diff --git a/crmeb/app/services/order/StoreOrderServices.php b/crmeb/app/services/order/StoreOrderServices.php index e6c66a9a3..2872f002c 100644 --- a/crmeb/app/services/order/StoreOrderServices.php +++ b/crmeb/app/services/order/StoreOrderServices.php @@ -2638,7 +2638,7 @@ HTML; $data['pay_price'] = $info['pay_price']; $data['pay_postage'] = $info['pay_postage']; - $data['offline_postage'] = sys_config('offline_postage', 0); + $data['offline_postage'] = (int)sys_config('offline_postage', 0); $data['invalid_time'] = $time; break; diff --git a/template/admin/src/pages/marketing/live/add_goods.vue b/template/admin/src/pages/marketing/live/add_goods.vue index 4802fd780..cfb55274f 100644 --- a/template/admin/src/pages/marketing/live/add_goods.vue +++ b/template/admin/src/pages/marketing/live/add_goods.vue @@ -106,7 +106,7 @@ export default { columns1: [ { key: 'id', title: '商品ID' }, { slot: 'img', title: '商品信息' }, - { slot: 'price', title: '直播售价' }, + { key: 'price', title: '直播售价' }, // { // key: 'price', // title: '直播售价',