zhongtianhaoyuan hace 2 años
padre
commit
92b0b87c5b

+ 0 - 1
App.vue

@@ -295,7 +295,6 @@
 			// #ifdef APP-PLUS
 			var that = this
 			//判断该用户是否需要开启持续定位
-			console.log("onlaunch11111111",uni.getStorageSync('userInfo'))
 			if (uni.getStorageSync('userInfo')) {
 				this.$request.baseRequest('get', '/orderInfo/getData', {
 					commonId: uni.getStorageSync('userInfo').id,

+ 1 - 1
pages/goodSource/index.vue

@@ -501,7 +501,6 @@
 			confirmClick() {
 				let item = this.ObjSelect
 				var that = this
-
 				let _obj = {
 					driverCommonId: that.driverCommonId,
 					commonId: item.commonId,
@@ -528,6 +527,7 @@
 					goodsType: item.goodsType,
 					goodsTypeKey: item.goodsTypeKey
 				}
+				console.log("查看抢单",_obj)
 				that.$request.baseRequest('post', '/publishTaskInfo/api/addOrder', _obj).then(res => {
 						if (res.code == 200) {
 							that.$refs.uToast.show({

+ 2 - 1
pages/goodSource/shippingDetails.vue

@@ -319,7 +319,7 @@
 						commonId: item.commonId,
 						id: item.id,
 						compId: item.compId,
-						cargoOwnerName: item.cargoOwnerReallyName,
+						cargoOwnerName: item.cargoOwnerName,
 						cargoOwner: item.cargoOwner,
 						sendPrivate: item.sendPrivate,
 						sendCity: item.sendCity,
@@ -330,6 +330,7 @@
 						unloadArea: item.unloadArea,
 						unloadDetailedAddress: item.unloadDetailedAddress,
 						goodsName: item.goodsName,
+						goodsType:item.goodsType,
 						distance: item.distance,
 						freightPrice: item.freightPrice,
 						driverName: res2.data.driverName,

+ 8 - 1
pages/mine/index1.vue

@@ -91,6 +91,12 @@
 					clearable></u--input>
 			</view>
 		</view>
+		<view class='row-between'>
+			<view class="">备注</view>
+			<view class="flex align-center">
+				<u--input placeholder="备注" border="none"  v-model="remark" inputAlign='right'></u--input>
+			</view>
+		</view>
 		
 		<button type="primary" @click="auth()">授权</button>
 		<button type="primary" @click="start()">开启定位</button>		
@@ -132,7 +138,8 @@
 					driverName:"孙亚洲",
 					interval:"5000" 
 				}],//运单信息列表,一辆车运单数最大支持数为 10
-				timer:""
+				timer:"",
+				// columns[["[00]车辆损坏","[01货主临时改变收货位置]",""]]
 			}
 		},
 		onLoad() {

+ 2 - 4
pages/order/confirmLoading.vue

@@ -302,12 +302,10 @@
 							console.log(res)
 							var errorCode = res.data.errorCode; //错误码
 							var errorMsg = res.data.errorMsg; //错误描述
-							
-							this.$refs.uToast.show({
+							that.$refs.uToast.show({
 								type: 'error',
 								message: errorMsg
 							})
-							return
 							that.timer = setTimeout(() => {
 								console.log("定时")
 								that.send()
@@ -786,7 +784,7 @@
 						if (res.code == 200) {
 							uni.hideLoading()
 							let _title = ''
-							if (this.detailData.statusFlag == 1) {
+							if (that.detailData.statusFlag == 1) {
 								_title = '暂存成功!'
 							} else {
 								that.start() //开始授权并开始定位

+ 7 - 0
pages/order/confirmUnloading.vue

@@ -210,6 +210,8 @@
 					this.shippingNoteInfos[0].driverName = this.detailData.driverName, //司机姓名,SDK 回调返回, 调用 start/stop/pause/restart/ 必填,send 时非必填
 					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) {
 					if (res.type == "onSuccess") {
@@ -220,6 +222,11 @@
 						//失败
 						var errorCode = res.data.errorCode;//错误码
 						var errorMsg = res.data.errorMsg;//错误描述
+						this.$refs.uToast.show({
+							type: 'error',
+							message: errorMsg,
+						})
+						return
 					}	
 				});			
 			},