Skip to content

M
mayi-mp-shop
Commit d342a3da by liujinsa
Options

解决冲突

parent c51d1a9d
Showing with 18 additions and 18 deletions
src/pages/home/index.vue
...@@ -18,24 +18,24 @@ ...@@ -18,24 +18,24 @@
<div v-else-if="item.componentCode == 'cube-nav'"> <div v-else-if="item.componentCode == 'cube-nav'">
<cube-nav :datas="item"></cube-nav> <cube-nav :datas="item"></cube-nav>
</div> </div>
</div> <div v-else-if="item.componentCode == 'time-limited-discount'">
<div v-else-if="item.componentCode == 'time-limited-discount'"> <time-limited-discount :datas="item"></time-limited-discount>
<time-limited-discount :datas="item"></time-limited-discount> </div>
</div> <div v-if="item.componentCode == 'links'">
<div v-if="item.componentCode == 'links'"> <links :datas="item"></links>
<links :datas="item"></links> </div>
</div> <div v-if="item.componentCode == 'interval'">
<div v-if="item.componentCode == 'interval'"> <interval :datas="item"></interval>
<interval :datas="item"></interval> </div>
</div> <div v-if="item.componentCode == 'partition'">
<div v-if="item.componentCode == 'partition'"> <partition :datas="item"></partition>
<partition :datas="item"></partition> </div>
</div> <div v-if="item.componentCode == 'shop-popup'">
<div v-if="item.componentCode == 'shop-popup'"> <shop-popup :datas="item"></shop-popup>
<shop-popup :datas="item"></shop-popup> </div>
</div> <div v-if="item.componentCode == 'float-button'">
<div v-if="item.componentCode == 'float-button'"> <float-button :datas="item"></float-button>
<float-button :datas="item"></float-button> </div>
</div> </div>
</div> </div>
<bottomCont></bottomCont> <bottomCont></bottomCont>
......
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