diff --git a/src/components/checked.vue b/src/components/checked.vue index 69d97c7..39761a7 100644 --- a/src/components/checked.vue +++ b/src/components/checked.vue @@ -22,7 +22,6 @@ const checkList = computed(()=>{ }) const handleChange = (val) => { let data = val.filter(item => item !== 'all') - if(val.length == 0)return if(data.length == props.list.length){ data = ['all'] }else{ @@ -39,9 +38,11 @@ const handleCheckAllChange = (val) => { if(val && props.selected[0] !== 'all'){ data = ['all'] // data = props.list.map(item => item.value) - emit('update:selected', data) - emit('change', data) + }else{ + data = [] } + emit('update:selected', data) + emit('change', data) } let data = reactive({ }) diff --git a/src/views/brandDetail/merchant-info.vue b/src/views/brandDetail/merchant-info.vue index b4b922f..64f7244 100644 --- a/src/views/brandDetail/merchant-info.vue +++ b/src/views/brandDetail/merchant-info.vue @@ -44,19 +44,19 @@ const {} = toRefs(data);
-
{{ designerDetail.email }}
+
{{ designerDetail.email }}
-
{{ designerDetail.mobile }}
+
{{ designerDetail.mobile }}
-
{{value}}
+
{{value}}
@@ -118,9 +118,20 @@ const {} = toRefs(data); font-size: 1.4rem; line-height: 100%; color: #585858; + align-items: center; + + &:last-child{ margin-bottom: 0; } + > .text{ + flex: 1; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + // word-break: break-word; + // white-space: normal; + } } } > .about{ diff --git a/src/views/digitalDetail/index.vue b/src/views/digitalDetail/index.vue index b507c5d..3f1583c 100644 --- a/src/views/digitalDetail/index.vue +++ b/src/views/digitalDetail/index.vue @@ -49,6 +49,8 @@ const addShopping = () => { const goShopping = () => { if(!detail.value.price) return ElMessage.warning(t('brandDetail.addShoppingTip')) + console.log(detail.value) +return let data = { listingId: detail.value.id, //资产ID title: detail.value.title, //标题 @@ -56,7 +58,7 @@ const goShopping = () => { sellerId: detail.value.sellerId, //店铺ID cover: detail.value.images.cover[0], //封面 amount: detail.value.price, //价格 - // status: v.status, //状态 + status: 1, //状态 // date: v.addTime, //添加时间 // tags: v.productCategory, //标签 // salesVolume: v.salesVolume, //销售量 @@ -163,7 +165,7 @@ defineExpose({})
{{ detail.shopName }}
- {{ $t('digitalDetail.ReleaseIn') }} {{ detail.updateTime }} + {{ $t('digitalDetail.ReleaseIn') }} {{ new Date(detail.updateTime).toLocaleString() }}
@@ -332,6 +334,7 @@ defineExpose({}) gap: 1.4rem; align-items: center; width: min-content; + white-space: nowrap; cursor: pointer; > span{ font-weight: 500; diff --git a/src/views/digitalItem/commodity-list.vue b/src/views/digitalItem/commodity-list.vue index e242ebc..812fddb 100644 --- a/src/views/digitalItem/commodity-list.vue +++ b/src/views/digitalItem/commodity-list.vue @@ -41,6 +41,11 @@ const reset = () => { getListingListData.isShowMark = false getListingListData.isNoData = false } +const clearData = () => { + commodityList.value = [] + getListingListData.pageNum = 1 + getListingListData.isNoData = true +} const getListingMallList = ()=>{ getListingListData.isShowMark = true @@ -86,7 +91,7 @@ onMounted(()=>{ }) onUnmounted(()=>{ }) -defineExpose({reset,commodityList,getListingListData}) +defineExpose({reset,clearData,commodityList,getListingListData}) const {} = toRefs(data);