Authored by lea guo

新需求:支付也返回订单详情页

... ... @@ -377,9 +377,10 @@ export default {
reportType: 'qiugou_buy',
type: 'buy',
back: {
name: 'ProductDetail',
name: 'buyOrderDetail',
params: {
productId: get(this.originProductData, 'productId', '')
owner: 'buy',
code: get(this.publishresult, 'orderCode', ''),
}
},
forward: {
... ...
... ... @@ -224,9 +224,10 @@ export default {
type: UserType.buy,
reportType: 'buy',
back: {
name: 'ProductDetail',
name: 'buyOrderDetail',
params: {
productId: this.productId
owner: UserType.buy,
code: result.data.orderCode
}
},
forward: {
... ...
... ... @@ -2,15 +2,15 @@
<div class="fee-detail">
<div class="item">
<div>平台费用:<i class="iconfont iconquestion icon-class" @click="onClick"></i></div>
<div>{{data.platformFee.amount || '¥0'}}</div>
<div>{{feeInfo.platformFee.amount || '¥0'}}</div>
</div>
<div class="item">
<div>银行转账费(1%):</div>
<div>{{data.bankTransferFee || '¥0'}}</div>
<div>{{feeInfo.bankTransferFee || '¥0'}}</div>
</div>
<div class="item">
<div class="total-fee">实际收入:</div>
<div class="fee">{{data.income || '¥0'}}</div>
<div class="fee">{{feeInfo.income || '¥0'}}</div>
</div>
<Modal ref="dialog" v-model="showModal">
... ... @@ -20,17 +20,17 @@
<div class="item item2">
<span>商品鉴定费</span>
<span>{{data.platformFee.appraiseFee}}</span>
<span>{{feeInfo.platformFee.appraiseFee}}</span>
</div>
<div class="item item2">
<span>商品包装费</span>
<span>{{data.platformFee.packageFee}}</span>
<span>{{feeInfo.platformFee.packageFee}}</span>
</div>
<div class="item item2">
<span>平台服务费({{data.platformFee.goodsPaymentRatePercent}})</span>
<span>{{data.platformFee.serviceFee}}</span>
<span>平台服务费({{feeInfo.platformFee.goodsPaymentRatePercent}})</span>
<span>{{feeInfo.platformFee.serviceFee}}</span>
</div>
<template slot="footer">
... ... @@ -58,7 +58,8 @@ export default {
data() {
return {
confirmBtn: {},
showModal: false
showModal: false,
feeInfo: this.$props.data || {platformFee: {}}
};
},
components: {
... ... @@ -67,7 +68,7 @@ export default {
},
methods: {
onClick() {
if (!this.data.income) {
if (!this.feeInfo.income) {
return this.$createToast({
txt: '没有价格',
time: 1500,
... ...
<template>
<div>
<div class="tip" v-if="!superSell">需支付保证金:<span class="red">{{data.earnestMoneyStr || '¥0'}}</span><i v-if="!hiddenIcon"
class="iconfont iconquestion icon-class"
@click="onClick"></i></div>
<div class="tip2">所有商品必须为国内现货,且承诺36小时内发货,交易成功后将自动退还保证金</div>
<div class="tip" v-if="!superSell">
需支付保证金:<span class="red">{{ earnestInfo.earnestMoneyStr || "¥0" }}</span>
<i
v-if="!hiddenIcon"
class="iconfont iconquestion icon-class"
@click="onClick"
></i>
</div>
<div class="tip2">
所有商品必须为国内现货,且承诺36小时内发货,交易成功后将自动退还保证金
</div>
</div>
</template>
<script>
export default {
name: 'OrderFee',
name: "OrderFee",
props: {
data: {
type: Object,
... ... @@ -31,13 +38,18 @@ export default {
},
url: {
type: String,
default: ''
default: ""
}
},
data() {
return {
earnestInfo: this.$props.data || {}
}
},
methods: {
onClick() {
if (this.url) {
this.$xianyu.goXianyuNewPage({url: this.url});
this.$xianyu.goXianyuNewPage({ url: this.url });
}
}
}
... ...
... ... @@ -3,7 +3,6 @@
<layout-app
:title="'\u200E'"
class="buyer-order-detail-wrapper"
:backAction="onBack"
>
<div class="order-detail-wrapper">
<div class="content">
... ...
... ... @@ -3,7 +3,6 @@
<layout-app
:title="'\u200E'"
class="seller-order-detail-wrapper"
:backAction="onBack"
>
<div class="order-detail-wrapper">
<div class="content">
... ...
... ... @@ -193,9 +193,10 @@ export default {
extra: JSON.stringify({
type: 'sell',
back: {
name: 'ProductDetail',
name: 'sellOrderDetail',
params: {
productId: get(this.originProductData, 'productId', '')
owner: 'sell',
code: get(this.publishinfo, 'orderCode', '')
}
},
forward: {
... ...
... ... @@ -386,9 +386,10 @@ export default {
type: UserType.sell,
reportType: 'sell',
back: {
name: 'ProductDetail',
name: 'sellOrderDetail',
params: {
productId: this.productId
owner: UserType.sell,
code: orderResult.data.orderCode
}
},
forward: {
... ...