root 2 éve
szülő
commit
8f864cf9e0
100 módosított fájl, 75 hozzáadás és 71 törlés
  1. 2 2
      backendApi/modules/v1/controllers/AtlasController.php
  2. 3 3
      backendApi/modules/v1/controllers/BaseController.php
  3. 40 40
      backendApi/modules/v1/controllers/BonusController.php
  4. 6 6
      backendApi/modules/v1/controllers/FinanceController.php
  5. 1 1
      backendApi/modules/v1/controllers/LogController.php
  6. 3 3
      backendApi/modules/v1/controllers/ReconsumeController.php
  7. 7 7
      backendApi/modules/v1/controllers/ShopController.php
  8. 9 9
      backendApi/modules/v1/controllers/UserController.php
  9. 0 0
      common/config/i18n.php
  10. 0 0
      common/messages/en-US/app.php
  11. 2 0
      common/messages/en-US/ctx.php
  12. 0 0
      common/messages/zh-CN/app.php
  13. 2 0
      common/messages/zh-CN/ctx.php
  14. 0 0
      common/models/CalcBonusBSDefault.php
  15. 0 0
      common/models/CalcOperation.php
  16. 0 0
      composer.lock
  17. 0 0
      frontendApi/config/menuV2.php
  18. 0 0
      node_modules/.package-lock.json
  19. 0 0
      node_modules/moment/CHANGELOG.md
  20. 0 0
      node_modules/moment/LICENSE
  21. 0 0
      node_modules/moment/README.md
  22. 0 0
      node_modules/moment/dist/locale/af.js
  23. 0 0
      node_modules/moment/dist/locale/ar-dz.js
  24. 0 0
      node_modules/moment/dist/locale/ar-kw.js
  25. 0 0
      node_modules/moment/dist/locale/ar-ly.js
  26. 0 0
      node_modules/moment/dist/locale/ar-ma.js
  27. 0 0
      node_modules/moment/dist/locale/ar-sa.js
  28. 0 0
      node_modules/moment/dist/locale/ar-tn.js
  29. 0 0
      node_modules/moment/dist/locale/ar.js
  30. 0 0
      node_modules/moment/dist/locale/az.js
  31. 0 0
      node_modules/moment/dist/locale/be.js
  32. 0 0
      node_modules/moment/dist/locale/bg.js
  33. 0 0
      node_modules/moment/dist/locale/bm.js
  34. 0 0
      node_modules/moment/dist/locale/bn-bd.js
  35. 0 0
      node_modules/moment/dist/locale/bn.js
  36. 0 0
      node_modules/moment/dist/locale/bo.js
  37. 0 0
      node_modules/moment/dist/locale/br.js
  38. 0 0
      node_modules/moment/dist/locale/bs.js
  39. 0 0
      node_modules/moment/dist/locale/ca.js
  40. 0 0
      node_modules/moment/dist/locale/cs.js
  41. 0 0
      node_modules/moment/dist/locale/cv.js
  42. 0 0
      node_modules/moment/dist/locale/cy.js
  43. 0 0
      node_modules/moment/dist/locale/da.js
  44. 0 0
      node_modules/moment/dist/locale/de-at.js
  45. 0 0
      node_modules/moment/dist/locale/de-ch.js
  46. 0 0
      node_modules/moment/dist/locale/de.js
  47. 0 0
      node_modules/moment/dist/locale/dv.js
  48. 0 0
      node_modules/moment/dist/locale/el.js
  49. 0 0
      node_modules/moment/dist/locale/en-au.js
  50. 0 0
      node_modules/moment/dist/locale/en-ca.js
  51. 0 0
      node_modules/moment/dist/locale/en-gb.js
  52. 0 0
      node_modules/moment/dist/locale/en-ie.js
  53. 0 0
      node_modules/moment/dist/locale/en-il.js
  54. 0 0
      node_modules/moment/dist/locale/en-in.js
  55. 0 0
      node_modules/moment/dist/locale/en-nz.js
  56. 0 0
      node_modules/moment/dist/locale/en-sg.js
  57. 0 0
      node_modules/moment/dist/locale/eo.js
  58. 0 0
      node_modules/moment/dist/locale/es-do.js
  59. 0 0
      node_modules/moment/dist/locale/es-mx.js
  60. 0 0
      node_modules/moment/dist/locale/es-us.js
  61. 0 0
      node_modules/moment/dist/locale/es.js
  62. 0 0
      node_modules/moment/dist/locale/et.js
  63. 0 0
      node_modules/moment/dist/locale/eu.js
  64. 0 0
      node_modules/moment/dist/locale/fa.js
  65. 0 0
      node_modules/moment/dist/locale/fi.js
  66. 0 0
      node_modules/moment/dist/locale/fil.js
  67. 0 0
      node_modules/moment/dist/locale/fo.js
  68. 0 0
      node_modules/moment/dist/locale/fr-ca.js
  69. 0 0
      node_modules/moment/dist/locale/fr-ch.js
  70. 0 0
      node_modules/moment/dist/locale/fr.js
  71. 0 0
      node_modules/moment/dist/locale/fy.js
  72. 0 0
      node_modules/moment/dist/locale/ga.js
  73. 0 0
      node_modules/moment/dist/locale/gd.js
  74. 0 0
      node_modules/moment/dist/locale/gl.js
  75. 0 0
      node_modules/moment/dist/locale/gom-deva.js
  76. 0 0
      node_modules/moment/dist/locale/gom-latn.js
  77. 0 0
      node_modules/moment/dist/locale/gu.js
  78. 0 0
      node_modules/moment/dist/locale/he.js
  79. 0 0
      node_modules/moment/dist/locale/hi.js
  80. 0 0
      node_modules/moment/dist/locale/hr.js
  81. 0 0
      node_modules/moment/dist/locale/hu.js
  82. 0 0
      node_modules/moment/dist/locale/hy-am.js
  83. 0 0
      node_modules/moment/dist/locale/id.js
  84. 0 0
      node_modules/moment/dist/locale/is.js
  85. 0 0
      node_modules/moment/dist/locale/it-ch.js
  86. 0 0
      node_modules/moment/dist/locale/it.js
  87. 0 0
      node_modules/moment/dist/locale/ja.js
  88. 0 0
      node_modules/moment/dist/locale/jv.js
  89. 0 0
      node_modules/moment/dist/locale/ka.js
  90. 0 0
      node_modules/moment/dist/locale/kk.js
  91. 0 0
      node_modules/moment/dist/locale/km.js
  92. 0 0
      node_modules/moment/dist/locale/kn.js
  93. 0 0
      node_modules/moment/dist/locale/ko.js
  94. 0 0
      node_modules/moment/dist/locale/ku.js
  95. 0 0
      node_modules/moment/dist/locale/ky.js
  96. 0 0
      node_modules/moment/dist/locale/lb.js
  97. 0 0
      node_modules/moment/dist/locale/lo.js
  98. 0 0
      node_modules/moment/dist/locale/lt.js
  99. 0 0
      node_modules/moment/dist/locale/lv.js
  100. 0 0
      node_modules/moment/dist/locale/me.js

