|
@@ -301,21 +301,24 @@
|
|
|
// 扫码洗车
|
|
|
scanCode () {
|
|
|
let _this = this
|
|
|
+ uni.navigateTo({
|
|
|
+ url: '/pages/getOrder/getOrder?scene=100040,2001'
|
|
|
+ })
|
|
|
// 检验是否登录或登录是否过期
|
|
|
- uni.scanCode({
|
|
|
- success: function (res) {
|
|
|
- console.log(res);
|
|
|
- if(res.scanType != 'WX_CODE'){
|
|
|
- setTimeout(()=>{
|
|
|
- _this.toashMsg("无法识别此二维码")
|
|
|
- },1000)
|
|
|
- }else{
|
|
|
- uni.navigateTo({
|
|
|
- url: '/'+res.path
|
|
|
- })
|
|
|
- }
|
|
|
- }
|
|
|
- });
|
|
|
+ // uni.scanCode({
|
|
|
+ // success: function (res) {
|
|
|
+ // console.log(res);
|
|
|
+ // if(res.scanType != 'WX_CODE'){
|
|
|
+ // setTimeout(()=>{
|
|
|
+ // _this.toashMsg("无法识别此二维码")
|
|
|
+ // },1000)
|
|
|
+ // }else{
|
|
|
+ // uni.navigateTo({
|
|
|
+ // url: '/'+res.path
|
|
|
+ // })
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // });
|
|
|
},
|
|
|
// 创建标记点 设备状态 USING :使用中 PAUSE:暂停 ON_LINE:在线
|
|
|
createMarker(point) {
|
|
@@ -325,23 +328,8 @@
|
|
|
if (point.deviceStatus === 'PAUSE') {
|
|
|
iconPath = '/static/img/store-dky.png'
|
|
|
} else if (point.deviceStatus === 'USING' || point.deviceStatus === 'ON_LINE') {
|
|
|
- let today = new Date().toLocaleDateString() // 获取今天日期
|
|
|
- let beginTime = today + ' ' + point.beginTime
|
|
|
- let endTime = today + ' ' + point.endTime
|
|
|
- let beginTimeStamp = new Date(beginTime).getTime() // 获取开始时间戳
|
|
|
- let endTimeStamp = new Date(endTime).getTime() // 获取结束时间戳
|
|
|
- let nowTimeStamp = new Date().getTime() // 获取当前时间戳
|
|
|
- // 结束时间小于开始时间时 为跨天 结束时间应加1天
|
|
|
- endTimeStamp = endTimeStamp <=beginTimeStamp ? (endTimeStamp+24*60*60*1000) : endTimeStamp
|
|
|
- // 根据当前时间判断目前是否在营业时间范围内
|
|
|
- if (nowTimeStamp>=beginTimeStamp && nowTimeStamp<=endTimeStamp) {
|
|
|
- iconPath = '/static/img/store.png'
|
|
|
- } else {
|
|
|
- iconPath = '/static/img/store-dky.png'
|
|
|
- }
|
|
|
- } else {
|
|
|
- iconPath = '/static/img/store-zt.png'
|
|
|
- }
|
|
|
+ iconPath = '/static/img/store.png'
|
|
|
+ }
|
|
|
let marker = {
|
|
|
iconPath: iconPath,
|
|
|
id: point.id || 0,
|