前端

config/index.js

@@ -1,6 +1,6 @@
 const dev = {
-	// baseUrlNew: 'https://apitest.eliangeyun.com',
-	baseUrlNew: 'http://192.168.110.9:8099',
+	baseUrlNew: 'https://apitest.eliangeyun.com',
+	// baseUrlNew: 'http://192.168.110.9:8099',
 	// baseUrlNew: 'http://192.168.110.82:8999',
 	// baseUrlNew: 'http://192.168.1.119:8999',
 	h5Appid: 'wxb66b599f7f61b46f',

pages.json

@@ -378,21 +378,8 @@
 				"navigationStyle": "custom",
 				"navigationBarTitleText": "管理车辆",
 				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "white",
-				"app-plus": {
-				    "pullToRefresh": {
-				        "support": true,
-				        "color": "#ff3333",
-				        "style": "default",
-				        "contentdown": {
-				            "caption": "下拉刷新"
-				        },
-
-				        "contentrefresh": {
-				            "caption": "正在刷新中"
-				        }
-				    }
-				}
+				"navigationBarBackgroundColor": "white"
+				
 			}
 		}, {
 			"path": "pages/mine/manageVehicles/addVehicle",

pages/goodSource/index.vue

@@ -284,11 +284,11 @@
 				var photol=await permision.checkSystemEnableLocation()
 				if(photol == true){
 					uni.removeStorageSync('confirm_location')
-					uni.showToast({
-									title: '只有文字弹窗',
-									icon: 'none',    //如果要纯文本，不要icon，将值设为'none'
-									duration: 2000    //持续时间为 2秒
-								})  
+					// uni.showToast({
+					// 				title: '只有文字弹窗',
+					// 				icon: 'none',    //如果要纯文本，不要icon，将值设为'none'
+					// 				duration: 2000    //持续时间为 2秒
+					// 			})  
 					this.getLngLat()
 				}else{
 					if(uni.getStorageSync('confirm_location')){

pages/mine/driverCertification.vue

@@ -661,6 +661,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.cardValidityDate = e.value[0]
 				} else {
 					if (!e.value[1] || !e.value[2]) {

pages/mine/driverCertificationNext.vue

@@ -361,6 +361,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
+					}
 					switch (this.ValidityPeriodType) {
 						case 0:
 							this.dataDetails.driverLicenseValidityStartDate = e.value[0]

pages/mine/editDriverCertification.vue

@@ -285,6 +285,13 @@
 				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',
+							message: "选择长期不允许选择月日！",
+						})
+						return
+					}
 				} else {
 					if (!e.value[1] || !e.value[2]) {
 						this.$refs.uToast.show({

pages/mine/editDriverCertificationNext.vue

@@ -366,6 +366,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
+					}
 					switch (this.ValidityPeriodType) {
 						case 0:
 							this.dataDetails.driverLicenseValidityStartDate = e.value[0]

pages/mine/manageVehicles/addVehicle.vue

@@ -23,7 +23,7 @@
 			</view>
 			<view class="flex row">
 				<view class="left-text">道路运输证号</view>
-				<u--input placeholder="输入道路运输证号" inputAlign='right' border="none"
+				<u--input maxlength='12' placeholder="输入道路运输证号" inputAlign='right' border="none"
 					v-model="dataDetails.operationCertificateNumber">
 				</u--input>
 			</view>
@@ -50,7 +50,7 @@
 			</view>
 			<view class="flex row" v-if="sign == '挂车'">
 				<view class="left-text">挂车道路运输证号</view>
-				<u--input placeholder="输入挂车道路运输证号" inputAlign='right' border="none"
+				<u--input maxlength='12' placeholder="输入挂车道路运输证号" inputAlign='right' border="none"
 					v-model="dataDetails.trailerOperationCertificateNumber">
 				</u--input>
 			</view>
@@ -89,9 +89,15 @@
 				</view>
 				<image class="" :src="dataDetails.drivingLicenseBackPage" mode="aspectFit"></image>
 			</view>
+			<view class="flex row flex-space-between">
+				<view class="left-text">行驶证车辆类型</view>
+				<u--input maxlength='10' placeholder="输入行驶证上的车辆类型" inputAlign='right' border="none"
+					v-model="dataDetails.vehicleType">
+				</u--input>
+			</view>
 			<view class="flex row flex-space-between">
 				<view class="left-text">行驶证档案编号</view>
-				<u--input placeholder="输入行驶证档案编号" inputAlign='right' border="none"
+				<u--input maxlength='12' placeholder="输入行驶证档案编号" inputAlign='right' border="none"
 					v-model="dataDetails.drivingLicenseNumber">
 				</u--input>
 			</view>
@@ -165,7 +171,7 @@
 			</view>
 			<view class="flex row flex-space-between" v-if="sign == '挂车'">
 				<view class="left-text">挂车行驶证档案编号</view>
-				<u--input placeholder="输入挂车行驶证档案编号" inputAlign='right' border="none"
+				<u--input maxlength='12' placeholder="输入挂车行驶证档案编号" inputAlign='right' border="none"
 					v-model="dataDetails.trailerLicenseNumber">
 				</u--input>
 			</view>
@@ -475,6 +481,7 @@
 			},
 			hidden(){
 				this.$refs.keyboard.open(false)
+				this.$refs.keyboard1.open(false)
 			},
 			//挂车牌号弹出键盘
 			handleShowKeyboard1(index) {
@@ -1061,6 +1068,13 @@
 						})
 						return true
 					}
+					if (this.dataDetails.trailerOperationCertificateNumber.length!=12) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "挂车道路运输证号输入错误！",
+						})
+						return true
+					}
 					if (uni.$u.test.isEmpty(this.dataDetails.trailerOperationCertificateValidityDate)) {
 						this.$refs.uToast.show({
 							type: 'error',
@@ -1076,10 +1090,17 @@
 					})
 					return true
 				}
