|
|
@@ -30,10 +30,9 @@
|
|
|
<image class="goods_img" :src="goodsInfo.original_img" mode=""></image>
|
|
|
<view class="goods_con flex_c flex_jc flex_jb">
|
|
|
<view class="goods_name ellipsis2">{{ goodsInfo.goods_name }}</view>
|
|
|
- <view class="flex_r flex_ac flex_jb">
|
|
|
- <view class="goods_msg">{{ Data.type == 2 ? goodsInfo.trade_num + "消费积分" + "¥" + goodsInfo.trade_price : "¥" + goodsInfo.cost_price }}</view>
|
|
|
- <view class="goods_num">x {{ Data.num }}</view>
|
|
|
- </view>
|
|
|
+ <view class="goods_msg" v-if="Data.type == 2">{{goodsInfo.trade_price}}元+{{goodsInfo.trade_num}}批发积分+{{goodsInfo.treasure_price}}茶宝</view>
|
|
|
+ <view class="goods_msg" v-else>{{ goodsInfo.cost_price }}</view>
|
|
|
+ <view class="goods_num">x {{ Data.num }}</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -49,7 +48,7 @@
|
|
|
<view class="list_name">运费</view>
|
|
|
<view class="list_con p_color">({{ freight }}元/每套)</view>
|
|
|
</view>
|
|
|
- <view class="list_con">¥{{ freight * Data.num }}</view>
|
|
|
+ <view class="list_con">¥{{ $h.Mul(freight, Data.num) }}</view>
|
|
|
</view>
|
|
|
<view class="order_list flex_r flex_ac flex_jb" v-if="Data.type == 2 || Data.type == 5">
|
|
|
<view class="flex_r flex_ac">
|
|
|
@@ -57,18 +56,18 @@
|
|
|
<view class="list_con p_color">(可用{{ userinfo.cha_bao }})</view>
|
|
|
</view>
|
|
|
<view class="list_con" v-if="Data.type != 5">{{ goodsInfo.treasure_price * Data.num }} 茶宝</view>
|
|
|
- <view class="list_con" v-else>{{ goodsInfo.cha_bao * Data.num }} 茶宝</view>
|
|
|
+ <view class="list_con" v-else>{{ $h.Mul(goodsInfo.cha_bao, Data.num) }} 茶宝</view>
|
|
|
</view>
|
|
|
<view class="order_list flex_r flex_ac flex_jb" v-if="Data.type == 2">
|
|
|
<view class="flex_r flex_ac">
|
|
|
<view class="list_name">批发积分</view>
|
|
|
<view class="list_con p_color">(可用{{ userinfo.integral }})</view>
|
|
|
</view>
|
|
|
- <view class="list_con">{{ goodsInfo.trade_num * Data.num }} 批发积分</view>
|
|
|
+ <view class="list_con">{{ $h.Mul(goodsInfo.trade_num, Data.num) }} 批发积分</view>
|
|
|
</view>
|
|
|
<view class="order_list flex_r flex_ac flex_jb" v-if="Data.type != 5">
|
|
|
<view class="list_name">商品金额</view>
|
|
|
- <view class="list_con">¥{{ (Data.type == 2 ? goodsInfo.trade_price : goodsInfo.cost_price) * Data.num || 0 }}</view>
|
|
|
+ <view class="list_con">¥{{ $h.Mul((Data.type == 2 ? goodsInfo.trade_price : goodsInfo.cost_price), Data.num) || 0 }}</view>
|
|
|
</view>
|
|
|
<view class="order_list flex_r flex_ac flex_jb" v-if="Data.type != 4 && Data.type != 5">
|
|
|
<view class="list_name">可用余额</view>
|
|
|
@@ -340,13 +339,19 @@ page {
|
|
|
}
|
|
|
|
|
|
.goods_num {
|
|
|
+ text-align: right;
|
|
|
font-size: 26rpx;
|
|
|
color: #989898;
|
|
|
+ position: absolute;
|
|
|
+ bottom: 0;
|
|
|
+ right: 0;
|
|
|
}
|
|
|
|
|
|
.goods_con {
|
|
|
width: calc(100% - 202rpx - 36rpx);
|
|
|
- overflow: hidden;
|
|
|
+ min-height: 187rpx;
|
|
|
+ position: relative;
|
|
|
+ // overflow: hidden;
|
|
|
}
|
|
|
|
|
|
.goods {
|