merge

assets/css/kaifain/detail.scss

@@ -401,7 +401,6 @@
   margin: 0 !important;
   background-color: #fff;
   width: 100vw;
-  height: 100vh;
   overflow-x: hidden;
   overflow-y: scroll;
   -webkit-overflow-scrolling: touch;

components/topics/editor.vue

@@ -62,6 +62,7 @@ export default {
   data() {
     return {
       topicId: "", // 编辑
+      hashID: null,
       title: "",
       subTitle: "",
       content: "",
@@ -105,6 +106,7 @@ export default {
             this.title = topic.title;
             this.subTitle = topic.intro;
             this.content = topic.body;
+            this.hashID = topic.hash_id;
             if (this.cover_url) {
               this.fileList.push({
                 name: "cover_image",
@@ -175,7 +177,7 @@ export default {
               this.$message.success("编辑成功！");
             }
             // TODO go details
-            window.location.href = `/p/${this.topicId}.html`;
+            window.location.href = `/p/${this.hashID}.html`;
           });
       } else {
         this.$axios
@@ -189,7 +191,7 @@ export default {
               this.$message.success("发布成功！");
             }
             // TODO go details
-            window.location.href = `/p/${res.data.id}.html`;
+            window.location.href = `/p/${res.data.hash_id}.html`;
           });
       }
     },

components/user/jishuin/topicCell.vue

@@ -52,7 +52,7 @@
        * 点击文章
        */
       clickArt(art, index) {
-        location.href = `/p/${art.id}.html`;
+        location.href = `/p/${art.hash_id}`;
       },
     }
   };

components/wx_header.vue

@@ -1,6 +1,6 @@
 <template>
   <section class="wx-header">
-    <img class="logo" src="https://stacdn.proginn.com/image/common/logo3@2x.png" alt="icon">
+    <img class="logo" src="https://stacdn.proginn.com/image/common/logo3@2x.png" alt="icon" @click="jumpTo">
     <el-dropdown class="nav-dropdown">
       <el-button class="text" type="text" style="font-size: 18px;">
         <i class="el-icon-tickets" style="width: 40px;"></i>
@@ -33,7 +33,11 @@
 
 <script>
 export default {
-
+  methods: {
+    jumpTo() {
+      location.href = this.$store.state.domainConfig.siteUrl
+    }
+  }
 }
 </script>
 

middleware/initialize.js

@@ -36,7 +36,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))\\.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|kaifain))\\.proginn\\.com(\\:(?<port>\\d+))?",
       "gim"
     );
     console.log(regx);
