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

pageB/contract/look.vue

@@ -128,12 +128,10 @@
 				imgstatus: false,
 				reason: "",
 				price: undefined,
-
 				imgstatus:false,
 				reason:"",
 				price:undefined,
 				planId:'',
-
 			};
 		},
 		onShow() {
@@ -145,7 +143,6 @@
 			this.id = option.id
 			this.planId=option.planId
 			this.goods.contractNo = option.contractNo
-
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),

pages/attestation/index.vue

@@ -24,7 +24,7 @@
 			<image src="../../static/img/authentication/siji@3x.png" class="portrait1"></image>
 		</view>
 		
-		<!-- <view class="homePage2">
+		 <view class="homePage2">
 			<image src="../../static/img/authentication/bg@2x.png" class="background"></image>
 			<view class="title">
 				粮农身份
@@ -33,7 +33,7 @@
 				<view style="margin-right: 30px;">{{changes}}</view>
 			</view>
 			<image src="../../static/img/authentication/farmer@2x.png" class="portrait1"></image>
-		</view> -->
+		</view> 
 	</view>
 </template>
 
@@ -88,24 +88,25 @@
 						showCancel: true,
 						confirmText: '确定',
 						success: (e) => {
-							this.$api.doRequest('post', '/identityAuthenticationInfo/api/addIdentityAuthenticationInfo', this.identityAuthenticationInfo,
-									'application/json;charset=UTF-8').then(res => {
-									// this.procurementPlanInfos = res.data.data.records
-									console.log("成功！")
-									if (res.data.message == "Success") {
-										this.$api.msg('确认成功！')
-										this.changes = "取消"
-										this.getList()
-										return
-									}
-								})
-								.catch(res => {
-									uni.showToast({
-										title: res.message,
-										icon: 'none',
-										duration: 2000
-									})
-								});
+								if (e.confirm) {
+									this.$api.doRequest('post', '/identityAuthenticationInfo/api/addIdentityAuthenticationInfo', this.identityAuthenticationInfo,
+											'application/json;charset=UTF-8').then(res => {
+											if (res.data.message == "Success") {
+												this.$api.msg('确认成功！')
+												this.changes = "取消"
+												this.getList()
+												return
+											}
+										})
+										.catch(res => {
+											uni.showToast({
+												title: res.message,
+												icon: 'none',
+												duration: 2000
+											})
+										});
+								}
+							
 						},
 						fail: () => {},
 						complete: () => {}
@@ -121,24 +122,25 @@
 						showCancel: true,
 						confirmText: '确定',
 						success: (e) => {
-							this.$api.doRequest('post', '/identityAuthenticationInfo/api/deleteIdentityAuthenticationInfo', this.identityAuthenticationInfo,
-									'application/json;charset=UTF-8').then(res => {
-										console.log(res.data.message,"判断")
-										console.log(res)
-									if (res.data.message == "Success") {
-										this.$api.msg('取消成功！')
-										this.changes = "确认"
-										this.getList()
-										return
-									}
-								})
-								.catch(res => {
-									uni.showToast({
-										title: res.errmsg,
-										icon: 'none',
-										duration: 2000
+							if (e.confirm) {
+								this.$api.doRequest('post', '/identityAuthenticationInfo/api/deleteIdentityAuthenticationInfo', this.identityAuthenticationInfo,
+										'application/json;charset=UTF-8').then(res => {
+										if (res.data.message == "Success") {
+											this.$api.msg('取消成功！')
+											this.changes = "确认"
+											this.getList()
+											return
+										}
 									})
-								});
+									.catch(res => {
+										uni.showToast({
+											title: res.errmsg,
+											icon: 'none',
+											duration: 2000
+										})
+									});
+							}
+							
 						},
 						fail: () => {},
 						complete: () => {}
@@ -147,13 +149,11 @@
 				},	
 				
 			liangShang(){
-				console.log(1111)
 				uni.navigateTo({
 					url: `/pages/attestation/indexTwo`
 				})
 			},
 			siJi(){
-				console.log(2222)
 				uni.navigateTo({
 					url: `/pages/attestation/indexThree`
 				})
@@ -163,11 +163,6 @@
 					url: `/pageD/identity/driverIdentityEdit?id=${items.id}`
 				})
 			},
