瀏覽代碼

second commit

wanjialin 2 年之前
父節點
當前提交
d131d8c62a
共有 41 個文件被更改,包括 280 次插入102 次删除
  1. 21 28
      README.md
  2. 0 3
      package.json
  3. 1 0
      src/assets/icons/svg/announcement.svg
  4. 1 0
      src/assets/icons/svg/appuserlist.svg
  5. 1 0
      src/assets/icons/svg/authority.svg
  6. 0 0
      src/assets/icons/svg/authority2.svg
  7. 0 0
      src/assets/icons/svg/collection.svg
  8. 1 0
      src/assets/icons/svg/createseries.svg
  9. 0 0
      src/assets/icons/svg/distributor.svg
  10. 1 0
      src/assets/icons/svg/document.svg
  11. 0 0
      src/assets/icons/svg/exchange.svg
  12. 1 0
      src/assets/icons/svg/home.svg
  13. 1 0
      src/assets/icons/svg/icon-menu.svg
  14. 1 0
      src/assets/icons/svg/issuer.svg
  15. 1 0
      src/assets/icons/svg/issuer1.svg
  16. 1 1
      src/assets/icons/svg/message.svg
  17. 0 0
      src/assets/icons/svg/order.svg
  18. 1 0
      src/assets/icons/svg/serieslist.svg
  19. 11 12
      src/components/Breadcrumb/index.vue
  20. 24 0
      src/components/Goback/index.vue
  21. 5 9
      src/components/Hamburger/index.vue
  22. 22 31
      src/layout/components/Navbar.vue
  23. 2 1
      src/layout/components/Sidebar/index.vue
  24. 1 0
      src/layout/index.vue
  25. 0 1
      src/main.js
  26. 161 15
      src/router/index.js
  27. 1 1
      src/settings.js
  28. 0 0
      src/views/announcement/announcementCreate/index.vue
  29. 0 0
      src/views/announcement/announcementList/index.vue
  30. 3 0
      src/views/appuserlist/index.vue
  31. 5 0
      src/views/authority/index.vue
  32. 3 0
      src/views/collection/createseries/index.vue
  33. 1 0
      src/views/collection/serieslist/index.vue
  34. 0 0
      src/views/distributor/index.vue
  35. 0 0
      src/views/document/index.vue
  36. 0 0
      src/views/exchange/index.vue
  37. 3 0
      src/views/issuer/issuer1/index.vue
  38. 3 0
      src/views/issuer/issuer2/index.vue
  39. 0 0
      src/views/message/messageCreate/index.vue
  40. 0 0
      src/views/message/messageList/index.vue
  41. 3 0
      src/views/order/index.vue

+ 21 - 28
README.md

@@ -1,37 +1,30 @@
-# ruoyi
+## 开发
 
-#### 介绍
-若依项目
+```bash
+# 克隆项目
+git clone http://39.105.160.25:10880/sifu-gogs/post-ui.git
 
-#### 软件架构
-软件架构说明
+# 进入项目目录
+cd ruoyi-ui
 
+# 安装依赖
+npm install
 
-#### 安装教程
+# 建议不要直接使用 cnpm 安装依赖,会有各种诡异的 bug。可以通过如下操作解决 npm 下载速度慢的问题
+npm install --registry=https://registry.npmmirror.com
 
-1.  xxxx
-2.  xxxx
-3.  xxxx
+# 启动服务
+npm run dev
+```
 
-#### 使用说明
+浏览器访问 http://localhost:80
 
-1.  xxxx
-2.  xxxx
-3.  xxxx
+## 发布
 
-#### 参与贡献
+```bash
+# 构建测试环境
+npm run build:stage
 
-1.  Fork 本仓库
-2.  新建 Feat_xxx 分支
-3.  提交代码
-4.  新建 Pull Request
-
-
-#### 特技
-
-1.  使用 Readme\_XXX.md 来支持不同的语言,例如 Readme\_en.md, Readme\_zh.md
-2.  Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
-3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
-4.  [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目,是综合评定出的优秀开源项目
-5.  Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6.  Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
+# 构建生产环境
+npm run build:prod
+```

