From 8b1b4982cf588ef0a3f3877cb41ecd67cc2691b9 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 02 Mar 2022 15:56:18 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/qfqk-android
---
pages/grabOrders/grabOrdersZAXC/map.vue | 49 ++++++++++++++++--------
pages/grabOrders/grabOrdersZAYWXC/map.vue | 19 +++++----
pages/grabOrders/grabOrdersZAFFPX/map.vue | 2
3 files changed, 44 insertions(+), 26 deletions(-)
diff --git a/pages/grabOrders/grabOrdersZAFFPX/map.vue b/pages/grabOrders/grabOrdersZAFFPX/map.vue
index bab408d..477f73a 100644
--- a/pages/grabOrders/grabOrdersZAFFPX/map.vue
+++ b/pages/grabOrders/grabOrdersZAFFPX/map.vue
@@ -445,7 +445,7 @@
getLocationInfo(val) {
var that = this;
uni.getLocation({
- type: 'wgs84',
+ type: 'gcj02',
isHighAccuracy: true,
success(res) {
// console.log(res, "当前位置");
diff --git a/pages/grabOrders/grabOrdersZAXC/map.vue b/pages/grabOrders/grabOrdersZAXC/map.vue
index a904a9b..aa58a21 100644
--- a/pages/grabOrders/grabOrdersZAXC/map.vue
+++ b/pages/grabOrders/grabOrdersZAXC/map.vue
@@ -5,8 +5,10 @@
<!-- <web-view :src="urls" @message="message"></web-view> -->
<map :scale='18' id="myMap" style="width: 100%" :style="{height: mapHeight + 'px'}" :markers="markers"
:longitude="longitude" :latitude="latitude" :circles="circles" :polyline="mypolylines" show-location="true">
+
<cover-view class="dingwBut" @click="mapControlsBack">
- <cover-image src="./map/img/dingwei.png" @click="mapControlsBack">
+
+ <cover-image src="./map/img/dingwei.png" @click="mapControlsBack" :class="[oncePotion?'oncePotion':'']">
</cover-image>
</cover-view>
@@ -107,8 +109,8 @@
<u-popup v-model="showIn" mode="bottom" border-radius="14" z-index='1000001' :mask-close-able="true">
<view class="Info2">
<view class="Info4">是否参加活动</view>
- <u-button class="Info5" type="primary" @click="openAPP('oks')">参加</u-button>
- <u-button class="Info5" type="error" @click="openAPP('nos')">取消</u-button>
+ <button class="Info5" type="primary" @click="openAPP('oks')">参加</button>
+ <button class="Info5" type="error" @click="openAPP('nos')">取消</button>
<!--<view class="Info3">
</view> -->
</view>
@@ -144,11 +146,10 @@
// color: "#A7B6CB", //描边的颜色
// radius: 10, //半径
// strokeWidth: 2, //描边的宽度
- }
- ], //圆
+ }], //圆
markers: [{ // 集合点
- width: '40',
- height: '40',
+ width: '80',
+ height: '80',
// label: {
// content: "集合点",
// color: "#FE0000",
@@ -158,14 +159,14 @@
id: 1,
latitude: '',
longitude: '',
- iconPath: '/static/dinw/location8.png',
+ iconPath: '/static/dinw/location7.png',
}, {
- width: '30',
- height: '30',
+ width: '50',
+ height: '50',
id: 2,
latitude: '',
longitude: '',
- iconPath: '/static/dinw/dinw11.png',
+ iconPath: '/static/dinw/dinw13.png',
}], //标记点
jihelatitude: '', //集合点
jihelongitude: '', //集合点
@@ -210,6 +211,7 @@
clickable: true,
}], //地图控件
inThere: true,
+ oncePotion: false,
}
},
methods: {
@@ -226,6 +228,7 @@
mapControlsBack() {
// console.log(1111)
this.inThere = true;
+ this.oncePotion = true;
this.getLocationInfo("notSet");
// this.bye = false;
// this.timeBegin(1);
@@ -492,16 +495,19 @@
getLocationInfo(val) {
var that = this;
uni.getLocation({
- type: 'wgs84',
+ type: 'gcj02',
isHighAccuracy: true,
success(res) {
// console.log(res, "当前位置");
+ // console.log(res)
+ // return;
that.latitude = res.latitude
that.longitude = res.longitude
// console.log(that.latitude)
// console.log(that.longitude)
if (that.inThere) {
that.inThere = false;
+ that.oncePotion = false;
that.map.moveToLocation({
latitude: res.latitude,
longitude: res.longitude
@@ -529,9 +535,12 @@
// strokeWidth: 2 //描边的宽度
// }]
if (val != "notSet") {
+ let util = require('../../../static/WSCoordinate.js');
+ let ress = util.transformFromGCJToWGS(res.latitude,
+ res.longitude);
let d = {
id: that.ourData.id,
- intlat: [res.longitude, res.latitude]
+ intlat: [ress.longitude, ress.latitude]
}
that.timeBeginSet(d) //30秒送数据
//加入绘制路线
@@ -1262,12 +1271,18 @@
// &::after{
// content: url(map/img/dingwei.png);
// }
- // .dingwButImg {
- // animation: mymove 5s infinite;
- // animation-timing-function: linear;
- // }
}
+ .oncePotion {
+ animation: mymove 0.5s infinite;
+ animation-timing-function: linear;
+ }
+
+ .dingwButtip {
+ bottom: 120 upx;
+ background-color: transparent;
+ color: #000000;
+ }
@keyframes mymove {
diff --git a/pages/grabOrders/grabOrdersZAYWXC/map.vue b/pages/grabOrders/grabOrdersZAYWXC/map.vue
index 12e78aa..62a156e 100644
--- a/pages/grabOrders/grabOrdersZAYWXC/map.vue
+++ b/pages/grabOrders/grabOrdersZAYWXC/map.vue
@@ -107,8 +107,8 @@
<u-popup v-model="showIn" mode="bottom" border-radius="14" z-index='1000001' :mask-close-able="true">
<view class="Info2">
<view class="Info4">是否参加活动</view>
- <u-button class="Info5" type="primary" @click="openAPP('oks')">参加</u-button>
- <u-button class="Info5" type="error" @click="openAPP('nos')">取消</u-button>
+ <button class="Info5" type="primary" @click="openAPP('oks')">参加</button>
+ <button class="Info5" type="error" @click="openAPP('nos')">取消</button>
<!--<view class="Info3">
</view> -->
</view>
@@ -157,14 +157,14 @@
id: 1,
latitude: '',
longitude: '',
- iconPath: '/static/dinw/location4.png',
+ iconPath: '/static/dinw/location7.png',
}, {
width: '10',
height: '10',
id: 2,
latitude: '',
longitude: '',
- iconPath: '/static/dinw/dinw11.png',
+ iconPath: '/static/dinw/dinw13.png',
}], //标记点
jihelatitude: '', //集合点
jihelongitude: '', //集合点
@@ -254,8 +254,8 @@
dataAppend["serid"] = "," + (uni.getStorageSync("ids") || that.$store.state.puserID);
// dataAppend["captain"] = uni.getStorageSync("name") || that.$store.state.puserName;
dataAppend["captain"] = uni.getStorageSync("name") || that.$store.state.puserName;
- console.log(dataAppend, 888)
- return
+ // console.log(dataAppend, 888)
+ // return
uni.request({
url: that.$store.state.piAPI + "taskqd/Graborder",
method: "POST",
@@ -493,7 +493,7 @@
getLocationInfo(val) {
var that = this;
uni.getLocation({
- type: 'wgs84',
+ type: 'gcj02',
isHighAccuracy: true,
success(res) {
// console.log(res, "当前位置");
@@ -530,9 +530,12 @@
// strokeWidth: 2 //描边的宽度
// }]
if (val != "notSet") {
+ let util = require('../../../static/WSCoordinate.js');
+ let ress = util.transformFromGCJToWGS(res.latitude,
+ res.longitude);
let d = {
id: that.ourData.id,
- intlat: [res.longitude, res.latitude]
+ intlat: [ress.longitude, ress.latitude]
}
that.timeBeginSet(d) //30秒送数据
//加入绘制路线
--
Gitblit v1.9.3