diff --git a/src/assets/images/homePage/bg1.jpg b/src/assets/images/homePage/bg1.jpg new file mode 100644 index 00000000..bf944c03 Binary files /dev/null and b/src/assets/images/homePage/bg1.jpg differ diff --git a/src/component/Detail/DesignDetailAlter.vue b/src/component/Detail/DesignDetailAlter.vue index 9f9111af..bc29e967 100644 --- a/src/component/Detail/DesignDetailAlter.vue +++ b/src/component/Detail/DesignDetailAlter.vue @@ -661,6 +661,10 @@ export default defineComponent({ item.categoryShow = false; } this.setSketchLibrary(file) + let DesignDetailEnd = this.$refs.DesignDetailEnd + if(DesignDetailEnd.sketchImg.id == file.id){ + this.selectImgItem(file) + } }, hiddenFileCategory() { for (let item of this.clothesList) { diff --git a/src/component/Detail/DesignDetailEnd.vue b/src/component/Detail/DesignDetailEnd.vue index 6455eae1..f0616590 100644 --- a/src/component/Detail/DesignDetailEnd.vue +++ b/src/component/Detail/DesignDetailEnd.vue @@ -57,7 +57,7 @@
- +
@@ -173,6 +173,7 @@ export default defineComponent({ //模型 setSketchImg(v){ this.sketchImg.id_ = v.id + this.sketchImg.id = v.id this.sketchImg.path = v.url this.sketchImg.minIOPath = v.minIOPath this.sketchImg.type = v.level2Type @@ -250,7 +251,7 @@ export default defineComponent({ }, soleId(arr,index){ let randomNum = Math.floor(100 + Math.random() * 900); - arr[index].id = this.sketchImg.id_? Number(this.sketchImg.id_+(randomNum+"")):this.current.id_ + arr[index].id = this.sketchImg.id_? Number(this.sketchImg.id_+(randomNum+"")):this.current.id if(this.hasDuplicateId(arr)){ this.soleId(arr,index) }else{ @@ -285,6 +286,7 @@ export default defineComponent({ data.designSingleItemDTOList[index].scale = 1 } data.designSingleItemDTOList = this.soleId(data.designSingleItemDTOList,index) + console.log(this.sketchImg); this.sketchImg.id_ = data.designSingleItemDTOList[index].id data.designSingleItemDTOList[index].path =this.sketchImg.minIOPath? this.sketchImg.minIOPath: this.current.minIOPath data.designSingleItemDTOList[index].type =this.sketchImg.type? this.sketchImg.type: this.current.type @@ -299,7 +301,7 @@ export default defineComponent({ let color = `${this.$parent.selectColor.rgba.r} ${this.$parent.selectColor.rgba.g} ${this.$parent.selectColor.rgba.b}` data.designSingleItemDTOList[index].color = color } - + console.log(data); data.timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone this.loadingShow = true Https.axiosPost(Https.httpUrls.designSingle, data).then( diff --git a/src/views/trialApproval.vue b/src/views/trialApproval.vue index 030c4daa..b67ff803 100644 --- a/src/views/trialApproval.vue +++ b/src/views/trialApproval.vue @@ -3,7 +3,7 @@
@@ -136,7 +136,7 @@ export default defineComponent({ title: 'Email', align: "center", ellipsis: true, - width: 200, + width: 170, dataIndex: "email", key: "email", }, @@ -158,7 +158,7 @@ export default defineComponent({ title: 'State', align: "center", ellipsis: true, - width: 100, + width: 150, dataIndex: "status", key: "status", customRender: (record: any) => { @@ -177,7 +177,7 @@ export default defineComponent({ title: 'Address', align: "center", ellipsis: true, - width: 100, + width: 150, dataIndex: "country", key: "country", }, @@ -185,7 +185,7 @@ export default defineComponent({ title: 'Surname', align: "center", ellipsis: true, - width: 100, + width: 150, dataIndex: "surname", key: "surname", }, @@ -202,7 +202,7 @@ export default defineComponent({ key: "operation", align: "center", fixed: "right", - width: 150, + width: 200, // slots:{customRender:'action'} Operations: true, }, @@ -391,7 +391,6 @@ export default defineComponent({ position: relative; .page_content { position: relative; - .page_content_bg { position: absolute; width: 100%; @@ -413,6 +412,7 @@ export default defineComponent({ display: flex; align-items: center; margin-top: 5rem; + color: #fff; .range_picker { width: 36rem; height: 4.8rem; @@ -450,7 +450,6 @@ export default defineComponent({ border: 0.1rem solid #f1f1f1; font-size: 1.6rem; font-weight: 400; - &::placeholder { color: #c2c2c2; } @@ -492,9 +491,11 @@ export default defineComponent({ transform: translateY(6rem); z-index: 2; display: none; + margin-left: -2rem; .username{ padding: 0 2rem; - background: #fff; + background: #ffffff; + color: #000; } .username:hover{ background: #e1e1e1; @@ -510,9 +511,12 @@ export default defineComponent({ margin-top: 2.6rem; width: 100%; height: calc(100% - 13.7rem); - background: rgba(255, 255, 255, 0.6); + background: rgba(255, 255, 255, 0.3); padding-bottom: 3rem; - + border-radius: 2rem; + backdrop-filter: blur(3rem); + overflow: hidden; + box-shadow: 0px 0px 18px rgba(0, 0, 0, 0.38); .ant-table { background: transparent; } @@ -526,19 +530,22 @@ export default defineComponent({ width: 0 !important; } } - .ant-table-thead > tr > th { - background: #ffffff; + background: #ffffff00; + color: #fff; + border-bottom: none; + backdrop-filter: blur(1rem); } .ant-table-tbody > tr > td { border: none; background: transparent; + // color: #fff; } .ant-table-tbody > tr { &:hover > td { - background: #ffffff; + background: #ffffff3a; } }