Преглед изворни кода

Merge branch 'master' into feature/1359-BonusTravelCarHouse

kevin_zhangl пре 3 година
родитељ
комит
7d3e0b4d73
2 измењених фајлова са 16 додато и 14 уклоњено
  1. 14 12
      backendEle/src/router/index.js
  2. 2 2
      common/models/forms/ConfigPeriodForm.php

+ 14 - 12
backendEle/src/router/index.js

@@ -1785,18 +1785,20 @@ export const constantRouterMap = [
             {title: '配置', path: '/config/base'},
           ],
         },
-      }, {
-        path: '/config/period',
-        component: _import('config/period'),
-        name: 'config_period',
-        meta: {
-          title: '期数配置',
-          breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '配置', path: '/config/index'},
-          ],
-        },
-      }, {
+      },
+      // {
+      //   path: '/config/period',
+      //   component: _import('config/period'),
+      //   name: 'config_period',
+      //   meta: {
+      //     title: '期数配置',
+      //     breadcrumb: [
+      //       {title: '首页', path: '/dashboard/index'},
+      //       {title: '配置', path: '/config/index'},
+      //     ],
+      //   },
+      // },
+      {
         path: '/config/other',
         component: _import('config/other'),
         name: 'config_other',

+ 2 - 2
common/models/forms/ConfigPeriodForm.php

@@ -83,8 +83,8 @@ class ConfigPeriodForm extends Model
             }
             // 异步重新生成业绩期先注释掉
             // 异步处理添加任务
-            $taskKey = \Yii::$app->swooleAsyncTimer->asyncHandle('config/update-period', \Yii::$app->request->post());
-//            $taskKey = true;
+//            $taskKey = \Yii::$app->swooleAsyncTimer->asyncHandle('config/update-period', \Yii::$app->request->post());
+            $taskKey = false;
             if($taskKey === false){
                 throw new Exception('请求异步服务器失败');
             }