+ 2 - 2
backendApi/modules/v1/controllers/AtlasController.php

@@ -149,7 +149,7 @@ class AtlasController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -214,7 +214,7 @@ class AtlasController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**

+ 3 - 3
backendApi/modules/v1/controllers/BaseController.php

@@ -226,7 +226,7 @@ class BaseController extends \yii\rest\ActiveController {
             if ($isDelData) {
                 // 真实删除数据
                 if (!$modelClass::deleteAll($condition, $params)) {
-                    throw new Exception('failed to delete');//删除失败
+                    throw new Exception(Yii::t('ctx', 'deleteFailed'));//删除失败 
                 }
             } else {
                 // 设置IS_DEL字段为1
@@ -234,7 +234,7 @@ class BaseController extends \yii\rest\ActiveController {
             }
             if ($afterFun) $afterFun($selected);
             $transaction->commit();
-            return self::notice('delete successfully');//删除成功
+            return self::notice(Yii::t('ctx', 'deleteSuccessfully'));//删除成功
         } catch (Exception $e) {
             $transaction->rollBack();
             return self::notice($e->getMessage(), 500);
@@ -320,7 +320,7 @@ class BaseController extends \yii\rest\ActiveController {
                 reset($getValueArr);
                 if($filterModel == 'date'){
                     if( $getSymbol !== '>=' && $getSymbol !== '<=' && $getSymbol !== '>' && $getSymbol !== '<' ) {
-                        throw new \Exception("Incorrect date format");//日期筛选格式不对
+                        throw new \Exception(Yii::t('ctx', 'incorrectDateFormat'));//日期筛选格式不对
                     }
                     $bindValue = strtotime($getValueArr[1]);
                     $isDate = true;

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

@@ -292,7 +292,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -347,7 +347,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
 
@@ -399,7 +399,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
 
@@ -455,7 +455,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -510,7 +510,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -567,7 +567,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -624,7 +624,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -675,7 +675,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -828,7 +828,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -910,7 +910,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1069,7 +1069,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1112,7 +1112,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1162,7 +1162,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1212,7 +1212,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
 
@@ -1263,7 +1263,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1313,7 +1313,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1363,7 +1363,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1413,7 +1413,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1463,7 +1463,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1513,7 +1513,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
 
@@ -1564,7 +1564,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1614,7 +1614,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1664,7 +1664,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1714,7 +1714,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1764,7 +1764,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1814,7 +1814,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
 
@@ -1865,7 +1865,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1915,7 +1915,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -2028,7 +2028,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -2106,7 +2106,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -2200,7 +2200,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -2270,7 +2270,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -2330,7 +2330,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -2390,7 +2390,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -2464,7 +2464,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -2508,7 +2508,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -2554,7 +2554,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -2598,7 +2598,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
 
@@ -2645,7 +2645,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
 
@@ -2774,7 +2774,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**

+ 6 - 6
backendApi/modules/v1/controllers/FinanceController.php

@@ -129,7 +129,7 @@ class FinanceController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -311,7 +311,7 @@ class FinanceController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -479,7 +479,7 @@ class FinanceController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -745,7 +745,7 @@ class FinanceController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1082,7 +1082,7 @@ class FinanceController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1128,7 +1128,7 @@ class FinanceController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**

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

@@ -100,7 +100,7 @@ class LogController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**

+ 3 - 3
backendApi/modules/v1/controllers/ReconsumeController.php

@@ -68,7 +68,7 @@ class ReconsumeController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -123,7 +123,7 @@ class ReconsumeController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -391,7 +391,7 @@ class ReconsumeController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**

+ 7 - 7
backendApi/modules/v1/controllers/ShopController.php

@@ -97,7 +97,7 @@ class ShopController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(\Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -356,7 +356,7 @@ class ShopController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(\Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     // 删除订单
@@ -421,7 +421,7 @@ class ShopController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(\Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -694,7 +694,7 @@ class ShopController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(\Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -723,7 +723,7 @@ class ShopController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(\Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -817,7 +817,7 @@ class ShopController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(\Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -844,6 +844,6 @@ class ShopController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(\Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 }

+ 9 - 9
backendApi/modules/v1/controllers/UserController.php

@@ -213,7 +213,7 @@ class UserController extends BaseController
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -326,7 +326,7 @@ class UserController extends BaseController
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -453,7 +453,7 @@ class UserController extends BaseController
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -574,7 +574,7 @@ class UserController extends BaseController
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -687,7 +687,7 @@ class UserController extends BaseController
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -755,7 +755,7 @@ class UserController extends BaseController
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1917,7 +1917,7 @@ class UserController extends BaseController
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -2214,7 +2214,7 @@ class UserController extends BaseController
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -2368,6 +2368,6 @@ class UserController extends BaseController
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 }

+ 0 - 0
common/config/i18n.php


+ 0 - 0
common/messages/en-US/app.php


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

@@ -1,6 +1,8 @@
 <?php
 return [
     # 公用
+    'startExporting'=> 'Starting exporting, please go to File Management - Export Files to view.',
+    'incorrectDateFormat' => 'Incorrect date format',
     'notConnection' => 'Connection not operated for too long',
     'deleteFailed' => 'failed to delete',
     'deleteSuccessfully' => 'delete successfully',

+ 0 - 0
common/messages/zh-CN/app.php


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

@@ -1,6 +1,8 @@
 <?php
 return [
     # 公用
+    'startExporting'=> '导出开始,请到文件管理-导出文件查看',
+    'incorrectDateFormat' => '日期筛选格式不对',
     'notConnection' => '长时间未操作',
     'deleteFailed' => '删除失败',
     'deleteSuccessfully' => '删除成功',

+ 0 - 0
common/models/CalcBonusBSDefault.php


+ 0 - 0
common/models/CalcOperation.php


+ 0 - 0
composer.lock


+ 0 - 0
frontendApi/config/menuV2.php


+ 0 - 0
node_modules/.package-lock.json


+ 0 - 0
node_modules/moment/CHANGELOG.md


+ 0 - 0
node_modules/moment/LICENSE


+ 0 - 0
node_modules/moment/README.md


+ 0 - 0
node_modules/moment/dist/locale/af.js


+ 0 - 0
node_modules/moment/dist/locale/ar-dz.js


+ 0 - 0
node_modules/moment/dist/locale/ar-kw.js


+ 0 - 0
node_modules/moment/dist/locale/ar-ly.js


+ 0 - 0
node_modules/moment/dist/locale/ar-ma.js


+ 0 - 0
node_modules/moment/dist/locale/ar-sa.js


+ 0 - 0
node_modules/moment/dist/locale/ar-tn.js


+ 0 - 0
node_modules/moment/dist/locale/ar.js


+ 0 - 0
node_modules/moment/dist/locale/az.js


+ 0 - 0
node_modules/moment/dist/locale/be.js


+ 0 - 0
node_modules/moment/dist/locale/bg.js


+ 0 - 0
node_modules/moment/dist/locale/bm.js


+ 0 - 0
node_modules/moment/dist/locale/bn-bd.js


+ 0 - 0
node_modules/moment/dist/locale/bn.js


+ 0 - 0
node_modules/moment/dist/locale/bo.js


+ 0 - 0
node_modules/moment/dist/locale/br.js


+ 0 - 0
node_modules/moment/dist/locale/bs.js


+ 0 - 0
node_modules/moment/dist/locale/ca.js


+ 0 - 0
node_modules/moment/dist/locale/cs.js


+ 0 - 0
node_modules/moment/dist/locale/cv.js


+ 0 - 0
node_modules/moment/dist/locale/cy.js


+ 0 - 0
node_modules/moment/dist/locale/da.js


+ 0 - 0
node_modules/moment/dist/locale/de-at.js


+ 0 - 0
node_modules/moment/dist/locale/de-ch.js


+ 0 - 0
node_modules/moment/dist/locale/de.js


+ 0 - 0
node_modules/moment/dist/locale/dv.js


+ 0 - 0
node_modules/moment/dist/locale/el.js


+ 0 - 0
node_modules/moment/dist/locale/en-au.js


+ 0 - 0
node_modules/moment/dist/locale/en-ca.js


+ 0 - 0
node_modules/moment/dist/locale/en-gb.js


+ 0 - 0
node_modules/moment/dist/locale/en-ie.js


+ 0 - 0
node_modules/moment/dist/locale/en-il.js


+ 0 - 0
node_modules/moment/dist/locale/en-in.js


+ 0 - 0
node_modules/moment/dist/locale/en-nz.js


+ 0 - 0
node_modules/moment/dist/locale/en-sg.js


+ 0 - 0
node_modules/moment/dist/locale/eo.js


+ 0 - 0
node_modules/moment/dist/locale/es-do.js


+ 0 - 0
node_modules/moment/dist/locale/es-mx.js


+ 0 - 0
node_modules/moment/dist/locale/es-us.js


+ 0 - 0
node_modules/moment/dist/locale/es.js


+ 0 - 0
node_modules/moment/dist/locale/et.js


+ 0 - 0
node_modules/moment/dist/locale/eu.js


+ 0 - 0
node_modules/moment/dist/locale/fa.js


+ 0 - 0
node_modules/moment/dist/locale/fi.js


+ 0 - 0
node_modules/moment/dist/locale/fil.js


+ 0 - 0
node_modules/moment/dist/locale/fo.js


+ 0 - 0
node_modules/moment/dist/locale/fr-ca.js


+ 0 - 0
node_modules/moment/dist/locale/fr-ch.js


+ 0 - 0
node_modules/moment/dist/locale/fr.js


+ 0 - 0
node_modules/moment/dist/locale/fy.js


+ 0 - 0
node_modules/moment/dist/locale/ga.js


+ 0 - 0
node_modules/moment/dist/locale/gd.js


+ 0 - 0
node_modules/moment/dist/locale/gl.js


+ 0 - 0
node_modules/moment/dist/locale/gom-deva.js


+ 0 - 0
node_modules/moment/dist/locale/gom-latn.js


+ 0 - 0
node_modules/moment/dist/locale/gu.js


+ 0 - 0
node_modules/moment/dist/locale/he.js


+ 0 - 0
node_modules/moment/dist/locale/hi.js


+ 0 - 0
node_modules/moment/dist/locale/hr.js


+ 0 - 0
node_modules/moment/dist/locale/hu.js


+ 0 - 0
node_modules/moment/dist/locale/hy-am.js


+ 0 - 0
node_modules/moment/dist/locale/id.js


+ 0 - 0
node_modules/moment/dist/locale/is.js


+ 0 - 0
node_modules/moment/dist/locale/it-ch.js


+ 0 - 0
node_modules/moment/dist/locale/it.js


+ 0 - 0
node_modules/moment/dist/locale/ja.js


+ 0 - 0
node_modules/moment/dist/locale/jv.js


+ 0 - 0
node_modules/moment/dist/locale/ka.js


+ 0 - 0
node_modules/moment/dist/locale/kk.js


+ 0 - 0
node_modules/moment/dist/locale/km.js


+ 0 - 0
node_modules/moment/dist/locale/kn.js


+ 0 - 0
node_modules/moment/dist/locale/ko.js


+ 0 - 0
node_modules/moment/dist/locale/ku.js


+ 0 - 0
node_modules/moment/dist/locale/ky.js


+ 0 - 0
node_modules/moment/dist/locale/lb.js


+ 0 - 0
node_modules/moment/dist/locale/lo.js


+ 0 - 0
node_modules/moment/dist/locale/lt.js


+ 0 - 0
node_modules/moment/dist/locale/lv.js


+ 0 - 0
node_modules/moment/dist/locale/me.js


Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott