Merge branch 'master' of http://47.100.3.209:3000/gongdecai/wangluohuoyun-app

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/mine/driverCertification.vue

@@ -663,6 +663,13 @@
 				if (e.value[0] == '长期') {
 					this.dataDetails.cardValidityDate = e.value[0]
 				} else {
+					if (!e.value[1] || !e.value[2]) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "日期格式错误,请重新选择！",
+						})
+						return
+					}
 					var date=new Date()
 					if(e.value[0]<date.getFullYear()){
 						this.$refs.uToast.show({

pages/order/addEvaluation.vue

@@ -16,8 +16,7 @@
 					@click="clickStar(index)">
 					<view class="flex" style="margin: 10rpx 0;">
 						<view class="ziti">{{item.name}}</view>
-						<start :count="item.count" style="" size="35" activeIcon="heart-fill" inactiveIcon="heart"
-							activeColor="#ffaa00" v-model="item.value1" @change="getVal" :size="22">
+						<start :value="item.value1" style="" size="35" @change="getVal" :size="36">
 						</start>
 					</view>
 

pages/order/confirmUnloading.vue

@@ -152,6 +152,7 @@
 				// unloadingImg: '',
 				// totalFreight: '',
 				unloadingImg:this.detailData.hyCarrierInfo.unloadingImg,
+				receiptImg:this.detailData.hyCarrierInfo.receiptImg,
 				id: this.detailData.carrierId,
 			}
 			this.validityPeriod = this.$helper.makeValidityPeriod()
@@ -227,7 +228,6 @@
 						if (res.latitude) {
 							// that.detailData.hyCarrierInfo.loadingAreaLongitude = res.longitude;
 							// that.detailData.hyCarrierInfo.loadingAreaLatitude = res.latitude;
-							
 							that.detailData.carrierInfo.unloadingAreaLongitude = res.longitude;
 							that.detailData.carrierInfo.unloadingAreaLatitude = res.latitude;
 							console.log("1234567890")
@@ -480,9 +480,12 @@
 									uni.switchTab({
 										url: '/pages/order/index'
 									})
-									that.$helper.fUN_AmapLocation.stop({}, result => {
-										console.log('====fUN_AmapLocation定位stop====', JSON.stringify(result));
-									});
+									if(that.$helper.fUN_AmapLocation){
+										that.$helper.fUN_AmapLocation.stop({}, result => {
+											console.log('====fUN_AmapLocation定位stop====', JSON.stringify(result));
+										});
+									}
+									
 									
 								}
 							})