diff --git a/src/App.vue b/src/App.vue
index 0b9886e..5978c16 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -53,10 +53,9 @@
left: 0;
width: 100%;
height: 100%;
- // background-color: rgba(0, 0, 0, 0.3);
- // display: flex;
- // align-items: center;
- // justify-content: center;
+ --el-mask-color: rgba(0, 0, 0, 0.3);
+ --el-color-primary: #007bff;
+ --el-loading-spinner-size: 9rem;
}
\ No newline at end of file
diff --git a/src/views/digitalItem/index.vue b/src/views/digitalItem/index.vue
index 44c8ce5..dedd96d 100644
--- a/src/views/digitalItem/index.vue
+++ b/src/views/digitalItem/index.vue
@@ -5,7 +5,6 @@ import MerchantInfo from "./merchant-info.vue";
import { useRouter } from "vue-router";
import scListNull from '@/views/shoppingCart/sc-list-null.vue'
import { getListingMallListApi } from '@/api/listing'
-import { get } from "http";
// 定义组件名称
defineOptions({
@@ -15,40 +14,41 @@ defineOptions({
//})
//const emit = defineEmits([
//])
+const categories = ref(['all'])
+const gender = ref(['all'])
const digitalItemRef = ref(null)
const scrollTop = ref(0)
const router = useRouter()
+const commodityListRef = ref(null)
-const categoriesList = ref([
+const searechTypeList = ref([
{
- value:'Best Selling',
+ value:'salesVolume',
label:'Best Selling'
},{
- value:'Price: Low to High',
+ value:'price',
label:'Price: Low to High'
},{
- value:'Newest First',
+ value:'updateTime',
label:'Newest First'
},
])
-const categories = ref('Newest First')
+
+const searechType = ref('updateTime')
const addShopping = (item) => {}
const openDetail = (item) => {
scrollTop.value = digitalItemRef.value.scrollTop
router.push({
- path: '/digitalItem/' + 123,
+ path: '/digitalItem/' + item.id,
})
}
const handleChange = (val) => {
-
+ categories.value = val.categories
+ gender.value = val.gender
+ commodityListRef.value.reset()
}
-const getListingMallList = ()=>{
- let data = {
- // designFor
- }
- getListingMallListApi().then(res => {
-
- })
+const updateSort = () => {
+ commodityListRef.value.reset()
}
onActivated(()=>{
digitalItemRef.value.scrollTop = scrollTop.value
@@ -70,13 +70,13 @@ defineExpose({})
-
+
@@ -218,8 +228,13 @@ defineExpose({})
border-right: 0.5px solid #585858;
margin-right: 9rem;
display: flex;
+ position: relative;
.null{
flex: 1;
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ background-color: #fff;
}
}
}
diff --git a/src/views/digitalItem/merchant-info.vue b/src/views/digitalItem/merchant-info.vue
index 11ac4cc..9fec146 100644
--- a/src/views/digitalItem/merchant-info.vue
+++ b/src/views/digitalItem/merchant-info.vue
@@ -16,12 +16,12 @@ const genderList = computed(() => [
{ label: t('Wardrobe.assets.genders.male'), value: 'male' },
{ label: t('Wardrobe.assets.genders.female'), value: 'female' }
])
-const categories = ref([''])
-const gender = ref([''])
+const categories = ref(['all'])
+const gender = ref(['all'])
const clearFilters = () => {
- categories.value = ['']
- gender.value = ['']
+ categories.value = ['all']
+ gender.value = ['all']
handleChange()
}
const handleChange = () => {
diff --git a/src/views/shoppingCart/index.d.js b/src/views/shoppingCart/index.d.js
index 31f580a..4025840 100644
--- a/src/views/shoppingCart/index.d.js
+++ b/src/views/shoppingCart/index.d.js
@@ -2,6 +2,4 @@
export const SCART_STATUS = {
/** 正常 */
NORMAL: 1,
- /** 下架 */
- DISABLED: 0,
}
\ No newline at end of file
diff --git a/src/views/shoppingCart/order-summary.vue b/src/views/shoppingCart/order-summary.vue
index b61b3ec..fe80c9a 100644
--- a/src/views/shoppingCart/order-summary.vue
+++ b/src/views/shoppingCart/order-summary.vue
@@ -34,6 +34,9 @@
diff --git a/src/views/shoppingCart/sc-item.vue b/src/views/shoppingCart/sc-item.vue
index 92ecffa..5fb5854 100644
--- a/src/views/shoppingCart/sc-item.vue
+++ b/src/views/shoppingCart/sc-item.vue
@@ -7,7 +7,6 @@
}"
>
- {{ info.status }}
{{ info.title }}
diff --git a/src/views/shoppingCart/sc-list.vue b/src/views/shoppingCart/sc-list.vue
index 514b2e7..5aac39d 100644
--- a/src/views/shoppingCart/sc-list.vue
+++ b/src/views/shoppingCart/sc-list.vue
@@ -51,12 +51,12 @@
:show-date="!isMini"
:show-remove="!isView"
@remove="handleRemoveClick"
- :disabled="v.status === SCART_STATUS.DISABLED"
+ :disabled="v.status !== SCART_STATUS.NORMAL"
>
@@ -141,10 +141,12 @@
cartId: v.cartId, //购物车ID
listingId: v.listingId, //资产ID
title: v.title, //标题
+ brand: v.shopName, //店铺名称
cover: v.cover, //封面
amount: v.price, //价格
status: v.status, //状态
date: v.addTime, //添加时间
+ tags: v.productCategory, //标签
checked: false
}
arr.push(obj)