+ 0 - 3
package.json

@@ -50,15 +50,12 @@
     "jsencrypt": "3.0.0-rc.1",
     "nprogress": "0.2.0",
     "quill": "1.3.7",
-    "quill-image-drop-module": "^1.0.3",
-    "quill-image-resize-module": "^3.0.0",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
     "vue": "2.6.12",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",
     "vue-meta": "2.4.0",
-    "vue-quill-editor": "^3.0.6",
     "vue-router": "3.4.9",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.0"

+ 1 - 0
src/assets/icons/svg/announcement.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1674112438622" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="31538" xmlns:xlink="http://www.w3.org/1999/xlink" width="300" height="300"><path d="M192 768H128c-70.4 0-128-57.6-128-128V448c0-70.4 57.6-128 128-128h64L467.2 44.8c25.6-25.6 64-25.6 89.6 0 12.8 12.8 19.2 25.6 19.2 44.8v864c0 38.4-25.6 64-64 64-12.8 0-32-6.4-38.4-12.8L192 768z m531.2-6.4c-19.2 6.4-38.4 6.4-44.8-12.8-6.4-12.8-6.4-32 12.8-44.8 70.4-38.4 108.8-115.2 108.8-192 0-83.2-44.8-153.6-115.2-192-12.8-6.4-19.2-25.6-12.8-44.8 12.8-19.2 32-19.2 44.8-12.8 89.6 51.2 147.2 147.2 147.2 249.6s-57.6 198.4-140.8 249.6z m128 89.6c-12.8 12.8-32 6.4-44.8-6.4s-6.4-32 6.4-44.8c89.6-64 147.2-172.8 147.2-281.6 0-115.2-57.6-217.6-147.2-288-12.8-12.8-19.2-32-6.4-44.8s32-19.2 44.8-6.4C960 256 1024 377.6 1024 512s-64 256-172.8 339.2z" fill="#e6e6e6" p-id="31539"></path></svg>

+ 1 - 0
src/assets/icons/svg/appuserlist.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1674030442994" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="24678" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M500 128.8c-95.2 5.6-173.6 83.2-180 178.4-7.2 112 80.8 205.6 191.2 205.6 106.4 0 192-86.4 192-192 0.8-110.4-92-198.4-203.2-192zM512 575.2c-128 0-383.2 64-383.2 192v96c0 17.6 14.4 32 32 32h702.4c17.6 0 32-14.4 32-32V766.4c0-127.2-255.2-191.2-383.2-191.2z" p-id="24679" fill="#e6e6e6"></path></svg>

+ 1 - 0
src/assets/icons/svg/authority.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1674029289284" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5457" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 102.4L165.4272 233.984v229.632a404.3776 404.3776 0 0 0 166.5536 327.0656L512 921.6l180.0704-131.0208a404.48 404.48 0 0 0 166.5536-326.9632V234.0864L512 102.4z m295.2704 361.216a354.2016 354.2016 0 0 1-145.408 285.4912L512 858.1632l-149.8624-109.0048a354.1504 354.1504 0 0 1-145.408-285.5424V269.3632L512 157.2864l295.2704 112.2304v194.0992z" p-id="5458"></path><path d="M397.6192 415.1808c0 53.8112 37.3248 98.6624 87.3984 110.848v170.7008a26.624 26.624 0 0 0 26.5728 26.5728h0.9216a26.624 26.624 0 0 0 26.5728-26.5728v-61.6448h41.8816a26.624 26.624 0 0 0 26.5728-26.5728v-0.9216a26.624 26.624 0 0 0-26.5728-26.5728h-41.8816v-55.04a114.2272 114.2272 0 0 0-26.9824-225.2288 114.432 114.432 0 0 0-114.4832 114.432zM512 351.9488c34.8672 0 63.1808 28.3648 63.1808 63.1808 0 29.0304-19.8656 54.1696-48.2816 61.0816L512 479.8976l-14.8992-3.6352a62.8224 62.8224 0 0 1-48.2816-61.0816c0-34.8672 28.3136-63.232 63.1808-63.232z" p-id="5459"></path></svg>

