diff --git a/.env.dev_build b/.env.dev_build index a25d8b1c..eb405885 100644 --- a/.env.dev_build +++ b/.env.dev_build @@ -3,6 +3,6 @@ VITE_USER_NODE_ENV = 'development_cloud' # VITE_APP_BASE_URL = 'http://18.167.251.121:10088' # VITE_APP_BASE_URL = 'https://api.aida.com.hk' # VITE_APP_BASE_URL = 'https://develop.api.aida.com.hk' -VITE_APP_BASE_URL = 'https://develop-ms.api.aida.com.hk' +VITE_APP_BASE_URL = 'https://www.develop-ms.api.aida.com.hk' # VITE_APP_BASE_URL = 'http://localhost:22170' diff --git a/.gitignore b/.gitignore index 97c229d8..cbc6cb77 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,6 @@ dist.rar *.sw? .eslintrc-auto-import.json components.d.ts -.cursor \ No newline at end of file +.cursor +*.zip +*.7z \ No newline at end of file diff --git a/src/router/index.ts b/src/router/index.ts index b7e7601d..2d558328 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -283,7 +283,6 @@ const routes: Array = [ name: "myListingsSelectItem", meta: { enter: "all", - cache: true, sellerHeaderTitleKey: "Seller.SelectCollection", sellerBreadcrumbs: [ myListingsBreadcrumb, diff --git a/src/views/SellerDashboard/BecomeSeller/sellerReview.vue b/src/views/SellerDashboard/BecomeSeller/sellerReview.vue index e6dd7ac9..828c4465 100644 --- a/src/views/SellerDashboard/BecomeSeller/sellerReview.vue +++ b/src/views/SellerDashboard/BecomeSeller/sellerReview.vue @@ -17,6 +17,7 @@ +
ID: {{ userId }}
@@ -28,6 +29,7 @@ const route = useRoute() const router = useRouter() const store = useStore() + const userId = computed(() => store.state.UserHabit.userDetail.userId) const applyStatus = computed(() => store.state.seller.applyStatus) const list = computed(() => [ { diff --git a/src/views/SellerDashboard/MyListings/EditDetail/components/ApparelSketchList.vue b/src/views/SellerDashboard/MyListings/EditDetail/components/ApparelSketchList.vue index 2379ea97..0ce7fc90 100644 --- a/src/views/SellerDashboard/MyListings/EditDetail/components/ApparelSketchList.vue +++ b/src/views/SellerDashboard/MyListings/EditDetail/components/ApparelSketchList.vue @@ -71,6 +71,8 @@ .img-src { width: 100%; + height: 100%; + object-fit: contain; } .crop-tool { diff --git a/src/views/SellerDashboard/MyListings/EditDetail/components/ProductImageList.vue b/src/views/SellerDashboard/MyListings/EditDetail/components/ProductImageList.vue index 3f2b5593..b25023ac 100644 --- a/src/views/SellerDashboard/MyListings/EditDetail/components/ProductImageList.vue +++ b/src/views/SellerDashboard/MyListings/EditDetail/components/ProductImageList.vue @@ -130,7 +130,9 @@ } .img-src { + width: 100%; height: 100%; + object-fit: contain; } .main-pic { diff --git a/src/views/SellerDashboard/MyListings/createSelectItem/index.vue b/src/views/SellerDashboard/MyListings/createSelectItem/index.vue index bfb90480..77bfafd4 100644 --- a/src/views/SellerDashboard/MyListings/createSelectItem/index.vue +++ b/src/views/SellerDashboard/MyListings/createSelectItem/index.vue @@ -147,9 +147,10 @@ onMounted(()=>{ // 开始监听 if(resizeObserver)resizeObserver.observe(listingsBoxRef.value) }) + chooseList.value = [] + getCollectionDetail() }) onActivated(()=>{ - getCollectionDetail() }) onUnmounted(()=>{ }) @@ -370,7 +371,8 @@ const {} = toRefs(data); } > img{ height: 100%; - object-fit: cover; + width: 100%; + object-fit: contain; } &.active{ border: 1.5px solid #000; diff --git a/src/views/SellerDashboard/MyListings/main/content.vue b/src/views/SellerDashboard/MyListings/main/content.vue index d6b44f4d..486b18fa 100644 --- a/src/views/SellerDashboard/MyListings/main/content.vue +++ b/src/views/SellerDashboard/MyListings/main/content.vue @@ -157,7 +157,7 @@ const draftListing = async (item: any)=>{ list2.value.unshift(item) list.value = list.value.filter((v: any)=>v.id != item.id) }) - message.success(t('Seller.draftMessage')) + message.success($t('Seller.draftMessage')) } const publishListing = async (item: any)=>{ @@ -165,7 +165,7 @@ const publishListing = async (item: any)=>{ list.value.unshift(item) list2.value = list2.value.filter((v: any)=>v.id != item.id) }) - message.success(t('Seller.publishMessage')) + message.success($t('Seller.publishMessage')) } const editListing = (item: any)=>{ diff --git a/src/views/SellerDashboard/seller-header.vue b/src/views/SellerDashboard/seller-header.vue index fb17442f..dd159c10 100644 --- a/src/views/SellerDashboard/seller-header.vue +++ b/src/views/SellerDashboard/seller-header.vue @@ -108,8 +108,9 @@ } const resolveTitle = (title?: RouteMetaValue, titleKey?: RouteMetaValue) => { - const key = resolveMetaValue(titleKey) - return title ? t(title) || "" : "" + let key = title || titleKey + // const key = resolveMetaValue(titleKey) + return key ? t(key) || "" : "" } const autoBreadcrumbs = computed(() => {