|
|
@@ -115,18 +115,22 @@
|
|
|
<view class="abount" style="margin-top: 20rpx;">
|
|
|
<view class="u-flex u-row-between" style='margin-bottom:40rpx'>
|
|
|
<view class="name">{{i18n.Commodityamount}}</view>
|
|
|
- <view class="money">
|
|
|
+ <view class="" v-if="typea=='shop'">{{goodsPrice}}</view>
|
|
|
+ <view class="money" v-else>
|
|
|
¥{{goodinfo.is_discount==1? (Number(sku_info.price*100)*Number(value*100))/10000:(Number(sku_info.discount_price*100)*Number(value*100))/10000}}
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="u-flex u-row-between">
|
|
|
<view class="name">{{i18n.Grosscommodityweight}}</view>
|
|
|
- <view class="money">{{Number(sku_info.weight)*value}}kg</view>
|
|
|
+ <view class="" v-if="typea=='shop'">{{
|
|
|
+ goodsWeight
|
|
|
+ }}kg</view>
|
|
|
+ <view class="money" v-else>{{Number(sku_info.weight)*value}}kg</view>
|
|
|
</view>
|
|
|
<view class="back u-flex" v-if="containname1">
|
|
|
<image src="static/images/warning.png" style="width: 32rpx;height: 32rpx;" mode=""></image>
|
|
|
<text
|
|
|
- style="margin-left: 12rpx;">{{i18n.buy}}{{max_weight}}kg{{i18n.price}}¥{{unit_fee}}，{{i18n.morefavorable}}</text>
|
|
|
+ style="margin-left: 12rpx;font-size: 24rpx;">{{i18n.buy}}{{max_weight}}kg{{i18n.price}}¥{{unit_fee}}，{{i18n.morefavorable}}</text>
|
|
|
</view>
|
|
|
<view class="u-flex u-row-between" style='margin-bottom:40rpx;margin-top: 20rpx;'>
|
|
|
<view class="name">{{i18n.Costperkilogram}}</view>
|
|
|
@@ -141,8 +145,8 @@
|
|
|
<text class="small">{{i18n.subtotal}}</text>
|
|
|
<text class="mon">¥</text>
|
|
|
<text class="mon" v-if="typea=='shop'">{{goodsPrice}}</text>
|
|
|
- <text class="mon"
|
|
|
- v-else style="font-size: 40rpx;">{{goodinfo.is_discount==1? (Number(sku_info.price*100)*Number(value*100))/10000:(Number(sku_info.discount_price*100)*Number(value*100))/10000}}</text>
|
|
|
+ <text class="mon" v-else
|
|
|
+ style="font-size: 40rpx;">{{goodinfo.is_discount==1? (Number(sku_info.price*100)*Number(value*100))/10000:(Number(sku_info.discount_price*100)*Number(value*100))/10000}}</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -153,7 +157,8 @@
|
|
|
<text v-else class="kg">{{i18n.Atotalof}}{{Number(sku_info.weight) * value}}kg,</text>
|
|
|
<text>{{i18n.total}}:</text>
|
|
|
<text class="money" style="font-size: 28rpx;">¥</text>
|
|
|
- <text style="font-weight: bold;" class="money" v-if="typea=='shop'">{{(Number(sum*10000+ Number(goodsPrice)*10000))/10000 }}</text>
|
|
|
+ <text style="font-weight: bold;" class="money"
|
|
|
+ v-if="typea=='shop'">{{(Number(sum*10000+ Number(goodsPrice)*10000))/10000 }}</text>
|
|
|
<view class="" v-else>
|
|
|
<text class="money" v-if="goodinfo.is_discount==1"
|
|
|
style="font-weight: bold;">{{(Number(sum*10000+ Number(sku_info.price)*Number(value)*10000))/10000}}</text>
|
|
|
@@ -177,7 +182,7 @@
|
|
|
</view>
|
|
|
<view class="u-flex " style="margin-top: 60rpx;flex-wrap: wrap;column-gap: 16rpx;">
|
|
|
<view :class="index==idx?'active':'unactive'" v-for="(item,idx) in containerList"
|
|
|
- @click="change(item,idx)"
|
|
|
+ v-if="item.sum != 0" @click="change(item,idx)"
|
|
|
style="display: flex;flex-direction: column;align-items: center;justify-content: center;margin-bottom: 28rpx;position: relative;">
|
|
|
<image v-if="index==idx" src="static/images/change.png"
|
|
|
style="width: 36rpx;height: 32rpx;position: absolute;top: 0;right: 0;" mode=""></image>
|
|
|
@@ -205,7 +210,7 @@
|
|
|
</view>
|
|
|
<scroll-view :scroll-y="true" style="500rpx">
|
|
|
<view class="transport" style="margin-top: 32rpx;" @click="activea(item,idx)"
|
|
|
- v-for="(item,idx) in containlist" >
|
|
|
+ v-for="(item,idx) in containlist">
|
|
|
<view class="u-flex u-row-between">
|
|
|
<text class="yundate">{{i18n.Shipmentdate}} {{item.end_date}}</text>
|
|
|
<image v-if="datechan==idx" src="/pageA/static/images/active.png"
|
zhaogongxue