-			// companyEdit(item) {
-			// 	uni.navigateTo({
-			// 		url: `/pageD/identity/companyIdentityEdit?id=${item.id}`
-			// 	})
-			// },
 			deleteLS(item) {
 				uni.showModal({
 					// title: '登录提示',
@@ -185,7 +180,6 @@
 									this.getList()
 									return
 								}
-
 							})
 							.catch(res => {
 								uni.showToast({
@@ -200,7 +194,6 @@
 				})
 			},
 			deleteSJ(item) {
-				console.log(item.driverName)
 				this.deletes = {}
 				this.deletes.id = item.id
 				uni.showModal({
@@ -232,40 +225,6 @@
 				})
 			},
 			getList() {
-				// this.identityAuthenticationInfo.commonId = this.userInfo.id
-				// this.$api.doRequest('get', '/identityAuthenticationInfo/selectIdentityAuthenticationInfo', {
-				// 		pageSize: 10,
-				// 		currentPage: 1,
-				// 		commonId: this.userInfo.id
-				// 	}, 'application/json;charset=UTF-8').then(res => {
-				// 		console.log("成功连接")
-				// 		this.businessman = res.data.data.records
-				// 	})
-				// 	.catch(res => {
-				// 		uni.showToast({
-				// 			title: res.errmsg,
-				// 			icon: 'none',
-				// 			duration: 2000
-				// 		})
-				// 	});
-
-				// this.$api.doRequest('get', '/driverViewInfo/selectDriverInfoPage', {
-				// 		pageSize: 10,
-				// 		currentPage: 1,
-				// 		commonId: this.userInfo.id,
-				// 		flag: 0
-				// 	}, 'application/json;charset=UTF-8').then(res => {
-				// 		console.log("成功连接")
-				// 		this.drivers = res.data.data.records
-				// 		console.log(this.drivers, "skalkdkk")
-				// 	})
-				// 	.catch(res => {
-				// 		uni.showToast({
-				// 			title: res.errmsg,
-				// 			icon: 'none',
-				// 			duration: 2000
-				// 		})
-				// 	});
 				this.$api.doRequest('get', '/identityAuthenticationInfo/selectCount', {
 					customerTypeFlag:3,customerType:"粮农"
 					}, 'application/json;charset=UTF-8').then(res => {
@@ -277,7 +236,6 @@
 							}	
 							this.id = res.data.data.id
 						}
-						
 					})
 					.catch(res => {
 						uni.showToast({

pages/attestation/indexThree.vue

@@ -168,7 +168,6 @@
 											success: function(res) {										
 												if (res.confirm) {
 													that.identityAuthenticationInfo.id = item.id
-														console.log(that.identityAuthenticationInfo,"已覆盖")
 													that.$api.doRequest('post','/driverViewInfo/api/modifyPhone',that.identityAuthenticationInfo).then(
 														res => {
 															uni.showToast({
@@ -197,7 +196,6 @@
 										});
 									}else if(res.data.code == 200){
 										that.identityAuthenticationInfo.id = item.id
-										console.log(that.identityAuthenticationInfo,"未覆盖")
 										that.$api.doRequest('post','/driverViewInfo/api/modifyPhone',that.identityAuthenticationInfo).then(
 											res => {
 												uni.showToast({
@@ -335,21 +333,24 @@
 					showCancel: true,
 					confirmText: '确定',
 					success: (e) => {
-						this.$api.doRequest('post', '/driverViewInfo/api/deleteDriver', this.deletes,
-								'application/json;charset=UTF-8').then(res => {
-								if (res.data.code == 200) {
-									this.$api.msg('删除成功！')
-									this.getList()
-									return
-								}
-							})
-							.catch(res => {
-								uni.showToast({
-									title: res.errmsg,
-									icon: 'none',
-									duration: 2000
+						if(e.confirm){
+							this.$api.doRequest('post', '/driverViewInfo/api/deleteDriver', this.deletes,
+									'application/json;charset=UTF-8').then(res => {
+									if (res.data.code == 200) {
+										this.$api.msg('删除成功！')
+										this.getList()
+										return
+									}
 								})
-							});
+								.catch(res => {
+									uni.showToast({
+										title: res.errmsg,
+										icon: 'none',
+										duration: 2000
+									})
+								});
+						}
+						
 					},
 					fail: () => {},
 					complete: () => {}