diff --git a/app/Admin/Forms/Settings/App.php b/app/Admin/Forms/Settings/App.php index f20b2bbf..8c9d3318 100644 --- a/app/Admin/Forms/Settings/App.php +++ b/app/Admin/Forms/Settings/App.php @@ -41,6 +41,7 @@ class App extends Form $this->text('app_name', 'APP名称')->value($appSettings['app_name'] ?? ''); $this->divider(); $this->text('search_hot_keys', '搜索热词(英文半角逗号隔开)')->value($appSettings['search_hot_keys'] ?? ''); + $this->text('invite_uri', '分享邀请地址(链接)')->value($appSettings['invite_uri'] ?? ''); $this->divider(); $this->number('order_payment_expires_at', '订单支付过期时间(秒)')->value($appSettings['order_payment_expires_at'] ?? ''); $this->number('order_auto_complete_days', '订单自动完成时间(天)')->value($appSettings['order_auto_complete_days'] ?? ''); @@ -59,8 +60,5 @@ class App extends Form $this->text('article_about_us', '关于我们文章指定(链接)')->value($appSettings['article_about_us'] ?? ''); $this->text('article_user_promotion_agreement', '服务协议文章指定(链接)')->value($appSettings['article_user_promotion_agreement'] ?? ''); $this->text('article_user_hide_agreement', '隐私协议文章指定(链接)')->value($appSettings['article_user_hide_agreement'] ?? ''); - $this->divider(); - - $this->text('invite_uri', '分享邀请地址(链接)')->value($appSettings['invite_uri'] ?? ''); } } diff --git a/app/Endpoint/Api/Http/Resources/AfterSaleResource.php b/app/Endpoint/Api/Http/Resources/AfterSaleResource.php index bfa02116..551df281 100644 --- a/app/Endpoint/Api/Http/Resources/AfterSaleResource.php +++ b/app/Endpoint/Api/Http/Resources/AfterSaleResource.php @@ -17,11 +17,13 @@ class AfterSaleResource extends JsonResource return [ 'id' => $this->id, 'order_sn' => $this->order->sn, + 'order_total_amount' => $this->order->total_amount, 'product'=>[ 'name' => $this->orderProduct->name, 'cover' => $this->orderProduct->cover, 'sell_price' => bcdiv($this->orderProduct->total_amount, $this->orderProduct->quantity * 100, 2), 'num'=> $this->num, + 'is_gift' => $this->orderProduct->isGift(), ], 'state' => $this->after_sale_state, 'type' => $this->type,