From 0c45349f09d8c3273135b1fdbed6f3ac843d0652 Mon Sep 17 00:00:00 2001
From: tsf <tsf3920322@126.com>
Date: Mon, 16 Mar 2026 20:02:09 +0800
Subject: [PATCH] 260316

---
 application/NewReedaw/controller/app/Card.php | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/application/NewReedaw/controller/app/Card.php b/application/NewReedaw/controller/app/Card.php
index ca26a57..3fe06aa 100644
--- a/application/NewReedaw/controller/app/Card.php
+++ b/application/NewReedaw/controller/app/Card.php
@@ -245,6 +245,17 @@ class Card extends Base{
         $card_data = Db::table($this->card_db_name['card'])->where(['is_del'=>0])->field('id,name,content,page_url_report,is_sub_item,background_color,background_pic,key_word')->cache(10)->select();
         // 根据用户处理卡片信息
         $return_data = [
+            'title'=>[
+                ['name'=>'对比','icon'=>'','page_jump'=>""],
+                ['name'=>'曲线','icon'=>'','page_jump'=>""],
+                ['name'=>'添加','icon'=>'','page_jump'=>""],
+                ['name'=>'历史','icon'=>'','page_jump'=>""]
+            ],
+            'chosen_fixed'=>[
+                ['id'=>'20','name'=>'中招估分','key_word'=>"zz_score",'icon'=>'https://tc.pcxbc.com/new_reedaw/icon/report.png','page_jump'=>'/pages/score/score'],
+                ['id'=>'21','name'=>'BMI测评','key_word'=>"bmi",'icon'=>'https://tc.pcxbc.com/new_reedaw/icon/bmi.png','page_jump'=>'/pageTwo/home/bmi'],
+                ['id'=>'22','name'=>'遗传身高','key_word'=>"heredity",'icon'=>'https://tc.pcxbc.com/new_reedaw/icon/inheritHeighet.png','page_jump'=>'/pageTwo/home/inheritHeighet'],
+            ],
             'chosen_yes'=>[],
             'chosen_no'=>[],
         ];
@@ -258,8 +269,13 @@ class Card extends Base{
         foreach ($user_data['card_order'] as $key => $value) {
             foreach ($card_data as $k => $v) {
                 if(in_array($v['id'],$user_data['card_order']) && $v['id'] == $value){
-                    $return_data['chosen_yes'][] = $v;
-                    unset($card_data[$k]);
+                    if($v['id'] == 20 || $v['id'] == 21 || $v['id'] == 22){
+                        continue;
+                    }else{
+                        $return_data['chosen_yes'][] = $v;
+                        unset($card_data[$k]);
+                    }
+                    
                 }
             }
         }
@@ -286,8 +302,15 @@ class Card extends Base{
         if(!$user_data){
             return $this->msg(10003,'未核实到角色信息');
         }
+        // 查一下卡片数据
         $card_data = Db::table($this->card_db_name['card'])->where("id in (".$data['card_list'].")")->field('id')->cache(86400)->select();
 
+        // // 处理一下数据格式
+        // $card_data_new = [];
+        // foreach ($card_data as $key => $value) {
+        //     $card_data_new[] = $value['id'];
+        // }
+
         if(count(explode(',',$data['card_list']))  == count($card_data)){
             $result = Db::table($this->card_db_name['juese'])->where(['id'=>$data['aud_id'],'is_del'=>0])->update([
                 'card_order' => $data['card_list']