diff --git a/src/assets/style/style.css b/src/assets/style/style.css index 709cb67f..044d4c9b 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -96,6 +96,7 @@ li { .ant-slider-handle { background-color: #2d2e76 !important; border: none !important; + margin-top: -4px; } .ant-slider-handle:hover { box-shadow: 0 0 0 5px rgba(45, 46, 118, 0.2); diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 84011c34..6f34c26f 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -107,6 +107,7 @@ input:focus{ .ant-slider-handle { background-color: #2d2e76 !important; border: none !important; + margin-top: -4px; } .ant-slider-handle:hover { box-shadow: 0 0 0 5px rgba(45, 46, 118, 0.2); diff --git a/src/component/Detail/DesignPrintOperation.vue b/src/component/Detail/DesignPrintOperation.vue index c3ad3bf2..7f125d23 100644 --- a/src/component/Detail/DesignPrintOperation.vue +++ b/src/component/Detail/DesignPrintOperation.vue @@ -39,10 +39,20 @@
-
+
-
+
-
+
-
+
@@ -298,6 +299,19 @@ export default defineComponent({ object-fit: cover; transition: all .3s; } + .falls_item_user_Original{ + font-weight: 600; + font-size: 12px; + color: #39215b; + background: #c9a2ff; + padding: 0 5px; + border-radius: 4px; + margin-right: 2px; + position: absolute; + top: 10px; + right: 10px; + left: auto; + } } .falls_item_bottom{ padding: 0 10px; @@ -334,8 +348,14 @@ export default defineComponent({ text-overflow: ellipsis; white-space: nowrap; color: #000; - div{ + display: flex; + flex-direction: column; + align-items: flex-start; + + >div{ font-size: 16px; + display: flex; + align-items: center; } span{ font-size: 12px; diff --git a/src/component/WorksPage/newScaleImage.vue b/src/component/WorksPage/newScaleImage.vue index 9d6e0cef..602783d8 100644 --- a/src/component/WorksPage/newScaleImage.vue +++ b/src/component/WorksPage/newScaleImage.vue @@ -54,6 +54,8 @@
-->
@{{scaleImageData.userName}}
+
{{$t('newScaleImage.Original')}}
+
{{$t('newScaleImage.from')}}@{{ scaleImageData.originalUserName }}/{{ scaleImageData.originalUserName }}
@@ -260,7 +262,7 @@ import fullScreenImg from '@/component/HomePage/fullScreenImg.vue' export default defineComponent({ components:{fullScreenImg}, - emits:['deletePorfolio'], + emits:['deletePorfolio','bbb'], setup(props:any,{emit}) { let {t} = useI18n() //首先在setup中定义 @@ -735,6 +737,44 @@ export default defineComponent({ } } } + .detail_right_user{ + display: flex; + width: 100%; + .detail_right_user_content{ + display: flex; + flex-direction: row; + justify-content: space-between; + width: 100%; + .scaleImage_chunk_title_Original{ + color: #39215b; + background: #c9a2ff; + padding: 0 1rem; + border-radius: 4px; + font-weight: 600; + } + .scaleImage_chunk_title_intro{ + span{ + cursor: pointer; + color: #39215b; + text-decoration: underline; + } + } + } + .detail_right_user_head{ + border-radius: 50%; + overflow: hidden; + margin-right: var(--margin); + img{ + width: 10rem; + height: 10rem; + object-fit: cover; + } + } + .detail_right_user_head:hover{ + + } + + } .newScaleImage_left{ display: flex; width: 60%; @@ -1128,42 +1168,7 @@ export default defineComponent({ } } .newScaleImage_right_detail{ - .detail_right_user{ - display: flex; - .detail_right_user_head{ - border-radius: 50%; - overflow: hidden; - margin-right: var(--margin); - img{ - width: 10rem; - height: 10rem; - object-fit: cover; - } - } - .detail_right_user_head:hover{ - - } - .detail_right_user_content{ - flex: 1; - display: flex; - flex-direction: column; - justify-content: center; - align-items: flex-start; - - .detail_right_user_content_intro,.detail_right_user_content_btn{ - font-size: 1.6rem; - } - .detail_right_user_content_intro{ - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - color: #6b6b6b; - } - .detail_right_user_content_btn{ - border: .2rem solid var(--border-color); - } - } - } + .detail_right_work_detail{ .scaleImage_chunk_title_intro{ margin-top: calc(var(--padding) / 2); diff --git a/src/lang/cn.ts b/src/lang/cn.ts index 51744d2d..e5e0d7b5 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -459,6 +459,7 @@ export default { Random:'随机', inputContent:'输入名字进行搜索', preview:'预览', + isOverall:'图案图像不能在单件模式下使用', jsContent1:'以上操作没有保存，是否继续? ', }, uploadFile:{ @@ -506,6 +507,8 @@ export default { unfold:'展开', Collapse:'折叠', Title:'标题', + Original:'原创', + from:'源自', Delete:'删除', Describe:'描述', replyAll:'所有回复', diff --git a/src/lang/en.ts b/src/lang/en.ts index 472c8911..37673022 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -460,6 +460,7 @@ export default { Random:'Random', inputContent:'Please input', preview:'Preview', + isOverall:'Pattern images cannot be used in Single mode', jsContent1:'The above changes are not saved, being sure to continue? ', }, uploadFile:{ @@ -505,6 +506,8 @@ export default { first:'You can be the first!', reply:'Reply', unfold:'Expand', + Original:'Original', + from:'Derived from', Title:'Title', Delete:'Delete', Describe:'Describe', diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue index 5da15ce7..dbc55fc7 100644 --- a/src/views/HomeView/library.vue +++ b/src/views/HomeView/library.vue @@ -113,7 +113,11 @@
{{ $t('LibraryPage.Rename') }}
- +