Authored by 张文文

Merge branch 'feature/saler_coupon' into develop

... ... @@ -47,9 +47,10 @@
</div>
<div class="price-info item-wrapper" v-if="orderFeeInfo.platformFee">
<p class="platform-fee">
<span class="label"
>平台费用:</span>
<p>
<span class="label platform-fee"
>平台费用:<i @click="onPlatformFee" class="tip"></i
></span>
<span>{{orderFeeInfo.platformFee.amount || '¥0'}}</span>
</p>
<p class="delivery-fee">
... ... @@ -96,6 +97,8 @@ import { get } from 'lodash';
import { Button, Input } from 'cube-ui';
import { createNamespacedHelpers } from 'vuex';
import PlatformFeeInfo from './components/platform-fee-info';
const { mapState, mapActions } = createNamespacedHelpers('order/orderDeliver');
export default {
... ... @@ -234,6 +237,35 @@ export default {
'computeWithCoupon',
'changeSelectCouponList'
]),
onPlatformFee() {
const { platformFee = {} } = this.orderFeeInfo;
this.$createDialog(
{
type: 'alert',
title: '平台费用',
confirmBtn: { text: '我知道了' }
},
createElement => {
return [
createElement(PlatformFeeInfo, {
props: {
platformFeeInfo: {
packageFee: platformFee.packageFee.replace('-', ''),
packageFeeDesc: '商品包装费',
payChannelPercentage: platformFee.goodsPaymentRatePercent,
serviceFee: platformFee.serviceFee.replace('-', ''),
serviceFeeDesc: '平台服务费',
appraiseFee: platformFee.appraiseFee.replace('-', ''),
appraiseFeeDesc: '商品鉴定费'
}
},
slot: 'content'
})
];
}
).show();
},
onCouponClick() {
let vm = this;
... ... @@ -546,6 +578,15 @@ export default {
align-items: center;
}
.tip {
width: 60px;
height: 30px;
display: inline-block;
background: url("~statics/image/order/tip@3x.png") no-repeat;
background-size: contain;
background-position: center;
}
.delivery-fee {
margin: 20px 0;
}
... ...
{
"name": "xianyu-ufo-app-web",
"version": "1.6.0-beta2",
"version": "1.6.0-beta3",
"private": true,
"description": "Xianyu Project With Express",
"repository": {
... ...