-
+
diff --git a/src/views/brandDetail/commodity-list.vue b/src/views/brandDetail/commodity-list.vue
index 32bd09f..3d31377 100644
--- a/src/views/brandDetail/commodity-list.vue
+++ b/src/views/brandDetail/commodity-list.vue
@@ -97,8 +97,8 @@ defineExpose({})
display: flex;
flex-direction: column;
.header{
- position: sticky;
- top: 0;
+ // position: sticky;
+ // top: 0;
z-index: 2;
background-color: #fff;
.title{
diff --git a/src/views/digitalDetail/index.vue b/src/views/digitalDetail/index.vue
index 7df2e78..6ad3a12 100644
--- a/src/views/digitalDetail/index.vue
+++ b/src/views/digitalDetail/index.vue
@@ -6,6 +6,9 @@ import myEvent from '@/utils/myEvent'
import { getListingDetailApi } from '@/api/listing'
import { useRoute } from 'vue-router'
import { ElMessage } from 'element-plus'
+import { useI18n } from 'vue-i18n'
+import { AddShoppingCart } from '@/api/shoppingCart'
+import { CreateOrder } from '@/api/shoppingCart'
//const props = defineProps({
@@ -13,6 +16,7 @@ import { ElMessage } from 'element-plus'
//const emit = defineEmits([
//])
const route = useRoute()
+const { t } = useI18n()
const router = useRouter()
let detail:any = ref({
@@ -22,30 +26,40 @@ let detail:any = ref({
shopName: '',
updateTime: '',
gender: '',
+ sellerId: '',
})
const sketchList = ref([])
const illustrationList = ref([])
const productList = ref([])
const editorialVisualList = ref([])
const addShopping = () => {
- console.log(detail.value)
- if(!detail.value.price) return ElMessage.warning('Please log in first.')
+ if(!detail.value.price) return ElMessage.warning(t('brandDetail.addShoppingTip'))
let data = {
cover: detail.value.images.cover[0],
price: detail.value.price,
shopName: detail.value.shopName,
title: detail.value.title,
+ id: detail.value.id,
}
- myEvent.emit('addShopping', data)
+ AddShoppingCart({listingIds:[detail.value.id]}).then((res)=>{
+ myEvent.emit('addShopping', data)
+ })
}
+
+
const goShopping = () => {
- if(!detail.value.price) return ElMessage.warning('Please log in first.')
- router.push({path: '/shoppingCart'})
+ if(!detail.value.price) return ElMessage.warning(t('brandDetail.addShoppingTip'))
+ CreateOrder(
+ [detail.value.id],true
+ ).then((res)=>{
+ // if(res)router.push({path: '/shoppingCart')
+ })
+ // router.push({path: '/shoppingCart'})
}
const setImgList = (list)=>{
- sketchList.value = list.apparel.map((item:any) => {return {imgUrl:item}})
- illustrationList.value = list.sketch.map((item:any) => {return {imgUrl:item}})
- productList.value = list.main_product.map((item:any) => {return {imgUrl:item}})
+ sketchList.value = list?.apparel?.map((item:any) => {return {imgUrl:item}})
+ illustrationList.value = list?.sketch?.map((item:any) => {return {imgUrl:item}})
+ productList.value = list?.main_product?.map((item:any) => {return {imgUrl:item}})
editorialVisualList.value = list.product.map((item:any) => {return {imgUrl:item}})
if(list.firstFrame){
@@ -62,11 +76,14 @@ const getListingDetail = ()=>{
getListingDetailApi({
id:route.params.id + '',
}).then((res)=>{
- console.log(res)
if(res)detail.value = res
setImgList(res.images)
})
}
+const gobrand = () => {
+ if(!detail.value.sellerId)return
+ router.push({path: `/brand/${detail.value.sellerId}`})
+}
// const vObserve = {
// mounted (el,binding) {
// },
@@ -85,7 +102,7 @@ defineExpose({})
-
![]()
@@ -95,13 +112,13 @@ defineExpose({})
![]()
@@ -144,26 +161,26 @@ defineExpose({})
@@ -320,6 +337,7 @@ defineExpose({})
font-size: 1.8rem;
line-height: 100%;
margin-bottom: .8rem;
+ cursor: pointer;
}
.release-time{
font-family: KaiseiOpti-Regular;
diff --git a/src/views/digitalItem/index.vue b/src/views/digitalItem/index.vue
index a620b17..aad0134 100644
--- a/src/views/digitalItem/index.vue
+++ b/src/views/digitalItem/index.vue
@@ -5,6 +5,10 @@ import MerchantInfo from "./merchant-info.vue";
import { useRouter } from "vue-router";
import scListNull from '@/views/shoppingCart/sc-list-null.vue'
import { useI18n } from 'vue-i18n'
+import { AddShoppingCart } from '@/api/shoppingCart'
+import { ElMessage } from 'element-plus'
+import myEvent from '@/utils/myEvent'
+
// 定义组件名称
defineOptions({
@@ -36,7 +40,13 @@ const searechTypeList = ref([
])
const searechType = ref('updateTime')
-const addShopping = (item) => {}
+const addShopping = (item) => {
+ console.log(item)
+ if(!item.price) return ElMessage.warning(t('brandDetail.addShoppingTip'))
+ AddShoppingCart({listingIds:[item.id]}).then((res)=>{
+ myEvent.emit('addShopping', item)
+ })
+}
const openDetail = (item) => {
scrollTop.value = digitalItemRef.value.scrollTop
router.push({
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 20241e1..ad62926 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -2,7 +2,7 @@
- 
+
+ 
\ No newline at end of file
diff --git a/src/views/shoppingCart/sc-list.vue b/src/views/shoppingCart/sc-list.vue
index 5aac39d..2aeec68 100644
--- a/src/views/shoppingCart/sc-list.vue
+++ b/src/views/shoppingCart/sc-list.vue
@@ -3,7 +3,7 @@
@@ -83,6 +94,10 @@
import { FormatBytes, FormatDate } from '@/utils/tools'
import scItem from './sc-item.vue'
import scListNull from './sc-list-null.vue'
+ import { useRouter } from 'vue-router'
+ import { useI18n } from 'vue-i18n'
+ const { t } = useI18n()
+ const router = useRouter()
const emit = defineEmits(['close', 'selected-change'])
const props = defineProps({
title: { type: String, default: '' },
@@ -100,19 +115,19 @@
const sortBy = ref('DateAdded')
const sortByOptions = ref([
{
- label: 'Best Selling',
+ label: 'digitalItem.BestSelling',
value: 'BestSelling'
},
{
- label: 'Price: Low to High',
+ label: 'digitalItem.Price',
value: 'PriceLowToHigh'
},
{
- label: 'Selected First',
+ label: 'digitalItem.SelectedFirst',
value: 'SelectedFirst'
},
{
- label: 'Date Added',
+ label: 'digitalItem.DateAdded',
value: 'DateAdded'
}
])
@@ -126,7 +141,9 @@
return list_.value.filter(() => true).sort((a, b) => a.amount - b.amount)
}
if (sortBy.value === 'SelectedFirst') {
- return list_.value.filter(() => true).sort((a, b) => (b.checked ? 1 : 0) - (a.checked ? 1 : 0))
+ return list_.value
+ .filter(() => true)
+ .sort((a, b) => (b.checked ? 1 : 0) - (a.checked ? 1 : 0))
}
if (sortBy.value === 'DateAdded') {
return list_.value.filter(() => true).sort((a, b) => b.date - a.date)
@@ -142,6 +159,7 @@
listingId: v.listingId, //资产ID
title: v.title, //标题
brand: v.shopName, //店铺名称
+ sellerId: v.sellerId, //店铺ID
cover: v.cover, //封面
amount: v.price, //价格
status: v.status, //状态
@@ -172,7 +190,7 @@
handleSelectedChange()
})
const handleRemoveClick = (value: any) => {
- ElMessageBox.confirm('Are you sure to remove this item?')
+ ElMessageBox.confirm(t('ShoppingCart.removeTip'))
.then(() => {
RemoveShoppingCartItem({ listingId: value.listingId }).then(() => {
GetList()
@@ -180,8 +198,8 @@
})
.catch(() => {})
}
- const handleExploreClick = () => {
- console.log('探索')
+ const handleExplore = () => {
+ router.push({ name: 'brand' })
}
@@ -360,6 +378,7 @@
height: 4.6rem;
--button-font-size: 1.4rem;
margin-top: 2rem;
+ text-transform: uppercase;
}
}
}
Sketch
+ {{ $t('digitalDetail.Sketch') }}
-
![]()
Illustration
+ {{ $t('digitalDetail.Illustration') }}
-
![]()
@@ -109,7 +126,7 @@ defineExpose({})
Product
+ {{ $t('digitalDetail.Product') }}
-
![]()
@@ -122,7 +139,7 @@ defineExpose({})
Editorial Visual
+ {{ $t('digitalDetail.EditorialVisual') }}
{{ detail.designFor?.toUpperCase() || ''}} / {{ detail.productCategory?.join(',')?.toUpperCase() || '' }}
@@ -133,9 +150,9 @@ defineExpose({})
-
{{ detail.shopName }}
+ {{ detail.shopName }}
- Release in {{ detail.updateTime }}
+ {{ $t('digitalDetail.ReleaseIn') }} {{ detail.updateTime }}
-
Copyright & License Notice
+ {{ $t('digitalDetail.CopyrightLicenseNotice') }}
- All products on this platform are digital assets, not physical goods. Purchase grants a usage license only; copyright and intellectual property rights remain with the original creator, unless otherwise stated.
+ {{ $t('digitalDetail.LicenseIncludedInAssetInfo') }}
+
Design with AiDA
- Each garment on this platform is where designer vision blooms through AiDA. A tool that
- nurtures your creativity, never overshadows it. Let your ideas flourish.
+ Each garment on this platform is where designer vision blooms through AiDA. A tool
+ that nurtures your creativity, never overshadows it. Let your ideas flourish.
-
+
- {{ title || 'Shopping Cart' }}
+ {{ title || $t('ShoppingCart.title') }}
Select All
- Deselect All
+
+ {{ $t('Wardrobe.assets.selectAll') }}
+
+
+ {{ $t('Wardrobe.assets.deselectAll') }}
+
-
+
- Sort By
- {{ label }}
+ {{ $t('Wardrobe.sort.label') }}
+ {{ $t(label) }}
@@ -40,8 +50,9 @@