Browse Source

完善功能

gorden 10 months ago
parent
commit
848c87903c

+ 1 - 0
app/admin/controller/medical/SalesmanController.php

@@ -74,6 +74,7 @@ class SalesmanController extends Curd
     protected function afterQuery($items)
     {
         foreach ($items as &$item) {
+            $item->salesman_status = strval($item->salesman_status);
             unset($item->salesman_password);
         }
 

+ 3 - 0
app/admin/controller/medical/ShopController.php

@@ -96,11 +96,14 @@ class ShopController extends Curd
     {
         foreach ($items as &$item) {
             $item->shop_logo = getenv('STORAGE_DOMAIN').$item->shop_logo;
+            $item->timeFormat = '';
             if (!empty($item->shop_business_hours)){
                 $shopBusinessHoursArr = explode('~', $item->shop_business_hours);
                 foreach ($shopBusinessHoursArr as $key => $v){
+                    $item->timeFormat .= $v.'~';
                     $shopBusinessHoursArr[$key] = date("Y-m-d\TH:i:s\Z",strtotime(date('Y-m-d ').$v)-8*3600);
                 }
+                $item->timeFormat = rtrim($item->timeFormat,'~');
                 $item->shop_business_hours = $shopBusinessHoursArr;
             }
 

+ 1 - 1
app/admin/controller/sys_manage/QuestionController.php

@@ -92,7 +92,7 @@ class QuestionController extends Curd
                     ];
                 }
             }
-            usort($question, function ($a, $b) {
+            usort($contentConfigJson, function ($a, $b) {
                 return $a['field'] - $b['field'];
             });