diff --git a/src/assets/style/style.css b/src/assets/style/style.css index eb5a10e8..27365a00 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -494,6 +494,7 @@ li { justify-content: center; } .ant-modal-confirm-confirm .ant-modal-content .ant-modal-body .ant-modal-confirm-btns .ant-btn-primary { + color: #fff; margin-left: 10rem; } .modal_component.ant-modal { @@ -899,26 +900,31 @@ li { .sketchboard_upload_modal .switch_type_list.showEvents * { pointer-events: auto; } -.habit :deep(.ant-btn:hover), -:deep(.ant-btn:focus), -:deep(.ant-btn:active), -:deep(.ant-btn::after) { +.ant-btn:hover, +.ant-btn:focus, +.ant-btn:active, +.ant-btn::after { color: #000; border-color: #000 !important; box-shadow: none !important; } -:deep(.ant-switch-checked) { +.ant-switch-checked { background-color: #000; } -:deep(.ant-switch-checked) .ant-switch-handle { +.ant-switch-checked .ant-switch-handle { left: calc(100% - 1.8rem - 0.2rem); + top: 0.3rem; } -:deep(.ant-switch) { +[ant-click-animating-without-extra-node='true']::after, +.ant-click-animating-node { + box-shadow: none !important; +} +.ant-switch { min-width: 4.4rem; height: 2.2rem; line-height: 2.2rem; } -:deep(.ant-switch) .ant-switch-handle { +.ant-switch .ant-switch-handle { width: 1.8rem; height: 1.8rem; } diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 7aec302d..0ec8c4e4 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -562,6 +562,7 @@ input:focus{ display: flex; justify-content: center; .ant-btn-primary{ + color: #fff; margin-left: 10rem; } } @@ -1022,22 +1023,25 @@ input:focus{ .ant-message-info .anticon{ // color: #b2b2b2; } -.habit :deep(.ant-btn:hover), -:deep(.ant-btn:focus), -:deep(.ant-btn:active), -:deep(.ant-btn::after) { +.ant-btn:hover, +.ant-btn:focus, +.ant-btn:active, +.ant-btn::after { color: #000; border-color: #000 !important; box-shadow: none !important; } -:deep(.ant-switch-checked) { +.ant-switch-checked { background-color: #000; .ant-switch-handle{ left: calc(100% - 1.8rem - .2rem); + top: .3rem; } - } -:deep(.ant-switch){ +[ant-click-animating-without-extra-node='true']::after, .ant-click-animating-node{ + box-shadow: none !important; +} +.ant-switch{ min-width: 4.4rem; height: 2.2rem; line-height: 2.2rem; diff --git a/src/component/Administrator/allUser.vue b/src/component/Administrator/allUser.vue index fa8ae472..aa7cd474 100644 --- a/src/component/Administrator/allUser.vue +++ b/src/component/Administrator/allUser.vue @@ -94,6 +94,7 @@ export default defineComponent({ { title: 'Country', align: "center", + width: 50, ellipsis: true, dataIndex: "country", key: "country", diff --git a/src/component/Detail/DesignDetailAlter.vue b/src/component/Detail/DesignDetailAlter.vue index 42b98342..a5b95087 100644 --- a/src/component/Detail/DesignDetailAlter.vue +++ b/src/component/Detail/DesignDetailAlter.vue @@ -163,14 +163,18 @@ -->
-
+ +
{{ $t('ColorboardUpload.Single') }}
+ +
{{ $t('ColorboardUpload.Gradual') }}
+
-
Alignment
+
{{ $t('ColorboardUpload.Alignment') }}
@@ -1688,6 +1692,16 @@ export default defineComponent({ .color_setting_operateSingle{ text-align: center; margin: 1rem 0; + display: flex; + justify-content: center; + .color_setting_btn{ + margin: 0 1rem; + color: rgba(0, 0, 0, 0.5); + &.active{ + color: rgba(0, 0, 0, 0.7); + font-weight: 900; + } + } } .color_setting_operate{ *{ diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue index ec9fbc0b..a1e86a58 100644 --- a/src/component/Detail/habit.vue +++ b/src/component/Detail/habit.vue @@ -57,11 +57,11 @@
-
Style:
+
{{ $t('Habit.Style') }}:
{{ workspaceItem.styleName }}
-
选择
+
{{ $t('Habit.Select') }}
-
Style
+
{{ $t('Habit.Style') }}
@@ -34,7 +34,7 @@ OK
- Clear + {{ $t('Habit.Clear') }}
@@ -55,7 +55,7 @@ import { Https } from "@/tool/https"; import { getCookie,setCookie } from "@/tool/cookie"; // import domTurnImg from '@/tool/domTurnImg' import { downloadIamge } from "@/tool/util"; - +import { useI18n } from "vue-i18n"; export default defineComponent({ emits:['setParentData','setWorkspaceStyle'], @@ -72,6 +72,7 @@ setup(props,{emit}) { selectStyleName:'', isShowMark:false, }) + const {t} = useI18n() let getStyleList = ()=>{ habitSetStyleData.isShowMark = true Https.axiosPost(Https.httpUrls.getStyleList, {}).then( @@ -127,7 +128,7 @@ setup(props,{emit}) { }else{ let _this = this Modal.confirm({ - title: 'It is detected that you have modified the style, may I ask whether the model is changed to the model corresponding to the style', + title: t('Habit.jsContent3'), icon: createVNode(ExclamationCircleOutlined), okText: 'Yes', cancelText: 'No', diff --git a/src/component/HomePage/ColorboardUpload.vue b/src/component/HomePage/ColorboardUpload.vue index bc4ac7df..3d16475e 100644 --- a/src/component/HomePage/ColorboardUpload.vue +++ b/src/component/HomePage/ColorboardUpload.vue @@ -50,14 +50,18 @@
-->
-
+ +
{{ $t('ColorboardUpload.Single') }}
+ +
{{ $t('ColorboardUpload.Gradual') }}
+
-
Alignment
+
{{ $t('ColorboardUpload.Alignment') }}
@@ -1125,6 +1129,16 @@ export default defineComponent({ .color_setting_operateSingle{ text-align: center; margin: 1rem 0; + display: flex; + justify-content: center; + .color_setting_btn{ + margin: 0 1rem; + color: rgba(0, 0, 0, 0.5); + &.active{ + color: rgba(0, 0, 0, 0.7); + font-weight: 900; + } + } } .color_setting_operate{ *{ diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index ba9c4a23..88f07eff 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -206,8 +206,8 @@
{{ $t('exportModel.HDExport') }}
-
Save
-
Share
+
{{ $t('exportModel.Save') }}
+
{{ $t('exportModel.Share') }}
{{ $t('exportModel.Export') }}
@@ -1842,7 +1842,7 @@ export default defineComponent({ formData.append('userLikeGroupId', userlikeGroupId); let config = {headers:{'Content-Type':'multipart/form-data','Accept':'*/*' }} Https.axiosPost(Https.httpUrls.exportSave, formData,config).then((rv)=>{ - message.success('save successfully') + message.success(t('exportModel.jsContent7')) }) } let setCanvasContent = ()=>{ diff --git a/src/component/HomePage/generalMenu.vue b/src/component/HomePage/generalMenu.vue index 5381c07a..c5c6ad4d 100644 --- a/src/component/HomePage/generalMenu.vue +++ b/src/component/HomePage/generalMenu.vue @@ -98,6 +98,7 @@ margin-top: calc(.3rem*1.2); border-radius: calc(1rem*1.2); overflow: hidden; + z-index: 3; li{ // background: rgba(0,0,0,.2); background: #cccccc; diff --git a/src/component/HomePage/productImg.vue b/src/component/HomePage/productImg.vue index 146542e7..35563809 100644 --- a/src/component/HomePage/productImg.vue +++ b/src/component/HomePage/productImg.vue @@ -18,18 +18,18 @@
-
Finalize
+
{{$t('ProductImg.Finalize')}}
-
Select Collection
+
{{$t('ProductImg.SelectCollection')}}
-
Upload
+
{{$t('ProductImg.Upload')}}
@@ -76,7 +76,10 @@
-
Magic Tools
+
+ {{$t('ProductImg.MagicTools')}} + +
@@ -108,7 +111,7 @@
-
Selected Product
+
{{$t('ProductImg.GenerateProduct')}}
@@ -121,8 +124,8 @@
- Selected Product -
Export
+ {{$t('ProductImg.SelectedProduct')}} +
{{$t('ProductImg.Export')}}
@@ -161,11 +164,13 @@ import { useI18n } from "vue-i18n"; import ExportModel from "@/component/HomePage/ExportModel.vue"; import { useStore } from "vuex"; import scaleImage from "@/component/HomePage/scaleImage.vue"; +import generalMenu from "@/component/HomePage/generalMenu.vue"; export default defineComponent({ components:{ ExportModel, scaleImage, + generalMenu, }, setup(props,{emit}) { const store = useStore(); @@ -189,6 +194,13 @@ export default defineComponent({ ], }) + let productimgMenuList = ref([ + { + value:'ProductImage', + label:useI18n().t('ProductImg.ProductImage') + } + ]) + let productimgMenu = ref(productimgMenuList.value[0]) let ExportModel = ref() let likeDesignCollectionList: any = computed(() => { return store.state.HomeStoreModule.likeDesignCollectionList; @@ -203,6 +215,9 @@ export default defineComponent({ userlikeGroupId = userGroupId getLikeProductImage(userGroupId) } + let setproduct = (value:any)=>{ + productimgMenu.value = value + } let getLikeProductImage = (userGroupId:any)=>{ let data = { userLikeGroupId:userGroupId @@ -219,7 +234,7 @@ export default defineComponent({ } let cancelDsign = ()=>{ Modal.confirm({ - title: 'Your changes will be lost if you navigate away from this page. Are you sure you want to leave this page?', + title: t('ProductImg.jsContent1'), icon: createVNode(ExclamationCircleOutlined), okText: 'Yes', cancelText: 'No', @@ -342,7 +357,7 @@ export default defineComponent({ } }) if(selectArr.length == 0) { - message.info('Please select at least one picture') + message.info(t('ProductImg.jsContent2')) return } let data:any ={ @@ -443,9 +458,12 @@ export default defineComponent({ productImg, productImgMask, ...toRefs(productImgData), + productimgMenuList, + productimgMenu, likeDesignCollectionList, ExportModel, init, + setproduct, cancelDsign, fileUploadChange, beforeUpload, @@ -547,6 +565,15 @@ export default defineComponent({ font-weight: 600; font-size: 1.8rem; margin-bottom: 1rem; + &.productImg_content_item_title_menu{ + display: flex; + align-items: center; + justify-content: space-between; + .productImg_content_item_title_menubtn{ + font-size: 1.6rem; + font-weight: 500; + } + } } .productImg_content_item_intro{ font-size: 1.4rem; diff --git a/src/component/WorksPage/Falls.vue b/src/component/WorksPage/Falls.vue index 76a1702f..30268899 100644 --- a/src/component/WorksPage/Falls.vue +++ b/src/component/WorksPage/Falls.vue @@ -338,7 +338,7 @@ export default defineComponent({ width: 40%; width: 20%; // width: 7rem; - width: 60px; + width: 70px; justify-content: space-between; >label{ // cursor: pointer; diff --git a/src/component/WorksPage/newScaleImage.vue b/src/component/WorksPage/newScaleImage.vue index f185ce7d..c9469d26 100644 --- a/src/component/WorksPage/newScaleImage.vue +++ b/src/component/WorksPage/newScaleImage.vue @@ -36,7 +36,7 @@
-
type：{{ scaleImageData?.portfolioType=='History'? 'collection' : 'generate' }}
+
{{$t('newScaleImage.Type')}}：{{ scaleImageData?.portfolioType=='History'? 'Collection' : 'Printboard' }}
@@ -53,7 +53,7 @@
-
二创
+
{{$t('newScaleImage.SecondaryCreation')}}
@@ -93,11 +93,11 @@
-
创建时间
+
{{$t('newScaleImage.CreationTime')}}
{{ scaleImageData.createDate }}
-
更新时间
+
{{$t('newScaleImage.UpdateTime')}}
{{ scaleImageData.updateDate }}
@@ -145,12 +145,12 @@
-
Comment
-
-
No Comments
-
You can be the first!
+
{{$t('newScaleImage.Comment')}}
+
+
{{$t('newScaleImage.NoComments')}}
+
{{$t('newScaleImage.first')}}
-
+
-
{{ item.comment }}
+
{{ item.comment }}
{{ item.createTimes }}
- 回复 + {{$t('newScaleImage.reply')}}
- - -
-
-
- +
+
删除
+
{{item.detailUnfold?$t('newScaleImage.Collapse'):$t('newScaleImage.unfold')}}
-
-
{{ children?.userName }}{{ children?.replyTo }}
- -
{{ children.comment }}
-
{{ children.createTimes }}
+
+
+
+
+ +
+
+
{{ children?.userName }}{{ children?.replyTo }}
+ +
{{ children.comment }}
+
{{ children.createTimes }}
-
-
- - 回复 -
- -
展开
+
+
+ + {{$t('newScaleImage.reply')}} +
+ +
+
删除
+
{{children.detailUnfold?$t('newScaleImage.Collapse'):$t('newScaleImage.unfold')}}
+
+
+
+ {{$t('newScaleImage.replyAll')}} +
+
+
+ + + + +
@@ -214,16 +231,20 @@