parent
commit
00ebcb43ce
2 changed files with 5 additions and 9 deletions
  1. 1
    5
      app/Http/Controllers/Api/ProjectController.php
  2. 4
    4
      app/Models/Project.php

+ 1
- 5
app/Http/Controllers/Api/ProjectController.php View File

82
         $result = [
82
         $result = [
83
             "name" => $project->getTranslation("name", $locale),
83
             "name" => $project->getTranslation("name", $locale),
84
             "subName" => $project->getTranslation("sub_name", $locale),
84
             "subName" => $project->getTranslation("sub_name", $locale),
85
-            "description" => $project->getTranslation("description", $locale),
85
+            "sub_name" => $project->getTranslation("sub_name", $locale),
86
             "images" => $project->img_list,
86
             "images" => $project->img_list,
87
-            "metaTitle" => $project->getTranslation("meta_title", $locale),
88
-            "metaKeyword" => $project->getTranslation("meta_keyword", $locale),
89
-            "metaDesc" => $project->getTranslation("meta_description", $locale),
90
-            "metaImg" => $project->meta_img,
91
             "region_id" => $project->region_id,
87
             "region_id" => $project->region_id,
92
             "region" => $project->region->getTranslation("name", $locale),
88
             "region" => $project->region->getTranslation("name", $locale),
93
             "address" => $project->getTranslation("address", $locale),
89
             "address" => $project->getTranslation("address", $locale),

+ 4
- 4
app/Models/Project.php View File

103
             foreach($this->badges as $badge){
103
             foreach($this->badges as $badge){
104
                 $badges[] = [
104
                 $badges[] = [
105
                     "imgUrl" => $badge->imgUrlLink,
105
                     "imgUrl" => $badge->imgUrlLink,
106
-                    "name" => $badge->getTranslation("name", $locale),
106
+                    "name" => $badge->getTranslation("title", $locale),
107
                     "rewardYear" => "取得年份 : " . $badge->reward_year
107
                     "rewardYear" => "取得年份 : " . $badge->reward_year
108
                 ];
108
                 ];
109
             }
109
             }
117
         $badges = [];
117
         $badges = [];
118
         switch($badgeType){
118
         switch($badgeType){
119
             case "1":
119
             case "1":
120
-                $badgesData = $this->targetBadges();
120
+                $badgesData = $this->targetBadges;
121
                 foreach($badgesData as $badge){
121
                 foreach($badgesData as $badge){
122
                     $badges[] = [
122
                     $badges[] = [
123
                         "imgUrl" => $badge->imgUrlLink,
123
                         "imgUrl" => $badge->imgUrlLink,
127
                 }
127
                 }
128
                 break;
128
                 break;
129
             case "2":
129
             case "2":
130
-                $badgesData = $this->awardBadges();
130
+                $badgesData = $this->awardBadges;
131
                 foreach($badgesData as $badge){
131
                 foreach($badgesData as $badge){
132
                     $badges[] = [
132
                     $badges[] = [
133
                         "imgUrl" => $badge->imgUrlLink,
133
                         "imgUrl" => $badge->imgUrlLink,
134
-                        "name" => $badge->getTranslation("name", $locale),
134
+                        "name" => $badge->getTranslation("title", $locale),
135
                         "rewardYear" => "取得年份 : " . $badge->award_date
135
                         "rewardYear" => "取得年份 : " . $badge->award_date
136
                     ];
136
                     ];
137
                 }
137
                 }