diff --git a/src/api/login.js b/src/api/login.js index b0750c4..09ff895 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -25,13 +25,14 @@ export function getMsg(phone) { }) } -export function setPassword(phone, new_pass, code, uuid) { +// 忘记密码 +export function setPassword(phone, newPass, code, uuid) { return request({ url: 'api/auth/password', method: 'post', data: { phone, - new_pass, + newPass, code, uuid } diff --git a/src/api/system/menu.js b/src/api/system/menu.js index 3298543..fd68ea7 100644 --- a/src/api/system/menu.js +++ b/src/api/system/menu.js @@ -38,6 +38,15 @@ export function buildMenus() { }) } +// 根据当前菜单ID获取子菜单/操作 +export function FetchChildMenus(parameter) { + return request({ + url: 'api/menus/child', + method: 'get', + params: parameter + }) +} + export function add(data) { return request({ url: 'api/menus', diff --git a/src/api/upload/upload.js b/src/api/upload/upload.js index 81a9e15..215ebdd 100644 --- a/src/api/upload/upload.js +++ b/src/api/upload/upload.js @@ -7,3 +7,12 @@ export function getQiniuToken() { method: 'get' }) } + +// 带数据处理的凭证 +export function FectchUploadTokenAndOps(parameter) { + return request({ + url: 'api/qiniu/uploadTokenAndOps', + method: 'get', + params: parameter + }) +} diff --git a/src/assets/icons/iconfont.js b/src/assets/icons/iconfont.js index f731376..095425e 100644 --- a/src/assets/icons/iconfont.js +++ b/src/assets/icons/iconfont.js @@ -1 +1 @@ -!function(a){var i,l,t,o,e,n='',h=(h=document.getElementsByTagName("script"))[h.length-1].getAttribute("data-injectcss"),d=function(a,i){i.parentNode.insertBefore(a,i)};if(h&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}function m(){e||(e=!0,t())}function s(){try{o.documentElement.doScroll("left")}catch(a){return void setTimeout(s,50)}m()}i=function(){var a,i=document.createElement("div");i.innerHTML=n,n=null,(i=i.getElementsByTagName("svg")[0])&&(i.setAttribute("aria-hidden","true"),i.style.position="absolute",i.style.width=0,i.style.height=0,i.style.overflow="hidden",i=i,(a=document.body).firstChild?d(i,a.firstChild):a.appendChild(i))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(i,0):(l=function(){document.removeEventListener("DOMContentLoaded",l,!1),i()},document.addEventListener("DOMContentLoaded",l,!1)):document.attachEvent&&(t=i,o=a.document,e=!1,s(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,m())})}(window); \ No newline at end of file +!function(a){var i,l,o,t,h,e='',n=(n=document.getElementsByTagName("script"))[n.length-1].getAttribute("data-injectcss"),m=function(a,i){i.parentNode.insertBefore(a,i)};if(n&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}function v(){h||(h=!0,o())}function c(){try{t.documentElement.doScroll("left")}catch(a){return void setTimeout(c,50)}v()}i=function(){var a,i=document.createElement("div");i.innerHTML=e,e=null,(i=i.getElementsByTagName("svg")[0])&&(i.setAttribute("aria-hidden","true"),i.style.position="absolute",i.style.width=0,i.style.height=0,i.style.overflow="hidden",i=i,(a=document.body).firstChild?m(i,a.firstChild):a.appendChild(i))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(i,0):(l=function(){document.removeEventListener("DOMContentLoaded",l,!1),i()},document.addEventListener("DOMContentLoaded",l,!1)):document.attachEvent&&(o=i,t=a.document,h=!1,c(),t.onreadystatechange=function(){"complete"==t.readyState&&(t.onreadystatechange=null,v())})}(window); \ No newline at end of file diff --git a/src/assets/styles/iconfont.css b/src/assets/styles/iconfont.css index af49c5f..50f27dc 100644 --- a/src/assets/styles/iconfont.css +++ b/src/assets/styles/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: 'iconfont'; /* Project id 3202838 */ - src: url('//at.alicdn.com/t/font_3202838_xxqwqp4ynb7.woff2?t=1647330074548') format('woff2'), - url('//at.alicdn.com/t/font_3202838_xxqwqp4ynb7.woff?t=1647330074548') format('woff'), - url('//at.alicdn.com/t/font_3202838_xxqwqp4ynb7.ttf?t=1647330074548') format('truetype'); + src: url('//at.alicdn.com/t/font_3202838_2xsmxbo1xoa.woff2?t=1650869325774') format('woff2'), + url('//at.alicdn.com/t/font_3202838_2xsmxbo1xoa.woff?t=1650869325774') format('woff'), + url('//at.alicdn.com/t/font_3202838_2xsmxbo1xoa.ttf?t=1650869325774') format('truetype'); } .iconfont { font-family: "iconfont" !important; diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index 97c0612..0dcc2cc 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -73,7 +73,13 @@ .submenu-title-noDropdown, .el-submenu__title { &:hover { + color: $subMenuHover !important; background-color: $menuHover !important; + .svg-icon{ + position: relative; + left: -100px; + filter: drop-shadow(#fff 100px 0); + } } } @@ -81,6 +87,13 @@ color: $subMenuActiveText !important; } + .is-active>.el-submenu__title { + &:hover { + color: $subMenuHover !important; + + } + } + & .nest-menu .el-submenu>.el-submenu__title, & .el-submenu .el-menu-item { min-width: $sideBarWidth !important; @@ -88,6 +101,9 @@ &:hover { background-color: $subMenuHover !important; + .svg-icon{ + filter: drop-shadow(#fff 100px 0); + } } } } diff --git a/src/assets/styles/variables.scss b/src/assets/styles/variables.scss index 8c42764..7ac3589 100644 --- a/src/assets/styles/variables.scss +++ b/src/assets/styles/variables.scss @@ -17,7 +17,7 @@ $menuBg:#fff; $menuHover:#3a8aeb; $subMenuBg:#fff; -$subMenuHover:#3a8aeb; +$subMenuHover:#fff; $sideBarWidth: 264px; diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index b515f61..4835b02 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -21,7 +21,7 @@ export default { } if (title) { - vnodes.push({(title)}) + vnodes.push({(title)}) } return vnodes } diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue index b0ba5f8..4d5be65 100644 --- a/src/layout/components/Sidebar/SidebarItem.vue +++ b/src/layout/components/Sidebar/SidebarItem.vue @@ -23,7 +23,7 @@ import { isExternal } from '@/utils/validate' import Item from './Item' import AppLink from './Link' import FixiOSBug from './FixiOSBug' - +// import { FetchChildMenus } from '@/api/system/menu' export default { name: 'SidebarItem', components: { Item, AppLink }, @@ -48,6 +48,20 @@ export default { return {} }, methods: { + getChildMenu(item) { + // console.log(item) + // const param = { + // id: item.id + // } + // console.log(param) + // FetchChildMenus(param).then(res => { + // if (res.code == 200) { + // console.log(res) + // } else { + // return this.$message.error('获取子菜单失败数据失败！') + // } + // }) + }, hasOneShowingChild(children = [], parent) { const showingChildren = children.filter((item) => { if (item.hidden) { @@ -58,6 +72,9 @@ export default { } }) + // console.log(showingChildren) + // console.log(showingChildren.length) + if (showingChildren.length === 1) { return true } diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue index 16f1cdb..57a72e5 100644 --- a/src/layout/components/TagsView/index.vue +++ b/src/layout/components/TagsView/index.vue @@ -49,7 +49,6 @@ export default { }, computed: { visitedViews() { - console.log(this.$store.state.tagsView.visitedViews) return this.$store.state.tagsView.visitedViews }, routes() { diff --git a/src/router/index.js b/src/router/index.js index 8fdcebe..0cc6923 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -48,7 +48,6 @@ router.beforeEach((to, from, next) => { if (whiteList.indexOf(to.path) !== -1) { // 在免登录白名单，直接进入 next() } else { - console.log('efdlsdkadjas;dkasdk') next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页 NProgress.done() } diff --git a/src/router/routers.js b/src/router/routers.js index 8cdda1a..37a1df2 100644 --- a/src/router/routers.js +++ b/src/router/routers.js @@ -57,36 +57,34 @@ export const constantRouterMap = [ noCache: true } }] - }, - { - path: '/user', - component: Layout, - hidden: true, - redirect: 'noredirect', - children: [ - { - path: 'menu1', - component: (resolve) => require(['@/views/user/menu1'], resolve), - name: '', - meta: { title: '' } - } - ] } // { - // path: '/system', + // path: '/user', // component: Layout, // hidden: true, // redirect: 'noredirect', + // children: [ + // { + // path: 'menu1', + // component: (resolve) => require(['@/views/user/menu1'], resolve), + // name: '', + // meta: { title: '' } + // } + // ] + // }, + // { + // path: '/system', + // component: Layout, // meta: { - // title: '权限管理', - // icon: 'documentation' + // title: '用户管理', + // icon: 'quanxianguanli' // }, // children: [{ // path: '/user', // component: () => import('@/views/system/user/index'), // meta: { // title: '用户管理', - // icon: 'edit' + // icon: '' // } // }, // { @@ -94,15 +92,23 @@ export const constantRouterMap = [ // component: () => import('@/views/system/role/index'), // meta: { // title: '角色管理', - // icon: 'edit' + // icon: '' // } + // }] + // }, + // { + // path: '/dept', + // component: Layout, + // meta: { + // title: '机构管理', + // icon: 'jigouguanli' // }, - // { + // children: [{ // path: '/dept', // component: () => import('@/views/system/dept/index'), // meta: { // title: '机构管理', - // icon: 'edit' + // icon: '' // } // }, // { @@ -110,24 +116,7 @@ export const constantRouterMap = [ // component: () => import('@/views/system/menu/index'), // meta: { // title: '权限管理', - // icon: 'edit' - // } - // }] - // }, - // { - // path: '/role', - // component: Layout, - // redirect: '/system', - // meta: { - // title: '权限管理', - // icon: 'documentation' - // }, - // children: [{ - // path: '/system/role', - // component: () => import('@/views/system/role/index'), - // meta: { - // title: '角色管理', - // icon: 'edit' + // icon: '' // } // }] // }, @@ -136,22 +125,22 @@ export const constantRouterMap = [ // component: Layout, // meta: { // title: '设备管理', - // icon: 'documentation' + // icon: 'shebeiguanli' // }, // children: [{ // path: '/device', - // component: () => import('@/views/device/index'), + // component: () => import('@/views/device/list/index'), // meta: { // title: '设备列表', - // icon: 'edit' + // icon: '' // } // }, // { // path: '/deviceConfig', - // component: () => import('@/views/device/deviceConfig'), + // component: () => import('@/views/device/config/index'), // meta: { // title: '开关机配置', - // icon: 'edit' + // icon: '' // } // }] // }, @@ -160,30 +149,30 @@ export const constantRouterMap = [ // component: Layout, // meta: { // title: '内容管理', - // icon: 'documentation' + // icon: 'neirongguanli' // }, // children: [{ // path: '/content', - // component: () => import('@/views/materialContent/index'), + // component: () => import('@/views/content/material/index'), // meta: { // title: '素材库', - // icon: 'edit' + // icon: '' // } // }, // { - // path: '/publish', - // component: () => import('@/views/publishContent/index'), + // path: '/display', + // component: () => import('@/views/content/publish/index'), // meta: { // title: '上屏发布', - // icon: 'edit' + // icon: '' // } // }, // { - // path: '/theme', - // component: () => import('@/views/ThemeGallery/index'), + // path: '/\r\ntheme', + // component: () => import('@/views/content/theme/index'), // meta: { // title: '主题库', - // icon: 'edit' + // icon: '' // } // }, // { @@ -191,20 +180,6 @@ export const constantRouterMap = [ // component: () => import('@/views/immediateRelease/index') // }] // } - // { - // path: '/user', - // component: Layout, - // hidden: true, - // redirect: 'noredirect', - // children: [ - // { - // path: 'center', - // component: resolve => require(['@/views/system/user/center'], resolve), - // name: '个人中心', - // meta: { title: '个人中心' } - // } - // ] - // } ] export default new Router({ diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 84a8c64..594f50c 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -45,9 +45,10 @@ const user = { // 忘记密码 SetPassword({ commit }, userInfo) { return new Promise((resolve, reject) => { - setPassword(userInfo.phone, userInfo.new_pass, userInfo.code, userInfo.uuid).then(res => { - setUserInfo(res.data, commit) - resolve(res) + setPassword(userInfo.phone, userInfo.newPass, userInfo.code, userInfo.uuid).then(res => { + if (res.code == 200) { + resolve(res) + } }).catch(error => { reject(error) }) @@ -58,7 +59,6 @@ const user = { return new Promise((resolve, reject) => { const token = getToken() getInfo(token).then(res => { - console.log(res) setUserInfo(res.data, commit) resolve(res) }).catch(error => { @@ -94,7 +94,6 @@ export const logOut = (commit) => { } export const setUserInfo = (res, commit) => { - console.log(res) // 如果没有任何权限，则赋予一个默认的权限，避免请求死循环 if (res.roles.length === 0) { commit('SET_ROLES', ['ROLE_SYSTEM_DEFAULT']) diff --git a/src/views/components/MyAlbum.vue b/src/views/components/MyAlbum.vue index 75bb80d..1e8e11e 100644 --- a/src/views/components/MyAlbum.vue +++ b/src/views/components/MyAlbum.vue @@ -182,13 +182,11 @@ export default { getMyAlbum() { let inOrOutFolderId if (this.$route.query.folderTag) { - console.log('文件夹内') this.isToFolder = true this.currentFolder = localStorage.getItem('currentFolder') this.currentFolderId = localStorage.getItem('currentFolderId') inOrOutFolderId = this.currentFolderId } else { - console.log('文件夹外') this.isToFolder = false localStorage.removeItem('currentFolder') localStorage.removeItem('currentFolderId') @@ -319,7 +317,6 @@ export default { }, // 删除 文件夹 deleteMaterialFolder() { - console.log(this.folderForm.id) this.$confirm('此操作将永久删除该文件夹, 是否继续?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -351,7 +348,6 @@ export default { // 提交表单 - 新建/编辑 submitFolderForm(formName) { this.folderForm.img_path = this.$refs.childUpload.imageUrl - console.log(this.folderForm) this.$refs[formName].validate((valid) => { if (valid) { FetchSaveThemeFolder(this.folderForm).then(res => { diff --git a/src/views/components/ThemeGalleryList.vue b/src/views/components/ThemeGalleryList.vue index 3bbe88c..f941792 100644 --- a/src/views/components/ThemeGalleryList.vue +++ b/src/views/components/ThemeGalleryList.vue @@ -119,7 +119,7 @@ export default { } }, isMyAlbum(newName, oldName) { - console.log(newName) + // console.log(newName) } }, mounted() { @@ -202,7 +202,6 @@ export default { } FetchAddToMyAlbum(params).then(res => { if (res.code == 200) { - console.log(res) this.$message.success('已成功添加到我的画册里啦~') } else { this.$message.error(res.msg) diff --git a/src/views/components/upload.vue b/src/views/components/upload.vue index 6f30495..a3f146d 100644 --- a/src/views/components/upload.vue +++ b/src/views/components/upload.vue @@ -2,13 +2,13 @@
选择文件 - +
上传 - + - +
@@ -20,21 +20,18 @@ :visible.sync="uploadListVisible" height="384px" > - - + @@ -44,11 +41,13 @@ type="primary" round class="on_off_btn" + style="width: 50px; display: inline-block;" @click="end(scope.$index, scope.row)" >{{ loading_txt }} 删除 @@ -56,15 +55,10 @@
- -
点击上传
- - +
+ 点击上传 + +
返回
@@ -74,7 +68,9 @@ - -