zhongtianhaoyuan hace 3 años
padre
commit
2fee1961f1
Se han modificado 2 ficheros con 40 adiciones y 42 borrados
  1. 20 21
      pages/mine/company/addcompany.vue
  2. 20 21
      pages/mine/company/editcompany.vue

+ 20 - 21
pages/mine/company/addcompany.vue

@@ -160,7 +160,7 @@
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>
-		<view v-if="value" class='content1'>
+		<!-- <view v-if="value" class='content1'>
 			<view class="flex row">
 			<view class="flex row">
 				<view class="left-text">企业用地是否自有</view>
 				<view class="left-text">企业用地是否自有</view>
 				<view class="flex right">
 				<view class="flex right">
@@ -199,8 +199,7 @@
 					</view>
 					</view>
 				</view>
 				</view>
 			</view>
 			</view>
-
-		</view>
+		</view> -->
 		<view class="content4">
 		<view class="content4">
 
 
 			<view class="flex service align-center">
 			<view class="flex service align-center">
@@ -513,25 +512,25 @@
 					})
 					})
 					return true
 					return true
 				}
 				}
+				//先注释掉
+				// if (this.dataDetails.advanceFreightService == 1 && uni.$u.test.isEmpty(this.dataDetails
+				// 		.propertyAddressUrl)) {
+				// 	this.$refs.uToast.show({
+				// 		type: 'error',
+				// 		message: "房产证或租赁合同不能为空!",
+				// 	})
+				// 	return true
+				// }
 
 
-				if (this.dataDetails.advanceFreightService == 1 && uni.$u.test.isEmpty(this.dataDetails
-						.propertyAddressUrl)) {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: "房产证或租赁合同不能为空!",
-					})
-					return true
-				}
-
-				if (this.dataDetails.advanceFreightService == 1 && this.dataDetails.landOwnership == '租赁') {
-					if (uni.$u.test.isEmpty(this.dataDetails.siteLeaseDate)) {
-						this.$refs.uToast.show({
-							type: 'error',
-							message: "场地租赁截止日期不能为空!",
-						})
-						return true
-					}
-				}
+				// if (this.dataDetails.advanceFreightService == 1 && this.dataDetails.landOwnership == '租赁') {
+				// 	if (uni.$u.test.isEmpty(this.dataDetails.siteLeaseDate)) {
+				// 		this.$refs.uToast.show({
+				// 			type: 'error',
+				// 			message: "场地租赁截止日期不能为空!",
+				// 		})
+				// 		return true
+				// 	}
+				// }
 				// if (uni.$u.test.isEmpty(this.dataDetails.videoAddressUrl)) {
 				// if (uni.$u.test.isEmpty(this.dataDetails.videoAddressUrl)) {
 				// 	this.$refs.uToast.show({
 				// 	this.$refs.uToast.show({
 				// 		type: 'error',
 				// 		type: 'error',

+ 20 - 21
pages/mine/company/editcompany.vue

@@ -157,7 +157,7 @@
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>
-		<view v-if="dataDetails.advanceFreightService == 1" class='content1'>
+		<!-- <view v-if="dataDetails.advanceFreightService == 1" class='content1'>
 			<view class="flex row">
 			<view class="flex row">
 				<view class="left-text">企业用地是否自有</view>
 				<view class="left-text">企业用地是否自有</view>
 				<view class="flex right">
 				<view class="flex right">
@@ -196,8 +196,7 @@
 					</view>
 					</view>
 				</view>
 				</view>
 			</view>
 			</view>
-
-		</view>
+		</view> -->
 		<view class="content4">
 		<view class="content4">
 
 
 			<view class="flex service align-center">
 			<view class="flex service align-center">
@@ -481,25 +480,25 @@
 					})
 					})
 					return true
 					return true
 				}
 				}
+				//先注释掉
+				// if (this.dataDetails.advanceFreightService == 1 && uni.$u.test.isEmpty(this.dataDetails
+				// 		.propertyAddressUrl)) {
+				// 	this.$refs.uToast.show({
+				// 		type: 'error',
+				// 		message: "房产证或租赁合同不能为空!",
+				// 	})
+				// 	return true
+				// }
 
 
-				if (this.dataDetails.advanceFreightService == 1 && uni.$u.test.isEmpty(this.dataDetails
-						.propertyAddressUrl)) {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: "房产证或租赁合同不能为空!",
-					})
-					return true
-				}
-
-				if (this.dataDetails.advanceFreightService == 1 && this.dataDetails.landOwnership == '租赁') {
-					if (uni.$u.test.isEmpty(this.dataDetails.siteLeaseDate)) {
-						this.$refs.uToast.show({
-							type: 'error',
-							message: "场地租赁截止日期不能为空!",
-						})
-						return true
-					}
-				}
+				// if (this.dataDetails.advanceFreightService == 1 && this.dataDetails.landOwnership == '租赁') {
+				// 	if (uni.$u.test.isEmpty(this.dataDetails.siteLeaseDate)) {
+				// 		this.$refs.uToast.show({
+				// 			type: 'error',
+				// 			message: "场地租赁截止日期不能为空!",
+				// 		})
+				// 		return true
+				// 	}
+				// }
 				// if (uni.$u.test.isEmpty(this.dataDetails.videoAddressUrl)) {
 				// if (uni.$u.test.isEmpty(this.dataDetails.videoAddressUrl)) {
 				// 	this.$refs.uToast.show({
 				// 	this.$refs.uToast.show({
 				// 		type: 'error',
 				// 		type: 'error',