Showing
8 changed files
with
40 additions
and
25 deletions
@@ -377,9 +377,10 @@ export default { | @@ -377,9 +377,10 @@ export default { | ||
377 | reportType: 'qiugou_buy', | 377 | reportType: 'qiugou_buy', |
378 | type: 'buy', | 378 | type: 'buy', |
379 | back: { | 379 | back: { |
380 | - name: 'ProductDetail', | 380 | + name: 'buyOrderDetail', |
381 | params: { | 381 | params: { |
382 | - productId: get(this.originProductData, 'productId', '') | 382 | + owner: 'buy', |
383 | + code: get(this.publishresult, 'orderCode', ''), | ||
383 | } | 384 | } |
384 | }, | 385 | }, |
385 | forward: { | 386 | forward: { |
@@ -224,9 +224,10 @@ export default { | @@ -224,9 +224,10 @@ export default { | ||
224 | type: UserType.buy, | 224 | type: UserType.buy, |
225 | reportType: 'buy', | 225 | reportType: 'buy', |
226 | back: { | 226 | back: { |
227 | - name: 'ProductDetail', | 227 | + name: 'buyOrderDetail', |
228 | params: { | 228 | params: { |
229 | - productId: this.productId | 229 | + owner: UserType.buy, |
230 | + code: result.data.orderCode | ||
230 | } | 231 | } |
231 | }, | 232 | }, |
232 | forward: { | 233 | forward: { |
@@ -2,15 +2,15 @@ | @@ -2,15 +2,15 @@ | ||
2 | <div class="fee-detail"> | 2 | <div class="fee-detail"> |
3 | <div class="item"> | 3 | <div class="item"> |
4 | <div>平台费用:<i class="iconfont iconquestion icon-class" @click="onClick"></i></div> | 4 | <div>平台费用:<i class="iconfont iconquestion icon-class" @click="onClick"></i></div> |
5 | - <div>{{data.platformFee.amount || '¥0'}}</div> | 5 | + <div>{{feeInfo.platformFee.amount || '¥0'}}</div> |
6 | </div> | 6 | </div> |
7 | <div class="item"> | 7 | <div class="item"> |
8 | <div>银行转账费(1%):</div> | 8 | <div>银行转账费(1%):</div> |
9 | - <div>{{data.bankTransferFee || '¥0'}}</div> | 9 | + <div>{{feeInfo.bankTransferFee || '¥0'}}</div> |
10 | </div> | 10 | </div> |
11 | <div class="item"> | 11 | <div class="item"> |
12 | <div class="total-fee">实际收入:</div> | 12 | <div class="total-fee">实际收入:</div> |
13 | - <div class="fee">{{data.income || '¥0'}}</div> | 13 | + <div class="fee">{{feeInfo.income || '¥0'}}</div> |
14 | </div> | 14 | </div> |
15 | 15 | ||
16 | <Modal ref="dialog" v-model="showModal"> | 16 | <Modal ref="dialog" v-model="showModal"> |
@@ -20,17 +20,17 @@ | @@ -20,17 +20,17 @@ | ||
20 | 20 | ||
21 | <div class="item item2"> | 21 | <div class="item item2"> |
22 | <span>商品鉴定费</span> | 22 | <span>商品鉴定费</span> |
23 | - <span>{{data.platformFee.appraiseFee}}</span> | 23 | + <span>{{feeInfo.platformFee.appraiseFee}}</span> |
24 | </div> | 24 | </div> |
25 | 25 | ||
26 | <div class="item item2"> | 26 | <div class="item item2"> |
27 | <span>商品包装费</span> | 27 | <span>商品包装费</span> |
28 | - <span>{{data.platformFee.packageFee}}</span> | 28 | + <span>{{feeInfo.platformFee.packageFee}}</span> |
29 | </div> | 29 | </div> |
30 | 30 | ||
31 | <div class="item item2"> | 31 | <div class="item item2"> |
32 | - <span>平台服务费({{data.platformFee.goodsPaymentRatePercent}})</span> | ||
33 | - <span>{{data.platformFee.serviceFee}}</span> | 32 | + <span>平台服务费({{feeInfo.platformFee.goodsPaymentRatePercent}})</span> |
33 | + <span>{{feeInfo.platformFee.serviceFee}}</span> | ||
34 | </div> | 34 | </div> |
35 | 35 | ||
36 | <template slot="footer"> | 36 | <template slot="footer"> |
@@ -58,7 +58,8 @@ export default { | @@ -58,7 +58,8 @@ export default { | ||
58 | data() { | 58 | data() { |
59 | return { | 59 | return { |
60 | confirmBtn: {}, | 60 | confirmBtn: {}, |
61 | - showModal: false | 61 | + showModal: false, |
62 | + feeInfo: this.$props.data || {platformFee: {}} | ||
62 | }; | 63 | }; |
63 | }, | 64 | }, |
64 | components: { | 65 | components: { |
@@ -67,7 +68,7 @@ export default { | @@ -67,7 +68,7 @@ export default { | ||
67 | }, | 68 | }, |
68 | methods: { | 69 | methods: { |
69 | onClick() { | 70 | onClick() { |
70 | - if (!this.data.income) { | 71 | + if (!this.feeInfo.income) { |
71 | return this.$createToast({ | 72 | return this.$createToast({ |
72 | txt: '没有价格', | 73 | txt: '没有价格', |
73 | time: 1500, | 74 | time: 1500, |
1 | <template> | 1 | <template> |
2 | <div> | 2 | <div> |
3 | - <div class="tip" v-if="!superSell">需支付保证金:<span class="red">{{data.earnestMoneyStr || '¥0'}}</span><i v-if="!hiddenIcon" | 3 | + <div class="tip" v-if="!superSell"> |
4 | + 需支付保证金:<span class="red">{{ earnestInfo.earnestMoneyStr || "¥0" }}</span> | ||
5 | + <i | ||
6 | + v-if="!hiddenIcon" | ||
4 | class="iconfont iconquestion icon-class" | 7 | class="iconfont iconquestion icon-class" |
5 | - @click="onClick"></i></div> | ||
6 | - <div class="tip2">所有商品必须为国内现货,且承诺36小时内发货,交易成功后将自动退还保证金</div> | 8 | + @click="onClick" |
9 | + ></i> | ||
10 | + </div> | ||
11 | + <div class="tip2"> | ||
12 | + 所有商品必须为国内现货,且承诺36小时内发货,交易成功后将自动退还保证金 | ||
13 | + </div> | ||
7 | </div> | 14 | </div> |
8 | </template> | 15 | </template> |
9 | 16 | ||
10 | <script> | 17 | <script> |
11 | export default { | 18 | export default { |
12 | - name: 'OrderFee', | 19 | + name: "OrderFee", |
13 | props: { | 20 | props: { |
14 | data: { | 21 | data: { |
15 | type: Object, | 22 | type: Object, |
@@ -31,13 +38,18 @@ export default { | @@ -31,13 +38,18 @@ export default { | ||
31 | }, | 38 | }, |
32 | url: { | 39 | url: { |
33 | type: String, | 40 | type: String, |
34 | - default: '' | 41 | + default: "" |
42 | + } | ||
43 | + }, | ||
44 | + data() { | ||
45 | + return { | ||
46 | + earnestInfo: this.$props.data || {} | ||
35 | } | 47 | } |
36 | }, | 48 | }, |
37 | methods: { | 49 | methods: { |
38 | onClick() { | 50 | onClick() { |
39 | if (this.url) { | 51 | if (this.url) { |
40 | - this.$xianyu.goXianyuNewPage({url: this.url}); | 52 | + this.$xianyu.goXianyuNewPage({ url: this.url }); |
41 | } | 53 | } |
42 | } | 54 | } |
43 | } | 55 | } |
@@ -3,7 +3,6 @@ | @@ -3,7 +3,6 @@ | ||
3 | <layout-app | 3 | <layout-app |
4 | :title="'\u200E'" | 4 | :title="'\u200E'" |
5 | class="buyer-order-detail-wrapper" | 5 | class="buyer-order-detail-wrapper" |
6 | - :backAction="onBack" | ||
7 | > | 6 | > |
8 | <div class="order-detail-wrapper"> | 7 | <div class="order-detail-wrapper"> |
9 | <div class="content"> | 8 | <div class="content"> |
@@ -3,7 +3,6 @@ | @@ -3,7 +3,6 @@ | ||
3 | <layout-app | 3 | <layout-app |
4 | :title="'\u200E'" | 4 | :title="'\u200E'" |
5 | class="seller-order-detail-wrapper" | 5 | class="seller-order-detail-wrapper" |
6 | - :backAction="onBack" | ||
7 | > | 6 | > |
8 | <div class="order-detail-wrapper"> | 7 | <div class="order-detail-wrapper"> |
9 | <div class="content"> | 8 | <div class="content"> |
@@ -193,9 +193,10 @@ export default { | @@ -193,9 +193,10 @@ export default { | ||
193 | extra: JSON.stringify({ | 193 | extra: JSON.stringify({ |
194 | type: 'sell', | 194 | type: 'sell', |
195 | back: { | 195 | back: { |
196 | - name: 'ProductDetail', | 196 | + name: 'sellOrderDetail', |
197 | params: { | 197 | params: { |
198 | - productId: get(this.originProductData, 'productId', '') | 198 | + owner: 'sell', |
199 | + code: get(this.publishinfo, 'orderCode', '') | ||
199 | } | 200 | } |
200 | }, | 201 | }, |
201 | forward: { | 202 | forward: { |
@@ -386,9 +386,10 @@ export default { | @@ -386,9 +386,10 @@ export default { | ||
386 | type: UserType.sell, | 386 | type: UserType.sell, |
387 | reportType: 'sell', | 387 | reportType: 'sell', |
388 | back: { | 388 | back: { |
389 | - name: 'ProductDetail', | 389 | + name: 'sellOrderDetail', |
390 | params: { | 390 | params: { |
391 | - productId: this.productId | 391 | + owner: UserType.sell, |
392 | + code: orderResult.data.orderCode | ||
392 | } | 393 | } |
393 | }, | 394 | }, |
394 | forward: { | 395 | forward: { |
-
Please register or login to post a comment