Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pages/knowledge/knowledgeDetail.vue

components/Header.vue

@@ -159,8 +159,8 @@ export default {
   mounted() {
     // 获取cookies拿到token
     var token = this.getCookie("BailunToken");
-     var token =
-        "Bearer%20eyJhbGciOiJSUzI1NiIsImtpZCI6IjQ1ZmMzZDYzYjRmNGM5YjAzMWVhNjQ0MzhhNTE1NmM3IiwidHlwIjoiSldUIn0.eyJuYmYiOjE2MTAxNzMxNTAsImV4cCI6MTYxMDIwOTE1MCwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi54aK6KOV5paHIiwiYXV0aF90aW1lIjoxNjEwMTczMTUwLCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjI5MjEyNzAiLCJXeFVzZXJJZCI6Inhpb25neXV3ZW4iLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-56eR5oqA5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDE4ODQiLCJVc2VyQ29kZSI6IkJMNTU2NjkyMiIsIk9hVXNlcklkIjoiMzk4OCIsIkRlcGFydG1lbnQiOiJ7XCJEZXBhcnRtZW50SWRcIjoyNTYsXCJOYW1lXCI6XCLliIrnmbvlsI_nu4RcIixcIkNvZGVcIjpcIlwifSIsInNjb3BlIjpbIm9wZW5pZCIsInByb2ZpbGUiLCJiYWlsdW5BcGkiXSwiYW1yIjpbImN1c3RvbSJdfQ.LWd_QutKJiG_zgE8kW2om5I5SB-rEA-c4LHvDZ0CzMLDGNNq-n40WodpD6W3W0nncKSObmvAycGo4Ko5bboAdP4zJykpoHEqSZ2naOZGwpvq8YnE50Ce0Nw1QgLWm0sXdNK6AfxItT04MOqjmhGrZ3KkQsS6VujXFCxBq1Mt2aVjhAgZjH5MKNMrPBuFN2h1l-fDWsjDoJw7JBNQQOJ2PlXHTCXIKLN3GzLt7VTmUa1Up8UozfoXu2k5Vzl5tCrNgGIUAmgdvME_I_eE3M-Klmqa6Tb2XfSRGqkmc7fnbF79ni4YtvxgYhQHAl-v9BNJF3OtQKXnGtGSaUC8rMTxzg";
+    //  var token =
+    //     "Bearer%20eyJhbGciOiJSUzI1NiIsImtpZCI6IjQ1ZmMzZDYzYjRmNGM5YjAzMWVhNjQ0MzhhNTE1NmM3IiwidHlwIjoiSldUIn0.eyJuYmYiOjE2MTAxNzMxNTAsImV4cCI6MTYxMDIwOTE1MCwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi54aK6KOV5paHIiwiYXV0aF90aW1lIjoxNjEwMTczMTUwLCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjI5MjEyNzAiLCJXeFVzZXJJZCI6Inhpb25neXV3ZW4iLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-56eR5oqA5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDE4ODQiLCJVc2VyQ29kZSI6IkJMNTU2NjkyMiIsIk9hVXNlcklkIjoiMzk4OCIsIkRlcGFydG1lbnQiOiJ7XCJEZXBhcnRtZW50SWRcIjoyNTYsXCJOYW1lXCI6XCLliIrnmbvlsI_nu4RcIixcIkNvZGVcIjpcIlwifSIsInNjb3BlIjpbIm9wZW5pZCIsInByb2ZpbGUiLCJiYWlsdW5BcGkiXSwiYW1yIjpbImN1c3RvbSJdfQ.LWd_QutKJiG_zgE8kW2om5I5SB-rEA-c4LHvDZ0CzMLDGNNq-n40WodpD6W3W0nncKSObmvAycGo4Ko5bboAdP4zJykpoHEqSZ2naOZGwpvq8YnE50Ce0Nw1QgLWm0sXdNK6AfxItT04MOqjmhGrZ3KkQsS6VujXFCxBq1Mt2aVjhAgZjH5MKNMrPBuFN2h1l-fDWsjDoJw7JBNQQOJ2PlXHTCXIKLN3GzLt7VTmUa1Up8UozfoXu2k5Vzl5tCrNgGIUAmgdvME_I_eE3M-Klmqa6Tb2XfSRGqkmc7fnbF79ni4YtvxgYhQHAl-v9BNJF3OtQKXnGtGSaUC8rMTxzg";
     var token = token.replace("Bearer%20", "").replace("Bearer ", "");
     
     if (token) {
@@ -170,7 +170,7 @@ export default {
 
       // 更加微信用户id获取对应得用户信息并返回
       axios
-        .get(`http://discuz.bailuntec.com/api/login?useid=chenzekai`)
+        .get(`http://discuz.bailuntec.com/api/login?useid=${wxUserid}`)
         .then(res => {
           if (res.data.data.relationships.users.data.id) {
             localStorage.setItem(

components/topic/Comment.vue

@@ -127,6 +127,7 @@ export default {
   },
   created() {
     this.getComment('scroll');
+    
   },
   methods: {
     getComment(type) {

config.js

@@ -5,6 +5,6 @@ export default {
   DEV_API_URL: 'http://discuz.bailuntec.com',
   // ssr api  url
   SSR_API_URL: 'http://discuz.bailuntec.com',
-  WEI_PAN_URL: 'http://localhost:5008'
-  //WEI_PAN_URL: 'http://pps.bailuntec.com/DiscuzApi'
+ // WEI_PAN_URL: 'http://localhost:5008'
+  WEI_PAN_URL: 'http://pps.bailuntec.com/DiscuzApi'
 };

pages/knowledge/knowledgeDetail.vue

@@ -80,12 +80,8 @@ import config from "@/config.js";
 export default {
   data() {
     return {
-<<<<<<< HEAD
       threadId: "999999999",
-=======
-      threadId: "28",
       renderComponent: true,
->>>>>>> origin/master
       actions: [
         {
           text: this.$t("topic.read"),
@@ -199,12 +195,7 @@ export default {
       window.open(this.fileSrc, "_blank");
     },
     handleNodeClick(data) {
-<<<<<<< HEAD
       self=this;
-=======
-      this.threadId = "29"; // 目前写死
-      this.forceRerenders(); // 强制从新渲染函数
->>>>>>> origin/master
       if (data.file) {
         this.showViewloading = true;
         axios
@@ -236,6 +227,7 @@ export default {
             //获取fileid对应得threadId
             let threadId=res.data.result.threadId;
             this.threadId=threadId.toString();
+            this.forceRerenders(); // 强制从新渲染函数
             console.log(this.threadId,3232);
             }
             this.fileMd5 = data.md5;