Merge branch 'dev_vite' of ssh://18.167.251.121:10002/aidlab/aida_front into dev_vite

This commit is contained in:
2026-05-05 15:10:16 +08:00
9 changed files with 19 additions and 9 deletions

View File

@@ -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'

4
.gitignore vendored
View File

@@ -24,4 +24,6 @@ dist.rar
*.sw?
.eslintrc-auto-import.json
components.d.ts
.cursor
.cursor
*.zip
*.7z

View File

@@ -283,7 +283,6 @@ const routes: Array<RouteRecordRaw> = [
name: "myListingsSelectItem",
meta: {
enter: "all",
cache: true,
sellerHeaderTitleKey: "Seller.SelectCollection",
sellerBreadcrumbs: [
myListingsBreadcrumb,

View File

@@ -17,6 +17,7 @@
</div>
</div>
<button class="home-btn" @click="onBackToHome">Back to Homepage</button>
<div class="tip">ID: {{ userId }}</div>
</div>
</template>
@@ -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(() => [
{

View File

@@ -71,6 +71,8 @@
.img-src {
width: 100%;
height: 100%;
object-fit: contain;
}
.crop-tool {

View File

@@ -130,7 +130,9 @@
}
.img-src {
width: 100%;
height: 100%;
object-fit: contain;
}
.main-pic {

View File

@@ -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;

View File

@@ -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)=>{

View File

@@ -108,8 +108,9 @@
}
const resolveTitle = (title?: RouteMetaValue<string>, titleKey?: RouteMetaValue<string>) => {
const key = resolveMetaValue(titleKey)
return title ? t(title) || "" : ""
let key = title || titleKey
// const key = resolveMetaValue(titleKey)
return key ? t(key) || "" : ""
}
const autoBreadcrumbs = computed(() => {