-				if (uni.$u.test.isEmpty(this.dataDetails.drivingLicenseBackPage)) {
+				if (this.dataDetails.vehicleType.length<2||this.dataDetails.vehicleType.length>10) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "行驶证车辆类型输入错误！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.dataDetails.drivingLicenseNumber)) {
 					this.$refs.uToast.show({
 						type: 'error',
-						message: "行驶证副页不能为空！",
+						message: "行驶证档案编号不能为空！",
 					})
 					return true
 				}
@@ -1090,6 +1111,13 @@
 					})
 					return true
 				}
+				if (this.dataDetails.drivingLicenseNumber.length!=12) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "行驶证档案编号输入错误！",
+					})
+					return true
+				}
 				if (uni.$u.test.isEmpty(this.dataDetails.drivingLicenseRegistrationDate)) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -1147,6 +1175,13 @@
 						})
 						return true
 					}
+					if (this.dataDetails.trailerLicenseNumber.length!=12) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "挂车行驶证档案编号输入错误！",
+						})
+						return true
+					}
 					if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseRegistrationDate)) {
 						this.$refs.uToast.show({
 							type: 'error',
@@ -1310,7 +1345,9 @@
 					delete this.dataDetails.guaUseNature
 				}
 				if(this.dataDetails.carCategory == "挂车"){
-					this.dataDetails.guaCarNumber=this.dataDetails.guaCarNumber+'挂'
+					if(this.dataDetails.guaCarNumber.indexOf('挂')==-1){
+						this.dataDetails.guaCarNumber=this.dataDetails.guaCarNumber+'挂'
+					}
 				}
 				this.$request.baseRequest('post', '/driverCarInfo/api/addInfo', this.dataDetails).then(res => {
 						if (res.code == '200') {

pages/mine/manageVehicles/editVehicle.vue

@@ -481,6 +481,7 @@
 			},
 			hidden(){
 				this.$refs.keyboard.open(false)
+				this.$refs.keyboard1.open(false)
 			},
 			confirmCarType(e) {
 				this.dataDetails.energyType = e.value[0]
@@ -1115,6 +1116,13 @@
 						})
 						return true
 					}
+					if (this.dataDetails.trailerOperationCertificateNumber.length!=12) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "挂车道路运输证号输入错误！",
+						})
+						return true
+					}
 					if (uni.$u.test.isEmpty(this.dataDetails.trailerOperationCertificateValidityDate)) {
 						this.$refs.uToast.show({
 							type: 'error',
@@ -1144,6 +1152,13 @@
 					})
 					return true
 				}
+				if (this.dataDetails.drivingLicenseNumber.length!=12) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "行驶证档案编号输入错误！",
+					})
+					return true
+				}
 				if (uni.$u.test.isEmpty(this.dataDetails.drivingLicenseRegistrationDate)) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -1202,6 +1217,13 @@
 						})
 						return true
 					}
