Explorar o código

feat: NG-15: 新会员注册时增加国家与语言选项.

zhangl hai 1 ano
pai
achega
a31acd6ca6

+ 1 - 1
backendApi/modules/v1/controllers/BonusController.php

@@ -105,7 +105,7 @@ class BonusController extends BaseController {
         $params = $filter['params'];
         $periodObj = Period::instance();
         $nowPeriodNum = $periodObj->getNowPeriodNum();
-        $condition .= ' AND PERIOD_NUM<=:PERIOD_NUM';
+        $condition .= ' AND PERIOD_NUM<=:PERIOD_NUM AND STATUS=1';
         $params[':PERIOD_NUM'] = $nowPeriodNum;
         $data = Period::lists($condition, $params, ['orderBy' => 'PERIOD_NUM DESC']);
         foreach ($data['list'] as $key => $value) {

+ 1 - 0
common/messages/en-US/ctx.php

@@ -688,6 +688,7 @@ return [
     'dbDeclarationLevelElite' => 'Elite',
     'dbDeclarationLevelPro' => 'Pro',
     'dbDeclarationLevelVip' => 'Vip',
+    'dbDeclarationLevelNa' => 'NA',
     'dbDeclarationLevelSilver' => 'Silver',
     'dbDeclarationLevelGold' => 'Gold',
     # 管理星级

+ 3 - 2
common/messages/zh-CN/ctx.php

@@ -692,8 +692,9 @@ return [
     'dbDeclarationLevelElite' => 'Elite',
     'dbDeclarationLevelPro' => 'Pro',
     'dbDeclarationLevelVip' => 'Vip',
-    'dbDeclarationLevelSilver' => 'Silver',
-    'dbDeclarationLevelGold' => 'Gold',
+    'dbDeclarationLevelNa' => '无级别',
+    'dbDeclarationLevelSilver' => '银卡',
+    'dbDeclarationLevelGold' => '金卡',
     # 管理星级
     'dbEmployLevelNoRank' => '无',
     'dbEmployLevel1StarDirector'  => '1星管理',