|
@@ -120,7 +120,7 @@
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script>
|
|
<script>
|
|
- let that;
|
|
|
|
|
|
+ var that;
|
|
//插件对象
|
|
//插件对象
|
|
var sdkwx = uni.requireNativePlugin('Hdgq-LocSdkWX');
|
|
var sdkwx = uni.requireNativePlugin('Hdgq-LocSdkWX');
|
|
import uploadImage from '@/components/ossutil/uploadFile.js';
|
|
import uploadImage from '@/components/ossutil/uploadFile.js';
|
|
@@ -180,6 +180,7 @@
|
|
}
|
|
}
|
|
},
|
|
},
|
|
onLoad(options) {
|
|
onLoad(options) {
|
|
|
|
+ that = this
|
|
let phoneType = uni.getSystemInfoSync().platform //判断手机类型
|
|
let phoneType = uni.getSystemInfoSync().platform //判断手机类型
|
|
this.enterpriseSenderCode = config.def().enterpriseSenderCode
|
|
this.enterpriseSenderCode = config.def().enterpriseSenderCode
|
|
this.environment = config.def().environment
|
|
this.environment = config.def().environment
|
|
@@ -209,16 +210,16 @@
|
|
sdkwx.checkLocationPermission(function(res) {
|
|
sdkwx.checkLocationPermission(function(res) {
|
|
console.log(res);
|
|
console.log(res);
|
|
});
|
|
});
|
|
-
|
|
|
|
- this.auth()
|
|
|
|
-
|
|
|
|
|
|
+
|
|
|
|
+ // this.auth()
|
|
|
|
+
|
|
},
|
|
},
|
|
onHide() {
|
|
onHide() {
|
|
uni.removeStorageSync(
|
|
uni.removeStorageSync(
|
|
"contractdata")
|
|
"contractdata")
|
|
},
|
|
},
|
|
onShow() {
|
|
onShow() {
|
|
-
|
|
|
|
|
|
+
|
|
this.firstAuthentication = uni.getStorageSync("firstAuthentication")
|
|
this.firstAuthentication = uni.getStorageSync("firstAuthentication")
|
|
if (uni.getStorageSync('contractdata')) {
|
|
if (uni.getStorageSync('contractdata')) {
|
|
this.id = uni.getStorageSync('contractdata').id
|
|
this.id = uni.getStorageSync('contractdata').id
|
|
@@ -231,123 +232,6 @@
|
|
...mapState(['hasLogin', 'userInfo'])
|
|
...mapState(['hasLogin', 'userInfo'])
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
- auth() { //授权
|
|
|
|
- console.log("appid:" + this.appId + "安全码:" + this.appSecurity + "发送代码:" + this.enterpriseSenderCode +
|
|
|
|
- "环境" + this.environment)
|
|
|
|
- var that = this
|
|
|
|
- sdkwx.auth(this.appId, this.appSecurity, this.enterpriseSenderCode, this.environment, function(res) {
|
|
|
|
- if (res.type == "onSuccess") {
|
|
|
|
- //成功
|
|
|
|
- console.log("授权成功")
|
|
|
|
- console.log(res)
|
|
|
|
- } else if (res.type == "onFailure") {
|
|
|
|
- //失败
|
|
|
|
- var errorCode = res.data.errorCode; //错误码
|
|
|
|
- var errorMsg = res.data.errorMsg; //错误描述
|
|
|
|
- that.$refs.uToast.show({
|
|
|
|
- type: 'error',
|
|
|
|
- message: "管局授权失败-" + errorMsg
|
|
|
|
- })
|
|
|
|
- console.log("授权失败")
|
|
|
|
- console.log(res)
|
|
|
|
- }
|
|
|
|
- });
|
|
|
|
- },
|
|
|
|
- start(val) { //开启定位
|
|
|
|
- var that = this
|
|
|
|
- //车牌号 //司机姓名 //备注 //运单信息列表
|
|
|
|
- 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
|
|
|
|
- var remark = "测试"; //备注
|
|
|
|
- var param = {}
|
|
|
|
- param.carNo = this.detailData.carNo
|
|
|
|
- param.driverName = this.firstAuthentication.driverName
|
|
|
|
- param.remark = remark
|
|
|
|
- param.shippingNoteInfos = this.shippingNoteInfos
|
|
|
|
-
|
|
|
|
- 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]; //运单信息列表
|
|
|
|
- if (shippingNoteInfos) {
|
|
|
|
- let dateTtime = Number(shippingNoteInfos.interval + 1000)
|
|
|
|
- console.log("开始定时", dateTtime)
|
|
|
|
- that.send()
|
|
|
|
- }
|
|
|
|
- // that.affirm(val) //管局上报成功后提交
|
|
|
|
- } else if (res.type == "onFailure") {
|
|
|
|
- //失败
|
|
|
|
- console.log("开启定位失败!!!")
|
|
|
|
- console.log(res)
|
|
|
|
- var errorCode = res.data.errorCode; //错误码
|
|
|
|
- var errorMsg = res.data.errorMsg; //错误描述
|
|
|
|
- uni.hideLoading()
|
|
|
|
- that.$refs.uToast.show({
|
|
|
|
- type: 'error',
|
|
|
|
- message: "管局上报-" + errorMsg
|
|
|
|
- })
|
|
|
|
- that.timer = setTimeout(() => {
|
|
|
|
- console.log("定时")
|
|
|
|
- that.send()
|
|
|
|
- }, 915204);
|
|
|
|
- }
|
|
|
|
- });
|
|
|
|
- },
|
|
|
|
- send() { //发送定位
|
|
|
|
- var remark = ""; //备注
|
|
|
|
- let that = this
|
|
|
|
- console.log("send this.shippingNoteInfos")
|
|
|
|
- console.log(this.shippingNoteInfos)
|
|
|
|
- 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 = setTimeout(() => {
|
|
|
|
- that.send()
|
|
|
|
- }, dateTtime);
|
|
|
|
- } else if (res.type == "onFailure") {
|
|
|
|
- var errorCode = res.data.errorCode; //错误码
|
|
|
|
- var errorMsg = res.data.errorMsg; //错误描述
|
|
|
|
- that.timer = setTimeout(() => {
|
|
|
|
- console.log("定时")
|
|
|
|
- that.send()
|
|
|
|
- }, 915204); //15分钟
|
|
|
|
- // that.$refs.uToast.show({
|
|
|
|
- // type: 'error',
|
|
|
|
- // message: "管局上报-" + errorMsg
|
|
|
|
- // })
|
|
|
|
- }
|
|
|
|
- });
|
|
|
|
- },
|
|
|
|
toSignContract() {
|
|
toSignContract() {
|
|
console.log(this.detailData)
|
|
console.log(this.detailData)
|
|
this.$request.baseRequest('get', '/orderInfo/getOrderInfo', {
|
|
this.$request.baseRequest('get', '/orderInfo/getOrderInfo', {
|
|
@@ -405,24 +289,6 @@
|
|
this.detailData.freight = res.data.estimatedFreight
|
|
this.detailData.freight = res.data.estimatedFreight
|
|
}
|
|
}
|
|
})
|
|
})
|
|
- // this.detailData.contractNo = ''
|
|
|
|
- // this.detailData.id = this.detailData.carrierId
|
|
|
|
- // this.detailData.carrierInfo.loadingDate = ''
|
|
|
|
- // this.detailData.carrierInfo.carNo = ''
|
|
|
|
- // this.detailData.carrierInfo.loadingAreaLongitude = ''
|
|
|
|
- // this.detailData.carrierInfo.loadingAreaLatitude = ''
|
|
|
|
- // this.detailData.carrierInfo.sendCity = '营口'
|
|
|
|
- // this.detailData.carrierInfo.sendArea = '鲅鱼圈'
|
|
|
|
- // this.detailData.carrierInfo.loadingImg = ''
|
|
|
|
- // this.carrierInfo = res.data.carrierInfo
|
|
|
|
- // this.freightInfo = res.data.freightInfo
|
|
|
|
- // this.zcPhoneList = this.carrierInfo.loadingImg.split(',')
|
|
|
|
- // if(res.data.orderStatus!="待货主确认"&&res.data.orderStatus!="未装车"&&res.data.orderStatus!="已终止"){
|
|
|
|
- // this.status1 = true
|
|
|
|
- // }
|
|
|
|
- // if(res.data.orderStatus!="已终止"&&res.data.orderStatus!="平台驳回装车信息"&&res.data.orderStatus!="待平台确认装车"&&res.data.orderStatus!="待货主确认"&&res.data.orderStatus!="未装车"&&res.data.orderStatus!="待货主确认装车"&&res.data.orderStatus!="货主驳回装车信息"){
|
|
|
|
- // this.status2 = true
|
|
|
|
- // }
|
|
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|
|
@@ -514,32 +380,6 @@
|
|
title: '获取定位中',
|
|
title: '获取定位中',
|
|
mask: true
|
|
mask: true
|
|
})
|
|
})
|
|
- // this.$helper.fUN_AmapLocation.start({
|
|
|
|
- // intervalTime: 1000 * 3,
|
|
|
|
- // isReport: false,
|
|
|
|
- // },
|
|
|
|
- // res => {
|
|
|
|
- // //见下方定位返回示例
|
|
|
|
- // console.log('====fUN_AmapLocation定位====', JSON.stringify(res));
|
|
|
|
- // if (res.latitude) {
|
|
|
|
- // this.detailData.carrierInfo.loadingAreaLongitude = res.longitude;
|
|
|
|
- // this.detailData.carrierInfo.loadingAreaLatitude = res.latitude;
|
|
|
|
- // this.detailData.carrierInfo.sendCity = this.$helper.filterUrban(res.city)
|
|
|
|
- // this.detailData.carrierInfo.sendArea = this.$helper.filterArea(res.district);
|
|
|
|
- // console.log(this.detailData.carrierInfo.sendCity)
|
|
|
|
- // console.log(this.detailData.carrierInfo.sendArea)
|
|
|
|
- // this.$forceUpdate()
|
|
|
|
-
|
|
|
|
- // }
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- // this.$helper.fUN_AmapLocation.stop({}, result => {
|
|
|
|
- // uni.hideLoading()
|
|
|
|
- // console.log('====fUN_AmapLocation定位stop====', JSON.stringify(result));
|
|
|
|
- // });
|
|
|
|
- // }
|
|
|
|
- // );
|
|
|
|
- // console.log(that.detailData,111111)
|
|
|
|
uni.getLocation({
|
|
uni.getLocation({
|
|
type: 'gcj02',
|
|
type: 'gcj02',
|
|
geocode: true,
|
|
geocode: true,
|
|
@@ -604,11 +444,6 @@
|
|
});
|
|
});
|
|
|
|
|
|
},
|
|
},
|
|
- alertBtn() {
|
|
|
|
- // uni.navigateTo({
|
|
|
|
- // url: '/pages/public/login'
|
|
|
|
- // })
|
|
|
|
- },
|
|
|
|
cancelClick() {
|
|
cancelClick() {
|
|
this.isShowAlert = false
|
|
this.isShowAlert = false
|
|
},
|
|
},
|
|
@@ -677,17 +512,8 @@
|
|
if (this.validate()) return
|
|
if (this.validate()) return
|
|
this.isShowAlert = true
|
|
this.isShowAlert = true
|
|
this.detailData.statusFlag = type
|
|
this.detailData.statusFlag = type
|
|
- // this.$refs.uToast.show({
|
|
|
|
- // ...params,
|
|
|
|
- // complete() {
|
|
|
|
- // params.url && uni.navigateTo({
|
|
|
|
- // url: params.url
|
|
|
|
- // })
|
|
|
|
- // }
|
|
|
|
- // })
|
|
|
|
},
|
|
},
|
|
validate() {
|
|
validate() {
|
|
- // uni.$u.test.isEmpty(this.detailData.carrierInfo.carNo
|
|
|
|
if (uni.$u.test.isEmpty(this.detailData.carNo)) {
|
|
if (uni.$u.test.isEmpty(this.detailData.carNo)) {
|
|
this.$refs.uToast.show({
|
|
this.$refs.uToast.show({
|
|
type: 'error',
|
|
type: 'error',
|
|
@@ -745,21 +571,166 @@
|
|
return true
|
|
return true
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
+
|
|
affirm(data) {
|
|
affirm(data) {
|
|
- console.log("提交", data)
|
|
|
|
|
|
+ this.$request.baseRequest('post', '/carrierInfo/loadingAdd', data).then(res => {
|
|
|
|
+ console.log("提交状态", res)
|
|
|
|
+ uni.hideLoading()
|
|
|
|
+ if (res.code == 200) {
|
|
|
|
+ that.$refs.uToast.show({
|
|
|
|
+ type: 'success',
|
|
|
|
+ message: '暂存成功',
|
|
|
|
+ complete() {
|
|
|
|
+ uni.switchTab({
|
|
|
|
+ url: '/pages/order/index'
|
|
|
|
+ })
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ }
|
|
|
|
+ }).catch(res => {
|
|
|
|
+ uni.hideLoading()
|
|
|
|
+ console.log("2", res.message)
|
|
|
|
+ // uni.$u.toast(res.message);
|
|
|
|
+ that.$refs.uToast.show({
|
|
|
|
+ type: 'error',
|
|
|
|
+ message: res.message,
|
|
|
|
+ })
|
|
|
|
+ });
|
|
|
|
+
|
|
|
|
+ },
|
|
|
|
+ confirmClick() {
|
|
|
|
+ uni.removeStorageSync('contractdata')
|
|
var that = this
|
|
var that = this
|
|
|
|
+ this.isShowAlert = false
|
|
|
|
+ //1暂存
|
|
|
|
+ if (this.detailData.statusFlag == 1) {
|
|
|
|
+ delete this.detailData.hyCarrierInfo.loadingAreaLongitude;
|
|
|
|
+ delete this.detailData.hyCarrierInfo.loadingAreaLatitude;
|
|
|
|
+ delete this.detailData.hyCarrierInfo.sendCity;
|
|
|
|
+ delete this.detailData.hyCarrierInfo.sendArea;
|
|
|
|
+ }
|
|
|
|
+ // uni.showLoading({
|
|
|
|
+ // title: '加载中'
|
|
|
|
+ // })
|
|
|
|
+ let time = new Date() //装车时间 去当前时间的时分秒
|
|
|
|
+ let h = time.getHours();
|
|
|
|
+ if (h < 10) {
|
|
|
|
+ h = "0" + h
|
|
|
|
+ }
|
|
|
|
+ let f = time.getMinutes();
|
|
|
|
+ if (f < 10) {
|
|
|
|
+ f = "0" + f
|
|
|
|
+ }
|
|
|
|
+ let m = time.getSeconds();
|
|
|
|
+ if (m < 10) {
|
|
|
|
+ m = "0" + m
|
|
|
|
+ }
|
|
|
|
+ var data = {
|
|
|
|
+ loadingImg: this.imgList.toString(),
|
|
|
|
+ statusFlag: this.detailData.statusFlag,
|
|
|
|
+ loadingDate: this.detailData.hyCarrierInfo.loadingDate.split(" ")[0] + " " + h + ":" + f + ":" + m,
|
|
|
|
+ loadingArea: this.detailData.loadingArea,
|
|
|
|
+ loadingCity: this.detailData.loadingCity,
|
|
|
|
+ loadingLongitude: this.detailData.loadingLongitude,
|
|
|
|
+ loadingLatitude: this.detailData.loadingLatitude,
|
|
|
|
+ id: this.detailData.hyCarrierInfo.id,
|
|
|
|
+ transportationDuration: this.detailData.transportationDuration
|
|
|
|
+ }
|
|
|
|
+ if (that.detailData.statusFlag == 1) { //暂存
|
|
|
|
+ console.log("暂存")
|
|
|
|
+ this.affirm(data)
|
|
|
|
+ } else { //提交
|
|
|
|
+ this.submitInfo(data) //先调用管局start
|
|
|
|
+ }
|
|
|
|
+ },
|
|
|
|
+ async submitInfo(data) {
|
|
|
|
+ console.log(11)
|
|
|
|
+ let _auth = await this.auth()
|
|
|
|
+ if (_auth.type == "onFailure") {
|
|
|
|
+ that.$refs.uToast.show({
|
|
|
|
+ type: 'error',
|
|
|
|
+ message: "管局授权失败-" + res.data.errorMsg
|
|
|
|
+ })
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ // then(res => {
|
|
|
|
+ // if (res.type == "onFailure") {
|
|
|
|
+ // that.$refs.uToast.show({
|
|
|
|
+ // type: 'error',
|
|
|
|
+ // message: "管局授权失败-" + res.data.errorMsg
|
|
|
|
+ // })
|
|
|
|
+ // return
|
|
|
|
+ // }
|
|
|
|
+ // })
|
|
|
|
+
|
|
|
|
+ let _start = this.start()
|
|
|
|
+ if (_start.type == 'onFailure') {
|
|
|
|
+ that.$refs.uToast.show({
|
|
|
|
+ type: 'error',
|
|
|
|
+ message: "管局上报-" + res.data.errorMsg
|
|
|
|
+ })
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // .then(res => {
|
|
|
|
+ // console.log(4)
|
|
|
|
+ // var shippingNoteInfos = res.data[0]; //运单信息列表
|
|
|
|
+ // if (res.type == "onSuccess") {
|
|
|
|
+
|
|
|
|
+ // } else if (res.type == "onFailure") {
|
|
|
|
+ // that.$refs.uToast.show({
|
|
|
|
+ // type: 'error',
|
|
|
|
+ // message: "管局上报1-" + res.data.errorMsg
|
|
|
|
+ // })
|
|
|
|
+ // return
|
|
|
|
+ // }
|
|
|
|
+
|
|
|
|
+ // })
|
|
|
|
+ console.log("_start", _start)
|
|
|
|
+ let _send = await this.send()
|
|
|
|
+
|
|
|
|
+ // .then(res => {
|
|
|
|
+ // console.log(6)
|
|
|
|
+ // if (res.type == "onSuccess") {
|
|
|
|
+ // var shippingNoteInfos = res.data[0]; //运单信息列表
|
|
|
|
+ // let dateTtime = Number(shippingNoteInfos.interval + 1000)
|
|
|
|
+ // that.timer = setTimeout(() => {
|
|
|
|
+ // that.send()
|
|
|
|
+ // }, dateTtime);
|
|
|
|
+ // } else if (res.type == "onFailure") {
|
|
|
|
+ // var errorCode = res.data.errorCode; //错误码
|
|
|
|
+ // var errorMsg = res.data.errorMsg; //错误描述
|
|
|
|
+ // that.$refs.uToast.show({
|
|
|
|
+ // type: 'error',
|
|
|
|
+ // message: "管局上报2-" + errorMsg
|
|
|
|
+ // })
|
|
|
|
+ // return
|
|
|
|
+ // }
|
|
|
|
+
|
|
|
|
+ // })
|
|
|
|
+
|
|
|
|
+ console.log("_send", _send)
|
|
|
|
+ if (_send.type == "onSuccess") {
|
|
|
|
+ var shippingNoteInfos = _send.data[0]; //运单信息列表
|
|
|
|
+ let dateTtime = Number(shippingNoteInfos.interval + 1000)
|
|
|
|
+ that.timer = setTimeout(() => {
|
|
|
|
+ that.send()
|
|
|
|
+ }, dateTtime);
|
|
|
|
+ } else if (_send.type == "onFailure") {
|
|
|
|
+ var errorCode = _send.data.errorCode; //错误码
|
|
|
|
+ var errorMsg = _send.data.errorMsg; //错误描述
|
|
|
|
+ that.$refs.uToast.show({
|
|
|
|
+ type: 'error',
|
|
|
|
+ message: "管局上报-" + errorMsg
|
|
|
|
+ })
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ console.log(35453454)
|
|
this.$request.baseRequest('post', '/carrierInfo/loadingAdd', data).then(res => {
|
|
this.$request.baseRequest('post', '/carrierInfo/loadingAdd', data).then(res => {
|
|
console.log("提交状态", res)
|
|
console.log("提交状态", res)
|
|
uni.hideLoading()
|
|
uni.hideLoading()
|
|
if (res.code == 200) {
|
|
if (res.code == 200) {
|
|
- let _title = ''
|
|
|
|
- if (that.detailData.statusFlag == 1) {
|
|
|
|
- _title = '暂存成功!'
|
|
|
|
- return
|
|
|
|
- } else {
|
|
|
|
- that.start() //开始授权并开始定位
|
|
|
|
- _title = '提交成功!'
|
|
|
|
- }
|
|
|
|
that.$helper.fUN_AmapLocation.start({
|
|
that.$helper.fUN_AmapLocation.start({
|
|
// intervalTime: 1000 * 60,
|
|
// intervalTime: 1000 * 60,
|
|
intervalTime: 60000,
|
|
intervalTime: 60000,
|
|
@@ -777,7 +748,8 @@
|
|
city: res.city,
|
|
city: res.city,
|
|
area: res.district
|
|
area: res.district
|
|
}
|
|
}
|
|
- if (this.shippingNoteInfos && this.shippingNoteInfos.length > 0) { //更新持续定位经纬度
|
|
|
|
|
|
+ if (this.shippingNoteInfos && this.shippingNoteInfos.length >
|
|
|
|
+ 0) { //更新持续定位经纬度
|
|
for (let i = 0; i < this.shippingNoteInfos.length; i++) {
|
|
for (let i = 0; i < this.shippingNoteInfos.length; i++) {
|
|
this.shippingNoteInfos[i].startLatitude = _data.latitude //纬度
|
|
this.shippingNoteInfos[i].startLatitude = _data.latitude //纬度
|
|
this.shippingNoteInfos[i].startLocationText = _data.city //起点
|
|
this.shippingNoteInfos[i].startLocationText = _data.city //起点
|
|
@@ -786,16 +758,12 @@
|
|
}
|
|
}
|
|
this.$helper.gjList.push(_data)
|
|
this.$helper.gjList.push(_data)
|
|
uni.setStorageSync('mapGJ', this.$helper.gjList);
|
|
uni.setStorageSync('mapGJ', this.$helper.gjList);
|
|
- // console.log('this.$helper.gjList')
|
|
|
|
- // console.log(this.$helper.gjList)
|
|
|
|
console.log("条数", uni.getStorageSync('mapGJ').length)
|
|
console.log("条数", uni.getStorageSync('mapGJ').length)
|
|
- // console.log("条数", uni.getStorageSync('mapGJ'))
|
|
|
|
if (uni.getStorageSync('mapGJ').length > 10) {
|
|
if (uni.getStorageSync('mapGJ').length > 10) {
|
|
- // console.log(JSON.stringify(uni.getStorageSync('mapGJ')))
|
|
|
|
- // that.send()
|
|
|
|
that.$request.baseRequest('post', '/hyOrderTravelPath/api/addInfo', {
|
|
that.$request.baseRequest('post', '/hyOrderTravelPath/api/addInfo', {
|
|
orderId: that.id,
|
|
orderId: that.id,
|
|
- longitudeLatitude: JSON.stringify(uni.getStorageSync('mapGJ'))
|
|
|
|
|
|
+ longitudeLatitude: JSON.stringify(uni.getStorageSync(
|
|
|
|
+ 'mapGJ'))
|
|
}).then(res => {
|
|
}).then(res => {
|
|
console.log("已发送定位----------------", res)
|
|
console.log("已发送定位----------------", res)
|
|
uni.removeStorageSync('mapGJ');
|
|
uni.removeStorageSync('mapGJ');
|
|
@@ -806,13 +774,12 @@
|
|
uni.$u.toast(res.message);
|
|
uni.$u.toast(res.message);
|
|
});
|
|
});
|
|
}
|
|
}
|
|
- //判断缓存数据条数,超过reportInterval时清空缓存,重新存入缓存
|
|
|
|
}
|
|
}
|
|
);
|
|
);
|
|
|
|
|
|
that.$refs.uToast.show({
|
|
that.$refs.uToast.show({
|
|
type: 'success',
|
|
type: 'success',
|
|
- message: _title,
|
|
|
|
|
|
+ message: '提交成功!',
|
|
complete() {
|
|
complete() {
|
|
uni.switchTab({
|
|
uni.switchTab({
|
|
url: '/pages/order/index'
|
|
url: '/pages/order/index'
|
|
@@ -837,51 +804,114 @@
|
|
})
|
|
})
|
|
});
|
|
});
|
|
},
|
|
},
|
|
- confirmClick() {
|
|
|
|
- uni.removeStorageSync('contractdata')
|
|
|
|
- var that = this
|
|
|
|
- this.isShowAlert = false
|
|
|
|
- //1暂存
|
|
|
|
- if (this.detailData.statusFlag == 1) {
|
|
|
|
- delete this.detailData.hyCarrierInfo.loadingAreaLongitude;
|
|
|
|
- delete this.detailData.hyCarrierInfo.loadingAreaLatitude;
|
|
|
|
- delete this.detailData.hyCarrierInfo.sendCity;
|
|
|
|
- delete this.detailData.hyCarrierInfo.sendArea;
|
|
|
|
- }
|
|
|
|
- uni.showLoading({
|
|
|
|
- title: '加载中'
|
|
|
|
|
|
+ auth() {
|
|
|
|
+ //授权
|
|
|
|
+ // console.log("appid:" + this.appId + "安全码:" + this.appSecurity + "发送代码:" + this.enterpriseSenderCode +
|
|
|
|
+ // "环境" + this.environment)
|
|
|
|
+ console.log(2)
|
|
|
|
+ let promise = new Promise(function(resolve, reject) {
|
|
|
|
+ sdkwx.auth(that.appId, that.appSecurity, that.enterpriseSenderCode, that.environment, function(
|
|
|
|
+ res) {
|
|
|
|
+ console.log("authres", res)
|
|
|
|
+ resolve(res)
|
|
|
|
+ });
|
|
})
|
|
})
|
|
- let time = new Date() //装车时间 去当前时间的时分秒
|
|
|
|
- let h = time.getHours();
|
|
|
|
- if (h < 10) {
|
|
|
|
- h = "0" + h
|
|
|
|
- }
|
|
|
|
- let f = time.getMinutes();
|
|
|
|
- if (f < 10) {
|
|
|
|
- f = "0" + f
|
|
|
|
- }
|
|
|
|
- let m = time.getSeconds();
|
|
|
|
- if (m < 10) {
|
|
|
|
- m = "0" + m
|
|
|
|
- }
|
|
|
|
- var data = {
|
|
|
|
- loadingImg: this.imgList.toString(),
|
|
|
|
- statusFlag: this.detailData.statusFlag,
|
|
|
|
- loadingDate: this.detailData.hyCarrierInfo.loadingDate.split(" ")[0] + " " + h + ":" + f + ":" + m,
|
|
|
|
- loadingArea: this.detailData.loadingArea,
|
|
|
|
- loadingCity: this.detailData.loadingCity,
|
|
|
|
- loadingLongitude: this.detailData.loadingLongitude,
|
|
|
|
- loadingLatitude: this.detailData.loadingLatitude,
|
|
|
|
- id: this.detailData.hyCarrierInfo.id,
|
|
|
|
- transportationDuration: this.detailData.transportationDuration
|
|
|
|
- }
|
|
|
|
- if (that.detailData.statusFlag == 1) { //暂存
|
|
|
|
- console.log("暂存")
|
|
|
|
- this.affirm(data)
|
|
|
|
- } else { //提交
|
|
|
|
- this.affirm(data) //先调用管局start
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ return promise
|
|
|
|
+ },
|
|
|
|
+ start() {
|
|
|
|
+ console.log(3)
|
|
|
|
+ //车牌号 //司机姓名 //备注 //运单信息列表
|
|
|
|
+ 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
|
|
|
|
+ var remark = "测试"; //备注
|
|
|
|
+ var param = {}
|
|
|
|
+ param.carNo = this.detailData.carNo
|
|
|
|
+ param.driverName = this.firstAuthentication.driverName
|
|
|
|
+ param.remark = remark
|
|
|
|
+ param.shippingNoteInfos = this.shippingNoteInfos
|
|
|
|
+
|
|
|
|
+ let promise = new Promise(function(resolve, reject) {
|
|
|
|
+ sdkwx.start(that.detailData.carNo, that.firstAuthentication.driverName, remark, that
|
|
|
|
+ .shippingNoteInfos,
|
|
|
|
+ function(res) {
|
|
|
|
+ console.log("startres", res)
|
|
|
|
+ resolve(res)
|
|
|
|
+ });
|
|
|
|
+ })
|
|
|
|
+
|
|
|
|
+ return promise
|
|
|
|
+ },
|
|
|
|
+ send() { //发送定位
|
|
|
|
+
|
|
|
|
+ console.log(5)
|
|
|
|
+ var remark = ""; //备注
|
|
|
|
+ let that = this
|
|
|
|
+ console.log("send this.shippingNoteInfos")
|
|
|
|
+ console.log(this.shippingNoteInfos)
|
|
|
|
+ let promise = new Promise(function(resolve, reject) {
|
|
|
|
+ sdkwx.send(that.detailData.carNo, that.firstAuthentication.driverName, remark, that
|
|
|
|
+ .shippingNoteInfos,
|
|
|
|
+ function(res) {
|
|
|
|
+ resolve(res)
|
|
|
|
+ });
|
|
|
|
+ })
|
|
|
|
+ return promise
|
|
|
|
+
|
|
|
|
+ },
|
|
|
|
+ // send() { //发送定位
|
|
|
|
+ // console.log(5)
|
|
|
|
+ // var remark = ""; //备注
|
|
|
|
+ // let that = this
|
|
|
|
+ // console.log("send this.shippingNoteInfos")
|
|
|
|
+ // console.log(this.shippingNoteInfos)
|
|
|
|
+ // 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 = setTimeout(() => {
|
|
|
|
+ // that.send()
|
|
|
|
+ // }, dateTtime);
|
|
|
|
+ // } else if (res.type == "onFailure") {
|
|
|
|
+ // var errorCode = res.data.errorCode; //错误码
|
|
|
|
+ // var errorMsg = res.data.errorMsg; //错误描述
|
|
|
|
+ // that.timer = setTimeout(() => {
|
|
|
|
+ // console.log("定时")
|
|
|
|
+ // that.send()
|
|
|
|
+ // }, 915204); //15分钟
|
|
|
|
+ // // that.$refs.uToast.show({
|
|
|
|
+ // // type: 'error',
|
|
|
|
+ // // message: "管局上报-" + errorMsg
|
|
|
|
+ // // })
|
|
|
|
+ // }
|
|
|
|
+ // });
|
|
|
|
+ // },
|
|
|
|
+
|
|
},
|
|
},
|
|
}
|
|
}
|
|
</script>
|
|
</script>
|
|
@@ -958,4 +988,4 @@
|
|
}
|
|
}
|
|
|
|
|
|
.date-style {}
|
|
.date-style {}
|
|
-</style>
|
|
|
|
|
|
+</style>
|