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