1
This commit is contained in:
parent
c6eb8e421a
commit
09e2f9fa93
@ -96,6 +96,8 @@
|
|||||||
|
|
||||||
<view class="tab-cont" :style="viewColor,{'height':'calc(100vh - '+listHeight+' - 84rpx)'}"
|
<view class="tab-cont" :style="viewColor,{'height':'calc(100vh - '+listHeight+' - 84rpx)'}"
|
||||||
:class="{noPointer : preview}">
|
:class="{noPointer : preview}">
|
||||||
|
|
||||||
|
|
||||||
<view v-show="diyActive == 0 && tabActive == 1">
|
<view v-show="diyActive == 0 && tabActive == 1">
|
||||||
<!-- #ifdef H5 -->
|
<!-- #ifdef H5 -->
|
||||||
<view v-for="(item, index) in styleConfig" :key="index">
|
<view v-for="(item, index) in styleConfig" :key="index">
|
||||||
@ -110,11 +112,14 @@
|
|||||||
<!-- #ifdef MP || APP-PLUS-->
|
<!-- #ifdef MP || APP-PLUS-->
|
||||||
<block v-for="(item, index) in styleConfig" :key="index">
|
<block v-for="(item, index) in styleConfig" :key="index">
|
||||||
<view>
|
<view>
|
||||||
<activeParty v-if="item.name == 'activeParty'" :merId="id" :dataConfig="item"></activeParty>
|
<activeParty v-if="item.name == 'activeParty'" :merId="id" :dataConfig="item">
|
||||||
<articleList v-if="item.name == 'articleList'" :merId="id" :dataConfig="item"></articleList>
|
</activeParty>
|
||||||
|
<articleList v-if="item.name == 'articleList'" :merId="id" :dataConfig="item">
|
||||||
|
</articleList>
|
||||||
<bargain v-if="item.name == 'bargain'" :merId="id" :dataConfig="item"></bargain>
|
<bargain v-if="item.name == 'bargain'" :merId="id" :dataConfig="item"></bargain>
|
||||||
<blankPage v-if="item.name == 'blankPage'" :merId="id" :dataConfig="item"></blankPage>
|
<blankPage v-if="item.name == 'blankPage'" :merId="id" :dataConfig="item"></blankPage>
|
||||||
<combination v-if="item.name == 'combination'" :merId="id" :dataConfig="item"></combination>
|
<combination v-if="item.name == 'combination'" :merId="id" :dataConfig="item">
|
||||||
|
</combination>
|
||||||
<topic v-if="item.name == 'topic'" :merId="id" :dataConfig="item"></topic>
|
<topic v-if="item.name == 'topic'" :merId="id" :dataConfig="item"></topic>
|
||||||
<coupon v-if="item.name == 'coupon'" :merId="id" :dataConfig="item"></coupon>
|
<coupon v-if="item.name == 'coupon'" :merId="id" :dataConfig="item"></coupon>
|
||||||
<goodList v-if="item.name == 'goodList'" :merId="id" :dataConfig="item"
|
<goodList v-if="item.name == 'goodList'" :merId="id" :dataConfig="item"
|
||||||
@ -124,11 +129,13 @@
|
|||||||
<liveBroadcast v-if="item.name == 'liveBroadcast'" :merId="id" :dataConfig="item">
|
<liveBroadcast v-if="item.name == 'liveBroadcast'" :merId="id" :dataConfig="item">
|
||||||
</liveBroadcast>
|
</liveBroadcast>
|
||||||
<menus v-if="item.name == 'menus'" :merId="id" :dataConfig="item"></menus>
|
<menus v-if="item.name == 'menus'" :merId="id" :dataConfig="item"></menus>
|
||||||
<presellList v-if="item.name == 'presellList'" :merId="id" :dataConfig="item"></presellList>
|
<presellList v-if="item.name == 'presellList'" :merId="id" :dataConfig="item">
|
||||||
|
</presellList>
|
||||||
<richText v-if="item.name == 'richText'" :merId="id" :dataConfig="item"></richText>
|
<richText v-if="item.name == 'richText'" :merId="id" :dataConfig="item"></richText>
|
||||||
<seckill v-if="item.name == 'seckill'" :merId="id" :dataConfig="item"></seckill>
|
<seckill v-if="item.name == 'seckill'" :merId="id" :dataConfig="item"></seckill>
|
||||||
<swiperBg v-if="item.name == 'swiperBg'" :merId="id" :dataConfig="item"></swiperBg>
|
<swiperBg v-if="item.name == 'swiperBg'" :merId="id" :dataConfig="item"></swiperBg>
|
||||||
<pictureCube v-if="item.name == 'pictureCube'" :merId="id" :dataConfig="item"></pictureCube>
|
<pictureCube v-if="item.name == 'pictureCube'" :merId="id" :dataConfig="item">
|
||||||
|
</pictureCube>
|
||||||
<swipers v-if="item.name == 'swipers'" :merId="id" :dataConfig="item"></swipers>
|
<swipers v-if="item.name == 'swipers'" :merId="id" :dataConfig="item"></swipers>
|
||||||
<titles v-if="item.name == 'titles'" :merId="id" :dataConfig="item"></titles>
|
<titles v-if="item.name == 'titles'" :merId="id" :dataConfig="item"></titles>
|
||||||
</view>
|
</view>
|
||||||
@ -169,8 +176,8 @@
|
|||||||
|
|
||||||
<view class="price">
|
<view class="price">
|
||||||
<view class="price-num">
|
<view class="price-num">
|
||||||
<text class="unit-price">¥{{ item.price }}</text><text
|
<text class="unit-price">¥{{ item.price }}</text><text class="unit-name"
|
||||||
class="unit-name" v-if="item.unit_name&&item.unit_name!='无'">/{{ item.unit_name }}</text>
|
v-if="item.unit_name&&item.unit_name!='无'">/{{ item.unit_name }}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="price-icon iconfont icon-gouwuche"></view>
|
<view class="price-icon iconfont icon-gouwuche"></view>
|
||||||
</view>
|
</view>
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user