文件差異過大導致無法顯示
+ 0 - 0
src/assets/icons/svg/authority2.svg


文件差異過大導致無法顯示
+ 0 - 0
src/assets/icons/svg/collection.svg


+ 1 - 0
src/assets/icons/svg/createseries.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1674030392979" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="22851" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M475.428571 475.428571V292.571429h73.142858v182.857142h182.857142v73.142858h-182.857142v182.857142h-73.142858v-182.857142H292.571429v-73.142858h182.857142zM146.285714 73.142857h731.428572a73.142857 73.142857 0 0 1 73.142857 73.142857v731.428572a73.142857 73.142857 0 0 1-73.142857 73.142857H146.285714a73.142857 73.142857 0 0 1-73.142857-73.142857V146.285714a73.142857 73.142857 0 0 1 73.142857-73.142857z m0 73.142857v731.428572h731.428572V146.285714H146.285714z" fill="#e6e6e6" p-id="22852"></path></svg>

文件差異過大導致無法顯示
+ 0 - 0
src/assets/icons/svg/distributor.svg


+ 1 - 0
src/assets/icons/svg/document.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1674114386886" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="37295" xmlns:xlink="http://www.w3.org/1999/xlink" width="300" height="300"><path d="M288 320h448a32 32 0 0 0 0-64H288a32 32 0 0 0 0 64zM288 544h448a32 32 0 0 0 0-64H288a32 32 0 0 0 0 64zM544 704H288a32 32 0 0 0 0 64h256a32 32 0 0 0 0-64z" p-id="37296" fill="#e6e6e6"></path><path d="M896 132.928C896 77.28 851.552 32 796.928 32H227.04C172.448 32 128 77.28 128 132.928v758.144C128 946.72 172.448 992 227.04 992h435.008c1.568 0 2.912-0.672 4.416-0.896 8.96 1.6 18.464-0.256 25.984-6.528l192-160a31.424 31.424 0 0 0 10.816-27.2c0.16-1.184 0.736-2.208 0.736-3.424V132.928zM192 891.072V132.928C192 112.576 207.712 96 227.04 96h569.888C816.288 96 832 112.576 832 132.928V736h-96a96 96 0 0 0-96 96v96H227.04C207.712 928 192 911.424 192 891.072zM814.016 800L704 891.68V832a32 32 0 0 1 32-32h78.016z" p-id="37297" fill="#e6e6e6"></path></svg>

文件差異過大導致無法顯示
+ 0 - 0
src/assets/icons/svg/exchange.svg


+ 1 - 0
src/assets/icons/svg/home.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1674028934308" class="icon" viewBox="0 0 1025 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2977" xmlns:xlink="http://www.w3.org/1999/xlink" width="200.1953125" height="200"><path d="M779 1024h-184v-196.4c0-14.4-11.6-26-26-26h-93.2c-14.4 0-26 11.8-26 26V1024h-198.8c-54.8 0-99.4-44.6-99.4-99.4V600.2l-112.2-35-9-9c-26.6-26.6-26.6-69.6 0-96.2L470 20.4c12.8-12.8 29.8-20 48-20s35.2 7 48 20l439.6 439.8c12.8 12.8 20 30 19.8 48 0 18.2-7.2 35.2-20 48l-9 9-118.4 35.2v324.2c0.2 54.8-44.2 99.4-99 99.4z" fill="#dbdbdb" p-id="2978"></path></svg>

