root/zyejMAll-mobile
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Branch_ccc #10

Merged
root merged 22 commits from Branch_ccc into master 2024-11-13 11:11:55 +08:00
Conversation 0 Commits 22 Files Changed 90 +38 -14
3 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8c75886b87 - Show all commits

7
pages/goods/index.vue
View File

@ -32,9 +32,12 @@
<view class="title-card detail-card ss-p-y-40 ss-p-x-20"> <view class="title-card detail-card ss-p-y-40 ss-p-x-20">
<view class="ss-flex ss-row-between ss-col-center ss-m-b-26"> <view class="ss-flex ss-row-between ss-col-center ss-m-b-26">
<view class="price-box ss-flex ss-col-bottom"> <view class="price-box ss-flex ss-col-bottom">
<view class="price-text ss-m-r-16"> <view class="price-text ss-m-r-16" v-if="state.goodsInfo.paidMemberPrice">
{{ fen2yuan(state.selectedSku.price || state.goodsInfo.price) }} {{ fen2yuan(state.goodsInfo.paidMemberPrice) }}
</view> </view>
<view class="price-text ss-m-r-16" v-else>
{{ fen2yuan(state.selectedSku.price || state.goodsInfo.price) }}
</view>
<view class="origin-price-text" v-if="state.goodsInfo.marketPrice > 0"> <view class="origin-price-text" v-if="state.goodsInfo.marketPrice > 0">
{{ fen2yuan(state.selectedSku.marketPrice || state.goodsInfo.marketPrice) }} {{ fen2yuan(state.selectedSku.marketPrice || state.goodsInfo.marketPrice) }}
</view> </view>

38
sheep/components/s-goods-column/s-goods-column.vue
View File

@ -35,9 +35,12 @@
</view> </view>
<template v-else> <template v-else>
<text class="price-unit ss-font-24">{{ priceUnit }}</text> <text class="price-unit ss-font-24">{{ priceUnit }}</text>
<text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text> <text v-if="data.promotionPrice > 0 && !data.paidMemberPrice">{{ fen2yuan(data.promotionPrice) }}</text>
<text v-else-if="data.paidMemberPrice">
{{ fen2yuan(data.paidMemberPrice) }}
</text>
<text v-else> <text v-else>
{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }} {{ isArray(data.paidMemberPrice) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
</text> </text>
</template> </template>
</view> </view>
@ -137,9 +140,12 @@
</view> </view>
<template v-else> <template v-else>
<text class="price-unit ss-font-24">{{ priceUnit }}</text> <text class="price-unit ss-font-24">{{ priceUnit }}</text>
<text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text> <text v-if="data.promotionPrice > 0 && !data.paidMemberPrice">{{ fen2yuan(data.promotionPrice) }}</text>
<text v-else-if="data.paidMemberPrice">
{{ fen2yuan(data.paidMemberPrice) }}
</text>
<text v-else> <text v-else>
{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }} {{ isArray(data.paidMemberPrice) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
</text> </text>
</template> </template>
</view> </view>
@ -218,16 +224,19 @@
</view> </view>
<template v-else> <template v-else>
<text class="price-unit ss-font-24">{{ priceUnit }}</text> <text class="price-unit ss-font-24">{{ priceUnit }}</text>
<text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text> <text v-if="data.promotionPrice > 0 && !data.paidMemberPrice">{{ fen2yuan(data.promotionPrice) }}</text>
<text v-else-if="data.paidMemberPrice">
{{ fen2yuan(data.paidMemberPrice) }}
</text>
<text v-else> <text v-else>
{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }} {{ isArray(data.paidMemberPrice) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
</text> </text>
</template> </template>
</view> </view>
<view v-if=" <view v-if="
(goodsFields.original_price?.show || goodsFields.marketPrice?.show) && (goodsFields.original_price?.show || goodsFields.marketPrice?.show) &&
(data.original_price > 0 || data.marketPrice > 0) (data.original_price > 0 || data.marketPrice > 0)
" class="goods-origin-price ss-m-t-16 font-OPPOSANS ss-flex" :style="[{ color: originPriceColor }]"> " class="goods-origin-price ss-m-t-16 font-OPPOSANS ss-flex" :style="[{ color: originPriceColor }]">
<text class="price-unit ss-font-20">{{ priceUnit }}</text> <text class="price-unit ss-font-20">{{ priceUnit }}</text>
<view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view> <view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view>
</view> </view>
@ -292,10 +301,19 @@
</text> </text>
</view> </view>
<template v-else> <template v-else>
<text class="price-unit ss-font-24">{{ priceUnit }}</text> <!-- <text class="price-unit ss-font-24">{{ priceUnit }}</text>
<text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text> <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
<text v-else> <text v-else>
{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }} {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
</text> -->
<text class="price-unit ss-font-24">{{ priceUnit }}</text>
<text v-if="data.promotionPrice > 0 && !data.paidMemberPrice">{{ fen2yuan(data.promotionPrice) }}</text>
<text v-else-if="data.paidMemberPrice">
{{ fen2yuan(data.paidMemberPrice) }}
</text>
<text v-else>
{{ isArray(data.paidMemberPrice) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
</text> </text>
</template> </template>
</view> </view>

7
sheep/components/s-select-sku/s-select-sku.vue
View File

@ -15,9 +15,12 @@
<view class="goods-title ss-line-2">{{ goodsInfo.name }}</view> <view class="goods-title ss-line-2">{{ goodsInfo.name }}</view>
<view class="header-right-bottom ss-flex ss-col-center ss-row-between"> <view class="header-right-bottom ss-flex ss-col-center ss-row-between">
<view class="ss-flex"> <view class="ss-flex">
<view class="price-text"> <view class="price-text" v-if="goodsInfo.paidMemberPrice">
{{ fen2yuan(state.selectedSku.price || goodsInfo.price) }} {{ fen2yuan(goodsInfo.paidMemberPrice) }}
</view> </view>
<view class="price-text" v-else>
{{ fen2yuan(state.selectedSku.price || goodsInfo.price) }}
</view>
</view> </view>
<view class="stock-text ss-m-l-20"> <view class="stock-text ss-m-l-20">
{{ formatStock('exact', state.selectedSku.stock || goodsInfo.stock) }} {{ formatStock('exact', state.selectedSku.stock || goodsInfo.stock) }}