Home Explore Help
Register Sign In
licailing
/
dingdong
0
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge remote-tracking branch 'origin/master'

licailing 5 years ago
parent
8a32328dce 30e10c6d54
commit
950930b655
7 changed files with 208 additions and 2 deletions
Unified View Show Diff Stats
  1. 1 1
      src/main/map/.prettierrc.js
  2. 2 0
      src/main/map/public/index.html
  3. 10 1
      src/main/map/src/router/index.js
  4. 37 0
      src/main/map/src/utils/Post.js
  5. 94 0
      src/main/map/src/views/Heat3D.vue
  6. 22 0
      src/main/map/src/views/Home.vue
  7. 42 0
      src/main/map/src/views/PolylineRoutePlan.vue

+ 1 - 1
src/main/map/.prettierrc.js
View File 

@@ -2,5 +2,5 @@ module.exports = {
 
     semi: true,

     semi: true,

     singleQuote: true,

     singleQuote: true,

     tabWidth: 4,

     tabWidth: 4,

-    trailingComma: 'all',

+		trailingComma: 'all',

 };

 };

+ 2 - 0
src/main/map/public/index.html
View File 

@@ -8,6 +8,8 @@
 
 		<title>叮咚外卖</title>
 
 		<title>叮咚外卖</title>
 
 		<script charset="utf-8"
 
 		<script charset="utf-8"
 
 			src="https://map.qq.com/api/gljs?libraries=tools&v=1.exp&key=GLFBZ-ZR2W6-76XSA-MF7CQ-GDJ6Z-6FB5K"></script>
 
 			src="https://map.qq.com/api/gljs?libraries=tools&v=1.exp&key=GLFBZ-ZR2W6-76XSA-MF7CQ-GDJ6Z-6FB5K"></script>
 
+			<script charset="utf-8"
 
+				src="https://map.qq.com/api/gljs?v=1.exp&key=GLFBZ-ZR2W6-76XSA-MF7CQ-GDJ6Z-6FB5K&libraries=visualization"></script>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
     <noscript>
 
     <noscript>

+ 10 - 1
src/main/map/src/router/index.js
View File 

@@ -18,8 +18,17 @@ const routes = [
 
         name: 'ChooseLocation',
 
         name: 'ChooseLocation',
 
         component: () => import('../views/ChooseLocation.vue'),
 
         component: () => import('../views/ChooseLocation.vue'),
 
     },
 
     },
 
+    {
 
+        path: '/heat3D',
 
+        name: 'heat3D',
 
+        component: () => import('../views/Heat3D.vue'),
 
+    },
 
+    {
 
+        path: '/polylineRoutePlan',
 
+        name: 'polylineRoutePlan',
 
+        component: () => import('../views/PolylineRoutePlan.vue'),
 
+    },
 
 ];
 
 ];
 
