Skip to content

M
mayi-mp-shop
Commit d342a3da by liujinsa
Options

解决冲突

parent c51d1a9d
Showing with 1 additions and 1 deletions
src/pages/home/index.vue
......@@ -18,7 +18,6 @@
<div v-else-if="item.componentCode == 'cube-nav'">
<cube-nav :datas="item"></cube-nav>
</div>
</div>
<div v-else-if="item.componentCode == 'time-limited-discount'">
<time-limited-discount :datas="item"></time-limited-discount>
</div>
......@@ -38,6 +37,7 @@
<float-button :datas="item"></float-button>
</div>
</div>
</div>
<bottomCont></bottomCont>
</scroll-view>
<!-- <image
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment