Merge branch 'master' of http://47.100.3.209:3000/gongdecai/wangluohuoyun-app

pages/order/index.vue

@@ -86,7 +86,7 @@
 							<!-- 货主装车确认前运费 -->
 							<view class="car"
 								v-if="good.orderStatus=='待货主确认'||good.orderStatus=='未装车'||good.orderStatus=='待货主确认装车'||good.orderStatus=='货主驳回装车信息'||good.orderStatus=='已终止'">
-								{{good.freight}}{{good.illingMethod==0?'元/吨':'元/车'}}
+								{{good.illingMethod==0?good.freight:good.freightCar}}{{good.illingMethod==0?'元/吨':'元/车'}}
 							</view>
 							<!-- 货主装车确认后卸车确认前运费 -->
 							<view class="car"