Jelajahi Sumber

增加配置

root 3 tahun lalu
induk
melakukan
296c416ab0

+ 0 - 1
common/config/main.php

@@ -1,7 +1,6 @@
 <?php
 $mainConfig = require_once __DIR__ . '/config.php';
 return [
-    'preparePerfLimit' => $configParams['preparePerfLimit'],
     'language' => 'zh-CN',
     'timeZone' => 'PRC',
     'aliases' => [

+ 1 - 0
common/config/params.php

@@ -1,6 +1,7 @@
 <?php
 $nationParams = require_once __DIR__ . '/params-nation.php';
 return [
+    'preparePerfLimit' => isset($mainConfig['preparePerfLimit']) ? $mainConfig['preparePerfLimit'] : false,
     'adminEmail' => 'admin@example.com',
     'supportEmail' => 'support@example.com',
     'nation' => $nationParams,

+ 5 - 3
frontendApi/modules/v1/controllers/BonusController.php

@@ -111,11 +111,13 @@ class BonusController extends BaseController {
         // 判断是否是周日,并且是否是月结节点
         // 特殊要求,测试环境要去掉是否是周日的判断,周一至周日都能看.正式环境只有周日能看
         // 读取加入到忽略文件的common/config/config.php文件内容
-        // $limit = Yii::$app->params['preparePerfLimit'];
-        // var_dump($limit);exit;
+        $preparePerfLimit = isset(Yii::$app->params['preparePerfLimit']) ? Yii::$app->params['preparePerfLimit'] : false;
         $isCalcMonth = $period->isCalcMonth($periodNum);
         $w = date('w', time());
-        if ($w != '0' || $isCalcMonth != 1) {
+        //特殊要求,测试环境要去掉是否是周日的判断,周一至周日都能看
+        if($preparePerfLimit === true && $isCalcMonth != 1) {
+            return static::notice(['user' => [],'team'=>[]]);
+        } else if ($preparePerfLimit !== true && ($w != '0' || $isCalcMonth != 1)) {
             return static::notice(['user' => [],'team'=>[]]);
         }
         // 判断此业绩期是否已经完成生成了预计算业绩单,生成完毕才能看到

+ 3 - 0
frontendEle/src/views/bonus/teams.vue

@@ -239,4 +239,7 @@
 /deep/ .el-descriptions-item__container {
   margin-top:10px;
 }
+/deep/ .el-descriptions-item__label.has-colon {
+  margin-left:10px;
+}  
 </style>