更新

common/helper.js

@@ -436,7 +436,6 @@ const changeTime = (t1) => {
 	}
 }
 const formatLocation = (str) => {
-	// console.log(str)
 	let area = {}
 	let index11 = 0
 	let index1 = str.indexOf("省")
@@ -465,7 +464,23 @@ const formatLocation = (str) => {
 	let index3 = str.indexOf("区")
 	if (index3 == -1) {
 		index3 = str.indexOf("县")
-		area.Country = str.substring(index2 + 1, index3 + 1)
+		if (index3 == -1) {
+			index3 = str.lastIndexOf("市")
+			if (index3 == -1) {
+				index3 = str.indexOf("镇")
+				if (index3 == -1) {
+
+				} else {
+					area.Country = str.substring(index2 + 1, index3 + 1)
+
+				}
+			} else {
+				area.Country = str.substring(index2 + 1, index3 + 1)
+			}
+		} else {
+			area.Country = str.substring(index2 + 1, index3 + 1)
+		}
+
 	} else {
 		area.Country = str.substring(index2 + 1, index3 + 1)
 	}

pages/goodSource/cargoOwnerSee.vue

@@ -12,7 +12,7 @@
 						v-show="objectInfo.cargoOwner=='企业货主'">
 					</image>
 				</view>
-				<view class="feedback_css">+关注</view>
+				<!-- <view class="feedback_css">+关注</view> -->
 			</view>
 			<view class="pf-row flex">
 				<view class="flex">

pages/goodSource/shippingDetails.vue

@@ -122,6 +122,7 @@
 				</view>
 				<view class="flex align-center">
 					<view class="left">车型</view>
+					<!-- carModel -->
 					<view v-if='carLength!=""&&carType!="不限"&&carWeight!=""' class="right">
 						{{carLength}} |
 						<text v-if='carType!="不限"'> {{carType}} </text>

pages/order/confirmLoading.vue

@@ -131,6 +131,7 @@
 	export default {
 		data() {
 			return {
+				firstAuthentication:{},
 				cyId: '',
 				localtion: {
 					city: '',
@@ -218,6 +219,7 @@
 				"contractdata")
 		},
 		onShow() {
+			this.firstAuthentication = uni.getStorageSync("firstAuthentication")
 			if (uni.getStorageSync('contractdata')) {
 				this.id = uni.getStorageSync('contractdata').id
 				this.detailData.hyCarrierInfo.id = uni.getStorageSync('contractdata').carrierId
@@ -226,7 +228,7 @@
 			}
 		},
 		computed: {
-			...mapState(['hasLogin', 'userInfo', "firstAuthentication"])
+			...mapState(['hasLogin', 'userInfo'])
 		},
 		methods: {
 			auth() { //授权
@@ -252,18 +254,18 @@
 			start() { //开启定位
 				//车牌号 //司机姓名 //备注 //运单信息列表
 				console.log(this.detailData, "行政区划分")
-				this.shippingNoteInfos[0].shippingNoteNumber = this.detailData.orderNo, //运单号
-				this.shippingNoteInfos[0].serialNumber = "0000", //分单号
-				this.shippingNoteInfos[0].startCountrySubdivisionCode = this.detailData.publishTaskInfo.sendAdCode, //起点位置行政区划代码，调 用 start/stop/pause/restart 时 必填，调用 send 非必填
-				this.shippingNoteInfos[0].endCountrySubdivisionCode = this.detailData.publishTaskInfo.unsendAdCode, //到达位置行政区划代码，调 用 start/stop/pause/restart 时 必填，调用 send 非必填
-				this.shippingNoteInfos[0].startLongitude = this.detailData.publishTaskInfo.sendLongitude, //起点位置经度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
-				this.shippingNoteInfos[0].startLatitude =  this.detailData.publishTaskInfo.sendLatitude, //起点位置纬度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
-				this.shippingNoteInfos[0].endLongitude =  this.detailData.publishTaskInfo.unsendLongitude, //到达位置经度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
-				this.shippingNoteInfos[0].endLatitude =  this.detailData.publishTaskInfo.unsendLatitude, //到达位置纬度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
-				this.shippingNoteInfos[0].startLocationText = this.detailData.sendCity, //起点地址文字描述，调用 start/stop/pause/restart 时必 填，调用 send 非必填
-				this.shippingNoteInfos[0].endLocationText = this.detailData.unloadCity, //到达地址文字描述，调用 start/stop/pause/restart 时必 填，调用 send 非必填
-				this.shippingNoteInfos[0].vehicleNumber = this.detailData.carNumber, //车牌号，SDK 回调返回，调 用 start/stop/pause/restart/必 填，send 时非必填
-				this.shippingNoteInfos[0].driverName = this.detailData.driverName, //司机姓名，SDK 回调返回， 调用 start/stop/pause/restart/ 必填，send 时非必填
+				this.shippingNoteInfos[0].shippingNoteNumber = this.detailData.orderNo //运单号
+				this.shippingNoteInfos[0].serialNumber = "0000" //分单号
+				this.shippingNoteInfos[0].startCountrySubdivisionCode = this.detailData.publishTaskInfo.sendAdCode //起点位置行政区划代码，调 用 start/stop/pause/restart 时 必填，调用 send 非必填
+				this.shippingNoteInfos[0].endCountrySubdivisionCode = this.detailData.publishTaskInfo.unsendAdCode //到达位置行政区划代码，调 用 start/stop/pause/restart 时 必填，调用 send 非必填
+				this.shippingNoteInfos[0].startLongitude = this.detailData.publishTaskInfo.sendLongitude //起点位置经度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
+				this.shippingNoteInfos[0].startLatitude =  this.detailData.publishTaskInfo.sendLatitude //起点位置纬度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
+				this.shippingNoteInfos[0].endLongitude =  this.detailData.publishTaskInfo.unsendLongitude //到达位置经度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
+				this.shippingNoteInfos[0].endLatitude =  this.detailData.publishTaskInfo.unsendLatitude //到达位置纬度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
+				this.shippingNoteInfos[0].startLocationText = this.detailData.sendCity //起点地址文字描述，调用 start/stop/pause/restart 时必 填，调用 send 非必填
+				this.shippingNoteInfos[0].endLocationText = this.detailData.unloadCity //到达地址文字描述，调用 start/stop/pause/restart 时必 填，调用 send 非必填
+				this.shippingNoteInfos[0].vehicleNumber = this.detailData.carNumber //车牌号，SDK 回调返回，调 用 start/stop/pause/restart/必 填，send 时非必填
+				this.shippingNoteInfos[0].driverName = this.detailData.driverName //司机姓名，SDK 回调返回， 调用 start/stop/pause/restart/ 必填，send 时非必填
 				this.shippingNoteInfos[0].interval = "5000" //请求时间间隔，SDK 回调返 回(单位 ms)
 
 				//}],//运单信息列表,一辆车运单数最大支持数为 10
@@ -279,6 +281,7 @@
 				// uni.setStorageSync("sdkStartParam",param)
 				// uni.setStorageSync("sdkStartParamOrderNum",this.detailData.orderNo)
 				// this.$helper.sdkStart(this.detailData.carNo, this.firstAuthentication.driverName, remark, this.shippingNoteInfos)
+				console.log("dsjaokfljdof",this.shippingNoteInfos)
 				sdkwx.start(this.detailData.carNo, this.firstAuthentication.driverName, remark, this.shippingNoteInfos,
 					function(res) {
 						if (res.type == "onSuccess") {

pages/order/confirmUnloading.vue

@@ -270,28 +270,28 @@
 				})
 			},
 			stop() { //结束定位
-				this.shippingNoteInfos[0].shippingNoteNumber = this.detailData.orderNo, //运单号
-					this.shippingNoteInfos[0].serialNumber = "0000", //分单号
+				this.shippingNoteInfos[0].shippingNoteNumber = this.detailData.orderNo //运单号
+					this.shippingNoteInfos[0].serialNumber = "0000" //分单号
 					this.shippingNoteInfos[0].startCountrySubdivisionCode = this.detailData
-					.sendAdCode, //起点位置行政区划代码，调 用 start/stop/pause/restart 时 必填，调用 send 非必填
+					.sendAdCode //起点位置行政区划代码，调 用 start/stop/pause/restart 时 必填，调用 send 非必填
 					this.shippingNoteInfos[0].endCountrySubdivisionCode = this.detailData
-					.unsendAdCode, //到达位置行政区划代码，调 用 start/stop/pause/restart 时 必填，调用 send 非必填
+					.unsendAdCode//到达位置行政区划代码，调 用 start/stop/pause/restart 时 必填，调用 send 非必填
 					this.shippingNoteInfos[0].startLongitude = this.detailData
-					.sendLongitude, //起点位置经度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
+					.sendLongitude //起点位置经度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
 					this.shippingNoteInfos[0].startLatitude = this.detailData
-					.sendLatitude, //起点位置纬度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
+					.sendLatitude //起点位置纬度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
 					this.shippingNoteInfos[0].endLongitude = this.detailData
-					.unsendLongitude, //到达位置经度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
+					.unsendLongitude //到达位置经度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
 					this.shippingNoteInfos[0].endLatitude = this.detailData
-					.unsendLatitude, //到达位置纬度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
+					.unsendLatitude //到达位置纬度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
 					this.shippingNoteInfos[0].startLocationText = this.detailData
-					.sendCity, //起点地址文字描述，调用 start/stop/pause/restart 时必 填，调用 send 非必填
+					.sendCity //起点地址文字描述，调用 start/stop/pause/restart 时必 填，调用 send 非必填
 					this.shippingNoteInfos[0].endLocationText = this.detailData
-					.unloadCity, //到达地址文字描述，调用 start/stop/pause/restart 时必 填，调用 send 非必填
+					.unloadCity //到达地址文字描述，调用 start/stop/pause/restart 时必 填，调用 send 非必填
 					this.shippingNoteInfos[0].vehicleNumber = this.detailData
-					.carNumber, //车牌号，SDK 回调返回，调 用 start/stop/pause/restart/必 填，send 时非必填
+					.carNumber //车牌号，SDK 回调返回，调 用 start/stop/pause/restart/必 填，send 时非必填
 					this.shippingNoteInfos[0].driverName = this.detailData
-					.driverName, //司机姓名，SDK 回调返回， 调用 start/stop/pause/restart/ 必填，send 时非必填
+					.driverName //司机姓名，SDK 回调返回， 调用 start/stop/pause/restart/ 必填，send 时非必填
 					this.shippingNoteInfos[0].interval = "5000" //请求时间间隔，SDK 回调返 回(单位 ms)
 				// var shippingNoteInfos = this.shippingNoteInfos;//运单信息列表
 				console.log("查看结束参数", this.shippingNoteInfos)
@@ -595,11 +595,14 @@
 				// 	return
 				// }
 				// this.detailData.publishTaskInfo.unsendLatitude //任务卸车所在地经纬度
-				// this.detailData.publishTaskInfo.unsendLongitude 
+				// this.detailData.publishTaskInfo.unsendLongitude
+				 
 				var lat = this.detailData.carrierInfo.unloadingLatitude  //当前定位所在的经纬度
 				var lng = this.detailData.carrierInfo.unloadingLongitude
+				var endlat = this.detailData.publishTaskInfo?this.detailData.publishTaskInfo.unsendLatitude:this.detailData.unsendLatitude
+				var endlng = this.detailData.publishTaskInfo?this.detailData.publishTaskInfo.unloadingLongitude:this.detailData.unloadingLongitude
 				if(this.editPlace){//true 未编辑 判断当前定位与任务卸车地点距离  大于5KM提示，编辑卸车地点后不在判断
-				let juli = this.getDistance(this.detailData.publishTaskInfo.unsendLatitude,this.detailData.carrierInfo.unloadingLongitude,lat,lng)
+				let juli = this.getDistance(endlat,endlng,lat,lng)
 					console.log("更改卸车地后距离",juli)
 					if(Number(juli)>5){
 						this.distanceTips="当前定位与运单卸货地不符，请在指定地点确认卸车，如果卸货地发生变化，请修改本页面基本信息中的卸货地址！",