zhongtianhaoyuan 2 rokov pred
rodič
commit
f03d97f8e7

+ 93 - 72
App.vue

@@ -31,18 +31,18 @@
 					vehicleNumber: "",
 					driverName: "",
 					interval: "",
-					
-					
+
+
 				}],
 				//网络货运信息定位
 				appId: "", //网络货运企业APP的唯一标识
 				appSecurity: "", //网络货运企业在省平台申请的接入安全码
 				enterpriseSenderCode: "23106960", //网络货运企业在省平台申请的企业发送代码
 				environment: "debug", //环境:“debug”接入测试环境,“release”接入正式环境。
-				
-			}},
+			}
+		},
 		methods: {
-			...mapMutations(['login',"firstAuthentication"]),
+			...mapMutations(['login', "firstAuthentication"]),
 			// vue的method里编写如下代码
 			// async requestAndroidPermission(permisionID) {
 			//     var result = await permision.requestAndroidPermission(permisionID)
@@ -59,58 +59,68 @@
 			//     }
 			// },
 			restart() { //开启定位
-					var remark = "测试";//备注
-					let that = this
-				sdkwx.restart(this.shippingNoteInfos[0].vehicleNumber, this.shippingNoteInfos[0].driverName,remark, this.shippingNoteInfos, function(res) {
-					if (res.type == "onSuccess") {
-						//成功
-						console.log("开启定位成功!!!")
-						console.log(res)
-						var shippingNoteInfos = res.data[0]; //运单信息列表
-						console.log(shippingNoteInfos,"sdassss")
-						if(shippingNoteInfos){
-							let dateTtime = Number(shippingNoteInfos.interval+1000)
-							console.log("开始定时",dateTtime)
-							that.timer = setInterval(() => {
+				var remark = "测试"; //备注
+				let that = this
+				sdkwx.restart(this.shippingNoteInfos[0].vehicleNumber, this.shippingNoteInfos[0].driverName, remark, this
+					.shippingNoteInfos,
+					function(res) {
+						if (res.type == "onSuccess") {
+							//成功
+							console.log("开启定位成功!!!")
+							console.log(res)
+							var shippingNoteInfos = res.data[0]; //运单信息列表
+							console.log(shippingNoteInfos, "sdassss")
+							if (shippingNoteInfos) {
+								let dateTtime = Number(shippingNoteInfos.interval + 1000)
+								console.log("开始定时", dateTtime)
+								that.timer = setInterval(() => {
+									console.log("定时")
+									that.send()
+								}, dateTtime);
+							}
+						} else if (res.type == "onFailure") {
+							//失败
+							console.log("开启定位失败!!!")
+							console.log(res)
+							var errorCode = res.data.errorCode; //错误码
+							var errorMsg = res.data.errorMsg; //错误描述
+							that.timer = setInterval(() => { //失败也需要定时发送定位
 								console.log("定时")
 								that.send()
-							}, dateTtime);
+							}, 915204); //15分钟
 						}
-					} else if (res.type == "onFailure") {
-						//失败
-						console.log("开启定位失败!!!")
-						console.log(res)
-						var errorCode = res.data.errorCode; //错误码
-						var errorMsg = res.data.errorMsg; //错误描述
-					}
-				});
+					});
 			},
-			send(){//发送定位
+			send() { //发送定位
 				var remark = ""
 				var that = this
-				console.log("send参数",this.shippingNoteInfos)
-				sdkwx.send(this.shippingNoteInfos[0].vehicleNumber, this.shippingNoteInfos[0].driverName,remark, this.shippingNoteInfos, function(res){
-						
-					if (res.type == "onSuccess") {
-						console.log("App.vue发送定位成功")
-						console.log(res);
-						var shippingNoteInfos = res.data[0];//运单信息列表
-						if(shippingNoteInfos){
-							let dateTime = Number(shippingNoteInfos.interval+1000)
-							console.log("定时开始",dateTime)
-							that.timer = setInterval(() => {
-							    //TODO 
+				console.log("send参数", this.shippingNoteInfos)
+				sdkwx.send(this.shippingNoteInfos[0].vehicleNumber, this.shippingNoteInfos[0].driverName, remark, this
+					.shippingNoteInfos,
+					function(res) {
+						if (res.type == "onSuccess") {
+							console.log("App.vue发送定位成功")
+							console.log(res);
+							var shippingNoteInfos = res.data[0]; //运单信息列表
+							if (shippingNoteInfos) {
+								let dateTime = Number(shippingNoteInfos.interval + 1000)
+								console.log("定时开始", dateTime)
+								that.timer = setInterval(() => {
+									//TODO 
+									that.send()
+								}, dateTime);
+							}
+						} else if (res.type == "onFailure") {
+							console.log("App.vue发送定位失败", res)
+							//失败
+							var errorCode = res.data.errorCode; //错误码
+							var errorMsg = res.data.errorMsg; //错误描述
+							that.timer = setInterval(() => { //失败也需要定时上传定位(为了解决频繁调用接口问题)
+								//TODO 
 								that.send()
-							},dateTime);
+							}, 915204);
 						}
-					} else if (res.type == "onFailure"){
-						console.log("App.vue发送定位失败",res)
-						//失败
-						var errorCode = res.data.errorCode;//错误码
-						var errorMsg = res.data.errorMsg;//错误描述
-					}
-					
-				});	
+					});
 			},
 			auth() { //授权
 				let phoneType = uni.getSystemInfoSync().platform //判断手机类型
@@ -125,7 +135,7 @@
 				sdkwx.auth(this.appId, this.appSecurity, this.enterpriseSenderCode, this.environment, function(res) {
 					if (res.type == "onSuccess") {
 						//成功
-						if(res.data.length > 0){
+						if (res.data.length > 0) {
 							that.restart()
 						}
 						console.log("授权成功")
@@ -202,7 +212,7 @@
 							okText: '退出程序',
 							infoAlignment: 'center',
 							radius: 10,
-					 	// cancelText: '否',
+							// cancelText: '否',
 							showCancel: false,
 							okButtonColor: '#2772FB'
 						};
@@ -275,26 +285,36 @@
 			// #ifdef APP-PLUS
 			var that = this
 			//判断该用户是否需要开启持续定位
-			if(uni.getStorageSync('userInfo')){
-				this.$request.baseRequest('get', '/orderInfo/getData',  {
-						commonId:uni.getStorageSync('userInfo').id,
-					}).then(res1 => {
-						console.log("/orderInfo/getData",res1.data)
-					if(res1.data.length>0){
+			if (uni.getStorageSync('userInfo')) {
+				this.$request.baseRequest('get', '/orderInfo/getData', {
+					commonId: uni.getStorageSync('userInfo').id,
+				}).then(res1 => {
+					console.log("/orderInfo/getData", res1.data)
+					if (res1.data.length > 0) {
 						this.shippingNoteInfos[0].shippingNoteNumber = res1.data[0].orderNo //运单号
 						this.shippingNoteInfos[0].serialNumber = "0000" //分单号
-						this.shippingNoteInfos[0].startCountrySubdivisionCode = res1.data[0].sendAdCode  //起点位置行政区划代码,调 用 start/stop/pause/restart 时 必填,调用 send 非必填
-						this.shippingNoteInfos[0].endCountrySubdivisionCode = res1.data[0].unsendAdCode  //到达位置行政区划代码,调 用 start/stop/pause/restart 时 必填,调用 send 非必填
-						this.shippingNoteInfos[0].startLongitude = res1.data[0].sendLongitude   //起点位置经度,调用 start/stop/pause/restart 时必 填,调用 send 非必填
-						this.shippingNoteInfos[0].startLatitude = res1.data[0].sendLatitude   //起点位置纬度,调用 start/stop/pause/restart 时必 填,调用 send 非必填
-						this.shippingNoteInfos[0].endLongitude = res1.data[0].unsendLongitude  //到达位置经度,调用 start/stop/pause/restart 时必 填,调用 send 非必填
-						this.shippingNoteInfos[0].endLatitude = res1.data[0].unsendLatitude  //到达位置纬度,调用 start/stop/pause/restart 时必 填,调用 send 非必填
-						this.shippingNoteInfos[0].driverName = res1.data[0].driverName  //司机姓名,SDK 回调返回, 调用 start/stop/pause/restart/ 必填,send 时非必填
-						this.shippingNoteInfos[0].vehicleNumber = res1.data[0].carNumber //车牌号,SDK 回调返回,调 用 start/stop/pause/restart/必 填,send 时非必填
-						this.shippingNoteInfos[0].startLocationText = res1.data[0].sendCity //起点地址文字描述,调用 start/stop/pause/restart 时必 填,调用 send 非必填
-						this.shippingNoteInfos[0].endLocationText = res1.data[0].unloadCity //到达地址文字描述,调用 start/stop/pause/restart 时必 填,调用 send 非必填
+						this.shippingNoteInfos[0].startCountrySubdivisionCode = res1.data[0]
+							.sendAdCode //起点位置行政区划代码,调 用 start/stop/pause/restart 时 必填,调用 send 非必填
+						this.shippingNoteInfos[0].endCountrySubdivisionCode = res1.data[0]
+							.unsendAdCode //到达位置行政区划代码,调 用 start/stop/pause/restart 时 必填,调用 send 非必填
+						this.shippingNoteInfos[0].startLongitude = res1.data[0]
+							.sendLongitude //起点位置经度,调用 start/stop/pause/restart 时必 填,调用 send 非必填
+						this.shippingNoteInfos[0].startLatitude = res1.data[0]
+							.sendLatitude //起点位置纬度,调用 start/stop/pause/restart 时必 填,调用 send 非必填
+						this.shippingNoteInfos[0].endLongitude = res1.data[0]
+							.unsendLongitude //到达位置经度,调用 start/stop/pause/restart 时必 填,调用 send 非必填
+						this.shippingNoteInfos[0].endLatitude = res1.data[0]
+							.unsendLatitude //到达位置纬度,调用 start/stop/pause/restart 时必 填,调用 send 非必填
+						this.shippingNoteInfos[0].driverName = res1.data[0]
+							.driverName //司机姓名,SDK 回调返回, 调用 start/stop/pause/restart/ 必填,send 时非必填
+						this.shippingNoteInfos[0].vehicleNumber = res1.data[0]
+							.carNumber //车牌号,SDK 回调返回,调 用 start/stop/pause/restart/必 填,send 时非必填
+						this.shippingNoteInfos[0].startLocationText = res1.data[0]
+							.sendCity //起点地址文字描述,调用 start/stop/pause/restart 时必 填,调用 send 非必填
+						this.shippingNoteInfos[0].endLocationText = res1.data[0]
+							.unloadCity //到达地址文字描述,调用 start/stop/pause/restart 时必 填,调用 send 非必填
 						this.shippingNoteInfos[0].interval = "5000"
-						console.log("查看参数",this.shippingNoteInfos)
+						console.log("查看参数", this.shippingNoteInfos)
 						that.auth()
 						that.$helper.fUN_AmapLocation.start({
 								// intervalTime: 1000 * 60,
@@ -330,9 +350,10 @@
 								// console.log("条数", uni.getStorageSync('mapGJ').length)
 								if (uni.getStorageSync('mapGJ').length > 100) {
 									console.log(JSON.stringify(uni.getStorageSync('mapGJ')))
-									this.$request.baseRequest('post', '/hyOrderTravelPath/api/addInfo',  {
-												orderId:"cdae6ec34c2349768c490a9fefa03fb3",
-												longitudeLatitude:JSON.stringify(uni.getStorageSync('mapGJ'))   
+									this.$request.baseRequest('post', '/hyOrderTravelPath/api/addInfo', {
+											orderId: "cdae6ec34c2349768c490a9fefa03fb3",
+											longitudeLatitude: JSON.stringify(uni.getStorageSync(
+												'mapGJ'))
 										}).then(res => {
 											uni.removeStorageSync('mapGJ');
 											this.$helper.gjList = []
@@ -393,7 +414,7 @@
 			if (type == "android") {
 				appUpdate()
 			}
-		
+
 			// plus.push.getClientInfoAsync((info) => {
 			// 	var name = 'clientId'
 			// 	var value = info.clientid

+ 0 - 1
components/itmister-address-picker/itmister-address-picker.nvue

@@ -80,7 +80,6 @@
 			this.value = this.addressIndex;
 			// let arrays = {}
 			// if(this.wholeCountry){
-			// 	debugger
 			// 	let cityDataCopy = this.cityData
 			// 	 arrays = {
 			// 		city:[{area:[],name:''}],

+ 2 - 2
config/index.js

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

+ 0 - 1
pages/goodSource/index.vue

@@ -604,7 +604,6 @@
 				this.$request.baseRequest('get', '/driverInfo/firstAuthentication', {
 					driverPhone: this.userInfo.phone,
 				}).then(res2 => {
-					debugger
 					if (res2.data.authenticationStatus == '已过期') {
 						that.$refs.uToast.show({
 							type: 'error',

+ 0 - 1
pages/mine/driverCertification.vue

@@ -669,7 +669,6 @@
 				} = e
 
 				// if (columnIndex === 0) {
-				// 	debugger
 				// 	if (e.index != 0) {
 				// 		picker.setColumnValues(1, this.validityPeriod[1].shift())
 				// 	}

+ 0 - 1
pages/mine/editDriverCertification.vue

@@ -221,7 +221,6 @@
 				} = e
 
 				// if (columnIndex === 0) {
-				// 	debugger
 				// 	if (e.index != 0) {
 				// 		picker.setColumnValues(1, this.validityPeriod[1].shift())
 				// 	}

+ 80 - 56
pages/order/confirmLoading.vue

@@ -57,6 +57,10 @@
 					{{detailData.loadingDate1?detailData.loadingDate1:'来自合同'}}
 				</view>
 			</view>
+			<view class='row-between'>
+				<view class="">装车毛重(吨)</view>
+				{{detailData.grossWeight ? detailData.grossWeight:"来自合同"}}
+			</view>
 			<view class='row-between'>
 				<view class="">装车净重(吨)</view>
 				{{detailData.weight ? detailData.weight:"来自合同"}}
@@ -163,7 +167,7 @@
 					driverName: "",
 					interval: "",
 				}],
-				timer:null
+				timer: null
 			}
 		},
 		onLoad(options) {
@@ -248,66 +252,85 @@
 			},
 			start() { //开启定位
 				//车牌号 //司机姓名 //备注 //运单信息列表
-				console.log(this.detailData,"行政区划分")
+				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.loadingLatitude, //起点位置经度,调用 start/stop/pause/restart 时必 填,调用 send 非必填
-					this.shippingNoteInfos[0].startLatitude = this.detailData.loadingLatitude, //起点位置纬度,调用 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].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
+					.loadingLatitude, //起点位置经度,调用 start/stop/pause/restart 时必 填,调用 send 非必填
+					this.shippingNoteInfos[0].startLatitude = this.detailData
+					.loadingLatitude, //起点位置纬度,调用 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
-					var remark = "测试";//备注
-					let that = this
-				sdkwx.start(this.detailData.carNo, this.firstAuthentication.driverName,remark, this.shippingNoteInfos, function(res) {
-					if (res.type == "onSuccess") {
-						//成功
-						console.log("开启定位成功!!!")
-						console.log(res)
-						var shippingNoteInfos = res.data[0]; //运单信息列表
-						console.log(shippingNoteInfos,"sdassss")
-						if(shippingNoteInfos){
-							let dateTtime = Number(shippingNoteInfos.interval+1000)
-							console.log("开始定时",dateTtime)
+				var remark = "测试"; //备注
+				let that = this
+				sdkwx.start(this.detailData.carNo, this.firstAuthentication.driverName, remark, this.shippingNoteInfos,
+					function(res) {
+						if (res.type == "onSuccess") {
+							//成功
+							console.log("开启定位成功!!!")
+							console.log(res)
+							var shippingNoteInfos = res.data[0]; //运单信息列表
+							console.log(shippingNoteInfos, "sdassss")
+							if (shippingNoteInfos) {
+								let dateTtime = Number(shippingNoteInfos.interval + 1000)
+								console.log("开始定时", dateTtime)
+								that.timer = setInterval(() => {
+									console.log("定时")
+									that.send()
+								}, dateTtime);
+							}
+						} else if (res.type == "onFailure") {
+							//失败
+							console.log("开启定位失败!!!")
+							console.log(res)
+							var errorCode = res.data.errorCode; //错误码
+							var errorMsg = res.data.errorMsg; //错误描述
 							that.timer = setInterval(() => {
 								console.log("定时")
 								that.send()
-							}, dateTtime);
+							}, 915204);
 						}
-					} else if (res.type == "onFailure") {
-						//失败
-						console.log("开启定位失败!!!")
-						console.log(res)
-						var errorCode = res.data.errorCode; //错误码
-						var errorMsg = res.data.errorMsg; //错误描述
-					}
-				});
+					});
 			},
-			send(){//发送定位
-				var remark = "";//备注
+			send() { //发送定位
+				var remark = ""; //备注
 				let that = this
-				sdkwx.send(this.detailData.carNo, this.firstAuthentication.driverName,remark, this.shippingNoteInfos, function(res){
-					console.log('发送定位',res);
-					if (res.type == "onSuccess") {
-						var shippingNoteInfos = res.data[0];//运单信息列表
-						let dateTtime = Number(shippingNoteInfos.interval+1000)
-						console.log("开始定时",dateTtime)
-						that.timer = setInterval(() => {
-						    //TODO 
-							that.send()
-						}, dateTtime);
-					} else if (res.type == "onFailure"){
-						var errorCode = res.data.errorCode;//错误码
-						var errorMsg = res.data.errorMsg;//错误描述
-					}
-				});	
+				sdkwx.send(this.detailData.carNo, this.firstAuthentication.driverName, remark, this.shippingNoteInfos,
+					function(res) {
+						console.log('发送定位', res);
+						if (res.type == "onSuccess") {
+							var shippingNoteInfos = res.data[0]; //运单信息列表
+							let dateTtime = Number(shippingNoteInfos.interval + 1000)
+							console.log("开始定时", dateTtime)
+							that.timer = setInterval(() => {
+								that.send()
+							}, dateTtime);
+						} else if (res.type == "onFailure") {
+							var errorCode = res.data.errorCode; //错误码
+							var errorMsg = res.data.errorMsg; //错误描述
+							that.timer = setInterval(() => {
+								console.log("定时")
+								that.send()
+							}, 915204); //15分钟
+						}
+					});
 			},
 			toSignContract() {
 				console.log(this.detailData)
@@ -358,6 +381,7 @@
 									this.detailData.loadingDate1 = res.data.loadingDate.split(' ')[0]
 								}
 								this.detailData.weight = res.data.loadingWeight
+								this.detailData.grossWeight = res.data.loadingGrossWeight
 								this.detailData.freight = res.data.estimatedFreight
 							}
 						})
@@ -417,7 +441,7 @@
 					var mainSvr = main.getSystemService(context.LOCATION_SERVICE);
 					if (!mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER)) {
 						uni.showModal({
-			  		title: '提示',
+							title: '提示',
 							content: '请打开定位服务功能',
 							// showCancel: false, // 不显示取消按钮
 							success(res) {
@@ -435,7 +459,7 @@
 				} else if (system.platform === 'ios') {
 					// console.log("苹果");
 					var cllocationManger = plus.ios.import("CLLocationManager");
-			 	var enable = cllocationManger.locationServicesEnabled();
+					var enable = cllocationManger.locationServicesEnabled();
 					var status = cllocationManger.authorizationStatus();
 					plus.ios.deleteObject(cllocationManger);
 					if (enable && status != 2) {
@@ -726,7 +750,7 @@
 					loadingLatitude: this.detailData.loadingLatitude,
 					id: this.detailData.hyCarrierInfo.id
 				}
-				
+
 				// console.log("查看id--------",this.detailData.hyCarrierInfo.id)
 				this.$request.baseRequest('post', '/carrierInfo/loadingAdd', data).then(res => {
 						if (res.code == 200) {
@@ -765,8 +789,8 @@
 										city: res.city,
 										area: res.district
 									}
-									if(this.shippingNoteInfos && this.shippingNoteInfos.length > 0){//更新持续定位经纬度
-										for(let i= 0;i<this.shippingNoteInfos.length;i++){
+									if (this.shippingNoteInfos && this.shippingNoteInfos.length > 0) { //更新持续定位经纬度
+										for (let i = 0; i < this.shippingNoteInfos.length; i++) {
 											this.shippingNoteInfos[i].startLatitude = _data.latitude //纬度
 											this.shippingNoteInfos[i].startLocationText = _data.city //起点
 											this.shippingNoteInfos[i].startLongitude = _data.longitude //经度

+ 8 - 0
pages/order/signContract.vue

@@ -80,6 +80,13 @@
 						inputAlign='right' clearable></u--input> -->
 				</view>
 			</view>
+			<view class='row-between'>
+				<view class="gray">装车毛重(吨)</view>
+				<view class="flex">
+					<u--input placeholder="请输入装车毛重" border="none" v-model="dataDetails.grossWeight" inputAlign='right'
+						clearable></u--input>
+				</view>
+			</view>
 			<view class='row-between'>
 				<view class="gray">装车净重(吨)</view>
 				<view class="flex">
@@ -516,6 +523,7 @@
 				// _obj.advanceCharge = that.dataDetails.advanceCharge
 				_obj.carNumber = that.dataDetails.carrierInfo.carNo
 				_obj.weight = that.dataDetails.weight
+				_obj.grossWeight = that.dataDetails.grossWeight
 				_obj.advanceCharge = that.dataDetails.advanceCharge
 				_obj.bankCard = that.dataDetails.bankCard
 				_obj.bankDeposit = that.dataDetails.bankDeposit

+ 0 - 2
util/request.js

@@ -81,7 +81,6 @@ const baseRequest = (method, url, data, header) => {
 							if (res[1].data.code == '200' || res[1].data.code == 200) {
 								resolve(res[1].data)
 							} else {
-								debugger
 								resolve(res[1].data)
 								// uni.$u.toast(res[1].data.message);
 								// uni.showToast({
@@ -91,7 +90,6 @@ const baseRequest = (method, url, data, header) => {
 								// 	}); 
 							}
 						} else {
-							debugger
 							reject(res)
 							// uni.showToast({
 							// 	icon: 'none',