-;
 
 const router = new VueRouter({
 
 const router = new VueRouter({
 
     mode: 'history',
 
     mode: 'history',
 
     base: process.env.BASE_URL,
 
     base: process.env.BASE_URL,

+ 37 - 0
src/main/map/src/utils/Post.js
View File 

@@ -0,0 +1,37 @@
 
+/***

+ * postJsCode.js

+ * 预注入webview javascript code

+ * web端使用：

+ * window.APP.invokeClientMethod('getList', { page: 1 , size: 10}, callback);

+ * * */

+function clientMethod() {

+    var APP = {

+        __GLOBAL_FUNC_INDEX__: 0,

+        invokeClientMethod: function(type, params, callback) {

+            var name;

+            if (typeof callback === 'function') {

+                var callbackName = '__CALLBACK__' + APP.__GLOBAL_FUNC_INDEX__++;

+                APP[callbackName] = callback;

+            }

+            window.ReactNativeWebView.postMessage(

+                JSON.stringify({ type, params, callback: name }),

+            );

+        },

+        invokeWebMethod: function(callback, args) {

+            if (typeof callback === 'string') {

+                var func = APP[callback];

+                if (typeof func === 'function') {

+                    setTimeout(function() {

+                        func.call(this, args);

+                    }, 0);

+                }

+            }

+        },

+    };

+    window.APP = APP;

+    window.webviewCallback = function(data) {

+        window.APP['invokeWebMethod'](data.callback, data.args);

+    };

+}

+

+export { clientMethod };

+ 94 - 0
src/main/map/src/views/Heat3D.vue
View File 

@@ -0,0 +1,94 @@
 
+<template>

+    <div id="container"></div>

+</template>

+<script>

+import { mapState } from 'vuex';

+import axios from 'axios';

+import { clientMethod } from '../utils/Post';

+clientMethod();

+

+export default {

+    name: '',

+    data() {

+        return {

+            heatData: [],

+        };

+    },

+    computed: {

+        ...mapState(['userInfo']),

+    },

+    mounted() {

+        window.APP.invokeClientMethod('getList', { page: 0 }, data => {

+            console.log(data);

+        });

+        // this.$nextTick(() => {

+        //     this.getData();

+        //     this.initMap();

+        // });

+    },

+    methods: {

+        getData() {

+            axios.get('http://dingdong.izouma.com/merchant/heatMap', {

+                longitude: '118.734661',

+                latitude: '31.981746',

+            });

+        },

+        initMap() {

+            var heatAddBtn = document.getElementById('heatAddBtn');

+            var heatDecBtn = document.getElementById('heatDecBtn');

+            var setStyleBtn = document.getElementById('setStyleBtn');

+

+            //初始化地图

+            var map = new TMap.Map('container', {

+                zoom: 12, //设置地图缩放级别

+                pitch: 45, // 设置地图俯仰角

+                center: new TMap.LatLng(39.909897147274364, 116.39756310116866), //设置地图中心点坐标

+                mapStyleId: 'style1', //个性化样式

+            });

+            //初始化热力图并添加至map图层

+            var heat = new TMap.visualization.Heat({

+                max: 180, // 热力最强阈值

+                min: 0, // 热力最弱阈值

+                height: 40, // 峰值高度

+                radius: 30, // 最大辐射半径

+            })

+                .addTo(map)

+                .setData(this.heatData); //设置数据

+

+            heatAddBtn.addEventListener(

+                'click',

+                () => {

+                    var radius = heat.getRadius() + 5;

+                    heat.setRadius(radius);

+                },

+                false,

+            );

+

+            heatDecBtn.addEventListener(

+                'click',

+                () => {

+                    var radius = heat.getRadius() - 5;

+                    if (radius > 0) {

+                        heat.setRadius(radius);

+                    }

+                },

+                false,

+            );

+

+            setStyleBtn.addEventListener('click', () => {

+                heat.setGradientColor({

+                    0.6: '#673198',

+                    0.8: '#e53390',

+                    0.9: '#ffc95a',

+                });

+            });

+        },

+    },

+};

+</script>

+<style lang='less' scoped>

+#container {

+    width: 100vw;

+    height: 100vh;

+}

+</style>

+ 22 - 0
src/main/map/src/views/Home.vue
View File 

@@ -74,6 +74,28 @@ export default {
 
             }
 
             }
 
         },
 
         },
 
     },
 
     },
 
+    watch: {
 
+        '$route.query'() {
 
+            if (this.$route.query.location) {
 
+                this.userLoaction = {
 
+                    lat: this.$route.query.location.split(',')[1],
 
+                    lng: this.$route.query.location.split(',')[0],
 
+                };
 
+            }
 
+            if (this.$route.query.merchantLocation) {
 
+                this.merchantLoaction = {
 
+                    lat: this.$route.query.merchantLocation.split(',')[1],
 
+                    lng: this.$route.query.merchantLocation.split(',')[0],
 
+                };
 
+            }
 
+
 
+            this.$nextTick(() => {
 
+                setTimeout(() => {
 
+                    this.initMap();
 
+                }, 1000);
 
+            });
 
+        },
 
+    },
 
     mounted() {
 
     mounted() {
 
         if (this.$route.query.location) {
 
         if (this.$route.query.location) {
 
             this.userLoaction = {
 
             this.userLoaction = {

+ 42 - 0
src/main/map/src/views/PolylineRoutePlan.vue
View File 

@@ -0,0 +1,42 @@
 
+<template>

+    <iframe id="iframe" frameborder="0" scrolling="no" :src="src"> </iframe>

+</template>

+<script>

+window.addEventListener(

+    'message',

+    function(event) {

+        if (event.origin === 'https://3gimg.qq.com') {

+            var loc = event.data;

+            console.log(loc);

+            if (window.ReactNativeWebView) {

+                window.ReactNativeWebView.postMessage(JSON.stringify(loc));

+            }

+        }

+    },

+    false,

+);

+export default {

+    name: '',

+    data() {

+        return {

+            location: '',

+        };

+    },

+    computed: {

+        src() {

+            return '  https://apis.map.qq.com/tools/routeplan/eword=故宫博物馆&epointx=116.39710&epointy=39.917200?key=GLFBZ-ZR2W6-76XSA-MF7CQ-GDJ6Z-6FB5K&referer=Dingdong';

+        },

+    },

+    created() {

+        // if (this.$route.query.location) {

+        //     this.location = this.$route.query.location;

+        // }

+    },

+};

+</script>

+<style lang='less' scoped>

+#iframe {

+    width: 100vw;

+    height: 100vh;

+}

+</style>