+ 1 - 0
src/assets/icons/svg/icon-menu.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1673955987922" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3473" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M44.4 245.9h935.2c24.4 0 44.4-20 44.4-44.4s-19.8-44.4-44.4-44.4H44.4C20 157.1 0 177.1 0 201.5s20 44.4 44.4 44.4z m935.2 221.8H44.4C20 467.7 0 487.7 0 512.1s20 44.4 44.4 44.4h935.2c24.4 0 44.4-20 44.4-44.4s-20-44.4-44.4-44.4z m0 310.4H44.4C20 778.1 0 797.8 0 822.5s20 44.4 44.4 44.4h935.2c24.4 0 44.4-19.8 44.4-44.4s-20-44.4-44.4-44.4z" p-id="3474"></path></svg>

+ 1 - 0
src/assets/icons/svg/issuer.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1674033027852" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="25726" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M834.7 279.8l61.3-58.9V208H683.7L532.4 586.4 360.3 208H137.7v12.9l71.6 86.6c7 6.4 10.6 15.8 9.7 25.2V673c2.2 12.3-1.7 24.8-10.3 33.7L128 805v12.7h228.6v-12.9l-80.6-98c-8.7-8.9-12.9-21.3-11.1-33.7V378.7l200.7 439.2h23.3l172.6-439.2v349.9c0 9.2 0 11.1-6 17.2l-62.1 60.3V819h301.2v-12.9l-59.9-58.9c-5.2-4-7.9-10.7-6.8-17.2V297c-1.1-6.5 1.6-13.2 6.8-17.2z" p-id="25727" fill="#e6e6e6"></path></svg>

+ 1 - 0
src/assets/icons/svg/issuer1.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1674033097618" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="25977" width="300" height="300" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M834.7 279.8l61.3-58.9V208H683.7L532.4 586.4 360.3 208H137.7v12.9l71.6 86.6c7 6.4 10.6 15.8 9.7 25.2V673c2.2 12.3-1.7 24.8-10.3 33.7L128 805v12.7h228.6v-12.9l-80.6-98c-8.7-8.9-12.9-21.3-11.1-33.7V378.7l200.7 439.2h23.3l172.6-439.2v349.9c0 9.2 0 11.1-6 17.2l-62.1 60.3V819h301.2v-12.9l-59.9-58.9c-5.2-4-7.9-10.7-6.8-17.2V297c-1.1-6.5 1.6-13.2 6.8-17.2z" p-id="25978"></path></svg>

+ 1 - 1
src/assets/icons/svg/message.svg

@@ -1 +1 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M0 20.967v59.59c0 11.59 8.537 20.966 19.075 20.966h28.613l1 26.477L76.8 101.523h32.125c10.538 0 19.075-9.377 19.075-20.966v-59.59C128 9.377 119.463 0 108.925 0h-89.85C8.538 0 0 9.377 0 20.967zm82.325 33.1c0-5.524 4.013-9.935 9.037-9.935 5.026 0 9.038 4.41 9.038 9.934 0 5.524-4.025 9.934-9.038 9.934-5.024 0-9.037-4.41-9.037-9.934zm-27.613 0c0-5.524 4.013-9.935 9.038-9.935s9.037 4.41 9.037 9.934c0 5.524-4.025 9.934-9.037 9.934-5.025 0-9.038-4.41-9.038-9.934zm-27.1 0c0-5.524 4.013-9.935 9.038-9.935s9.038 4.41 9.038 9.934c0 5.524-4.026 9.934-9.05 9.934-5.013 0-9.025-4.41-9.025-9.934z"/></svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1674113562084" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="32590" xmlns:xlink="http://www.w3.org/1999/xlink" width="300" height="300"><path d="M821.333333 800H547.584l-86.464 96.074667a32 32 0 1 1-47.573333-42.816l96-106.666667A32 32 0 0 1 533.333333 736h288a53.333333 53.333333 0 0 0 53.333334-53.333333V234.666667a53.333333 53.333333 0 0 0-53.333334-53.333334H202.666667a53.333333 53.333333 0 0 0-53.333334 53.333334v448a53.333333 53.333333 0 0 0 53.333334 53.333333h138.666666a32 32 0 0 1 0 64H202.666667c-64.8 0-117.333333-52.533333-117.333334-117.333333V234.666667c0-64.8 52.533333-117.333333 117.333334-117.333334h618.666666c64.8 0 117.333333 52.533333 117.333334 117.333334v448c0 64.8-52.533333 117.333333-117.333334 117.333333zM704 341.333333a32 32 0 0 1 0 64H320a32 32 0 0 1 0-64h384zM512 512a32 32 0 0 1 0 64H320a32 32 0 0 1 0-64h192z" fill="#e6e6e6" p-id="32591"></path></svg>

