-
-
-
+
+
+
+
+
+
![]()
+
Delete
+
-
-
![]()
-
Delete
+
-
-
-
-
-
+
@@ -849,24 +894,56 @@ export default defineComponent({
padding-right: calc(3rem*1.2);
margin-right: 2.4rem;
.upload_centetn{
- overflow-x: hidden;
+ // overflow-x: hidden;
height: calc(100% - 4.4rem*1.2);
padding-bottom: 4rem;
+
+ }
+ .upload_item{
+ position: relative;
}
.upload_centetn::-webkit-scrollbar {
display: none;
}
+ .upload_file_item_show{
+ position: relative;
+ }
+ .upload_file_item_scale{
+ position: absolute;
+ width: 28rem;
+ height: 14rem;
+ z-index: 2;
+ top: 100%;
+ left: 50%;
+ display: none;
+ transform: translateX(-50%);
+ border-radius: 4px;
+ box-shadow: 0 0px 4px 0px rgba(0, 0, 0, 0.3);
+ overflow: hidden;
+ background: #fff;
+ }
+ .upload_file_item_show:hover{
+ border-bottom: none;
+ .upload_file_item_scale{
+ display: flex;
+ }
+ }
+ .fi-rr-square-plus,.fi-rr-picture{
+ zoom: 4;
+ }
.upload_file_item{
// margin: 0 2rem 2rem 0;
margin: 0;
- display: inline-block;
// width: 16.5rem;
// height: 16.5rem;
width: calc(12rem*1.2);
height: calc(12rem*1.2);
border: 1px solid #F5F5F5;
vertical-align: top;
-
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
.upload_file_item_content{
display: flex;
align-items: center;
@@ -911,6 +988,11 @@ export default defineComponent({
width: calc(12rem*1.2);
flex-wrap: wrap;
justify-content: space-between;
+ height: 25rem;
+ overflow-y: auto;
+ &.upload_color::-webkit-scrollbar {
+ display: none;
+ }
.upload_color_item{
width: calc(5rem*1.2);
height: calc(5rem*1.2);
diff --git a/src/component/HomePage/selectImgList.vue b/src/component/HomePage/selectImgList.vue
new file mode 100644
index 00000000..087e5988
--- /dev/null
+++ b/src/component/HomePage/selectImgList.vue
@@ -0,0 +1,182 @@
+
+
+
+
+
+
{{ $t('selectImgList.SelectImg') }}
+
+
+
+
+
![]()
+
+
+
+
+ {{ $t('selectImgList.Clear') }}
+
+
+ OK
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/component/LibraryPage/ModelPlacement.vue b/src/component/LibraryPage/ModelPlacement.vue
index bf79b86a..b50a7e5a 100644
--- a/src/component/LibraryPage/ModelPlacement.vue
+++ b/src/component/LibraryPage/ModelPlacement.vue
@@ -730,6 +730,7 @@ export default defineComponent({
models = {
libraryId:this.printObject.relationId || null,
templateId:this.printObject.templateId || null,
+ sex:this.sex,
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
...await this.getPrintLocation()
}
diff --git a/src/component/LibraryPage/ModelPlacementMobile.vue b/src/component/LibraryPage/ModelPlacementMobile.vue
index fd9f3564..560d76dc 100644
--- a/src/component/LibraryPage/ModelPlacementMobile.vue
+++ b/src/component/LibraryPage/ModelPlacementMobile.vue
@@ -718,6 +718,7 @@ export default defineComponent({
libraryId:this.printObject.relationId || null,
templateId:this.printObject.templateId || null,
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
+ sex:this.sex,
...this.getPrintLocation()
}
let cropper:any = this.$refs.cropper
@@ -730,7 +731,7 @@ export default defineComponent({
if(this.isShowMark){
return
}
- this.isShowMark = true
+ // this.isShowMark = true
Https.axiosPost(Https.httpUrls.libraryModelsDot, formData,{headers:{'Content-Type': 'multipart/form-data'}}).then(
(rv: any) => {
this.perviewUrl = rv
diff --git a/src/component/LibraryPage/ModelPlacementUpdata.vue b/src/component/LibraryPage/ModelPlacementUpdata.vue
index 74570a02..b72c17de 100644
--- a/src/component/LibraryPage/ModelPlacementUpdata.vue
+++ b/src/component/LibraryPage/ModelPlacementUpdata.vue
@@ -1,6 +1,6 @@