diff --git a/src/assets/icons/iconfont.js b/src/assets/icons/iconfont.js index 82f8380..f731376 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,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 diff --git a/src/assets/styles/adminIndex.scss b/src/assets/styles/adminIndex.scss index bcca503..f628f40 100644 --- a/src/assets/styles/adminIndex.scss +++ b/src/assets/styles/adminIndex.scss @@ -35,7 +35,7 @@ } } } - +// 获取验证码 .auth_code { position: relative; @@ -75,7 +75,7 @@ } } } - +// table新增按钮 .page_add { text-align: right; @@ -107,7 +107,7 @@ .col_flex { display: flex; } - +// table内不同的btn .el-table { color: #333; font-size: 14px; @@ -141,6 +141,7 @@ background-color: #a7acae !important; } } +// 弹框定位居中 .el-dialog { margin-top: 0 !important; top: 50%; @@ -150,39 +151,35 @@ -ms-transform: translateY(-50%); -o-transform: translateY(-50%); } +// 弹框内表单统一操作 .el-dialog__body { max-height: 70vh !important; overflow-y: auto; .el-form-item { margin-bottom: 24px; } - .el-form-item__label { line-height: 40px; color: #333; } - .el-input__inner { // width: 336px; height: 40px; line-height: 40px; } - .el-range-separator { line-height: 34px; } - .el-date-editor { width: 336px; } } - +// 弹框header样式 .el-dialog__header { position: relative; padding: 20px 0; margin: 0 24px; border-bottom: 1px solid #eee; - &::before { content: ""; position: absolute; @@ -194,29 +191,25 @@ background: url(../images/t-zs.png) no-repeat left center; background-size: 100% 100%; } - .el-dialog__title { color: #000; } - - .el-dialog__headerbtn { - font-size: 20px; - top: 50%; - right: 0; - transform: translateY(-50%); - } + // .el-dialog__headerbtn { + // font-size: 20px; + // top: 50%; + // right: 0; + // transform: translateY(-50%); + // } } - +// 弹框底部-居中-btn样式 .el-dialog__footer { padding: 10px 0 40px 0; text-align: center; - .dialog-footer { .el-button { font-size: 14px; padding: 10px 36px; } - .el-button--default { color: #3a8aeb; border-color: #3a8aeb; @@ -224,7 +217,7 @@ } } } - +// 记录弹框 .record_layer { .el-dialog__body { padding: 0 20px 30px 20px; @@ -272,61 +265,6 @@ } } -.item_format { - display: flex; - position: absolute; - left: 0; - bottom: 38px; - - span { - display: block; - width: 47px; - height: 18px; - // padding: 2px 5px; - margin-left: 6px; - text-align: center; - background: #3a8aeb; - color: #fff; - font-size: 12px; - line-height: 18px; - border-radius: 9px; - } -} - -.file_name { - height: 32px; - line-height: 32px; - padding: 0 10px; - font-size: 14px; - color: #333; - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-line-clamp: 1; - overflow: hidden; - text-overflow: ellipsis; -} -// 首页-主题库-按钮 -.home_publish_btn { - position: absolute; - top: 14px; - right: 26px; - z-index: 999; - - .el-button { - padding: 8px 20px; - margin-left: 20px; - font-size: 14px; - color: #fff; - border: none; - - &:first-child { - background: linear-gradient(to right, #fc8c6f, #fa544e); - } - // &:last-child { - // margin-left: 24px; - // } - } -} .content_warp { i { font-style: normal; @@ -435,16 +373,8 @@ padding: 0 20px 30px 20px; } } - -// 弹框右上角多按钮且关闭X出框 +// 弹框右上角多按钮 .upload_layer { - // .el-dialog__headerbtn { - // right: -60px; - // .el-dialog__close { - // color: #fff; - // font-size: 26px; - // } - // } .upload_list_right { position: absolute; right: 24px; @@ -456,7 +386,6 @@ cursor: pointer; .upload_return { margin-left: 16px; - } } } @@ -479,6 +408,44 @@ height: 100%; } } + +.cont_upload { + display: flex; + flex-wrap: wrap; + justify-content: center; + align-content: center; + border: 1px dashed #dcdde3; + background: #f2f7ff; + .el-button { + display: block; + width: 114px; + height: 34px; + padding: 0; + font-size: 14px; + border: none; + } + .cont_upload_btn { + background: linear-gradient(to right, #fc8c6f, #fa544e) !important; + } + .mkdir_btn { + margin-left: 0; + margin-top: 16px; + } +} +.folder { + border: 1px solid #dcdde3; + .icon_bg { + display: flex; + align-items: center; + justify-content: center; + height: 148px; + background: #fff5dd; + .icon { + width: 104px; + height: 89px; + } + } +} // 素材库/主题库选中 .checked_btn { position: absolute; @@ -497,5 +464,130 @@ background: url(~@/assets/images/selected.png) no-repeat; } } +// 主题-素材-资源格式样式 +.item_format { + display: flex; + position: absolute; + left: 0; + bottom: 38px; + span { + display: block; + width: 47px; + height: 18px; + // padding: 2px 5px; + margin-left: 6px; + text-align: center; + background: #3a8aeb; + color: #fff; + font-size: 12px; + line-height: 18px; + border-radius: 9px; + } +} +// 主题-素材-文件名样式 +.file_name { + height: 32px; + line-height: 32px; + padding: 0 10px; + font-size: 14px; + color: #333; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; + overflow: hidden; + text-overflow: ellipsis; +} +// 首页-主题库-按钮 +.home_publish_btn { + position: absolute; + top: 14px; + right: 26px; + z-index: 999; + .el-button { + padding: 8px 20px; + margin-left: 20px; + font-size: 14px; + color: #fff; + border: none; + &.el_button_red { + background: linear-gradient(to right, #fc8c6f, #fa544e); + } + &.el_button_green { + background: linear-gradient(to right, #43c7b8, #3dd3ae); + } + } +} +// 素材-主题库-list-上传历史/多选btn +.material_btn { + position: absolute; + right: 24px; + top: 13px; + .el-button { + padding: 0 20px; + height: 28px; + border-color: #3a8aeb; + &:last-child { + padding: 0 25px; + color: #3a8aeb; + } + } +} +// 素材-主题库-list- 多选之后操作 +.multi_handle { + display: flex; + position: fixed; + bottom: 140px; + left: 50%; + // width: 1100px; + padding: 25px 150px; + background: rgba(0, 0, 0, 0.5); + border-radius: 4px; + transform: translateX(-40%); + .mulit_btn { + padding: 0 24px; + height: 34px; + font-size: 14px; + color: #333; + border: none; + margin: 0 24px; + background-color: #fff; + } + .mulit_delt_btn { + background-color: #ec414d; + color: #fff; + } +} +// 移动至 - 文件夹弹框 +.wjj_layer { + ::v-deep .el-dialog__body { + padding: 30px 24px; + } + .wjj_list { + display: flex; + flex-wrap: wrap; + .wjj_item { + display: flex; + flex-wrap: wrap; + align-content: center; + justify-content: center; + width: 96px; + height: 104px; + cursor: pointer; + &.wjj_item_active { + background: #e8f3ff; + border: 1px solid #428fec; + } + .font-icon { + width: 64px; + height: 55px; + } + .wjj_name { + font-size: 14px; + color: #333; + margin-top: 8px; + } + } + } +} // end diff --git a/src/assets/styles/iconfont.css b/src/assets/styles/iconfont.css index 9b01f8c..af49c5f 100644 --- a/src/assets/styles/iconfont.css +++ b/src/assets/styles/iconfont.css @@ -1,10 +1,8 @@ @font-face { - font-family: 'iconfont'; - /* project id 3202838 */ - src: url('//at.alicdn.com/t/font_3202838_q6w9546ze7d.woff2') format('woff2'), - url('//at.alicdn.com/t/font_3202838_q6w9546ze7d.woff') format('woff'), - url('//at.alicdn.com/t/font_3202838_q6w9546ze7d.ttf') format('truetype'), - url('#iconfont') format('svg'); + 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'); } .iconfont { font-family: "iconfont" !important; diff --git a/src/views/ThemeGallery/index.vue b/src/views/ThemeGallery/index.vue index 0cbee13..faf641c 100644 --- a/src/views/ThemeGallery/index.vue +++ b/src/views/ThemeGallery/index.vue @@ -1,29 +1,25 @@ @@ -34,7 +30,6 @@ export default { components: { ThemeGalleryList }, data() { return { - activeName: '1', mulitText: '多选', isMultiSelected: false, showItemInfo: true @@ -51,44 +46,44 @@ export default { } else { this.mulitText = '多选' } - }, - publishHandle(index) { - this.$router.push( - { - path: '/release', query: { tag: index } - } - ) } } } diff --git a/src/views/components/ThemeGalleryList.vue b/src/views/components/ThemeGalleryList.vue index c6e05e3..34d98c5 100644 --- a/src/views/components/ThemeGalleryList.vue +++ b/src/views/components/ThemeGalleryList.vue @@ -1,16 +1,37 @@