文件差異過大導致無法顯示
+ 0 - 0
src/assets/icons/svg/order.svg


+ 1 - 0
src/assets/icons/svg/serieslist.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1674030364079" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="21793" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M972.8 358.4h-256V51.2a51.2 51.2 0 0 0-51.2-51.2H51.2a51.2 51.2 0 0 0-51.2 51.2v563.2a51.2 51.2 0 0 0 51.2 51.2h256v307.2a51.2 51.2 0 0 0 51.2 51.2h614.4a51.2 51.2 0 0 0 51.2-51.2V409.6a51.2 51.2 0 0 0-51.2-51.2zM102.4 563.2V102.4h512v256H358.4a51.2 51.2 0 0 0-51.2 51.2v153.6z m512-102.4v102.4H409.6V460.8z m307.2 460.8H409.6v-256h256a51.2 51.2 0 0 0 51.2-51.2V460.8h204.8z" fill="#dbdbdb" p-id="21794"></path></svg>

+ 11 - 12
src/components/Breadcrumb/index.vue

@@ -1,12 +1,12 @@
 <template>
-  <el-breadcrumb class="app-breadcrumb" separator="/">
+  <div class="app-breadcrumb" >
     <transition-group name="breadcrumb">
-      <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
+      <div v-for="(item,index) in levelList" :key="item.path">
         <span v-if="item.redirect === 'noRedirect' || index == levelList.length - 1" class="no-redirect">{{ item.meta.title }}</span>
-        <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
-      </el-breadcrumb-item>
+        <!-- <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a> -->
+      </div>
     </transition-group>
-  </el-breadcrumb>
+  </div>
 </template>
 
 <script>
@@ -34,9 +34,9 @@ export default {
       let matched = this.$route.matched.filter(item => item.meta && item.meta.title)
       const first = matched[0]
 
-      if (!this.isDashboard(first)) {
-        matched = [{ path: '/index', meta: { title: '首页' }}].concat(matched)
-      }
+      // if (!this.isDashboard(first)) {
+      //   matched = [{ path: '/index', meta: { title: '首页' }}].concat(matched)
+      // }
 
       this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
     },
