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

# Conflicts:
#	pages/release/release.vue

pages/order/orderDetails.vue

@@ -213,14 +213,14 @@
 			<view class='row-between'>
 				<view class="row-left-text gray">运费尾款</view>
 				<view class="row-right-text">
-					{{dataObj.freightInfo.freightBalance?dataObj.freightInfo.freightBalance:"未支付"}}
+					{{dataObj.freightInfo.ownerFreightBalance?dataObj.freightInfo.ownerFreightBalance:"未支付"}}
 				</view>
 			</view>
 			<view class='flex flex-end'>
-				<view class="row-right-text">{{dataObj.freightInfo.freightBalanceDate}}</view>
+				<view class="row-right-text">{{dataObj.freightInfo.ownerFreightBalanceDate}}</view>
 			</view>
 			<view class='row-between mx row-left-text' v-if="dataObj.freightInfo.freightBalance">
-				明细：预付{{dataObj.advanceCharge}}元，服务费{{dataObj.freightInfo.driverServiceCharge}}元，尾款{{dataObj.freightInfo.freightBalance}}元，司机合计收款{{dataObj.freightInfo.totalCollection}}元。
+				明细：预付{{dataObj.advanceCharge}}元，服务费{{dataObj.freightInfo.driverServiceCharge}}元，尾款{{dataObj.freightInfo.ownerFreightBalance}}元，合计{{dataObj.freightInfo.totalPayment}}元。
 			</view>
 		</view>
 		<!-- v-if="status3" -->

pages/release/release.vue

@@ -23,7 +23,6 @@
 
 				<view class="left select-sf" :class='dataObj.cargoOwner?"":"select-sf1"'>{{dataObj.cargoOwner?dataObj.cargoOwner:'选择货主身份'}}</view>
 				<view class="right"><image src="../../static/right.png" style="width: 22rpx;height: 22rpx;margin-top:14rpx;"></image></view>
-
 			</view>
 			<!-- 		<view class="row" @click="selectCargoOwner" v-if="dataObj.cargoOwner">
 				<view class="left">{{dataObj.cargoOwner}}</view>
@@ -47,7 +46,6 @@
 				</view>
 				<view class="right" @click="selectAddress(0)" v-if="!dataObj.sendArea">
 					<view v-if='dataObj.sendArea' class="right"></view>
-
 					<view class="right" v-else><image src="../../static/right.png" style="width: 22rpx;height: 22rpx;margin-top:14rpx;"></image></view>
 				</view>
 			</view>
@@ -65,7 +63,6 @@
 				</view>
 				<view class="right" @click="selectAddress(1)" v-if="!dataObj.unloadArea">
 					<view v-if='dataObj.unloadArea' class="right">{{(dataObj.unloadCity+dataObj.unloadArea)}}</view>
-
 					<view class="right" v-else><image src="../../static/right.png" style="width: 22rpx;height: 22rpx;margin-top:14rpx;"></image></view>
 				</view>
 			</view>
@@ -384,6 +381,12 @@
 				let _obj = res.data
 				if (_obj.authenticationStatus == '已认证') {
 					uni.$u.route('/pages/components/empty/index');
+				} else if (_obj.authenticationStatus == '审核中') {
+					uni.showToast({
+						title: '身份信息审核中',
+						icon: 'none'
+					})
+
 				} else if (_obj.authenticationStatus == '已过期') {
 					this.alertTitle = '身份信息已过期！'
 					this.showCancelButton = false