diff --git a/src/assets/icons/picture.svg b/src/assets/icons/picture.svg new file mode 100644 index 00000000..99968650 --- /dev/null +++ b/src/assets/icons/picture.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/lang/en.ts b/src/lang/en.ts index a9f119c6..f673dc7e 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -1794,7 +1794,7 @@ export default { sketch:'Sketch', mainProductImage:'Main Product Image', cover:'Cover', - productImageDesc:'Choose from product image', + productImageDesc:'Choose from product media', cropDesc:'Crop from main product image or sketch', productImageMainTitle:'Product Media ', productImageSubTitle:'(from design collection)', diff --git a/src/views/SellerDashboard/BrandProfile/image-clip.vue b/src/views/SellerDashboard/BrandProfile/image-clip.vue index 8442e8a2..a321432e 100644 --- a/src/views/SellerDashboard/BrandProfile/image-clip.vue +++ b/src/views/SellerDashboard/BrandProfile/image-clip.vue @@ -9,6 +9,8 @@ :fixedNumber="ratio" :fixed="isProduct ? type !== 'apparel' : true" movable + :centerBox="isProduct" + :info="false" @realTime="onChange" outputType="png" :full="true" diff --git a/src/views/SellerDashboard/MyListings/EditDetail/components/TopImageSection.vue b/src/views/SellerDashboard/MyListings/EditDetail/components/TopImageSection.vue index 9d1b5143..22db6171 100644 --- a/src/views/SellerDashboard/MyListings/EditDetail/components/TopImageSection.vue +++ b/src/views/SellerDashboard/MyListings/EditDetail/components/TopImageSection.vue @@ -35,7 +35,7 @@ -
+
- +
+ +
| null>(null) + const editDetailContentRef = ref(null) + const rightContentRef = ref(null) defineOptions({ name: "EditDetail" @@ -646,7 +650,19 @@ }) } + const resetScrollPositions = () => { + if (editDetailContentRef.value) { + editDetailContentRef.value.scrollTop = 0 + } + if (rightContentRef.value) { + rightContentRef.value.scrollTop = 0 + } + } + onMounted(() => { + // 重置滚动条位置 + resetScrollPositions() + // 从 sessionStorage 获取参数 const paramsStr = sessionStorage.getItem('listingEditParams') const data = paramsStr ? JSON.parse(paramsStr) : {} @@ -730,7 +746,7 @@ flex: 1; min-height: 0; overflow-y: auto; - justify-content: space-between; + justify-content: space-around; &::-webkit-scrollbar { width: 0; @@ -740,10 +756,26 @@ .right { width: 55.2rem; flex-shrink: 0; + display: flex; + flex-direction: column; + min-height: 0; + + .right-content { + flex: 1; + min-height: 0; + overflow-y: auto; + + &::-webkit-scrollbar { + width: 0; + height: 0; + } + } .page-control { justify-content: flex-end; - margin-top: 4rem; + margin-top: 2rem; + padding: 2rem 0; + flex-shrink: 0; } } } diff --git a/src/views/SellerDashboard/MyListings/main/content.vue b/src/views/SellerDashboard/MyListings/main/content.vue index a3b11390..f092466b 100644 --- a/src/views/SellerDashboard/MyListings/main/content.vue +++ b/src/views/SellerDashboard/MyListings/main/content.vue @@ -168,13 +168,17 @@ const publishListing = async (item: any)=>{ message.success($t('Seller.publishMessage')) } -const editListing = (item: any)=>{ +const editListing = (item: any) => { + sessionStorage.setItem('listingEditParams', JSON.stringify({ + id:item.id, + type:'edit' + })) router.push({ path:'/home/seller/myListings/edit', - state: { - id:item.id, - type:'edit' - } + // state: { + // id:item.id, + // type:'edit' + // } }) }