@@ -60,14 +60,13 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.app-breadcrumb.el-breadcrumb {
+.app-breadcrumb {
   display: inline-block;
-  font-size: 14px;
+  font-size: 18px;
   line-height: 50px;
-  margin-left: 8px;
+  margin-left: 0px;
 
   .no-redirect {
-    color: #97a8be;
     cursor: text;
   }
 }

+ 24 - 0
src/components/Goback/index.vue

@@ -0,0 +1,24 @@
+<template>
+    <el-page-header @back="goBack" class="title-text" >
+        
+    </el-page-header>    
+</template>
+
+<script>
+  export default {
+    
+  
+    methods: {
+      goBack() {
+        this.$router.go(-1);
+      },
+      
+    }
+    
+  }
+</script>
+<style lang="scss" scoped>
+.title-text{
+    font-weight: 700;
+}
+</style>

+ 5 - 9
src/components/Hamburger/index.vue

@@ -1,15 +1,11 @@
 <template>
   <div style="padding: 0 15px;" @click="toggleClick">
-    <svg
-      :class="{'is-active':isActive}"
-      class="hamburger"
-      viewBox="0 0 1024 1024"
-      xmlns="http://www.w3.org/2000/svg"
-      width="64"
-      height="64"
-    >
-      <path d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z" />
+
+    <svg :class="{ 'is-active': isActive }" class="hamburger" viewBox="0 0 1024 1024" version="1.1"
+      xmlns="http://www.w3.org/2000/svg" width="64" height="64">
+      <path d="M44.4 245.9h935.2c24.4 0 44.4-20 44.4-44.4s-19.8-44.4-44.4-44.4H44.4C20 157.1 0 177.1 0 201.5s20 44.4 44.4 44.4z m935.2 221.8H44.4C20 467.7 0 487.7 0 512.1s20 44.4 44.4 44.4h935.2c24.4 0 44.4-20 44.4-44.4s-20-44.4-44.4-44.4z m0 310.4H44.4C20 778.1 0 797.8 0 822.5s20 44.4 44.4 44.4h935.2c24.4 0 44.4-19.8 44.4-44.4s-20-44.4-44.4-44.4z"></path>
     </svg>
+
   </div>
 </template>
 

+ 22 - 31
src/layout/components/Navbar.vue

@@ -1,30 +1,12 @@
 <template>
   <div class="navbar">
     <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
-
-    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
+    <Goback id="goback-container" class="goback-container" v-if="!topNav"/>
+    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/> 
     <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
 
     <div class="right-menu">
-      <template v-if="device!=='mobile'">
-        <search id="header-search" class="right-menu-item" />
-        
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
-          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
-        <el-tooltip content="文档地址" effect="dark" placement="bottom">
-          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
-        <screenfull id="screenfull" class="right-menu-item hover-effect" />
-
-        <el-tooltip content="布局大小" effect="dark" placement="bottom">
-          <size-select id="size-select" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
-      </template>
-
+      
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
           <img :src="avatar" class="user-avatar">
@@ -49,24 +31,26 @@
 <script>
 import { mapGetters } from 'vuex'
 import Breadcrumb from '@/components/Breadcrumb'
+import Goback from '@/components/Goback'
 import TopNav from '@/components/TopNav'
 import Hamburger from '@/components/Hamburger'
-import Screenfull from '@/components/Screenfull'
-import SizeSelect from '@/components/SizeSelect'
-import Search from '@/components/HeaderSearch'
-import RuoYiGit from '@/components/RuoYi/Git'
-import RuoYiDoc from '@/components/RuoYi/Doc'
+//import Screenfull from '@/components/Screenfull'
+//import SizeSelect from '@/components/SizeSelect'
+//import Search from '@/components/HeaderSearch'
+//import RuoYiGit from '@/components/RuoYi/Git'
+//import RuoYiDoc from '@/components/RuoYi/Doc'
 
 export default {
   components: {
     Breadcrumb,
     TopNav,
+     Goback,
     Hamburger,
-    Screenfull,
-    SizeSelect,
-    Search,
-    RuoYiGit,
-    RuoYiDoc
+   // Screenfull,
+    //SizeSelect,
+    //Search,
+   // RuoYiGit,
+   // RuoYiDoc
   },
   computed: {
     ...mapGetters([
@@ -131,8 +115,15 @@ export default {
     }
   }
 
+  .goback-container{
+    
+    float: left;
+    line-height: 50px;
+  }
   .breadcrumb-container {
+    
     float: left;
+    line-height: 50px;
   }
 
   .topmenu-container {

+ 2 - 1
src/layout/components/Sidebar/index.vue

@@ -1,6 +1,7 @@
 <template>
     <div :class="{'has-logo':showLogo}" :style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
-        <logo v-if="showLogo" :collapse="isCollapse" />
+        <!-- 删去logo -->
+        <!-- <logo v-if="showLogo" :collapse="isCollapse" /> -->
         <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
             <el-menu
                 :default-active="activeMenu"

+ 1 - 0
src/layout/index.vue

@@ -27,6 +27,7 @@ export default {
   components: {
     AppMain,
     Navbar,
+    //Goback,
     RightPanel,
     Settings,
     Sidebar,

+ 0 - 1
src/main.js

@@ -38,7 +38,6 @@ import VueMeta from 'vue-meta'
 // 字典数据组件
 import DictData from '@/components/DictData'
 
-
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
 Vue.prototype.getConfigKey = getConfigKey

+ 161 - 15
src/router/index.js

@@ -70,37 +70,184 @@ export const constantRoutes = [
         path: 'index',
         component: () => import('@/views/index'),
         name: 'Index',
-        meta: { title: '首页', icon: 'dashboard', affix: true }
+        meta: { title: '首页', icon: 'home', affix: true }
       }
     ]
   },
+  //权限管理
   {
-    path: '/user',
+    path: '',
     component: Layout,
-    hidden: true,
-    redirect: 'noredirect',
     children: [
       {
-        path: 'profile',
-        component: () => import('@/views/system/user/profile/index'),
-        name: 'Profile',
-        meta: { title: '个人中心', icon: 'user' }
+        path: '/authority',
+        component: () => import('@/views/authority/index'),
+        name: 'authority',
+        meta: { title: '权限', icon: 'authority2' }
       }
     ]
   },
+  //订单管理
   {
-    path: '/announce',
+    path: '',
     component: Layout,
     children: [
       {
-        path: 'index',
-        component: () => import('@/views/announce/add/index'),
-        name: 'Profile',
-        meta: { title: '创建公告', icon: 'user' }
+        path: '/order',
+        component: () => import('@/views/order/index'),
+        name: 'order',
+        meta: { title: '订单列表', icon: 'order' }
       }
     ]
   },
+  //藏品管理
+  {
+    path: '/collection',
+    component: Layout,
+    
+    meta: { title: '藏品管理', icon: 'collection' },
+    children: [
+      {
+        path: '/serieslist',
+        component: () => import('@/views/collection/serieslist/index'),
+        name: 'serieslist',
+        meta: { title: '套系列表', icon: 'serieslist' }
+      },
+      {
+        path: '/createseries',
+        component: () => import('@/views/collection/createseries/index'),
+        name: 'createseries',
+        meta: { title: '创建藏品', icon: 'createseries' }
+      },
+    ]
+  },
   
+  //app用户列表
+  {
+    path: '',
+    component: Layout,
+    children: [
+      {
+        path: '/appuserlist',
+        component: () => import('@/views/appuserlist/index'),
+        name: 'appuserlist',
+        meta: { title: 'app用户列表', icon: 'appuserlist' }
+      }
+    ]
+  },
+  //发行方管理
+  {
+    path: '/issuer',
+    component: Layout,
+    meta: { title: '发行方管理', icon: 'issuer1' },
+    children: [
+      {
+        path: '/issuer1',
+        component: () => import('@/views/issuer/issuer1/index'),
+        name: 'issuer1',
+        meta: { title: '发行方管理', icon: 'issuer1' }
+      },
+      {
+        path: '/issuer2',
+        component: () => import('@/views/issuer/issuer2/index'),
+        name: 'issuer2',
+        meta: { title: '发行方管理', icon: 'issuer1' }
+      },
+    ]
+  },
+  //公告管理
+  {
+    path: '/announcement',
+    component: Layout,
+    meta: { title: '公告管理', icon: 'announcement' },
+    children: [
+      {
+        path: '/announcementList',
+        component: () => import('@/views/announcement/announcementList/index'),
+        name: 'announcementList',
+        meta: { title: '公告列表', icon: 'announcement' }
+      },
+      {
+        path: '/announcementCreate',
+        component: () => import('@/views/announcement/announcementCreate/index'),
+        name: 'announcementCreate',
+        meta: { title: '创建公告', icon: 'createseries' }
+      },
+    ]
+  },
+  //消息管理
+  {
+    path: '/message',
+    component: Layout,
+    meta: { title: '消息管理', icon: 'message' },
+    children: [
+      {
+        path: '/messageList',
+        component: () => import('@/views/message/messageList/index'),
+        name: 'messageList',
+        meta: { title: '消息列表', icon: 'message' }
+      },
+      {
+        path: '/messageCreate',
+        component: () => import('@/views/message/messageCreate/index'),
+        name: 'messageCreate',
+        meta: { title: '创建消息', icon: 'createseries' }
+      },
+    ]
+  },
+  //兑换列表
+  {
+    path: 'exchange',
+    component: Layout,
+    children: [
+      {
+        path: '/exchange',
+        component: () => import('@/views/exchange/index'),
+        name: 'exchange',
+        meta: { title: '兑换列表', icon: 'exchange' }
+      }
+    ]
+  },
+  //分销商管理
+  {
+    path: 'distributor',
+    component: Layout,
+    children: [
+      {
+        path: '/distributor',
+        component: () => import('@/views/distributor/index'),
+        name: 'distributor',
+        meta: { title: '分销商管理', icon: 'distributor' }
+      }
+    ]
+  },
+  //文档管理
+  {
+    path: 'document',
+    component: Layout,
+    children: [
+      {
+        path: '/document',
+        component: () => import('@/views/document/index'),
+        name: 'document',
+        meta: { title: '文档管理', icon: 'document' }
+      }
+    ]
+  },
+  {
+    path: '/user',
+    component: Layout,
+    hidden: true,
+    redirect: 'noredirect',
+    children: [
+      {
+        path: 'profile',
+        component: () => import('@/views/system/user/profile/index'),
+        name: 'Profile',
+        meta: { title: '个人中心', icon: 'user' }
+      }
+    ]
+  }
 ]
 
 // 动态路由,基于用户权限动态去加载
@@ -174,8 +321,7 @@ export const dynamicRoutes = [
         meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
       }
     ]
-  },
-
+  }
 ]
 
 // 防止连续点击多次路由报错

