|
@@ -18,9 +18,8 @@
|
|
|
type="del"
|
|
|
></uploadAllData>
|
|
|
</div>
|
|
|
- <p class="normal-margin" style="font-size: 13px !important;color:red;font-weight: normal" v-if="data.status === '新建'">{{$t(checkFreefreightamount)}}</p>
|
|
|
+ <p class="normal-margin" style="font-size: 13px !important;color:red;font-weight: normal" v-if="data.status === '新建'">{{checkFreefreightamount}}</p>
|
|
|
<Table
|
|
|
- v-if="tablecols.length"
|
|
|
height="calc(100vh - 500px)"
|
|
|
ref="multipleTable"
|
|
|
:layout="tablecols"
|
|
@@ -292,14 +291,13 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
checkFreefreightamount () {
|
|
|
- console.log('执行输出')
|
|
|
let result = ''
|
|
|
switch (this.freefreightamount) {
|
|
|
case -1:
|
|
|
- result = '不免运费'
|
|
|
+ result = this.$t('不免运费')
|
|
|
break;
|
|
|
case 0:
|
|
|
- result = '免运费'
|
|
|
+ result = this.$t('免运费')
|
|
|
break;
|
|
|
default:
|
|
|
result = this.data.amount >= this.freefreightamount?this.$t('当前订单免运费'):`${this.$t(`订单满`)} ${this.tool.formatAmount(this.freefreightamount,2)} ${this.$t(`元免运费,当前还差`)} ${this.tool.formatAmount(this.freefreightamount - this.data.amount,2)} ${this.$t(`元`)}`
|