|
@@ -57,7 +57,7 @@
|
|
|
</div>
|
|
|
<!-- 合计 -->
|
|
|
<a-alert type="info" showIcon style="margin-bottom:15px">
|
|
|
- <div class="ftext" slot="message">共<span>{{ orderTotal }}</span>单,实收<span>¥{{ amountTotal }}</span>元</div>
|
|
|
+ <div class="ftext" slot="message">共<span> {{ orderTotal }} </span>单,兑换乐豆<span> {{ amountTotal }} </span>个</div>
|
|
|
</a-alert>
|
|
|
<s-table
|
|
|
ref="table"
|
|
@@ -68,7 +68,7 @@
|
|
|
bordered>
|
|
|
<!-- 订单状态 -->
|
|
|
<template slot="one" slot-scope="text, record">
|
|
|
- <span v-if="record.rubbishType=='CLOTHING'">{{ record.rubbishWeight }}</span>
|
|
|
+ <span v-if="record.rubbishType=='CLOTHES'">{{ record.rubbishWeight }}</span>
|
|
|
<span v-else>0</span>
|
|
|
</template>
|
|
|
<template slot="two" slot-scope="text, record">
|
|
@@ -84,7 +84,7 @@
|
|
|
<span v-else>0</span>
|
|
|
</template>
|
|
|
<template slot="five" slot-scope="text, record">
|
|
|
- <span v-if="record.rubbishType=='RUBBISH'">{{ record.rubbishWeight }}</span>
|
|
|
+ <span v-if="record.rubbishType=='HARM'">{{ record.rubbishWeight }}</span>
|
|
|
<span v-else>0</span>
|
|
|
</template>
|
|
|
<template slot="six" slot-scope="text, record">
|