diff --git a/src/assets/icons/shop.svg b/src/assets/icons/shop.svg new file mode 100644 index 0000000..b52e7fe --- /dev/null +++ b/src/assets/icons/shop.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/icons/statement.svg b/src/assets/icons/statement.svg new file mode 100644 index 0000000..80c5207 --- /dev/null +++ b/src/assets/icons/statement.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/views/collectionStory/detail/index.vue b/src/views/collectionStory/detail/index.vue index 5c88e4c..ed8f739 100644 --- a/src/views/collectionStory/detail/index.vue +++ b/src/views/collectionStory/detail/index.vue @@ -77,6 +77,7 @@ const {} = toRefs(data); display: flex; height: calc(100vh - var(--header-height) - var(--footer-height)); align-items: flex-start; + overflow: hidden; > div{ // height: 100%; } @@ -119,8 +120,8 @@ const {} = toRefs(data); border-right: 0.5px solid #585858; // overflow-y: auto; overflow: hidden; - // height: 100%; - height: auto; + height: 100%; + // height: auto; position: relative; .line{ border: 0.5px solid #58585899; @@ -141,6 +142,7 @@ const {} = toRefs(data); align-items: center; gap: 4rem; overflow-y: auto; + height: 100%; &::-webkit-scrollbar{ display: none; } diff --git a/src/views/digitalItem/index.vue b/src/views/digitalItem/index.vue index db156d3..a9742a9 100644 --- a/src/views/digitalItem/index.vue +++ b/src/views/digitalItem/index.vue @@ -3,6 +3,8 @@ import { ref, onMounted, onUnmounted, reactive, toRefs, onActivated } from "vue" import CommodityList from "./commodity-list.vue"; import MerchantInfo from "./merchant-info.vue"; import { useRouter } from "vue-router"; +import scListNull from '@/views/shoppingCart/sc-list-null.vue' + // 定义组件名称 defineOptions({ name: 'digitalItem' @@ -77,7 +79,15 @@ const {} = toRefs(data);
- + +
+ +
@@ -178,7 +188,7 @@ const {} = toRefs(data); > .content{ display: flex; height: auto; - align-items: flex-start; + // align-items: flex-start; border-top: 0.5px solid #585858; .merchant-info{ width: 38.5rem; @@ -197,6 +207,10 @@ const {} = toRefs(data); border-left: 0.5px solid #585858; border-right: 0.5px solid #585858; margin-right: 9rem; + display: flex; + .null{ + flex: 1; + } } } } diff --git a/src/views/shopping-drawer.vue b/src/views/shopping-drawer.vue index 572cde2..2ff3664 100644 --- a/src/views/shopping-drawer.vue +++ b/src/views/shopping-drawer.vue @@ -1,7 +1,9 @@ + \ No newline at end of file