前端

config/index.js

@@ -7,5 +7,4 @@ const dev = {
 
 export function def() {
 	return dev
-}
-
+}

pages/mine/cargoowner/addEnerprise.vue

@@ -288,7 +288,15 @@
 			confirmValidityPeriod(e) {
 				console.log('confirm', e)
 				if (e.value[0] == '长期') {
+					if(e.value[1]||e.value[2]){
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "选择长期时不允许选择月日！",
+						})
+						return
+					}
 					this.dataDetails.authorizationDeadline = e.value[0]
+					
 				} else {
 					if(e.value[0]==''){
 						this.$refs.uToast.show({

pages/mine/cargoowner/editEnerprise.vue

@@ -279,6 +279,13 @@
 			confirmValidityPeriod(e) {
 				console.log('confirm', e)
 				if (e.value[0] == '长期') {
+					if(e.value[1]||e.value[2]){
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "选择长期时不允许选择月日！",
+						})
+						return
+					}
 					this.dataDetails.authorizationDeadline = e.value[0]
 				} else {
 					if(e.value[0]==''){

pages/mine/cargoowner/editpersonalinformation.vue

@@ -284,7 +284,6 @@
 			confirmValidityPeriod(e) {
 				console.log('confirm', e)
 				if (e.value[0] == '长期') {
-					this.dataDetails.cardValidityDate = e.value[0]
 					if(e.value[1]!=''||e.value[2]!=''){
 						this.$refs.uToast.show({
 							type: 'error',
@@ -292,6 +291,8 @@
 						})
 						return
 					}
+					this.dataDetails.cardValidityDate = e.value[0]
+					
 				} else {
 					if(e.value[0]==''){
 						this.$refs.uToast.show({

pages/mine/company/addcompany.vue

@@ -452,7 +452,6 @@
 				switch (this.dataType) {
 					case 0:
 						if (e.value[0] == '长期') {
-							this.dataDetails.businessTermDate = e.value[0]
 							if(e.value[1]!=''||e.value[2]!=''){
 								this.$refs.uToast.show({
 									type: 'error',
@@ -460,6 +459,8 @@
 								})
 								return
 							}
+							this.dataDetails.businessTermDate = e.value[0]
+							
 						} else {
 							var date=new Date()
 							if(e.value[0]<date.getFullYear()){

pages/mine/company/addcompanytwo.vue

@@ -141,6 +141,13 @@
 			confirmValidityPeriod(e) {
 				console.log('confirm', e)
 				if (e.value[0] == '长期') {
+					if(e.value[1]||e.value[2]){
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "选择长期时不允许选择月日！",
+						})
+						return
+					}
 					this.dataDetails.siteLeaseDate = e.value[0]
 				} else {
 					this.dataDetails.siteLeaseDate = e.value[0] + '-' + e.value[1] + '-' + e.value[2]

pages/mine/company/editcompany.vue

@@ -409,7 +409,6 @@
 				switch (this.dataType) {
 					case 0:
 						if (e.value[0] == '长期') {
-							this.dataDetails.businessTermDate = e.value[0]
 							if(e.value[1]!=''||e.value[2]!=''){
 								this.$refs.uToast.show({
 									type: 'error',
@@ -417,6 +416,8 @@
 								})
 								return
 							}
+							this.dataDetails.businessTermDate = e.value[0]
+							
 						} else {
 							var date=new Date()
 							if(e.value[0]<date.getFullYear()){
@@ -445,7 +446,6 @@
 						break
 					case 1:
 						if (e.value[0] == '长期') {
-							this.dataDetails.cardValidityDate = e.value[0]
 							if(e.value[1]!=''||e.value[2]!=''){
 								this.$refs.uToast.show({
 									type: 'error',
@@ -453,6 +453,8 @@
 								})
 								return
 							}
+							this.dataDetails.cardValidityDate = e.value[0]
+							
 						} else {
 							var date=new Date()
 							if(e.value[0]<date.getFullYear()){

pages/mine/company/editcompanytwo.vue

@@ -141,6 +141,13 @@
 			confirmValidityPeriod(e) {
 				console.log('confirm', e)
 				if (e.value[0] == '长期') {
+					if(e.value[1]||e.value[2]){
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "选择长期时不允许选择月日！",
+						})
+						return
+					}
 					this.dataDetails.siteLeaseDate = e.value[0]
 				} else {
 					this.dataDetails.siteLeaseDate = e.value[0] + '-' + e.value[1] + '-' + e.value[2]

pages/mine/driverCertification.vue

@@ -268,6 +268,13 @@
 				// 
 				console.log('confirm', e)
 				if (e.value[0] == '长期') {
+					if(e.value[1]||e.value[2]){
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "选择长期时不允许选择月日！",
+						})
+						return
+					}
 					this.dataDetails.cardValidityDate = e.value[0]
 				} else {
 					this.dataDetails.cardValidityDate = e.value[0] + '-' + e.value[1] + '-' + e.value[2]

pages/order/index.vue

@@ -191,7 +191,7 @@
 			@close="cancelClick" @cancel="cancelClick" class="modal">
 		</u-modal>
 		<u-popup :show="show" mode="bottom" @close="close" @open="open">
-			<view class="">
+			<view class="u-popup-wrap">
 				<view >
 					<image style='width:12px;height:12px;' @click='closepopup' class='close'  src="../../static/images/order/guanbi@3x.png" mode=""></image>
 					<!-- <u-icon @click="closepopup" class='close' name="close" size="20"></u-icon> -->
@@ -1084,7 +1084,7 @@
 	}
 	/deep/.u-popup__content{
 		border-radius: 10px;
-		padding:20px;
+		// padding:20px;
 	}
 	/deep/.u-radio{
 		margin:40rpx 0;
@@ -1114,5 +1114,7 @@
 		width:14px;
 		height:14px;
 	}
-	
+	.u-popup-wrap{
+		padding:20px;
+	}
 </style>

pages/order/orderDetails.vue

@@ -267,7 +267,7 @@
 			</u--textarea>
 		</u-modal>
 		<u-popup :show="show" mode="bottom" @close="close" @open="open">
-			<view class="">
+			<view class="u-popup-wrap">
 				<view >
 					<image style='width:12px;height:12px;' @click='closepopup' class='close'  src="../../static/images/order/guanbi@3x.png" mode=""></image>
 					<!-- <u-icon @click="closepopup" class='close' name="close" size="20"></u-icon> -->
@@ -1224,7 +1224,7 @@
 	}
 	/deep/.u-popup__content{
 		border-radius: 10px;
-		padding:20px;
+		// padding:20px;
 	}
 	/deep/.u-radio{
 		margin:40rpx 0;
@@ -1264,4 +1264,7 @@
 			line-height: 50rpx;
 		}
 	}
+	.u-popup-wrap{
+		padding:20px;
+	}
 </style>

pages/release/editRelease.vue

@@ -812,6 +812,13 @@
 			confirmValidityPeriodcq(e) {
 				console.log('confirm', e)
 				if (e.value[0] == '长期') {
+					if(e.value[1]||e.value[2]){
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "选择长期时不允许选择月日！",
+						})
+						return
+					}
 					this.dataObj.taskValidity = e.value[0]
 				} else {
 					if (!e.value[1] || !e.value[2]) {

pages/release/release.vue

@@ -1040,6 +1040,13 @@
 			},
 			confirmValidityPeriodcq(e) {
 				if (e.value[0] == '长期') {
+					if(e.value[1]||e.value[2]){
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "选择长期时不允许选择月日！",
+						})
+						return
+					}
 					this.dataObj.taskValidity = e.value[0]
 				} else {
 					if (!e.value[1] || !e.value[2]) {