gjy преди 2 години
родител
ревизия
27f85025d4
променени са 4 файла, в които са добавени 43 реда и са изтрити 5 реда
  1. 1 1
      pages/order/orderDetails.vue
  2. 20 2
      pages/release/addAddress.vue
  3. 19 1
      pages/release/editAddress.vue
  4. 3 1
      pages/release/release.vue

+ 1 - 1
pages/order/orderDetails.vue

@@ -186,7 +186,7 @@
 						v-for="(item,index) in zcImgList" @click='ylImg(zcImgList)'></u--image>
 				</view>
 			</view>
-			<view v-if='dataObj.orderStatus=="待货主确认卸车"||dataObj.orderStatus=="待平台确认卸车"||dataObj.orderStatus=="货主驳回装车信息"||dataObj.orderStatus=="平台驳回装车信息"||dataObj.orderStatus=="已完结"'>
+			<view v-if='dataObj.orderStatus=="待货主确认卸车"||dataObj.orderStatus=="待平台确认卸车"||dataObj.orderStatus=="货主驳回装车信息"||dataObj.orderStatus=="平台驳回装车信息"||dataObj.orderStatus=="待确认运费"||dataObj.cargoOwnerStatus=="已完结"'>
 				<view class='row-between'>
 					<view class="row-left-text gray">合计应付运费</view>
 					<view class="row-right-text">

+ 20 - 2
pages/release/addAddress.vue

@@ -20,7 +20,8 @@
 						</view>
 					</u-form-item>
 					<u-form-item label="详细地址" prop="addressInfo.detailedAddress" ref="item1" borderBottom>
-						<u--input v-model="addressInfo.detailedAddress" border="none" placeholder="详细地址"></u--input>
+						<u--textarea v-model="addressInfo.detailedAddress" border="none"  placeholder="详细地址" autoHeight  maxlength="30"></u--textarea>
+						<!-- <u--input v-model="addressInfo.detailedAddress" border="none" placeholder="详细地址"></u--input> -->
 					</u-form-item>
 					<u-form-item label="联系人" prop="addressInfo.contacts" ref="item1" borderBottom>
 						<u--input v-model="addressInfo.contacts" border="none" placeholder="联系人">></u--input>
@@ -34,7 +35,7 @@
 		</view>
 		<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
 			confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
-		<view class="submit" @click="$u.throttle(submit, 5000)">提交</view>
+		<view class="submit" @click="$u.throttle(submit(), 5000)">提交</view>
 		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
@@ -160,7 +161,17 @@
 				// 	id: 1,
 				// });
 			},
+			validate() {
+				if (this.addressInfo.contacts.length<2||this.addressInfo.contacts.length>10) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "联系人姓名长度2-10个字符!",
+					})
+					return true
+				}
+			},
 			submit() {
+				if (this.validate()) return
 				this.isShowAlert = true
 
 			},
@@ -207,4 +218,11 @@
 	/deep/input{
 		word-break:break-all;
 	}
+	/deep/.u-textarea{
+		padding:9px 0;
+	}
+	/deep/.u-textarea__field{
+		color:#000;
+		text-align:right;
+	}
 </style>

+ 19 - 1
pages/release/editAddress.vue

@@ -19,7 +19,8 @@
 						</view>
 					</u-form-item>
 					<u-form-item label="详细地址" prop="addressInfo.detailedAddress" ref="item1" borderBottom>
-						<u--input v-model="addressInfo.detailedAddress" border="none" placeholder="详细地址"></u--input>
+						<u--textarea v-model="addressInfo.detailedAddress" border="none"  placeholder="详细地址" autoHeight  maxlength="30"></u--textarea>
+						<!-- <u--input v-model="addressInfo.detailedAddress" border="none" placeholder="详细地址"></u--input> -->
 					</u-form-item>
 					<u-form-item label="联系人" prop="addressInfo.contacts" ref="item1" borderBottom>
 						<u--input v-model="addressInfo.contacts" border="none" placeholder="联系人">></u--input>
@@ -154,7 +155,17 @@
 				// 	id: 1,
 				// });
 			},
+			validate() {
+				if (this.addressInfo.contacts.length<2||this.addressInfo.contacts.length>10) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "联系人姓名长度2-10个字符!",
+					})
+					return true
+				}
+			},
 			submit() {
+				if (this.validate()) return
 				this.isShowAlert = true
 
 			},
@@ -194,5 +205,12 @@
 		right: 0;
 		margin: auto;
 	}
+	/deep/.u-textarea{
+		padding:9px 0;
+	}
+	/deep/.u-textarea__field{
+		color:#000;
+		text-align:right;
+	}
 </style>
 

+ 3 - 1
pages/release/release.vue

@@ -867,7 +867,9 @@
 									taskDescription: '',
 									taskValidity: '',
 									sendLongitude: '',
+									receiverIdcard:'',
 									sendLatitude: '',
+									receiverCreditCode:'',
 									unsendLongitude: '',
 									unsendLatitude: '',
 								}
@@ -971,7 +973,7 @@
 							}else{
 								this.dataObj.compId=this.qyList[i].id
 							}
-							console.log(this.qyList[i].compStatus,this.dataObj.compId)
+							// console.log(this.qyList[i].compStatus,this.dataObj.compId)
 							uni.setStorageSync('releasecompId', this.dataObj.compId)
 						}
 						this.dataObj.freightAdvance = this.qyList[i].advanceFreightService == 1 ? true : false