+					if (this.dataDetails.trailerLicenseNumber.length!=12) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "挂车行驶证档案编号输入错误！",
+						})
+						return true
+					}
 					if (uni.$u.test.isEmpty(this.dataDetails.guaCarNumber)) {
 						this.$refs.uToast.show({
 							type: 'error',

pages/mine/manageVehicles/index.vue

@@ -16,6 +16,7 @@
 			</view>
 
 		</view>
+		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback">
 		<view class="car-list" v-for="(item,index) in carList" :key="index">
 			<view class="left-img">
 				<image style="width: 125rpx;height:125rpx;box-shadow: 1px 1px 10px #ccc; background-color: #eeeeee;border-radius:10rpx;" mode="aspectFill"
@@ -46,6 +47,7 @@
 				</view>
 			</view>
 		</view>
+		</mescroll-body>
 		<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
 			confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
 		<u-toast ref="uToast"></u-toast>
@@ -53,11 +55,13 @@
 </template>
 
 <script>
+	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
 	import {
 		mapState
 	} from 'vuex';
 	var _this;
 	export default {
+		mixins: [MescrollMixin], // 使用mixin
 		data() {
 			return {
 				carList: [],
@@ -70,25 +74,22 @@
 		computed: {
 			...mapState(['hasLogin', 'userInfo', 'firstAuthentication']),
 		},
-		onPullDownRefresh () {
-		console.log('触发了下拉刷新')
-		var that=this
-			setTimeout(()=>{
-				that.init()
-						//手动关闭刷新
-			uni.stopPullDownRefresh()
-		},2000)
-		},
 		onLoad(options) {
 			console.log(this.firstAuthentication.id)
 			_this = this;
 			if (!this.hasLogin) {
 				uni.$u.route('/pages/public/login');
 			}
-			this.init();
+			this.upCallback({num:1,size:10});
 			console.log(options)
 		},
+		onShow() {
+			this.upCallback({num:1,size:10});
+		},
 		methods: {
+			mescrollInit(mescroll) {
+				this.mescroll = mescroll;
+			},
 			leftClick(){
 				uni.switchTab({url:'/pages/mine/index'});
 			},
@@ -108,25 +109,29 @@
 
 					})
 					.catch(res => {
+						
 						uni.$u.toast(res.message);
 					});
 			},
 			cancelClick() {
 				this.isShowAlert = false
 			},
-			init() {
+			upCallback(page) {
 				this.$request.baseRequest('get', '/driverCarInfo/selectDriverCar', {
 						commonId: this.userInfo.id,
 						// driverId:this.firstAuthentication.id
 					}).then(res => {
 						if (res.code == '200') {
+							this.mescroll.endBySize(res.data.length, 1);
 							this.carList = res.data
 						} else {
+							this.mescroll.endErr();
 							uni.$u.toast(res.message);
 						}
 
 					})
 					.catch(res => {
+						this.mescroll.endErr();
 						uni.$u.toast(res.message);
 					});
 			},

pages/order/index.vue

@@ -47,7 +47,7 @@
 					</view>
 				</view>
 				<view :id="'good'+good.id" class="good-list" v-for="good in goods" :key="good.id"
-					@click="toDetail(good.id)">
+					@click="toDetail(good)">
 					<view style="padding: 0 35rpx 20rpx 35rpx;">
 						<view class="flex flex-space-between row1">
 							<view class="item1">
@@ -127,7 +127,7 @@
 							<!-- 		<view class="start normal" @click.stop="confirmLoading(good)"
 								v-if="good.orderStatus=='未装车'||good.orderStatus=='货主驳回装车信息'||good.orderStatus=='平台驳回装车信息'">
 								确认装车</view> -->
-							<view class="start normal" @click.stop="toDetail(good.id)"
+							<view class="start normal" @click.stop="toDetail(good)"
 								v-if="good.orderStatus=='未装车'||good.orderStatus=='货主驳回装车信息'||good.orderStatus=='平台驳回装车信息'">
 								确认装车</view>
 
@@ -139,7 +139,7 @@
 								确认卸车</view>
 							<view class="start normal" @click.stop="closed(good)" v-if="good.orderStatus=='结算中'">完结
 							</view>
-							<view class="start normal" @click.stop="toDetail(good.id)" v-if="good.orderStatus=='待确认运费'">确认运费
+							<view class="start normal" @click.stop="toDetail(good)" v-if="good.orderStatus=='待确认运费'">确认运费
 							</view>
 							<!-- <view class="start normal" @click.stop="addevaluation(good)" v-if="good.orderStatus=='已完结'">评价</view> -->
 							<view class="start normal" @click.stop="addevaluation(good)" v-if="good.orderStatus=='已完结' && good.driverEvaluated != 1"><!-- driverEvaluated 为1是已评价过-->
@@ -584,10 +584,13 @@
 			cancel() {
 				this.isSearch = false
 			},
-			toDetail(id) {
-				uni.$u.route('/pages/order/orderDetails', {
-					id: id,
-				});
+			toDetail(item) {
+				if(item.orderStatus!='待货主确认'){
+					uni.$u.route('/pages/order/orderDetails', {
+						id: item.id,
+					});
+				}
+				
 			},
 			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
 			upCallback(page) {