hrjy 3 gadi atpakaļ
vecāks
revīzija
dcc377f8f9

+ 2 - 2
app/api/controller/diagnosis/DiagnosisCateController.php

@@ -37,7 +37,7 @@ class DiagnosisCateController
         $data = UtilService::getMore([
             ['type']
         ]);
-        $list = DiagnosisCate::where('type', $data['type'])->select()->toArray();
+        $list = DiagnosisCate::where('type', $data['type'])->where('status', 1)->select()->toArray();
         return app('json')->successful($list);
     }
 
@@ -52,7 +52,7 @@ class DiagnosisCateController
      */
     public function service(Request $request)
     {
-        $list = DiagnosisService::select()->toArray();
+        $list = DiagnosisService::select()->where('status', 1)->toArray();
         return app('json')->successful($list);
     }
 

+ 2 - 3
app/api/controller/user/CardController.php

@@ -169,9 +169,8 @@ class CardController
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function use_card(Request $request,$id)
+    public function use_card(Request $request)
     {
-        if (!$id) return app('json')->fail('传入id');
         $data = UtilService::postMore([
             ['card'],
             ['pwd']
@@ -200,7 +199,7 @@ class CardController
             {
                 UserEquity::create([
                     'uid' => $request->uid(),
-                    'user_card_id' => $id,
+                    'user_card_id' => $user_card['id'],
                     'c_id' => $item['c_id'],
                     'type' => $item['type'],
                     'number' => $item['number'],