Commit b19436849786708a312df4c45347ee1ac6288073
1 parent
b5bf785c
优选库:
优选 商城(旗舰店) 完成 还差折扣商品模块相关页面
Showing
7 changed files
with
19 additions
and
14 deletions
src/components/goodsItem_2/goodsItem_2.less
| @@ -34,12 +34,15 @@ | @@ -34,12 +34,15 @@ | ||
| 34 | font-size: 24px; | 34 | font-size: 24px; |
| 35 | white-space: nowrap; | 35 | white-space: nowrap; |
| 36 | text-overflow: ellipsis; | 36 | text-overflow: ellipsis; |
| 37 | - overflow: hidden; | ||
| 38 | - } | ||
| 39 | - /**积分商城显示灰色颜色字**/ | ||
| 40 | - .grey { | ||
| 41 | - color: #666666; | ||
| 42 | - } | 37 | + overflow: hidden; |
| 38 | + /**积分商城显示灰色颜色字**/ | ||
| 39 | + &.grey { | ||
| 40 | + color: #666666; | ||
| 41 | + } | ||
| 42 | + &.align-center { | ||
| 43 | + text-align: center; | ||
| 44 | + } | ||
| 45 | + } | ||
| 43 | .price-box { | 46 | .price-box { |
| 44 | display: flex; | 47 | display: flex; |
| 45 | justify-content: flex-start; | 48 | justify-content: flex-start; |
src/components/goodsItem_2/goodsItem_2.vue
| @@ -7,9 +7,11 @@ | @@ -7,9 +7,11 @@ | ||
| 7 | <slot name="flag"></slot> | 7 | <slot name="flag"></slot> |
| 8 | </div> | 8 | </div> |
| 9 | <div class="content-box"> | 9 | <div class="content-box"> |
| 10 | - <!--因积分商城需要显示白色灰色字体标示 --> | ||
| 11 | - <div class="title" :class={grey:item.num} v-if="pid == undefined || pid == '1' || pid == '3' || pid == '4' || pid == '5'">{{item.title}}</div> | ||
| 12 | - <!--因积分商城不价格所有加上 !item.grade判断 --> | 10 | + |
| 11 | + <!-- 因积分商城需要显示白色灰色字体标示 --> | ||
| 12 | + <div class="title" :class="{'grey': item.num ? true : false, 'align-center': pid == '5'}" v-if="pid == undefined || pid == '1' || pid == '3' || pid == '4' || pid == '5'">{{item.title}}</div> | ||
| 13 | + | ||
| 14 | + <!-- 因积分商城不价格所有加上 !item.grade判断 --> | ||
| 13 | <div class="price-box" v-if="pid != '5' && !item.num"> | 15 | <div class="price-box" v-if="pid != '5' && !item.num"> |
| 14 | <div class="symbol">¥ </div> | 16 | <div class="symbol">¥ </div> |
| 15 | <div class="price">{{item.price}}</div> | 17 | <div class="price">{{item.price}}</div> |
src/pages/discountList/discountList.vue
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | <div class="discount-list-page"> | 2 | <div class="discount-list-page"> |
| 3 | 3 | ||
| 4 | <!-- H5唤起App组件 --> | 4 | <!-- H5唤起App组件 --> |
| 5 | - <call-app-box class="call-app-box" ref="callApp" v-if="!isCNLive.value" | 5 | + <call-app-box class="call-app-box" ref="callApp" v-if="!isCNLive.value && $parent.isOpenApp.value" |
| 6 | :callApps="$parent.callApps"> | 6 | :callApps="$parent.callApps"> |
| 7 | </call-app-box> | 7 | </call-app-box> |
| 8 | 8 |
src/pages/hotSaleList/hotSaleList.vue
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | <div class="hot-sale-list-page"> | 2 | <div class="hot-sale-list-page"> |
| 3 | 3 | ||
| 4 | <!-- H5唤起App组件 --> | 4 | <!-- H5唤起App组件 --> |
| 5 | - <call-app-box class="call-app-box" ref="callApp" v-if="!isCNLive.value" | 5 | + <call-app-box class="call-app-box" ref="callApp" v-if="!isCNLive.value && $parent.isOpenApp.value" |
| 6 | :callApps="$parent.callApps"> | 6 | :callApps="$parent.callApps"> |
| 7 | </call-app-box> | 7 | </call-app-box> |
| 8 | 8 |
src/pages/mall2/mall2.vue
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | <div class="mall-box"> | 2 | <div class="mall-box"> |
| 3 | 3 | ||
| 4 | <!-- H5唤起App组件 --> | 4 | <!-- H5唤起App组件 --> |
| 5 | - <call-app-box class="call-app-box" ref="callApp" v-if="!isCNLive.value" | 5 | + <call-app-box class="call-app-box" ref="callApp" v-if="!isCNLive.value && $parent.isOpenApp.value" |
| 6 | :callApps="$parent.callApps"> | 6 | :callApps="$parent.callApps"> |
| 7 | </call-app-box> | 7 | </call-app-box> |
| 8 | 8 |
src/pages/optimization2/optimization2.vue
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | <div class="optimization-box"> | 2 | <div class="optimization-box"> |
| 3 | 3 | ||
| 4 | <!-- H5唤起App组件 --> | 4 | <!-- H5唤起App组件 --> |
| 5 | - <call-app-box class="call-app-box" ref="callApp" v-if="!isCNLive.value" | 5 | + <call-app-box class="call-app-box" ref="callApp" v-if="!isCNLive.value && $parent.isOpenApp.value" |
| 6 | :callApps="$parent.callApps"> | 6 | :callApps="$parent.callApps"> |
| 7 | </call-app-box> | 7 | </call-app-box> |
| 8 | 8 |
src/pages/optimizationList/optimizationList.vue
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | <div class="optimization-list-page"> | 2 | <div class="optimization-list-page"> |
| 3 | 3 | ||
| 4 | <!-- H5唤起App组件 --> | 4 | <!-- H5唤起App组件 --> |
| 5 | - <call-app-box class="call-app-box" ref="callApp" v-if="!isCNLive.value" | 5 | + <call-app-box class="call-app-box" ref="callApp" v-if="!isCNLive.value && $parent.isOpenApp.value" |
| 6 | :callApps="$parent.callApps"> | 6 | :callApps="$parent.callApps"> |
| 7 | </call-app-box> | 7 | </call-app-box> |
| 8 | 8 |