权限优化

zyplayer-doc-ui/wiki-ui/src/App.vue

@@ -4,8 +4,8 @@
             <router-view></router-view>
         </template>
         <el-container v-else>
-            <el-aside width="200px">
-                <div style="padding: 10px;height: 100%;box-sizing: border-box;background: #fafafa;" v-show="leftCollapse">
+            <el-aside v-show="leftCollapse">
+                <div style="padding: 10px;height: 100%;box-sizing: border-box;background: #fafafa;">
                     <div style="margin-bottom: 10px;">
                         <el-select v-model="choiceSpace" @change="spaceChangeEvents" filterable placeholder="选择空间" style="width: 100%;">
                             <el-option-group label="">
@@ -362,7 +362,7 @@
             userSettingDropdown(command) {
                 console.log("command:" + command);
                 if (command == 'userSignOut') {
-                    // this.userSignOut();
+                    this.userSignOut();
                 } else if (command == 'aboutDoc') {
                     app.aboutDialogVisible = true;
                 } else {

zyplayer-doc-ui/wiki-ui/src/common/config/apilist.js

@@ -14,6 +14,8 @@ var URL = {
     updatePageComment: '/zyplayer-doc-wiki/page/comment/update',
     pageZanList: '/zyplayer-doc-wiki/page/zan/list',
     updatePageZan: '/zyplayer-doc-wiki/page/zan/update',
+
+    commonUpload: '/zyplayer-doc-wiki/common/upload',
 };
 
 var URL1 = {};

zyplayer-doc-ui/wiki-ui/src/common/lib/common/common.js

@@ -23,7 +23,7 @@ export default {
             global.vue.$message('请求错误：' + res.message);
         } else if (res.data.errCode == 400) {
             global.vue.$message('请先登录');
-            window.location = apimix.apilist1.HOST + "/static/manage/login.html";
+            // window.location = apimix.apilist1.HOST + "/static/manage/login.html";
         } else if (res.data.errCode == 402) {
             global.vue.$router.push("/common/noAuth");
         } else if (res.data.errCode !== 200) {

zyplayer-doc-ui/wiki-ui/src/views/page/Show.vue

@@ -12,7 +12,8 @@
 			<div class="wiki-author">
 				<span>创建：{{wikiPage.createUserName}}　{{wikiPage.createTime}}　　<span v-show="wikiPage.updateUserName">修改：{{wikiPage.updateUserName}}　{{wikiPage.updateTime}}</span></span>
 				<div style="float: right;">
-					<el-upload class="upload-page-file" action="zyplayer-doc-wiki/common/upload"
+					<el-upload class="upload-page-file" :action="apilist1.commonUpload"
+							   :with-credentials="true"
 							   :on-success="uploadFileSuccess" :on-error="uploadFileError"
 							   name="files" show-file-list multiple :data="uploadFormData" :limit="999">
 						<el-button icon="el-icon-upload">上传附件</el-button>
@@ -120,6 +121,13 @@
 				recommentInfo: {},
 			};
 		},
+		beforeRouteUpdate(to, from, next){
+			var pageId = to.query.pageId;
+			if (!!pageId) {
+				this.loadPageDetail(pageId);
+			}
+			next();
+		},
 		mounted: function () {
 			app = this;
 			var pageId = this.$route.query.pageId;
@@ -226,10 +234,10 @@
 				toast.success("上传失败，" + err);
 			},
 			uploadFileSuccess(response) {
-				if (this.common.validateResult(response)) {
+				this.common.validateResult({data: response}, function () {
 					app.pageFileList.push(response.data);
 					toast.success("上传成功！");
-				}
+				});
 			},
 			deletePageFile(row) {
 				this.$confirm('确定要删除此文件吗？', '提示', {