Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pageB/contract/look.vue

@@ -25,7 +25,7 @@
 			</view>
 			<view v-for="(item , index) in carlist" :Key="index" class="forxinxi">
 				<view class="c-row carNos">
-					<text>{{item.carNo}}</text>
+					<text>{{item.carNo}} ({{item.tranCarNo}})</text>
 					<view class="con-list">
 						<text>{{item.sendDateStart}}<text class="hair">发</text></text>
 					</view>
@@ -71,11 +71,11 @@
 					@click="confirmunload(item)" >确认卸货</button>
 			</view>
 		</view>
-		<view class="c-list">
-				<button class=" btn btns" style="background-color: #FFFFFF;"
+		<view class="addcarwrap">
+				<view class="addcar" style="background-color: #FFFFFF;"
 					@click="commit1(goods)">
-					<image src="../../static/img/jiaoyi/ic_fabu@2x.png" style="width: 24px; height: 24px;top: 7px;"></image>
-					添加发车信息</button>
+					+
+					添加发车信息</view>
 		</view>
 		<view v-if='imgstatus' class='shade'>
 			<view class='shade-content'>
@@ -335,6 +335,7 @@
 	.center {
 		padding: 10px 20px;
 		background-color: #F5F6FA;
+		margin-bottom: 50px;
 	}
 
 	page {
@@ -1064,4 +1065,17 @@
 	.unload{
 		
 	}
+	.addcarwrap{
+		position:fixed;bottom:0;
+		width:100%;
+		left:0;
+		z-index:9999;
+	}
+	.addcarwrap .addcar{
+		text-align:center;
+		margin: 0 auto;
+		height:46px;
+		line-height:46px;
+		color:#00C265;
+	}
 </style>