Home Explore Help
Register Sign In
usoft
/
showdoc
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

bug

star7th 4 years ago
parent
149f8602a7
commit
e4bc22ce99
10 changed files with 27 additions and 15 deletions
Split View Show Diff Stats
  1. 1 1
      server/Application/Api/Controller/AttachmentController.class.php
  2. 1 1
      web/index.html
  3. 0 0
      web/static/css/app.4386f3f26f3431f60eb036075a365f22.css
  4. 0 0
      web/static/js/app.0d182fe523afa0916598.js
  5. 0 0
      web/static/js/app.282391e323c1331e934f.js
  6. 3 0
      web_src/src/components/item/show/Index.vue
  7. 6 3
      web_src/src/components/item/show/show_regular_item/LeftMenu.vue
  8. 1 2
      web_src/src/components/item/show/show_regular_item/OpBar.vue
  9. 3 3
      web_src/src/components/page/edit/Index.vue
  10. 12 5
      web_src/src/router/index.js

+ 1 - 1
server/Application/Api/Controller/AttachmentController.class.php
View File 

@@ -122,7 +122,7 @@ class AttachmentController extends BaseController {
 
     }
 
     //页面的上传附件列表
 
     public function pageAttachmentUploadList(){
 
-        $login_user = $this->checkLogin();
 
+        $login_user = $this->checkLogin(false);
 
         $item_id = I("item_id/d") ? I("item_id/d") : 0 ;
 
         $page_id = I("page_id/d") ? I("page_id/d") : 0 ;
 
         if (!$page_id) {

+ 1 - 1
web/index.html
View File 

@@ -16,4 +16,4 @@
 
       "server": window.location.protocol +'//'+ window.location.host + window.location.pathname+ '../server/index.php?s=',
 
       //"lang" :'en'
 
       "lang" :'zh-cn'
 
-  }</script><link href=./static/css/app.0519781781266ae931fc99c41a9e879f.css rel=stylesheet></head><body class=grey-bg><div id=app></div><div style=display:none>本网站基于开源版showdoc搭建，仅供私人使用。如需访问showdoc官网，请在搜索引擎里搜索showdoc字样或者直接访问showdoc.com.cn</div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1eb6213d11eb61d1bd46.js></script><script type=text/javascript src=./static/js/app.282391e323c1331e934f.js></script></body></html>
 
+  }</script><link href=./static/css/app.4386f3f26f3431f60eb036075a365f22.css rel=stylesheet></head><body class=grey-bg><div id=app></div><div style=display:none>本网站基于开源版showdoc搭建，仅供私人使用。如需访问showdoc官网，请在搜索引擎里搜索showdoc字样或者直接访问showdoc.com.cn</div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1eb6213d11eb61d1bd46.js></script><script type=text/javascript src=./static/js/app.0d182fe523afa0916598.js></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
web/static/css/app.4386f3f26f3431f60eb036075a365f22.css


File diff suppressed because it is too large
+ 0 - 0
web/static/js/app.0d182fe523afa0916598.js


File diff suppressed because it is too large
+ 0 - 0
web/static/js/app.282391e323c1331e934f.js


+ 3 - 0
web_src/src/components/item/show/Index.vue
View File 

@@ -59,6 +59,9 @@ export default {
 
       var loading = that.$loading()
 
       var item_id = this.$route.params.item_id ? this.$route.params.item_id : 0
 
       var page_id = this.$route.query.page_id ? this.$route.query.page_id : 0
 
+      page_id = this.$route.params.page_id
 
+        ? this.$route.params.page_id
 
+        : page_id
 
       let params = {
 
         item_id: item_id,
 
         keyword: keyword

+ 6 - 3
web_src/src/components/item/show/show_regular_item/LeftMenu.vue
View File 

@@ -102,15 +102,18 @@ export default {
 
 
     // 改变url
 
     change_url(page_id) {
 
-      if (page_id > 0 && page_id == this.$route.query.page_id) {
 
+      if (
 
+        page_id > 0 &&
 
+        (page_id == this.$route.query.page_id ||
 
+          page_id == this.$route.params.page_id)
 
+      ) {
 
         return
 
       }
 
       var domain = this.item_info.item_domain
 
         ? this.item_info.item_domain
 
         : this.item_info.item_id
 
       this.$router.replace({
 
-        path: '/' + domain,
 
-        query: { page_id: page_id }
 
+        path: '/' + domain + '/' + page_id
 
       })
 
     },

+ 1 - 2
web_src/src/components/item/show/show_regular_item/OpBar.vue
View File 

@@ -361,8 +361,7 @@ export default {
 
     share_page() {
 
       var page_id = this.page_id > 0 ? this.page_id : 0
 
       let path = this.item_domain ? this.item_domain : this.item_id
 
-      this.share_page_link =
 
-        this.getRootPath() + '#/' + path + '?page_id=' + page_id
 
+      this.share_page_link = this.getRootPath() + '#/' + path + '/' + page_id
 
       // this.share_single_link= this.getRootPath()+"/page/"+page_id ;
 
       this.qr_page_link =
 
         DocConfig.server +

+ 3 - 3
web_src/src/components/page/edit/Index.vue
View File 

@@ -518,10 +518,10 @@ export default {
 
       }, 20000)
 
     },
 
     goback() {
 
-      var url = '/' + this.$route.params.item_id
 
+      var url =
 
+        '/' + this.$route.params.item_id + '/' + this.$route.params.page_id
 
       this.$router.push({
 
-        path: url,
 
-        query: { page_id: this.$route.params.page_id }
 
+        path: url
 
       })
 
     },
 
     dropdown_callback(data) {

+ 12 - 5
web_src/src/router/index.js
View File 

@@ -73,11 +73,6 @@ export default new Router({
 
       name: 'ItemPassword',
 
       component: ItemPassword
 
     },
 
-    {
 
-      path: '/:item_id',
 
-      name: 'ItemShow',
 
-      component: ItemShow
 
-    },
 
     {
 
       path: '/item/export/:item_id',
 
       name: 'ItemExport',
 
@@ -147,6 +142,18 @@ export default new Router({
 
       path: '/item/group/index',
 
       name: 'ItemGroup',
 
       component: ItemGroup
 
+    },
 
+
 
+    // -------新路由加在分割线前面---------------
 
+    {
 
+      path: '/:item_id',
 
+      name: 'ItemShow',
 
+      component: ItemShow
 
+    },
 
+    {
 
+      path: '/:item_id/:page_id(\\d+)',
 
+      name: 'ItemShow',
 
+      component: ItemShow
 
     }
 
   ]
 
 })

Some files were not shown because too many files changed in this diff