Commit fadce8c0 by xiongyuwen

no message

parent 64700d81
...@@ -13,6 +13,9 @@ ...@@ -13,6 +13,9 @@
alt="头部logo" alt="头部logo"
/> />
</div> </div>
<div class="knowledge" @click="knowledge">
<img class="knowledgeImg" src="@/assets/zhishiku.png" alt="" />
</div>
<el-input <el-input
v-model="inputVal" v-model="inputVal"
autocomplete="off" autocomplete="off"
...@@ -30,7 +33,6 @@ ...@@ -30,7 +33,6 @@
/> />
</el-input> </el-input>
<template> <template>
<div class="knowledge" @click="knowledge">知识库</div>
<div <div
class="knowledge" class="knowledge"
v-loading="showSyncWanPanloading" v-loading="showSyncWanPanloading"
...@@ -156,14 +158,12 @@ export default { ...@@ -156,14 +158,12 @@ export default {
if (!!this.$store.state.user) { if (!!this.$store.state.user) {
let users = this.$store.state.user.info.attributes; let users = this.$store.state.user.info.attributes;
if(!!users) if (!!users) {
{ console.log(users, 22);
console.log(users,22)
if (users.username == "熊裕文") { if (users.username == "熊裕文") {
this.showSyncWanPan = true; this.showSyncWanPan = true;
} }
} }
} }
return this.$store.state.user.info.attributes || {}; return this.$store.state.user.info.attributes || {};
}, },
...@@ -182,7 +182,7 @@ export default { ...@@ -182,7 +182,7 @@ export default {
this.showSyncWanPan = false; this.showSyncWanPan = false;
// 获取cookies拿到token // 获取cookies拿到token
var token = this.getCookie("BailunToken"); var token = this.getCookie("BailunToken");
//var token = // var token =
// "Bearer%20eyJhbGciOiJSUzI1NiIsImtpZCI6IjQ1ZmMzZDYzYjRmNGM5YjAzMWVhNjQ0MzhhNTE1NmM3IiwidHlwIjoiSldUIn0.eyJuYmYiOjE2MTAxNzMxNTAsImV4cCI6MTYxMDIwOTE1MCwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi54aK6KOV5paHIiwiYXV0aF90aW1lIjoxNjEwMTczMTUwLCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjI5MjEyNzAiLCJXeFVzZXJJZCI6Inhpb25neXV3ZW4iLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-56eR5oqA5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDE4ODQiLCJVc2VyQ29kZSI6IkJMNTU2NjkyMiIsIk9hVXNlcklkIjoiMzk4OCIsIkRlcGFydG1lbnQiOiJ7XCJEZXBhcnRtZW50SWRcIjoyNTYsXCJOYW1lXCI6XCLliIrnmbvlsI_nu4RcIixcIkNvZGVcIjpcIlwifSIsInNjb3BlIjpbIm9wZW5pZCIsInByb2ZpbGUiLCJiYWlsdW5BcGkiXSwiYW1yIjpbImN1c3RvbSJdfQ.LWd_QutKJiG_zgE8kW2om5I5SB-rEA-c4LHvDZ0CzMLDGNNq-n40WodpD6W3W0nncKSObmvAycGo4Ko5bboAdP4zJykpoHEqSZ2naOZGwpvq8YnE50Ce0Nw1QgLWm0sXdNK6AfxItT04MOqjmhGrZ3KkQsS6VujXFCxBq1Mt2aVjhAgZjH5MKNMrPBuFN2h1l-fDWsjDoJw7JBNQQOJ2PlXHTCXIKLN3GzLt7VTmUa1Up8UozfoXu2k5Vzl5tCrNgGIUAmgdvME_I_eE3M-Klmqa6Tb2XfSRGqkmc7fnbF79ni4YtvxgYhQHAl-v9BNJF3OtQKXnGtGSaUC8rMTxzg"; // "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 ", ""); var token = token.replace("Bearer%20", "").replace("Bearer ", "");
...@@ -194,7 +194,7 @@ export default { ...@@ -194,7 +194,7 @@ export default {
// 更加微信用户id获取对应得用户信息并返回 // 更加微信用户id获取对应得用户信息并返回
axios axios
.get(`http://discuz.bailuntec.com/api/login?useid=${wxUserid}`) .get(`http://discuz.bailuntec.com/api/login?useid=${wxUserid}`)
// .get(`http://discuz.bailuntec.com/api/login?useid=chenzekai`) //.get(`http://discuz.bailuntec.com/api/login?useid=chenqi`)
.then((res) => { .then((res) => {
if (res.data.data.relationships.users.data.id) { if (res.data.data.relationships.users.data.id) {
localStorage.setItem( localStorage.setItem(
...@@ -211,7 +211,6 @@ export default { ...@@ -211,7 +211,6 @@ export default {
} }
}); });
} }
const { code, preurl } = this.$route.query; const { code, preurl } = this.$route.query;
if (preurl) { if (preurl) {
this.preurl = preurl; this.preurl = preurl;
...@@ -266,6 +265,8 @@ export default { ...@@ -266,6 +265,8 @@ export default {
return ""; return "";
}, },
SyncWanPan() { SyncWanPan() {
//alert('开始授权')
//this.getCode();
this.showSyncWanPanloading = true; this.showSyncWanPanloading = true;
axios axios
.get(`${config.WEI_PAN_URL}/weipan/ProcessWeiPanWorker`) .get(`${config.WEI_PAN_URL}/weipan/ProcessWeiPanWorker`)
...@@ -372,9 +373,13 @@ export default { ...@@ -372,9 +373,13 @@ export default {
} }
} }
.knowledge { .knowledge {
margin-left: 30px; margin-left: 5px;
cursor: pointer; cursor: pointer;
} }
.knowledgeImg {
height: 25px;
margin-top: 6px;
}
.logo2 { .logo2 {
background-position: center center; background-position: center center;
background-size: contain; background-size: contain;
......
...@@ -48,8 +48,7 @@ export default { ...@@ -48,8 +48,7 @@ export default {
include: "groups,wechat" include: "groups,wechat"
}; };
if (!this.userId) { if (!this.userId) {
this.$message.warning(`请先登录`); this.getCode();
return false;
} }
this.$store this.$store
.dispatch("jv/get", [`users/${this.userId}`, { params }]) .dispatch("jv/get", [`users/${this.userId}`, { params }])
...@@ -57,8 +56,7 @@ export default { ...@@ -57,8 +56,7 @@ export default {
this.userInfo = JSON.parse(res.wechat_info); this.userInfo = JSON.parse(res.wechat_info);
this.qywxUserid = this.userInfo.userid; this.qywxUserid = this.userInfo.userid;
if (!this.qywxUserid) { if (!this.qywxUserid) {
this.$message.warning(`请先登录`); this.getCode();
return false;
} }
this.loading = true; this.loading = true;
// 调用后台获取文件列表 // 调用后台获取文件列表
...@@ -70,12 +68,15 @@ export default { ...@@ -70,12 +68,15 @@ export default {
if (res.data.result.file_list != null) { if (res.data.result.file_list != null) {
const filelist = res.data.result.file_list.item; const filelist = res.data.result.file_list.item;
this.knowledgeList = []; this.knowledgeList = [];
filelist.forEach(element => { filelist.forEach(element => {
if (element.file_status == "1") { if (element.file_status == "1") {
var date=element.ctime.split(' ')[0].split("/")[2]+'/'+element.ctime.split(' ')[0].split("/")[1]+'/'+element.ctime.split(' ')[0].split("/")[0]+' '+element.ctime.split(' ')[1];
const knowledge = { const knowledge = {
title: element.file_name, title: element.file_name,
name: element.create_user_name, name: element.create_user_name,
time: element.ctime, time: date,
fileid: element.fileid, fileid: element.fileid,
fatherid: element.fatherid, fatherid: element.fatherid,
filetype: element.file_type filetype: element.file_type
...@@ -92,6 +93,28 @@ export default { ...@@ -92,6 +93,28 @@ export default {
}); });
}, },
methods: { methods: {
getCode() {
if (!this.userInfo) {
let ua = window.navigator.userAgent.toLowerCase();
if (
ua.match(/MicroMessenger/i) == "micromessenger" &&
ua.match(/wxwork/i) == "wxwork"
) {
// 静默授权
//const code = this.getUrlParam("code"); // 截取路径中的code,如果没有就去微信授权,如果已经获取到了就直接传code给后台获取openId
const local = "http://discuz.bailuntec.com/user/login";
const APPID = "ww833808f6b8dc0745"; // 企业微信
window.location.href =
"https://open.weixin.qq.com/connect/oauth2/authorize?appid=" +
APPID +
"&redirect_uri=" +
encodeURIComponent(local) +
"&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect";
}else{
this.$message.warning(`请先登录`);
}
}
},
knowledgeDetail(fileid, fatherid) { knowledgeDetail(fileid, fatherid) {
this.$router.push({ this.$router.push({
path: "/knowledge/knowledgeDetail", path: "/knowledge/knowledgeDetail",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment