Merge branch 'master' of https://code.bailuntec.com/Discuz/DiscuzWeb

components/Header.vue

@@ -31,6 +31,14 @@
         </el-input>
         <template>
           <div class="knowledge" @click="knowledge">知识库</div>
+          <div
+            class="knowledge"
+            v-loading="showSyncWanPanloading"
+            v-if="showSyncWanPan"
+            @click="SyncWanPan"
+          >
+            刷新知识库
+          </div>
         </template>
       </div>
       <div>
@@ -55,7 +63,7 @@
               id: userInfo.id,
               username: userInfo.username,
               avatarUrl: userInfo.avatarUrl,
-              isReal: userInfo.isReal
+              isReal: userInfo.isReal,
             }"
             :size="35"
             :round="true"
@@ -73,7 +81,7 @@
               <span
                 v-if="
                   userInfo.unreadNotifications &&
-                    userInfo.unreadNotifications > 0
+                  userInfo.unreadNotifications > 0
                 "
                 class="unread-notice"
                 >{{
@@ -98,17 +106,20 @@
 import loginAbout from "@/mixin/loginAbout";
 import jwt from "jsonwebtoken";
 import axios from "@/plugins/axios.js";
+import config from "@/config.js";
 export default {
   name: "Header",
   mixins: [loginAbout],
   props: {
     headImg: {
       type: String,
-      default: ""
-    }
+      default: "",
+    },
   },
   data() {
     return {
+      showSyncWanPanloading: false,
+      showSyncWanPan: false,
       inputVal: "",
       code: "", // 邀请码
       canReg: false,
@@ -118,7 +129,7 @@ export default {
       imgurl: require("@/assets/logo.png"),
       islogin: true,
       hideHeader: false, // 不需要头部右侧部分
-      preurl: "/"
+      preurl: "/",
     };
   },
   computed: {
@@ -143,8 +154,19 @@ export default {
       //   console.log(res.data.result);
       // })
 
+      if (!!this.$store.state.user) {
+        let users = this.$store.state.user.info.attributes;
+        if(!!users)
+        {
+        console.log(users,22)
+        if (users.username == "熊裕文") {
+          this.showSyncWanPan = true;
+        }
+        }
+
+      }
       return this.$store.state.user.info.attributes || {};
-    }
+    },
   },
   watch: {
     // 监听路由变化
@@ -154,15 +176,16 @@ export default {
       } else {
         this.siteClose = false;
       }
-    }
+    },
   },
   mounted() {
+    this.showSyncWanPan = false;
     // 获取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) {
       // 有值
       const jwt = require("jsonwebtoken");
@@ -170,9 +193,9 @@ export default {
 
       // 更加微信用户id获取对应得用户信息并返回
       axios
-        .get(`http://discuz.bailuntec.com/api/login?useid=${wxUserid}`)
-        //.get(`http://discuz.bailuntec.com/api/login?useid=chenzekai`)
-        .then(res => {
+        //.get(`http://discuz.bailuntec.com/api/login?useid=${wxUserid}`)
+        .get(`http://discuz.bailuntec.com/api/login?useid=xiongyuwen`)
+        .then((res) => {
           if (res.data.data.relationships.users.data.id) {
             localStorage.setItem(
               "user_id",
@@ -228,7 +251,7 @@ export default {
   },
   methods: {
     // 获取cookie
-    getCookie: function(cname) {
+    getCookie: function (cname) {
       const name = `${cname}=`;
       const ca = document.cookie.split(";");
       console.log("获取cookie,现在循环");
@@ -242,6 +265,19 @@ export default {
       }
       return "";
     },
+    SyncWanPan() {
+      this.showSyncWanPanloading = true;
+      axios
+        .get(`${config.WEI_PAN_URL}/weipan/ProcessWeiPanWorker`)
+        .then((res) => {
+          if (res.data.statusCode == 200) {
+            this.$message.success(res.data.result);
+          } else {
+            this.$message.err(res.data.result);
+          }
+          this.showSyncWanPanloading = false;
+        });
+    },
     // 退出
     logout() {
       this.$store.dispatch("session/logout").then(() => {
@@ -287,8 +323,8 @@ export default {
     },
     knowledge() {
       this.$router.push(`/knowledge`);
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

pages/knowledge/knowledgeDetail.vue

@@ -92,7 +92,6 @@
       </div>
     </div>
   </div>
-  </div>
 </template>
 <script>
 import axios from '@/plugins/axios.js';
@@ -291,12 +290,16 @@ export default {
         // this.data = res.data.result;
         this.data = this.deleteChildren(res.data.result);
         this.loading = false;
-        if (this.data.length == 1) {
-          if (this.data[0].file) {
+        if(!!this.data)
+        {
+           let file=this.data.filter(item => item.file==true);
+           if(!!file)
+           {
             // 触发点击事件
-            this.handleNodeClick(this.data[0]);
-          }
+            this.handleNodeClick(file[0]);
+           }
         }
+      
       });
     if (Object.keys(this.thread).length === 0) this.getThread();
     else this.initData();
@@ -333,7 +336,6 @@ export default {
       window.open(this.fileSrc, '_blank');
     },
     handleNodeClick(data) {
-      console.log(data);
       self = this;
       if (data.file) {
         this.showViewloading = true;
@@ -368,7 +370,6 @@ export default {
               console.log(this.threadId, 3232);
             }
             this.fileMd5 = data.md5;
-            console.log(this.threadId, '我是父组件');
           });
       }
     },
@@ -590,14 +591,7 @@ export default {
   head() {
     return {
       title:
-        ((this.thread && this.thread.title)
-          || (this.thread
-            && this.thread.firstPost
-            && this.thread.firstPost.summaryText.slice(0, 15))
-          || '主题详情页')
-        + (this.forums && this.forums.set_site && this.forums.set_site.site_name
-          ? ` - ${this.forums.set_site.site_name}`
-          : '\u200E'),
+        '知识库',
       meta: [
         {
           hid: 'keywords',
@@ -693,7 +687,7 @@ export default {
       }
     }
     &-right {
-      width: 865px;
+      width: 867px;
       background: #fff;
       margin-left: 9px;
       padding: 20px;