Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun-app

pages/mine/manageVehicles/addVehicle.vue

@@ -234,6 +234,11 @@
 				<u--input type='number' placeholder="输入总质量" inputAlign='right' border="none" v-model="dataDetails.carTotalWeight">
 				</u--input>
 			</view>
+			<view class="flex row" v-if="sign == '非挂车'">
+				<view class="left-text">核定载质量（千克）</view>
+				<u--input placeholder="输入核定载质量" inputAlign='left' border="none" v-model="dataDetails.carApprovedWeight">
+				</u--input>
+			</view>
 			<view class="flex row" v-if="sign == '挂车'">
 				<view class="left-text">整备质量（千克）</view>
 				<u--input type='number' placeholder="输入整备质量" inputAlign='right' border="none" v-model="dataDetails.servicingWeight">
@@ -1195,6 +1200,13 @@
 					})
 					return true
 				}
+				if (uni.$u.test.isEmpty(this.dataDetails.carApprovedWeight) && this.sign == '非挂车') {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "核定载质量不能为空！",
+					})
+					return true
+				}
 				
 				if (uni.$u.test.isEmpty(this.dataDetails.servicingWeight) && this.sign == '挂车') {
 					this.$refs.uToast.show({

pages/mine/manageVehicles/editVehicle.vue

@@ -235,6 +235,11 @@
 				<u--input placeholder="输入总质量" inputAlign='right' border="none" v-model="dataDetails.carTotalWeight">
 				</u--input>
 			</view>
+			<view class="flex row" v-if="sign == '非挂车'">
+				<view class="left-text">核定载质量（千克）</view>
+				<u--input placeholder="输入核定载质量" inputAlign='left' border="none" v-model="dataDetails.carApprovedWeight">
+				</u--input>
+			</view>
 			<view class="flex row" v-if="sign == '挂车'">
 				<view class="left-text">整备质量（千克）</view>
 				<u--input placeholder="输入整备质量" inputAlign='right' border="none" v-model="dataDetails.servicingWeight">
@@ -1037,6 +1042,13 @@
 					})
 					return true
 				}
+				if (uni.$u.test.isEmpty(this.dataDetails.carApprovedWeight) && this.sign == '非挂车') {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "核定载质量不能为空！",
+					})
+					return true
+				}
 				
 				if (uni.$u.test.isEmpty(this.dataDetails.servicingWeight) && this.sign == '挂车') {
 					this.$refs.uToast.show({

pages/order/orderDetails.vue

@@ -408,7 +408,6 @@
 				// this.lookAlert = true
 				uni.$u.route('/pages/order/signContract',{obj:encodeURIComponent(JSON.stringify(this.dataObj))} 
 				);
-				
 			},
 			// 完结
 			closed() {

pages/public/register.vue

@@ -305,7 +305,6 @@
 						}
 					})
 					.catch(res => {
-						debugger
 						console.log(res);
 					});
 			},