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

pages/goodSource/shippingDetails.vue

@@ -123,12 +123,14 @@
 				<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>
-						| {{carWeight}}
+					<view class="right">
+						<text v-if="detailData.carModel.indexOf('1') != -1">不限</text>
+						<text v-show="detailData.carModel.indexOf('2') != -1">高栏 | </text>
+						<text v-show="detailData.carModel.indexOf('3') != -1">集装箱 | </text>
+						<text v-show="detailData.carModel.indexOf('4') != -1">自卸车</text>
+					
 					</view>
-					<view class="right" v-else>不限</view>
+					<!-- <view class="right" v-else>不限</view> -->
 				</view>
 				<view class="flex mt20">
 					<view class="left">描述</view>

pages/order/confirmUnloading.vue

@@ -270,6 +270,7 @@
 				})
 			},
 			stop() { //结束定位
+			var that = this
 				this.shippingNoteInfos[0].shippingNoteNumber = this.detailData.orderNo //运单号
 					this.shippingNoteInfos[0].serialNumber = "0000" //分单号
 					this.shippingNoteInfos[0].startCountrySubdivisionCode = this.detailData
@@ -295,7 +296,6 @@
 					this.shippingNoteInfos[0].interval = "5000" //请求时间间隔，SDK 回调返 回(单位 ms)
 				// var shippingNoteInfos = this.shippingNoteInfos;//运单信息列表
 				console.log("查看结束参数", this.shippingNoteInfos)
-
 				let remark = ""
 				sdkwx.stop(this.detailData.carNumber, this.detailData.driverName, remark, this.shippingNoteInfos, function(
 					res) {
@@ -307,7 +307,7 @@
 						//失败
 						var errorCode = res.data.errorCode; //错误码
 						var errorMsg = res.data.errorMsg; //错误描述
-						this.$refs.uToast.show({
+						that.$refs.uToast.show({
 							type: 'error',
 							message: errorMsg,
 						})
@@ -600,7 +600,7 @@
 				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
+				var endlng = this.detailData.publishTaskInfo?this.detailData.publishTaskInfo.unsendLongitude:this.detailData.unsendLongitude
 				if(this.editPlace){//true 未编辑 判断当前定位与任务卸车地点距离  大于5KM提示，编辑卸车地点后不在判断
 				let juli = this.getDistance(endlat,endlng,lat,lng)
 					console.log("更改卸车地后距离",juli)
@@ -668,7 +668,6 @@
 					this.detailData.carrierInfo.unloadingDate = this.detailData.carrierInfo.unloadingDate.split(" ")[0] +
 						" " + h + ":" + f + ":" + m
 				}
-				// this.detailData.carrierInfo.totalFreight = this.detailData.totalFreight
 				this.detailData.carrierInfo.carNo = this.detailData.carNumber
 				this.$request.baseRequest('post', '/carrierInfo/unLoadingAdd', this.detailData.carrierInfo).then(res => {
 						if (res.code == 200) {
@@ -680,7 +679,7 @@
 								_title = '提交成功！'
 							}
 							uni.hideLoading()
-							this.$refs.uToast.show({
+							that.$refs.uToast.show({
 								type: 'success',
 								message: _title,
 								complete() {