yudao
/
mall-uniapp
mirror of https://gitee.com/yudaocode/yudao-mall-uniapp.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

增加 vipPrice 的返回

pull/1/MERGE
YunaiV 2023-09-24 00:45:48 +08:00
parent 1e01a404ba
commit 681535e94b
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/goodList/index.vue
View File

@ -12,7 +12,7 @@
<view class='text'> <view class='text'>
<view class='line1'>{{ item.name }}</view> <view class='line1'>{{ item.name }}</view>
<view class='money font-color'>￥<text class='num'>{{ fen2yuan(item.price) }}</text></view> <view class='money font-color'>￥<text class='num'>{{ fen2yuan(item.price) }}</text></view>
<view class='vip-money acea-row row-middle' v-if="item.vipPrice > 0">￥{{ fen2yuan(item.vipPrice || 0) }} <view class='vip-money acea-row row-middle' v-if="item.vipPrice > 0">￥{{ fen2yuan(item.price - item.vipPrice) }}
<image src='../../static/images/vip.png'></image><text class='num'>已售{{ item.salesCount }}{{item.unitName}}</text> <image src='../../static/images/vip.png'></image><text class='num'>已售{{ item.salesCount }}{{item.unitName}}</text>
</view> </view>
<view class='vip-money acea-row row-middle' v-else><text class='num'>已售{{ item.salesCount }}{{item.unitName}}</text></view> <view class='vip-money acea-row row-middle' v-else><text class='num'>已售{{ item.salesCount }}{{item.unitName}}</text></view>

2
pages/goods_details/index.vue
View File

@ -29,7 +29,7 @@
<view class='money font-color'> <view class='money font-color'>
￥ ￥
<text class='num'>{{ fen2yuan(spu.price) }}</text> <text class='num'>{{ fen2yuan(spu.price) }}</text>
<text class='vip-money' v-if="spu.vipPrice && spu.vipPrice > 0">￥{{ fen2yuan(spu.vipPrice) }}</text> <text class='vip-money' v-if="spu.vipPrice && spu.vipPrice > 0">￥{{ fen2yuan(spu.price - spu.vipPrice) }}</text>
<image v-if="spu.vipPrice && spu.vipPrice > 0" src="../../static/images/vip.png" /> <image v-if="spu.vipPrice && spu.vipPrice > 0" src="../../static/images/vip.png" />
</view> </view>
<view class='iconfont icon-fenxiang' @click="listenerActionSheet"></view> <view class='iconfont icon-fenxiang' @click="listenerActionSheet"></view>

2
pages/goods_list/index.vue
View File

@ -50,7 +50,7 @@
<view class='money font-color' :class='is_switch?"":"on"'>￥<text <view class='money font-color' :class='is_switch?"":"on"'>￥<text
class='num'>{{ fen2yuan(item.price) }}</text></view> class='num'>{{ fen2yuan(item.price) }}</text></view>
<view class='vip acea-row row-between-wrapper' :class='is_switch?"":"on"'> <view class='vip acea-row row-between-wrapper' :class='is_switch?"":"on"'>
<view class='vip-money' v-if="item.vipPrice > 0">￥{{ fen2yuan(item.vipPrice) }} <view class='vip-money' v-if="item.vipPrice > 0">￥{{ fen2yuan(item.price - item.vipPrice) }}
<image src='../../static/images/vip.png'></image> <image src='../../static/images/vip.png'></image>
</view> </view>
<view>已售 {{ item.salesCount || 0}} {{item.unitName}}</view> <view>已售 {{ item.salesCount || 0}} {{item.unitName}}</view>

10
pages/users/order_confirm/index.vue
View File

@ -70,12 +70,12 @@
</checkbox-group> </checkbox-group>
</view> </view>
</view> </view>
<!-- VIP 展示 TODO --> <!-- VIP 展示 -->
<!-- <view class='item acea-row row-between-wrapper' <view class='item acea-row row-between-wrapper'
v-if="priceGroup.vipPrice > 0 && userInfo.vip && !pinkId && !BargainId && !combinationId && !seckillId"> v-if="orderInfoVo.price.vipPrice > 0">
<view>会员优惠</view> <view>会员优惠</view>
<view class='discount'>-￥{{priceGroup.vipPrice}}</view> <view class='discount'>-￥{{ fen2yuan(orderInfoVo.price.vipPrice) }}</view>
</view> --> </view>
<!-- 配送展示 TODO --> <!-- 配送展示 TODO -->
<view class='item acea-row row-between-wrapper' v-if='deliveryType === 1'> <view class='item acea-row row-between-wrapper' v-if='deliveryType === 1'>
<view>快递费用</view> <view>快递费用</view>

2
pages/users/order_list/index.vue
View File

@ -47,7 +47,7 @@
<view v-if="order.status === 0" class="font-color">待付款</view> <view v-if="order.status === 0" class="font-color">待付款</view>
<view v-else-if="order.status === 10 && order.deliveryType === 1" class="font-color">待发货</view> <view v-else-if="order.status === 10 && order.deliveryType === 1" class="font-color">待发货</view>
<!-- TODO 芋艿：核销逻辑 --> <!-- TODO 芋艿：核销逻辑 -->
<view v-else-if="order._status === 10 && order.deliveryType === 2" class="font-color">待核销</view> <view v-else-if="order.status === 10 && order.deliveryType === 2" class="font-color">待核销</view>
<view v-else-if="order.status === 20" class="font-color">待收货</view> <view v-else-if="order.status === 20" class="font-color">待收货</view>
<view v-else-if="order.status === 30 && !order.commentStatus" class="font-color">待评价</view> <view v-else-if="order.status === 30 && !order.commentStatus" class="font-color">待评价</view>
<view v-else-if="order.status === 30 && order.commentStatus" class="font-color">已完成</view> <view v-else-if="order.status === 30 && order.commentStatus" class="font-color">已完成</view>