+ 1 - 1
src/settings.js

@@ -17,7 +17,7 @@ module.exports = {
   /**
    * 是否显示 tagsView
    */
-  tagsView: true,
+  tagsView: false,
 
   /**
    * 是否固定头部

+ 0 - 0
src/views/announcement/announcementCreate/index.vue


+ 0 - 0
src/views/announcement/announcementList/index.vue


+ 3 - 0
src/views/appuserlist/index.vue

@@ -0,0 +1,3 @@
+<template>
+    <div>app用户</div>
+</template>

+ 5 - 0
src/views/authority/index.vue

@@ -0,0 +1,5 @@
+<template>
+    <div>
+        权限管理
+    </div>
+</template>

+ 3 - 0
src/views/collection/createseries/index.vue

@@ -0,0 +1,3 @@
+<template>
+    <router-view />
+</template>

+ 1 - 0
src/views/collection/serieslist/index.vue

@@ -0,0 +1 @@
+<template><router-view /></template>

+ 0 - 0
src/views/distributor/index.vue


+ 0 - 0
src/views/document/index.vue


+ 0 - 0
src/views/exchange/index.vue


+ 3 - 0
src/views/issuer/issuer1/index.vue

@@ -0,0 +1,3 @@
+<template>
+    
+</template>

+ 3 - 0
src/views/issuer/issuer2/index.vue

@@ -0,0 +1,3 @@
+<template>
+    
+</template>

+ 0 - 0
src/views/message/messageCreate/index.vue


+ 0 - 0
src/views/message/messageList/index.vue


+ 3 - 0
src/views/order/index.vue

@@ -0,0 +1,3 @@
+<template>
+    <div>订单管理</div>
+</template>

部分文件因文件數量過多而無法顯示