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

pageB/contract/contract_detail.vue

@@ -194,7 +194,6 @@
 		methods: {
 			DateChange(e) {
 				this.goods.sendDateStart = e.year + '-' + e.month + '-' + e.day
-				// this.goods.sendDateStart = e.detail.value
 			},
 			commit1(item) {
 				uni.navigateTo({
@@ -264,10 +263,10 @@
 							that.$api.doRequest('post', '/tranCarInfo/api/addTranTask', that.goods).then(
 								res => {
 									if (res.data.code == 200) {
-										uni.showToast({
-											title: '提交成功！',
-											icon: 'success',
-											duration: 2000,
+										uni.showModal({
+											content: '提交成功！',
+											cancelText: "返回",
+											confirmText: "继续添加",
 											success: function(res) {
 												setTimeout(() => {
 													var result = that.goods.tranCarNo
@@ -290,8 +289,7 @@
 														tare: '',
 														loadNetWeight: '',
 														loadPoundImg: '',
-														contractNo: that
-															.contractNo,
+														contractNo: that.contractNo,
 														goodsName: that.goodsName,
 														sendDateStart: ''
 													}
@@ -299,7 +297,8 @@
 														delta: 1
 													});
 												}, 2000)
-											}
+											},
+											
 										})
 									} else if (res.data.code == 11015) {
 										uni.showToast({
@@ -316,7 +315,9 @@
 										duration: 2000
 									})
 								});
-						} else if (res.cancel) {}
+						} else if (res.cancel) {
+							// setTimeout(()=>{uni.navigateBack({})},1000);
+						}
 					}
 				});
 			},

pageB/contract/look.vue

@@ -71,12 +71,15 @@
 					@click="confirmunload(item)" >确认卸货</button>
 			</view>
 		</view>
-		<view class="addcarwrap">
+		<view class='footer'>
+			<button class="btn" @click="commit1(goods)">添加发车信息</button>
+		</view>
+		<!-- <view class="addcarwrap">
 				<view class="addcar" style="background-color: #FFFFFF;"
 					@click="commit1(goods)">
 					+
 					添加发车信息</view>
-		</view>
+		</view> -->
 		<view v-if='imgstatus' class='shade'>
 			<view class='shade-content'>
 				<image v-if='img' style='width:100px;height:100px;' :src='img'></image>
@@ -1046,15 +1049,17 @@
 		color: #FE6430;
 		background-color: #FEECE6;
 	}
-	.btn {
-		margin-top: 10px;
-		background-color: #FFFFFF;
-		border-radius: 25px;
-		border: none;
+	.footer {
+		position: fixed;
+		bottom: 0;
+		width: 90%;
+		padding: 20px 0;
 	}
-	
-	.btns {
-		background-color: #22C572;
+	.btn {
+		width: 90%;
+		background: #22C572;
+		color: #fff;
+		border-radius: 30px;
 	}
 	.poundlist{
 		width: 62px;
@@ -1072,7 +1077,7 @@
 	.unload{
 		
 	}
-	.addcarwrap{
+	/* .addcarwrap{
 		position:fixed;bottom:0;
 		width:100%;
 		left:0;
@@ -1084,5 +1089,5 @@
 		height:46px;
 		line-height:46px;
 		color:#00C265;
-	}
+	} */
 </style>

pageD/identity/companyIdentityEdit.vue

@@ -484,6 +484,7 @@
 	
 	.btns {
 		background-color: #22C572;
+		color: white;
 	}
 	.switchs1{
 		font-size: 20px;

pageD/identity/companyIdentityThree.vue

@@ -520,6 +520,7 @@
 
 	.btns {
 		background-color: #22C572;
+		color: white;
 	}
 
 	.picture {

pageD/identity/companyIdentityTwo.vue

@@ -217,6 +217,7 @@
 
 	.btns {
 		background-color: #22C572;
+		color: white;
 	}
 	.picture{
 		width: 100%;

pageD/identity/driverIdentity.vue

@@ -528,6 +528,7 @@
 
 	.btns {
 		background-color: #22C572;
+		color: white;
 	}
 	.words{
 		font-size: 18px;

pageD/identity/driverIdentityEdit.vue

@@ -774,6 +774,7 @@
 
 	.btns {
 		background-color: #22C572;
+		color: white;
 	}
 
 	.information {

pageD/identity/driverIdentityTwo.vue

@@ -530,13 +530,12 @@
 
 	.btns {
 		background-color: #22C572;
+		color: white;
 	}
 
 	.add {
 		width: 26px;
 		height: 26px;
-
-		/* background-image: url(../../static/img/jiaoyi/ic_fabu@3x.png); */
 	}
 
 	/* 清除 */

pages/attestation/indexThree.vue

@@ -82,8 +82,8 @@
 
 
 		</view>
-		<view>
-			<button class="btn btns" @click="Add">新增</button>
+		<view v-if="drivers.length==0">
+			<button class="btn btns"  @click="Add">新增</button>
 		</view>
 	</view>
 </template>
@@ -465,6 +465,7 @@
 
 	.btns {
 		background-color: #22C572;
+		color: white;
 	}
 
 	.but {

pages/attestation/indexTwo.vue

@@ -81,7 +81,7 @@
 				</view>
 			</view>
 		</view>
-		<button class="btn btns" @click="Add">新增</button>
+		<button class="btns btn" @click="Add">新增</button>
 	</view>
 </template>
 
@@ -565,6 +565,7 @@
 
 	.btns {
 		background-color: #22C572;
+		color: white;
 	}
 
 	.shade-content {