Merge remote-tracking branch 'remotes/origin/developer' into developerB

.gitignore

@@ -1,11 +1,8 @@
 HELP.md
-/target/**/
-/target/*.original
-!target/*.jar
-!/target/*.jar
+target/
 !.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**
-!**/src/test/**
+!**/src/main/**/target/
+!**/src/test/**/target/
 
 ### STS ###
 .apt_generated
@@ -29,49 +26,8 @@ HELP.md
 /nbdist/
 /.nb-gradle/
 build/
+!**/src/main/**/build/
+!**/src/test/**/build/
 
 ### VS Code ###
 .vscode/
-
-
-.DS_Store
-node_modules/
-dist/
-**/node_modules/
-**/dist/
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-package-lock.json
-tests/**/coverage/
-
-# Editor directories and files
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-**/.idea
-
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*

src/main/resources/static/js/single-page/topic.js

@@ -34,7 +34,8 @@ var topicPage = new Vue({
         }
     },
     created: function () {
-        this.pageType = getUrlParam("type") ? getUrlParam("type")*1 : 0;
+        var paramsArr = window.location.pathname.split(".")[0].split("-");
+        this.pageType  =  paramsArr.length>=1 ? paramsArr[1] : '';
         // 获取列表数据
         this.getFloorDatas();
         this.GetPageTopicBanner();