点餐页优化

app/admin/controller/sys_manage/RestaurantController.php

@@ -70,6 +70,27 @@ class RestaurantController extends Curd{
         }
         return $model;
     }
+    
+    public function afterQuery($items)
+    {
+        foreach ($items as &$item) {
+            if (!empty($item->dept_extend_json)) {
+                $extendJson = json_decode($item->dept_extend_json, true);
+                $item->dept_week = $extendJson['week'] ?? [];
+                $item->dept_work = [];
+                $deptWork = [];
+                if (!empty($extendJson['times'])) {
+                    $times = explode('~', $extendJson['times']);
+                    $deptWork[] = date('Y-m-d H:i:s', strtotime(date('Y-m-d ') . $times[0]));
+                    $deptWork[] = date('Y-m-d H:i:s', strtotime(date('Y-m-d ') . $times[1]));
+                }
+
+                $item->dept_work = $deptWork;
+            }
+        }
+
+        return $items;
+    }
 
     public function insert(Request $request): Response
     {

app/admin/service/goods/GoodsService.php

@@ -562,12 +562,14 @@ class GoodsService
         $goods = Goods::with('sku')
             ->whereIn('join_goods_category_id',$goodsCategoryIds)
             ->where('goods_status','ON')
-            ->select('goods_id','goods_id as id','goods_name as name','join_goods_category_id as pid','goods_attribute_json','goods_classify')
+            ->select('goods_id','goods_id as id','goods_name as name','join_goods_category_id as pid','goods_attribute_json','goods_classify','goods_sales_price','goods_cover')
             ->orderBy('goods_sort','DESC')
             ->orderBy('goods_addtimes','DESC')
             ->get()
             ->toArray();
         foreach ($goods as &$good) {
+            $good['goods_cover'] = getenv('STORAGE_DOMAIN').$good['goods_cover'];
+            $good['nbr'] = 0;
             if (!empty($good['sku'])) {
                 foreach ($good['sku'] as $key => $sku) {
                     if (!empty($sku['goods_sku_specs_json'])) {