diff --git a/src/assets/less/custom.less b/src/assets/less/custom.less index c928c01..2fde2b9 100644 --- a/src/assets/less/custom.less +++ b/src/assets/less/custom.less @@ -13,9 +13,9 @@ left: 50%; top: 50%; transform: translate(-50%, -50%); - padding: 1rem 1.8rem; - border-radius: .3rem; - font-size: 1.2rem; + padding: 10rem 18rem; + border-radius: 3rem; + font-size: 12rem; white-space: nowrap; } @@ -84,19 +84,19 @@ } .badge { - font-size: 1.2rem; + font-size: 12rem; display: block; color: black; - padding: 1px .6rem; - border-radius: 1rem; + padding: 1rem 6rem; + border-radius: 10rem; background: yellow; } .badge2 { transform: scale(.9); - font-size: 1.2rem; + font-size: 12rem; color: black; - @width: 1.8rem; + @width: 18rem; width: @width; height: @width; display: flex; @@ -112,7 +112,7 @@ p { } .line { - height: 1px; + height: 1rem; background: @line-color2; width: 100%; } diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue new file mode 100644 index 0000000..fecadbc --- /dev/null +++ b/src/components/UserPanel.vue @@ -0,0 +1,946 @@ + + + + + \ No newline at end of file diff --git a/src/components/UserPanel2.vue b/src/components/UserPanel2.vue new file mode 100644 index 0000000..95da82f --- /dev/null +++ b/src/components/UserPanel2.vue @@ -0,0 +1,684 @@ + + + + + \ No newline at end of file diff --git a/src/pages/test/Test.vue b/src/pages/test/Test.vue index 6dbf740..238495a 100644 --- a/src/pages/test/Test.vue +++ b/src/pages/test/Test.vue @@ -3,7 +3,8 @@ - + + @@ -21,10 +22,12 @@ import TestImg from "./TestImg"; import slideHooks from '../slideHooks' import TestSwiperJs from "./TestSwiperJs"; import {mat4} from "gl-matrix"; +import UserPanel from "@/components/UserPanel.vue"; export default { name: "Test", components: { + UserPanel, slideHooks, TestSlide, SlideUser, diff --git a/src/utils/index.jsx b/src/utils/index.jsx index f2c9d4a..796495c 100644 --- a/src/utils/index.jsx +++ b/src/utils/index.jsx @@ -73,12 +73,12 @@ export default { const app = Vue.createApp({ render() { return + onCancel={tempCancelCb} + onDismiss={remove} + title={title} + okText={okText} + cancelText={cancelText} + onOk={tempOkCb}/> }, }) let parent = document.createElement('div') @@ -237,7 +237,7 @@ export default { params: (function () { const ret = {} const seg = a.search.replace(/^\?/, '') - .split('&') + .split('&') const len = seg.length let i = 0 let s @@ -266,14 +266,6 @@ export default { } return Config.filePreview + url }, - formatNumber(num) { - if (!num) return - if (num < 10000) { - return num - } else { - return (num / 10000).toFixed(1) + 'w' - } - }, $getTransform(el) { let transform = el.style.transform if (!transform) return 0 @@ -354,6 +346,19 @@ export default { } return str }, + formatNumber(num) { + if (!num) return + if (num < 10000) { + return num + } else { + return (num / 10000).toFixed(1) + 'w' + } + }, + filterAge(age) { + if (!age) return + let date = new Date(age) + return new Date().getFullYear() - date.getFullYear() + }, randomNum(minNum, maxNum) { switch (arguments.length) { case 1: @@ -378,5 +383,17 @@ export default { old[key] = val emit('update:item', old) bus.emit('update:item', {position: props.position, item: old}) + }, + copy(val) { + const input = document.createElement('input'); + input.setAttribute('readonly', 'readonly'); + input.setAttribute('value', val); + document.body.appendChild(input); + input.setSelectionRange(0, 9999); + if (document.execCommand('copy')) { + document.execCommand('copy'); + this.$notice('已复制') + } + document.body.removeChild(input); } }