aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zhangyahui
2026-05-05 15:10:16 +08:00
parent 006c2e3f9c 1f413b36ca
commit f3b873b7ae
9 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.dev_build
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 = 'http://18.167.251.121:10088'
# VITE_APP_BASE_URL = 'https://api.aida.com.hk' # 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.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' # VITE_APP_BASE_URL = 'http://localhost:22170'

4
.gitignore vendored
View File

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

1
src/router/index.ts
View File

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

2
src/views/SellerDashboard/BecomeSeller/sellerReview.vue
View File

@@ -17,6 +17,7 @@
</div> </div>
</div> </div>
<button class="home-btn" @click="onBackToHome">Back to Homepage</button> <button class="home-btn" @click="onBackToHome">Back to Homepage</button>
<div class="tip">ID: {{ userId }}</div>
</div> </div>
</template> </template>
@@ -28,6 +29,7 @@
const route = useRoute() const route = useRoute()
const router = useRouter() const router = useRouter()
const store = useStore() const store = useStore()
const userId = computed(() => store.state.UserHabit.userDetail.userId)
const applyStatus = computed(() => store.state.seller.applyStatus) const applyStatus = computed(() => store.state.seller.applyStatus)
const list = computed(() => [ const list = computed(() => [
{ {

2
src/views/SellerDashboard/MyListings/EditDetail/components/ApparelSketchList.vue
View File

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

2
src/views/SellerDashboard/MyListings/EditDetail/components/ProductImageList.vue
View File

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

6
src/views/SellerDashboard/MyListings/createSelectItem/index.vue
View File

@@ -147,9 +147,10 @@ onMounted(()=>{
// 开始监听 // 开始监听
if(resizeObserver)resizeObserver.observe(listingsBoxRef.value) if(resizeObserver)resizeObserver.observe(listingsBoxRef.value)
}) })
chooseList.value = []
getCollectionDetail()
}) })
onActivated(()=>{ onActivated(()=>{
getCollectionDetail()
}) })
onUnmounted(()=>{ onUnmounted(()=>{
}) })
@@ -370,7 +371,8 @@ const {} = toRefs(data);
} }
> img{ > img{
height: 100%; height: 100%;
object-fit: cover; width: 100%;
object-fit: contain;
} }
&.active{ &.active{
border: 1.5px solid #000; border: 1.5px solid #000;

4
src/views/SellerDashboard/MyListings/main/content.vue
View File

@@ -157,7 +157,7 @@ const draftListing = async (item: any)=>{
list2.value.unshift(item) list2.value.unshift(item)
list.value = list.value.filter((v: any)=>v.id != item.id) 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)=>{ const publishListing = async (item: any)=>{
@@ -165,7 +165,7 @@ const publishListing = async (item: any)=>{
list.value.unshift(item) list.value.unshift(item)
list2.value = list2.value.filter((v: any)=>v.id != item.id) 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)=>{ const editListing = (item: any)=>{

5
src/views/SellerDashboard/seller-header.vue
View File

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