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

pageB/contract/contract_detail.vue

@@ -215,14 +215,6 @@
 				}
 			},
 			getList() {
-				// tranCarNo:'',
-				// carNo:'',
-				// grossWeight:'',
-				// tare:'',
-				// loadNetWeight:'',
-				// loadPoundImg:'',
-				//  contractNo:'',
-				//  goodsName:'',
 				if (this.goods.carNo.length == 0) {
 					this.$api.msg('车牌号不能为空')
 					return
@@ -268,6 +260,11 @@
 											cancelText: "返回",
 											confirmText: "继续添加",
 											success: function(res) {
+												if (res.confirm) {
+													uni.navigateTo({
+														url: `/pageB/contract/contract_detail?`
+													})
+												}
 												setTimeout(() => {
 													var result = that.goods.tranCarNo
 														.substr(that.goods.tranCarNo
@@ -399,19 +396,8 @@
 					success: res => {
 						if (res.confirm) {
 							if (e.currentTarget.dataset.index == 0) {
-								this.personNoImg = "";
-							} else if (e.currentTarget.dataset.index == 1) {
-								this.personNoImg1 = "";
-							} else if (e.currentTarget.dataset.index == 2) {
-								this.driverNoImg = "";
-							} else if (e.currentTarget.dataset.index == 3) {
-								this.driverNoImg1 = "";
-							} else if (e.currentTarget.dataset.index == 4) {
-								this.carNoImg = "";
-							} else if (e.currentTarget.dataset.index == 5) {
-								this.carNoImg1 = "";
-							}
-
+								this.goods.loadPoundImg = "";
+							} 
 						}
 					}
 				})

pageB/contract/look.vue

@@ -58,13 +58,13 @@
 				<view  v-if='item.loadPoundImg'>
 					<view class="poundtitle">发货磅单</view>
 					<view class="poundlists">
-						<image :src="item.loadPoundImg" mode="" class="poundlist"></image>
+						<image :src="item.loadPoundImg" mode="" @click="ViewImage(item.loadPoundImg)" class="poundlist"></image>
 					</view>
 				</view>
 				<view  v-if='item.unloadPoundImg'>
 					<view class="poundtitle">收货磅单</view>
 					<view class="poundlists">
-						<image :src="item.unloadPoundImg" mode="" class="poundlist"></image>
+						<image :src="item.unloadPoundImg" mode="" @click="ViewImage(item.unloadPoundImg)" class="poundlist"></image>
 					</view>
 				</view>
 				<button v-if='item.confirmFlag != 3 && item.status == "已送达"' class=" btn btns unload" style="background-color: #22C572; color: #FFFFFF ;width:80%;"
@@ -250,12 +250,32 @@
 						}
 					});
 			},
-			ViewImage(e) {
-				var img = [];
-				img.push(e)
-				uni.previewImage({
-					current: 0,
-					urls: img
+			ViewImage(imageUrl) {
+				console.log(imageUrl) // http://192.168.100.251:8970/6_1597822634094.png
+				var images = [];
+				images.push(imageUrl);
+				console.log(images)  // ["http://192.168.100.251:8970/6_1597822634094.png"]
+				uni.previewImage({ // 预览图片  图片路径必须是一个数组 => ["http://192.168.100.251:8970/6_1597822634094.png"]
+					current:0,
+					urls:images,
+					longPressActions: {  //长按保存图片到相册
+						itemList: ['保存图片'],
+						success: (data)=> {
+							console.log(data);
+							uni.saveImageToPhotosAlbum({ //保存图片到相册
+								filePath: payUrl,
+								success: function () {
+									uni.showToast({icon:'success',title:'保存成功'})
+								},
+								fail: (err) => {
+									uni.showToast({icon:'none',title:'保存失败，请重新尝试'})
+								}
+							});
+						},
+						fail: (err)=> {
+							console.log(err.errMsg);
+						}
+				}
 				});
 			},
 			priceInput(e) {

pageD/identity/driverIdentityEdit.vue

@@ -103,7 +103,6 @@
 					</view>
 				</picker>
 
-
 				<view v-else class="con-list">
 					<input placeholder="请填写车长(米)" name="input" v-model="item.carLength"></input>
 				</view>
@@ -183,11 +182,9 @@
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">开户支行</text>
-				<picker @change="bankChange" :value="bankIndex" :range="bankType" class="con-list">
-					<view class="con-list">
-						{{bankIndex>-1?bankType[bankIndex]:'请选择开户支行'}}
-					</view>
-				</picker>
+				<view class="con-list">
+					<input placeholder="请填写开户支行" name="input" v-model="items.bankDepositBranch"></input>
+				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">收款人姓名</text>
@@ -282,7 +279,9 @@
 				carLongIndex: 0,
 				carLongType: ['13', '9.6', '8.2', '8.7', '11.7', '12.5', '13.7', '15', '16', '17.5'],
 				driverCarInfoList: [],
-				driverPayeeInfoList: [],
+				driverPayeeInfoList: [
+					{bankDepositBranch:''}
+				],
 				DriverViewInfo: {
 					driverCarInfoList: [],
 					driverPayeeInfoList: [],
@@ -312,6 +311,7 @@
 				bankIndex: -1,
 				bankType: [],
 				year:[],
+				 bankstatus:true,
 				region:"请选择常驻城市",
 			}
 		},
@@ -350,6 +350,9 @@
 			},
 			changeCarChength() {
 				this.carchength = !this.carchength
+			},
+			 bankstatusChength() {
+				this.bankstatus = !this.carchength
 			},
 			carAdd() {
 				this.driverCarInfoList.push({
@@ -419,6 +422,7 @@
 					}, 'application/json;charset=UTF-8').then(res => {
 						this.procurementPlanInfos = res.data.data
 						this.DriverViewInfo = res.data.data
+						console.log(this.DriverViewInfo)
 						this.driverCarInfoList = this.DriverViewInfo.driverCarInfoList
 						this.driverPayeeInfoList = this.DriverViewInfo.driverPayeeInfoList
 						this.addressUrl = this.DriverViewInfo.addressUrl.split(",")
@@ -727,7 +731,9 @@
 		padding-right: 20rpx;
 		font-size: 14px;
 	}
-
+.con-list input{
+	font-size:14px;
+}
 	.getcode {
 		font-size: 14px;
 		position: absolute;