瀏覽代碼

Merge branch 'master' into dev

lushuncheng 5 年之前
父節點
當前提交
57fd3483d0
共有 2 個文件被更改,包括 525 次插入510 次删除
  1. 9 3
      middleware/initialize.js
  2. 516 507
      pages/job/detail/_id.vue

+ 9 - 3
middleware/initialize.js

@@ -39,7 +39,7 @@ export default function (context) {
   let groups = {}
   try {
     let regx = new RegExp(
-      "((?<branch>[a-z0-9_\\-]+)\\.)?(?<env>(www|prod|test|local|test-rooter|test-jishuin|prod-rooter|prod-jishuin|rooter|jishuin|app|test-kaifain|prod-kaifain|kaifain|test-job|job|prod-job|local-rooter|local-job|local-jishuin|local-kaifain))\\.proginn\\.com(\\:(?<port>\\d+))?",
+      "((?<branch>[a-z0-9_\\-]+)\\.)?(?<env>(www|prod|test|local|test-rooter|test-jishuin|prod-rooter|prod-jishuin|rooter|jishuin|app|test-kaifain|prod-kaifain|test-job|job|prod-job|local-rooter|local-job|local-jishuin|local-kaifain))\\.proginn\\.com(\\:(?<port>\\d+))?",
       "gim"
     );
     // console.log(regx);
@@ -84,8 +84,6 @@ export default function (context) {
         jobUrl = "https://job.proginn.com";
         break;
       case "jishuin":
-      case "kaifain":
-      case "job":
         api = "https://jishuin.proginn.com";
         siteUrl = "https://www.proginn.com";
         jishuinUrl = "https://jishuin.proginn.com";
@@ -93,6 +91,14 @@ export default function (context) {
         rooterUrl = "https://rooter.proginn.com";
         jobUrl = "https://job.proginn.com";
         break;
+      case "job":
+        api = "https://job.proginn.com";
+        siteUrl = "https://www.proginn.com";
+        jishuinUrl = "https://jishuin.proginn.com";
+        kaifainUrl = "https://kaifain.proginn.com";
+        rooterUrl = "https://rooter.proginn.com";
+        jobUrl = "https://job.proginn.com";
+        break;
       case "app":
         api = "https://app.proginn.com";
         siteUrl = "https://app.proginn.com";

文件差異過大導致無法顯示
+ 516 - 507
pages/job/detail/_id.vue