@@ -59,6 +59,7 @@ export default function (context) {
   let jishuinUrl = "";
   let rooterUrl = "";
   let siteUrl = "";
+  let kaifainUrl = "";
   console.log(groups);
   if (groups) {
     let {
@@ -71,26 +72,32 @@ export default function (context) {
         api = "https://www.proginn.com";
         siteUrl = "https://www.proginn.com";
         jishuinUrl = "https://jishuin.proginn.com";
+        kaifainUrl = "https://kaifain.proginn.com";
         rooterUrl = "https://rooter.proginn.com";
         break;
       case "jishuin":
+      case "kaifain":
         api = "https://jishuin.proginn.com";
         siteUrl = "https://www.proginn.com";
         jishuinUrl = "https://jishuin.proginn.com";
+        kaifainUrl = "https://kaifain.proginn.com";
         rooterUrl = "https://rooter.proginn.com";
         break;
       case "app":
         api = "https://app.proginn.com";
         siteUrl = "https://app.proginn.com";
         jishuinUrl = "https://jishuin.proginn.com";
+        kaifainUrl = "https://kaifain.proginn.com";
         rooterUrl = "https://rooter.proginn.com";
         break;
       case "test":
       case "test-jishuin":
       case "test-rooter":
+      case "test-kaifain":
         api = "https://" + branch + ".test.proginn.com";
         siteUrl = "https://" + branch + ".test.proginn.com";
         jishuinUrl = "https://" + branch + ".test-jishuin.proginn.com";
+        kaifainUrl = "https://" + branch + ".test-kaifain.proginn.com";
         rooterUrl = "https://" + branch + ".test-rooter.proginn.com";
         break;
       case "local":
@@ -98,20 +105,24 @@ export default function (context) {
           api = "http://local.proginn.com";
           siteUrl = "http://local.proginn.com:" + port;
           jishuinUrl = "http://jishuin.local.proginn.com";
+          kaifainUrl = "http://kaifain.local.proginn.com";
           rooterUrl = "http://rooter.local.proginn.com";
         } else {
           api = "http://local.proginn.com";
           siteUrl = "http://local.proginn.com";
           jishuinUrl = "http://jishuin.local.proginn.com";
+          kaifainUrl = "http://kaifain.local.proginn.com";
           rooterUrl = "http://rooter.local.proginn.com";
         }
         break;
       case "prod":
       case "prod-jishuin":
       case "prod-rooter":
+      case "prod-kaifain":
         api = "https://" + branch + ".prod.proginn.com";
         siteUrl = "https://" + branch + ".prod.proginn.com";
         jishuinUrl = "https://" + branch + ".prod-jishuin.proginn.com";
+        kaifainUrl = "https://" + branch + ".prod-kaifain.proginn.com";
         rooterUrl = "https://" + branch + ".prod-rooter.proginn.com";
         break;
       default:
@@ -119,6 +130,7 @@ export default function (context) {
         api = "https://www.proginn.com";
         siteUrl = "https://www.proginn.com";
         jishuinUrl = "https://jishuin.proginn.com";
+        kaifainUrl = "https://kaifain.proginn.com";
         rooterUrl = "https://rooter.proginn.com";
         break;
     }
@@ -127,12 +139,14 @@ export default function (context) {
     api = "https://www.proginn.com";
     siteUrl = "https://www.proginn.com";
     jishuinUrl = "https://jishuin.proginn.com";
+    kaifainUrl = "https://kaifain.proginn.com";
     rooterUrl = "https://rooter.proginn.com";
   }
   context.store.commit("updateDomainConfig", {
     api: api,
     siteUrl: siteUrl,
     jishuinUrl: jishuinUrl,
+    kaifainUrl: kaifainUrl,
     rooterUrl: rooterUrl
   });
   context.store.commit("updateDeviceType", context.app.$deviceType || {});

package.json

@@ -48,7 +48,16 @@
     "nodemon": "^1.18.9",
     "sass-loader": "^7.1.0",
     "style-loader": "^0.23.1",
-    "t2css": "^0.1.6"
+    "t2css": "^0.1.6",
+    "webpack": "^4.43.0",
+    "@babel/core": "^7.10.1",
+    "@babel/compat-data": "^7.10.1",
+    "@babel/plugin-proposal-object-rest-spread": "^7.10.1",
+    "@babel/plugin-transform-runtime": "^7.10.1",
+    "@babel/preset-env": "^7.10.1",
+    "@babel/preset-react": "^7.10.1",
+    "babel-loader": "^8.1.0",
+    "babel-preset-mobx": "^2.0.0"
   },
   "resolutions": {
     "jspdf/file-saver": "1.3.8"

pages/kaifain/detail/_tid/index.vue

@@ -43,9 +43,9 @@
       </div>
       <div class="bannerSelect">
         <div class="cell selected">方案首页</div>
-        <a class="cell" :href="jishuBaseUrl + '/user/collect_article/' + tid">
+        <a class="cell" :href="jishuBaseUrl + '/c/' + detail.hash_id">
           文章({{detail.jishuin && detail.jishuin.topics_count || 0}})</a>
-        <a class="cell" :href="jishuBaseUrl + '/user/collect_article/' + tid + '?type=video'">
+        <a class="cell" :href="jishuBaseUrl + '/c/' + detail.hash_id + '?type=video'">
           视频({{detail.jishuin && detail.jishuin.videos_count || 0}})</a>
       </div>
       <div class="introArea">