|
@@ -16,7 +16,7 @@
|
|
|
<map id="map" :latitude="lat" :longitude="lng" scale="10" show-compass :markers="markers" @markertap="markertap"
|
|
|
show-location style="width: 100%; height:100%;">
|
|
|
<!-- 信息提示 -->
|
|
|
- <cover-view class="work-message" @click="toWork" v-if="workStatus!='stop'">
|
|
|
+ <cover-view class="work-message" v-if="workStatus!='stop'" @click="toWork">
|
|
|
<cover-view class="work-message-in">
|
|
|
<cover-view class="view">洗车机正在工作中...</cover-view>
|
|
|
<cover-view class="view">点击进入</cover-view>
|
|
@@ -77,8 +77,6 @@
|
|
|
this.mapCtx = uni.createMapContext('map')
|
|
|
},
|
|
|
onShow() {
|
|
|
- console.log(this.$store.state.vuex_orderInfo,'vuex_orderInfo')
|
|
|
- console.log(this.$store.state.vuex_workStatus,'vuex_workStatus')
|
|
|
this.workStatus = this.$store.state.vuex_workStatus
|
|
|
},
|
|
|
onLoad() {
|
|
@@ -253,15 +251,15 @@
|
|
|
},
|
|
|
// 扫码洗车
|
|
|
scanCode () {
|
|
|
- uni.navigateTo({
|
|
|
- url: `/pages/getOrder/getOrder?scene=100033,9695`
|
|
|
- })
|
|
|
- // uni.scanCode({
|
|
|
- // success: function (res) {
|
|
|
- // console.log('条码类型:' + res.scanType);
|
|
|
- // console.log('条码内容:' + res.result);
|
|
|
- // }
|
|
|
- // });
|
|
|
+ uni.scanCode({
|
|
|
+ success: function (res) {
|
|
|
+ console.log('条码类型:' + res.scanType);
|
|
|
+ console.log('条码内容:' + res.result);
|
|
|
+ uni.navigateTo({
|
|
|
+ url: `/pages/getOrder/getOrder?scene=100033,9996`
|
|
|
+ })
|
|
|
+ }
|
|
|
+ });
|
|
|
},
|
|
|
// 创建标记点 OPEN :正常营业 CLOSED:暂停营业 TO_BE_OPENED:待开业
|
|
|
createMarker(point) {
|