From 872710dc11cd6f7bfab79586b89f87ecbea221eb Mon Sep 17 00:00:00 2001 From: chargehand <2502468276@qq.com> Date: Sun, 13 Nov 2022 17:08:30 +0800 Subject: [PATCH] g --- .../miniprogram/pages/map/map.js | 77 -- .../miniprogram/pages/map/map.json | 3 - .../miniprogram/pages/map/map.wxml | 1 - .../miniprogram/pages/map/map.wxss | 0 .../map}/.eslintrc.js | 0 .../map}/README.md | 0 .../map}/cloud/useroption/config.json | 0 .../map}/cloud/useroption/index.js | 0 .../map}/cloud/useroption/package.json | 0 .../map}/miniprogram/app.js | 0 .../map}/miniprogram/app.json | 22 +- .../map}/miniprogram/app.wxss | 0 .../components/cloudTipModal/index.js | 0 .../components/cloudTipModal/index.json | 0 .../components/cloudTipModal/index.wxml | 0 .../components/cloudTipModal/index.wxss | 0 .../map}/miniprogram/envList.js | 0 .../map}/miniprogram/image/arrowright.png | Bin .../miniprogram/image/icon64_appwx_logo.png | Bin .../map}/miniprogram/image/locate.png | Bin .../map}/miniprogram/image/locateHL.png | Bin .../miniprogram/image/location-control.png | Bin .../map}/miniprogram/image/location.png | Bin .../map}/miniprogram/image/logo.png | Bin .../map}/miniprogram/image/map.png | Bin .../map}/miniprogram/image/map_active.png | Bin .../map}/miniprogram/image/navigator.jpg | Bin .../map}/miniprogram/image/pause.png | Bin .../map}/miniprogram/image/play.png | Bin .../map}/miniprogram/image/plus.png | Bin .../map}/miniprogram/image/record.png | Bin .../miniprogram/image/screenshot-marker.png | Bin .../map}/miniprogram/image/screenshot1.png | Bin .../map}/miniprogram/image/screenshot2.png | Bin .../map}/miniprogram/image/stop.png | Bin .../map}/miniprogram/image/trash.png | Bin .../map}/miniprogram/image/wechat.png | Bin .../map}/miniprogram/image/wechatHL.png | Bin .../map}/miniprogram/images/arrow.svg | 0 .../map}/miniprogram/images/database.png | Bin .../map}/miniprogram/images/deploy_step1.png | Bin .../map}/miniprogram/images/deploy_step2.png | Bin src/map/miniprogram/images/destination.jpeg | Bin 0 -> 18758 bytes .../map}/miniprogram/images/dh.jpg | Bin .../map}/miniprogram/images/gps.jpg | Bin .../map}/miniprogram/images/hxLocation.png | Bin .../map}/miniprogram/images/logo1.png | Bin src/map/miniprogram/images/src.jpeg | Bin 0 -> 21174 bytes .../map}/miniprogram/images/sxaubg.jpg | Bin src/map/miniprogram/images/tag.png | Bin 0 -> 1171 bytes .../map}/miniprogram/images/xm.jpg | Bin .../pages/Find directions/Find directions.js | 0 .../Find directions/Find directions.json | 0 .../Find directions/Find directions.wxml | 0 .../Find directions/Find directions.wxss | 0 .../pages/ManageAccount/ManageAccount.js | 0 .../pages/ManageAccount/ManageAccount.json | 0 .../pages/ManageAccount/ManageAccount.wxml | 0 .../pages/ManageAccount/ManageAccount.wxss | 0 .../ModifyInformation/ModifyInformation.js | 0 .../ModifyInformation/ModifyInformation.json | 0 .../ModifyInformation/ModifyInformation.wxml | 0 .../ModifyInformation/ModifyInformation.wxss | 0 .../miniprogram/pages/ModifyMap/ModifyMap.js | 0 .../pages/ModifyMap/ModifyMap.json | 0 .../pages/ModifyMap/ModifyMap.wxml | 0 .../pages/ModifyMap/ModifyMap.wxss | 0 .../map}/miniprogram/pages/adduser/index.js | 0 .../map}/miniprogram/pages/adduser/index.json | 0 .../map}/miniprogram/pages/adduser/index.wxml | 0 .../map}/miniprogram/pages/adduser/index.wxss | 0 .../map}/miniprogram/pages/addusers/index.js | 0 .../miniprogram/pages/addusers/index.json | 0 .../miniprogram/pages/addusers/index.wxml | 0 .../miniprogram/pages/addusers/index.wxss | 0 .../pages/adduserssuccess/index.js | 0 .../pages/adduserssuccess/index.json | 0 .../pages/adduserssuccess/index.wxml | 0 .../pages/adduserssuccess/index.wxss | 0 .../map}/miniprogram/pages/adlogin/adlogin.js | 0 .../miniprogram/pages/adlogin/adlogin.json | 0 .../miniprogram/pages/adlogin/adlogin.wxml | 0 .../miniprogram/pages/adlogin/adlogin.wxss | 0 .../map}/miniprogram/pages/delete/index.js | 0 .../map}/miniprogram/pages/delete/index.json | 0 .../map}/miniprogram/pages/delete/index.wxml | 0 .../map}/miniprogram/pages/delete/index.wxss | 0 .../miniprogram/pages/deleteuser/index.js | 0 .../miniprogram/pages/deleteuser/index.json | 0 .../miniprogram/pages/deleteuser/index.wxml | 0 .../miniprogram/pages/deleteuser/index.wxss | 0 .../miniprogram/pages/deleteusers/index.js | 0 .../miniprogram/pages/deleteusers/index.json | 0 .../miniprogram/pages/deleteusers/index.wxml | 0 .../miniprogram/pages/deleteusers/index.wxss | 0 .../pages/deleteuserssuccess/index.js | 0 .../pages/deleteuserssuccess/index.json | 0 .../pages/deleteuserssuccess/index.wxml | 0 .../pages/deleteuserssuccess/index.wxss | 0 .../pages/getWeather/getWeather.js | 36 + .../pages/getWeather/getWeather.json | 4 + .../pages/getWeather/getWeather.wxml | 10 + .../pages/getWeather/getWeather.wxss | 14 + .../map}/miniprogram/pages/home/home.js | 0 .../map}/miniprogram/pages/home/home.json | 0 .../map}/miniprogram/pages/home/home.wxml | 0 .../map}/miniprogram/pages/home/home.wxss | 0 .../map}/miniprogram/pages/index/index.js | 0 .../map}/miniprogram/pages/index/index.json | 0 .../map}/miniprogram/pages/index/index.wxml | 0 .../map}/miniprogram/pages/index/index.wxss | 0 .../map}/miniprogram/pages/index1/index1.js | 0 .../map}/miniprogram/pages/index1/index1.json | 0 .../map}/miniprogram/pages/index1/index1.wxml | 0 .../map}/miniprogram/pages/index1/index1.wxss | 0 .../miniprogram/pages/index_hjf/index_hjf.js | 0 .../pages/index_hjf/index_hjf.json | 0 .../pages/index_hjf/index_hjf.wxml | 0 .../pages/index_hjf/index_hjf.wxss | 0 .../miniprogram/pages/location/location.js | 0 .../miniprogram/pages/location/location.json | 0 .../miniprogram/pages/location/location.wxml | 0 .../miniprogram/pages/location/location.wxss | 0 .../map}/miniprogram/pages/login/login.js | 0 .../map}/miniprogram/pages/login/login.json | 0 .../map}/miniprogram/pages/login/login.wxml | 28 +- .../map}/miniprogram/pages/login/login.wxss | 0 .../map}/miniprogram/pages/login_1/login_1.js | 2 +- .../miniprogram/pages/login_1/login_1.json | 0 .../miniprogram/pages/login_1/login_1.wxml | 2 +- .../miniprogram/pages/login_1/login_1.wxss | 0 .../map}/miniprogram/pages/logs/logs.js | 0 .../map}/miniprogram/pages/logs/logs.wxml | 0 src/map/miniprogram/pages/map/map.js | 946 ++++++++++++++++++ src/map/miniprogram/pages/map/map.json | 4 + src/map/miniprogram/pages/map/map.wxml | 65 ++ src/map/miniprogram/pages/map/map.wxss | 137 +++ .../map}/miniprogram/pages/me/me.js | 0 .../map}/miniprogram/pages/me/me.json | 0 .../map}/miniprogram/pages/me/me.wxml | 0 .../map}/miniprogram/pages/me/me.wxss | 0 .../map}/miniprogram/pages/me1/me1.js | 0 .../map}/miniprogram/pages/me1/me1.json | 0 .../map}/miniprogram/pages/me1/me1.wxml | 0 .../map}/miniprogram/pages/me1/me1.wxss | 0 .../pages/selectusers(ID)/index.js | 0 .../pages/selectusers(ID)/index.json | 0 .../pages/selectusers(ID)/index.wxml | 0 .../pages/selectusers(ID)/index.wxss | 0 .../pages/selectusers(college)/index.js | 0 .../pages/selectusers(college)/index.json | 0 .../pages/selectusers(college)/index.wxml | 0 .../pages/selectusers(college)/index.wxss | 0 .../miniprogram/pages/selectusers/index.js | 0 .../miniprogram/pages/selectusers/index.json | 0 .../miniprogram/pages/selectusers/index.wxml | 0 .../miniprogram/pages/selectusers/index.wxss | 0 .../miniprogram/pages/selectuserss/index.js | 0 .../miniprogram/pages/selectuserss/index.json | 0 .../miniprogram/pages/selectuserss/index.wxml | 0 .../miniprogram/pages/selectuserss/index.wxss | 0 .../pages/selectuserssuccess/index.js | 0 .../pages/selectuserssuccess/index.json | 0 .../pages/selectuserssuccess/index.wxml | 0 .../pages/selectuserssuccess/index.wxss | 0 .../map}/miniprogram/pages/text/text.js | 0 .../map}/miniprogram/pages/text/text.json | 0 .../map}/miniprogram/pages/text/text.wxml | 0 .../map}/miniprogram/pages/text/text.wxss | 0 .../miniprogram/pages/updateusers/index.js | 0 .../miniprogram/pages/updateusers/index.json | 0 .../miniprogram/pages/updateusers/index.wxml | 0 .../miniprogram/pages/updateusers/index.wxss | 0 .../pages/updateuserssuccess/index.js | 0 .../pages/updateuserssuccess/index.json | 0 .../pages/updateuserssuccess/index.wxml | 0 .../pages/updateuserssuccess/index.wxss | 0 .../map}/miniprogram/sitemap.json | 0 .../miniprogram/utils/Find directions.wxml | 13 + src/map/miniprogram/utils/amap-wx.js | 1 + src/map/miniprogram/utils/location.js | 40 + src/map/miniprogram/utils/qqmap-wx-jssdk.js | 741 ++++++++++++++ .../miniprogram/utils/qqmap-wx-jssdk.min.js | 3 + .../map}/project.config.json | 2 +- .../map}/project.private.config.json | 2 +- .../map}/uploadCloudFunction.bat | 0 186 files changed, 2039 insertions(+), 114 deletions(-) delete mode 100644 scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/map/map.js delete mode 100644 scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/map/map.json delete mode 100644 scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/map/map.wxml delete mode 100644 scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/map/map.wxss rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/.eslintrc.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/README.md (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/cloud/useroption/config.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/cloud/useroption/index.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/cloud/useroption/package.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/app.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/app.json (82%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/app.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/components/cloudTipModal/index.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/components/cloudTipModal/index.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/components/cloudTipModal/index.wxml (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/components/cloudTipModal/index.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/envList.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/image/arrowright.png (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/image/icon64_appwx_logo.png (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/image/locate.png (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/image/locateHL.png (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/image/location-control.png (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/image/location.png (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/image/logo.png (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/image/map.png (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/image/map_active.png (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/image/navigator.jpg (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/image/pause.png (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/image/play.png (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/image/plus.png (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/image/record.png (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/image/screenshot-marker.png (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/image/screenshot1.png (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/image/screenshot2.png (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/image/stop.png (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/image/trash.png (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/image/wechat.png (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/image/wechatHL.png (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/images/arrow.svg (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/images/database.png (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/images/deploy_step1.png (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/images/deploy_step2.png (100%) create mode 100644 src/map/miniprogram/images/destination.jpeg rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/images/dh.jpg (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/images/gps.jpg (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/images/hxLocation.png (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/images/logo1.png (100%) create mode 100644 src/map/miniprogram/images/src.jpeg rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/images/sxaubg.jpg (100%) create mode 100644 src/map/miniprogram/images/tag.png rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/images/xm.jpg (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/Find directions/Find directions.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/Find directions/Find directions.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/Find directions/Find directions.wxml (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/Find directions/Find directions.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/ManageAccount/ManageAccount.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/ManageAccount/ManageAccount.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/ManageAccount/ManageAccount.wxml (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/ManageAccount/ManageAccount.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/ModifyInformation/ModifyInformation.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/ModifyInformation/ModifyInformation.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/ModifyInformation/ModifyInformation.wxml (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/ModifyInformation/ModifyInformation.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/ModifyMap/ModifyMap.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/ModifyMap/ModifyMap.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/ModifyMap/ModifyMap.wxml (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/ModifyMap/ModifyMap.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/adduser/index.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/adduser/index.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/adduser/index.wxml (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/adduser/index.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/addusers/index.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/addusers/index.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/addusers/index.wxml (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/addusers/index.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/adduserssuccess/index.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/adduserssuccess/index.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/adduserssuccess/index.wxml (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/adduserssuccess/index.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/adlogin/adlogin.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/adlogin/adlogin.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/adlogin/adlogin.wxml (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/adlogin/adlogin.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/delete/index.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/delete/index.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/delete/index.wxml (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/delete/index.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/deleteuser/index.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/deleteuser/index.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/deleteuser/index.wxml (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/deleteuser/index.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/deleteusers/index.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/deleteusers/index.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/deleteusers/index.wxml (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/deleteusers/index.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/deleteuserssuccess/index.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/deleteuserssuccess/index.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/deleteuserssuccess/index.wxml (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/deleteuserssuccess/index.wxss (100%) create mode 100644 src/map/miniprogram/pages/getWeather/getWeather.js create mode 100644 src/map/miniprogram/pages/getWeather/getWeather.json create mode 100644 src/map/miniprogram/pages/getWeather/getWeather.wxml create mode 100644 src/map/miniprogram/pages/getWeather/getWeather.wxss rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/home/home.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/home/home.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/home/home.wxml (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/home/home.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/index/index.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/index/index.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/index/index.wxml (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/index/index.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/index1/index1.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/index1/index1.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/index1/index1.wxml (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/index1/index1.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/index_hjf/index_hjf.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/index_hjf/index_hjf.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/index_hjf/index_hjf.wxml (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/index_hjf/index_hjf.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/location/location.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/location/location.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/location/location.wxml (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/location/location.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/login/login.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/login/login.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/login/login.wxml (61%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/login/login.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/login_1/login_1.js (97%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/login_1/login_1.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/login_1/login_1.wxml (71%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/login_1/login_1.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/logs/logs.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/logs/logs.wxml (100%) create mode 100644 src/map/miniprogram/pages/map/map.js create mode 100644 src/map/miniprogram/pages/map/map.json create mode 100644 src/map/miniprogram/pages/map/map.wxml create mode 100644 src/map/miniprogram/pages/map/map.wxss rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/me/me.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/me/me.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/me/me.wxml (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/me/me.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/me1/me1.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/me1/me1.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/me1/me1.wxml (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/me1/me1.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/selectusers(ID)/index.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/selectusers(ID)/index.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/selectusers(ID)/index.wxml (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/selectusers(ID)/index.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/selectusers(college)/index.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/selectusers(college)/index.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/selectusers(college)/index.wxml (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/selectusers(college)/index.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/selectusers/index.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/selectusers/index.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/selectusers/index.wxml (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/selectusers/index.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/selectuserss/index.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/selectuserss/index.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/selectuserss/index.wxml (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/selectuserss/index.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/selectuserssuccess/index.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/selectuserssuccess/index.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/selectuserssuccess/index.wxml (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/selectuserssuccess/index.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/text/text.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/text/text.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/text/text.wxml (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/text/text.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/updateusers/index.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/updateusers/index.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/updateusers/index.wxml (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/updateusers/index.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/updateuserssuccess/index.js (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/updateuserssuccess/index.json (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/updateuserssuccess/index.wxml (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/pages/updateuserssuccess/index.wxss (100%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/miniprogram/sitemap.json (100%) create mode 100644 src/map/miniprogram/utils/Find directions.wxml create mode 100644 src/map/miniprogram/utils/amap-wx.js create mode 100644 src/map/miniprogram/utils/location.js create mode 100644 src/map/miniprogram/utils/qqmap-wx-jssdk.js create mode 100644 src/map/miniprogram/utils/qqmap-wx-jssdk.min.js rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/project.config.json (98%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/project.private.config.json (93%) rename {scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本 => src/map}/uploadCloudFunction.bat (100%) diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/map/map.js b/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/map/map.js deleted file mode 100644 index 8e90359..0000000 --- a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/map/map.js +++ /dev/null @@ -1,77 +0,0 @@ -// map.js -let schoolData = require('../../resources/gis-school') -Page({ - data: { - centerX:113.3245211, - centerY:23.10229, - markers: [], - controls: [{ - id: 1, - iconPath: '/image/location-control.png', - position: { - left: 0, - top:10, - width: 40, - height: 40 - }, - clickable: true - }] - }, - onReady: function (e) { - // 使用 wx.createMapContext 获取 map 上下文 - this.mapCtx = wx.createMapContext('myMap') - }, - onLoad: function () { - console.log('地图定位！') - let that = this - wx.getLocation({ - type: 'gcj02', //返回可以用于wx.openLocation的经纬度 - success:(res)=>{ - console.log(res) - let latitude = res.latitude; - let longitude = res.longitude; - let marker=this.createMarker(res); - this.setData({ - centerX:longitude, - centerY:latitude, - markers:this.getSchoolMarkers() - }) - } - }); - }, - regionchange(e) { - console.log(e.type) - }, - markertap(e) { - console.log(e) - }, - controltap(e) { - console.log(e.controlId) - this.moveToLocation() - }, - getSchoolMarkers(){ - let markers=[]; - for(let item of schoolData){ - let marker=this.createMarker(item); - markers.push(marker) - } - return markers; - }, - moveToLocation: function () { - this.mapCtx.moveToLocation() - }, - createMarker(point){ - let latitude = point.latitude; - let longitude = point.longitude; - let marker= { - iconPath: "/image/location.png", - id:point.id || 0, - name:point.name || '', - latitude: latitude, - longitude: longitude, - width: 25, - height: 48 - }; - return marker; - } -}) \ No newline at end of file diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/map/map.json b/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/map/map.json deleted file mode 100644 index 08652e2..0000000 --- a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/map/map.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "navigationBarTitleText": "地图标注" -} \ No newline at end of file diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/map/map.wxml b/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/map/map.wxml deleted file mode 100644 index 1db24af..0000000 --- a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/map/map.wxml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/map/map.wxss b/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/map/map.wxss deleted file mode 100644 index e69de29..0000000 diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/.eslintrc.js b/src/map/.eslintrc.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/.eslintrc.js rename to src/map/.eslintrc.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/README.md b/src/map/README.md similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/README.md rename to src/map/README.md diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/cloud/useroption/config.json b/src/map/cloud/useroption/config.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/cloud/useroption/config.json rename to src/map/cloud/useroption/config.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/cloud/useroption/index.js b/src/map/cloud/useroption/index.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/cloud/useroption/index.js rename to src/map/cloud/useroption/index.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/cloud/useroption/package.json b/src/map/cloud/useroption/package.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/cloud/useroption/package.json rename to src/map/cloud/useroption/package.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/app.js b/src/map/miniprogram/app.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/app.js rename to src/map/miniprogram/app.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/app.json b/src/map/miniprogram/app.json similarity index 82% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/app.json rename to src/map/miniprogram/app.json index 7e4763b..cacc8d2 100644 --- a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/app.json +++ b/src/map/miniprogram/app.json @@ -25,7 +25,10 @@ "pages/index_hjf/index_hjf", "pages/index1/index1", "pages/adlogin/adlogin", - "pages/login_1/login_1" + "pages/login_1/login_1", + "pages/getWeather/getWeather", + "pages/map/map" + ], "window": { "backgroundColor": "#F6F6F6", @@ -40,15 +43,10 @@ "borderStyle": "black", "backgroundColor": "#ffffff", "list": [{ - "pagePath": "pages/location/location", + "pagePath": "pages/map/map", "iconPath": "image/wechat.png", "selectedIconPath": "image/locate.png", "text": "导航" - },{ - "pagePath": "pages/Find directions/Find directions", - "iconPath": "image/map.png", - "selectedIconPath": "image/map_active.png", - "text": "查询路线" },{ "pagePath": "pages/text/text", "iconPath": "image/locate.png", @@ -58,6 +56,14 @@ ] }, "debug": true, + "style": "v2", "sitemapLocation": "sitemap.json", - "style": "v2" + "requiredPrivateInfos":[ + "getLocation" + ], + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + } } \ No newline at end of file diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/app.wxss b/src/map/miniprogram/app.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/app.wxss rename to src/map/miniprogram/app.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/components/cloudTipModal/index.js b/src/map/miniprogram/components/cloudTipModal/index.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/components/cloudTipModal/index.js rename to src/map/miniprogram/components/cloudTipModal/index.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/components/cloudTipModal/index.json b/src/map/miniprogram/components/cloudTipModal/index.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/components/cloudTipModal/index.json rename to src/map/miniprogram/components/cloudTipModal/index.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/components/cloudTipModal/index.wxml b/src/map/miniprogram/components/cloudTipModal/index.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/components/cloudTipModal/index.wxml rename to src/map/miniprogram/components/cloudTipModal/index.wxml diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/components/cloudTipModal/index.wxss b/src/map/miniprogram/components/cloudTipModal/index.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/components/cloudTipModal/index.wxss rename to src/map/miniprogram/components/cloudTipModal/index.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/envList.js b/src/map/miniprogram/envList.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/envList.js rename to src/map/miniprogram/envList.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/arrowright.png b/src/map/miniprogram/image/arrowright.png similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/arrowright.png rename to src/map/miniprogram/image/arrowright.png diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/icon64_appwx_logo.png b/src/map/miniprogram/image/icon64_appwx_logo.png similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/icon64_appwx_logo.png rename to src/map/miniprogram/image/icon64_appwx_logo.png diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/locate.png b/src/map/miniprogram/image/locate.png similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/locate.png rename to src/map/miniprogram/image/locate.png diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/locateHL.png b/src/map/miniprogram/image/locateHL.png similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/locateHL.png rename to src/map/miniprogram/image/locateHL.png diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/location-control.png b/src/map/miniprogram/image/location-control.png similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/location-control.png rename to src/map/miniprogram/image/location-control.png diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/location.png b/src/map/miniprogram/image/location.png similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/location.png rename to src/map/miniprogram/image/location.png diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/logo.png b/src/map/miniprogram/image/logo.png similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/logo.png rename to src/map/miniprogram/image/logo.png diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/map.png b/src/map/miniprogram/image/map.png similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/map.png rename to src/map/miniprogram/image/map.png diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/map_active.png b/src/map/miniprogram/image/map_active.png similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/map_active.png rename to src/map/miniprogram/image/map_active.png diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/navigator.jpg b/src/map/miniprogram/image/navigator.jpg similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/navigator.jpg rename to src/map/miniprogram/image/navigator.jpg diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/pause.png b/src/map/miniprogram/image/pause.png similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/pause.png rename to src/map/miniprogram/image/pause.png diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/play.png b/src/map/miniprogram/image/play.png similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/play.png rename to src/map/miniprogram/image/play.png diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/plus.png b/src/map/miniprogram/image/plus.png similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/plus.png rename to src/map/miniprogram/image/plus.png diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/record.png b/src/map/miniprogram/image/record.png similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/record.png rename to src/map/miniprogram/image/record.png diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/screenshot-marker.png b/src/map/miniprogram/image/screenshot-marker.png similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/screenshot-marker.png rename to src/map/miniprogram/image/screenshot-marker.png diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/screenshot1.png b/src/map/miniprogram/image/screenshot1.png similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/screenshot1.png rename to src/map/miniprogram/image/screenshot1.png diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/screenshot2.png b/src/map/miniprogram/image/screenshot2.png similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/screenshot2.png rename to src/map/miniprogram/image/screenshot2.png diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/stop.png b/src/map/miniprogram/image/stop.png similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/stop.png rename to src/map/miniprogram/image/stop.png diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/trash.png b/src/map/miniprogram/image/trash.png similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/trash.png rename to src/map/miniprogram/image/trash.png diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/wechat.png b/src/map/miniprogram/image/wechat.png similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/wechat.png rename to src/map/miniprogram/image/wechat.png diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/wechatHL.png b/src/map/miniprogram/image/wechatHL.png similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/image/wechatHL.png rename to src/map/miniprogram/image/wechatHL.png diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/images/arrow.svg b/src/map/miniprogram/images/arrow.svg similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/images/arrow.svg rename to src/map/miniprogram/images/arrow.svg diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/images/database.png b/src/map/miniprogram/images/database.png similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/images/database.png rename to src/map/miniprogram/images/database.png diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/images/deploy_step1.png b/src/map/miniprogram/images/deploy_step1.png similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/images/deploy_step1.png rename to src/map/miniprogram/images/deploy_step1.png diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/images/deploy_step2.png b/src/map/miniprogram/images/deploy_step2.png similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/images/deploy_step2.png rename to src/map/miniprogram/images/deploy_step2.png diff --git a/src/map/miniprogram/images/destination.jpeg b/src/map/miniprogram/images/destination.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..b8aeb1f82c43d248809e2ed1d4b7224cc64e56f0 GIT binary patch literal 18758 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 literal 0 HcmV?d00001 diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/images/dh.jpg b/src/map/miniprogram/images/dh.jpg similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/images/dh.jpg rename to src/map/miniprogram/images/dh.jpg diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/images/gps.jpg b/src/map/miniprogram/images/gps.jpg similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/images/gps.jpg rename to src/map/miniprogram/images/gps.jpg diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/images/hxLocation.png b/src/map/miniprogram/images/hxLocation.png similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/images/hxLocation.png rename to src/map/miniprogram/images/hxLocation.png diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/images/logo1.png b/src/map/miniprogram/images/logo1.png similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/images/logo1.png rename to src/map/miniprogram/images/logo1.png diff --git a/src/map/miniprogram/images/src.jpeg b/src/map/miniprogram/images/src.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..bce35dd85ba74daf6cccaa13715e5a9051e16ea7 GIT binary patch literal 21174 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 literal 0 HcmV?d00001 diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/images/xm.jpg b/src/map/miniprogram/images/xm.jpg similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/images/xm.jpg rename to src/map/miniprogram/images/xm.jpg diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/Find directions/Find directions.js b/src/map/miniprogram/pages/Find directions/Find directions.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/Find directions/Find directions.js rename to src/map/miniprogram/pages/Find directions/Find directions.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/Find directions/Find directions.json b/src/map/miniprogram/pages/Find directions/Find directions.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/Find directions/Find directions.json rename to src/map/miniprogram/pages/Find directions/Find directions.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/Find directions/Find directions.wxml b/src/map/miniprogram/pages/Find directions/Find directions.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/Find directions/Find directions.wxml rename to src/map/miniprogram/pages/Find directions/Find directions.wxml diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/Find directions/Find directions.wxss b/src/map/miniprogram/pages/Find directions/Find directions.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/Find directions/Find directions.wxss rename to src/map/miniprogram/pages/Find directions/Find directions.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/ManageAccount/ManageAccount.js b/src/map/miniprogram/pages/ManageAccount/ManageAccount.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/ManageAccount/ManageAccount.js rename to src/map/miniprogram/pages/ManageAccount/ManageAccount.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/ManageAccount/ManageAccount.json b/src/map/miniprogram/pages/ManageAccount/ManageAccount.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/ManageAccount/ManageAccount.json rename to src/map/miniprogram/pages/ManageAccount/ManageAccount.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/ManageAccount/ManageAccount.wxml b/src/map/miniprogram/pages/ManageAccount/ManageAccount.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/ManageAccount/ManageAccount.wxml rename to src/map/miniprogram/pages/ManageAccount/ManageAccount.wxml diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/ManageAccount/ManageAccount.wxss b/src/map/miniprogram/pages/ManageAccount/ManageAccount.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/ManageAccount/ManageAccount.wxss rename to src/map/miniprogram/pages/ManageAccount/ManageAccount.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/ModifyInformation/ModifyInformation.js b/src/map/miniprogram/pages/ModifyInformation/ModifyInformation.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/ModifyInformation/ModifyInformation.js rename to src/map/miniprogram/pages/ModifyInformation/ModifyInformation.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/ModifyInformation/ModifyInformation.json b/src/map/miniprogram/pages/ModifyInformation/ModifyInformation.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/ModifyInformation/ModifyInformation.json rename to src/map/miniprogram/pages/ModifyInformation/ModifyInformation.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/ModifyInformation/ModifyInformation.wxml b/src/map/miniprogram/pages/ModifyInformation/ModifyInformation.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/ModifyInformation/ModifyInformation.wxml rename to src/map/miniprogram/pages/ModifyInformation/ModifyInformation.wxml diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/ModifyInformation/ModifyInformation.wxss b/src/map/miniprogram/pages/ModifyInformation/ModifyInformation.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/ModifyInformation/ModifyInformation.wxss rename to src/map/miniprogram/pages/ModifyInformation/ModifyInformation.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/ModifyMap/ModifyMap.js b/src/map/miniprogram/pages/ModifyMap/ModifyMap.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/ModifyMap/ModifyMap.js rename to src/map/miniprogram/pages/ModifyMap/ModifyMap.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/ModifyMap/ModifyMap.json b/src/map/miniprogram/pages/ModifyMap/ModifyMap.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/ModifyMap/ModifyMap.json rename to src/map/miniprogram/pages/ModifyMap/ModifyMap.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/ModifyMap/ModifyMap.wxml b/src/map/miniprogram/pages/ModifyMap/ModifyMap.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/ModifyMap/ModifyMap.wxml rename to src/map/miniprogram/pages/ModifyMap/ModifyMap.wxml diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/ModifyMap/ModifyMap.wxss b/src/map/miniprogram/pages/ModifyMap/ModifyMap.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/ModifyMap/ModifyMap.wxss rename to src/map/miniprogram/pages/ModifyMap/ModifyMap.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/adduser/index.js b/src/map/miniprogram/pages/adduser/index.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/adduser/index.js rename to src/map/miniprogram/pages/adduser/index.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/adduser/index.json b/src/map/miniprogram/pages/adduser/index.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/adduser/index.json rename to src/map/miniprogram/pages/adduser/index.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/adduser/index.wxml b/src/map/miniprogram/pages/adduser/index.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/adduser/index.wxml rename to src/map/miniprogram/pages/adduser/index.wxml diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/adduser/index.wxss b/src/map/miniprogram/pages/adduser/index.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/adduser/index.wxss rename to src/map/miniprogram/pages/adduser/index.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/addusers/index.js b/src/map/miniprogram/pages/addusers/index.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/addusers/index.js rename to src/map/miniprogram/pages/addusers/index.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/addusers/index.json b/src/map/miniprogram/pages/addusers/index.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/addusers/index.json rename to src/map/miniprogram/pages/addusers/index.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/addusers/index.wxml b/src/map/miniprogram/pages/addusers/index.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/addusers/index.wxml rename to src/map/miniprogram/pages/addusers/index.wxml diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/addusers/index.wxss b/src/map/miniprogram/pages/addusers/index.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/addusers/index.wxss rename to src/map/miniprogram/pages/addusers/index.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/adduserssuccess/index.js b/src/map/miniprogram/pages/adduserssuccess/index.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/adduserssuccess/index.js rename to src/map/miniprogram/pages/adduserssuccess/index.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/adduserssuccess/index.json b/src/map/miniprogram/pages/adduserssuccess/index.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/adduserssuccess/index.json rename to src/map/miniprogram/pages/adduserssuccess/index.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/adduserssuccess/index.wxml b/src/map/miniprogram/pages/adduserssuccess/index.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/adduserssuccess/index.wxml rename to src/map/miniprogram/pages/adduserssuccess/index.wxml diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/adduserssuccess/index.wxss b/src/map/miniprogram/pages/adduserssuccess/index.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/adduserssuccess/index.wxss rename to src/map/miniprogram/pages/adduserssuccess/index.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/adlogin/adlogin.js b/src/map/miniprogram/pages/adlogin/adlogin.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/adlogin/adlogin.js rename to src/map/miniprogram/pages/adlogin/adlogin.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/adlogin/adlogin.json b/src/map/miniprogram/pages/adlogin/adlogin.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/adlogin/adlogin.json rename to src/map/miniprogram/pages/adlogin/adlogin.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/adlogin/adlogin.wxml b/src/map/miniprogram/pages/adlogin/adlogin.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/adlogin/adlogin.wxml rename to src/map/miniprogram/pages/adlogin/adlogin.wxml diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/adlogin/adlogin.wxss b/src/map/miniprogram/pages/adlogin/adlogin.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/adlogin/adlogin.wxss rename to src/map/miniprogram/pages/adlogin/adlogin.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/delete/index.js b/src/map/miniprogram/pages/delete/index.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/delete/index.js rename to src/map/miniprogram/pages/delete/index.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/delete/index.json b/src/map/miniprogram/pages/delete/index.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/delete/index.json rename to src/map/miniprogram/pages/delete/index.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/delete/index.wxml b/src/map/miniprogram/pages/delete/index.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/delete/index.wxml rename to src/map/miniprogram/pages/delete/index.wxml diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/delete/index.wxss b/src/map/miniprogram/pages/delete/index.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/delete/index.wxss rename to src/map/miniprogram/pages/delete/index.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/deleteuser/index.js b/src/map/miniprogram/pages/deleteuser/index.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/deleteuser/index.js rename to src/map/miniprogram/pages/deleteuser/index.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/deleteuser/index.json b/src/map/miniprogram/pages/deleteuser/index.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/deleteuser/index.json rename to src/map/miniprogram/pages/deleteuser/index.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/deleteuser/index.wxml b/src/map/miniprogram/pages/deleteuser/index.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/deleteuser/index.wxml rename to src/map/miniprogram/pages/deleteuser/index.wxml diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/deleteuser/index.wxss b/src/map/miniprogram/pages/deleteuser/index.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/deleteuser/index.wxss rename to src/map/miniprogram/pages/deleteuser/index.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/deleteusers/index.js b/src/map/miniprogram/pages/deleteusers/index.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/deleteusers/index.js rename to src/map/miniprogram/pages/deleteusers/index.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/deleteusers/index.json b/src/map/miniprogram/pages/deleteusers/index.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/deleteusers/index.json rename to src/map/miniprogram/pages/deleteusers/index.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/deleteusers/index.wxml b/src/map/miniprogram/pages/deleteusers/index.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/deleteusers/index.wxml rename to src/map/miniprogram/pages/deleteusers/index.wxml diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/deleteusers/index.wxss b/src/map/miniprogram/pages/deleteusers/index.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/deleteusers/index.wxss rename to src/map/miniprogram/pages/deleteusers/index.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/deleteuserssuccess/index.js b/src/map/miniprogram/pages/deleteuserssuccess/index.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/deleteuserssuccess/index.js rename to src/map/miniprogram/pages/deleteuserssuccess/index.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/deleteuserssuccess/index.json b/src/map/miniprogram/pages/deleteuserssuccess/index.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/deleteuserssuccess/index.json rename to src/map/miniprogram/pages/deleteuserssuccess/index.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/deleteuserssuccess/index.wxml b/src/map/miniprogram/pages/deleteuserssuccess/index.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/deleteuserssuccess/index.wxml rename to src/map/miniprogram/pages/deleteuserssuccess/index.wxml diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/deleteuserssuccess/index.wxss b/src/map/miniprogram/pages/deleteuserssuccess/index.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/deleteuserssuccess/index.wxss rename to src/map/miniprogram/pages/deleteuserssuccess/index.wxss diff --git a/src/map/miniprogram/pages/getWeather/getWeather.js b/src/map/miniprogram/pages/getWeather/getWeather.js new file mode 100644 index 0000000..25b720e --- /dev/null +++ b/src/map/miniprogram/pages/getWeather/getWeather.js @@ -0,0 +1,36 @@ +var amapFile = require('../../utils/amap-wx.js'); +var app = getApp(); + +Page({ + data: { + city:"天津", + weather:"晴", + temperature:"10", + windpower:"18级", + winddirection:"南", + humidity:"5", + }, + onLoad: function(options){ + var that = this; + var myAmapFun = new amapFile.AMapWX({key:'78a99442f6e5cad3bfb832e33bdcf629'}); + myAmapFun.getWeather({ + success: function(res){ + //成功回调 + console.log("调取天气接口成功", res) + // 一定要在接口里进行赋值，否则接口数据还未返回，页面就已经将数据取走进行显示 + that.setData({ + city: res.city.data, + weather: res.weather.data, + temperature: res.temperature.data, + windpower: res.windpower.data, + winddirection: res.winddirection.data, + humidity: res.humidity.data + }) + }, + fail: function(info){ + //失败回调 + console.log(info) + } + }) + } +}) \ No newline at end of file diff --git a/src/map/miniprogram/pages/getWeather/getWeather.json b/src/map/miniprogram/pages/getWeather/getWeather.json new file mode 100644 index 0000000..f9e31e9 --- /dev/null +++ b/src/map/miniprogram/pages/getWeather/getWeather.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "天气", + "usingComponents": {} +} \ No newline at end of file diff --git a/src/map/miniprogram/pages/getWeather/getWeather.wxml b/src/map/miniprogram/pages/getWeather/getWeather.wxml new file mode 100644 index 0000000..70176bf --- /dev/null +++ b/src/map/miniprogram/pages/getWeather/getWeather.wxml @@ -0,0 +1,10 @@ + + + + 城市:{{city}} + 天气：{{weather}} + 温度：{{temperature}} + 风力：{{windpower}} + 风向：{{winddirection}} + 湿度：{{humidity}} + \ No newline at end of file diff --git a/src/map/miniprogram/pages/getWeather/getWeather.wxss b/src/map/miniprogram/pages/getWeather/getWeather.wxss new file mode 100644 index 0000000..693eaa5 --- /dev/null +++ b/src/map/miniprogram/pages/getWeather/getWeather.wxss @@ -0,0 +1,14 @@ +/* pages/getWeather/getWeather.wxss */ + +.container{ + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + background: #4D8AD7; + color: #fff; + font-size: 18px; + padding-top: 200rpx; + padding-left: 150rpx; +} \ No newline at end of file diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/home/home.js b/src/map/miniprogram/pages/home/home.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/home/home.js rename to src/map/miniprogram/pages/home/home.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/home/home.json b/src/map/miniprogram/pages/home/home.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/home/home.json rename to src/map/miniprogram/pages/home/home.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/home/home.wxml b/src/map/miniprogram/pages/home/home.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/home/home.wxml rename to src/map/miniprogram/pages/home/home.wxml diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/home/home.wxss b/src/map/miniprogram/pages/home/home.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/home/home.wxss rename to src/map/miniprogram/pages/home/home.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/index/index.js b/src/map/miniprogram/pages/index/index.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/index/index.js rename to src/map/miniprogram/pages/index/index.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/index/index.json b/src/map/miniprogram/pages/index/index.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/index/index.json rename to src/map/miniprogram/pages/index/index.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/index/index.wxml b/src/map/miniprogram/pages/index/index.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/index/index.wxml rename to src/map/miniprogram/pages/index/index.wxml diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/index/index.wxss b/src/map/miniprogram/pages/index/index.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/index/index.wxss rename to src/map/miniprogram/pages/index/index.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/index1/index1.js b/src/map/miniprogram/pages/index1/index1.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/index1/index1.js rename to src/map/miniprogram/pages/index1/index1.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/index1/index1.json b/src/map/miniprogram/pages/index1/index1.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/index1/index1.json rename to src/map/miniprogram/pages/index1/index1.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/index1/index1.wxml b/src/map/miniprogram/pages/index1/index1.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/index1/index1.wxml rename to src/map/miniprogram/pages/index1/index1.wxml diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/index1/index1.wxss b/src/map/miniprogram/pages/index1/index1.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/index1/index1.wxss rename to src/map/miniprogram/pages/index1/index1.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/index_hjf/index_hjf.js b/src/map/miniprogram/pages/index_hjf/index_hjf.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/index_hjf/index_hjf.js rename to src/map/miniprogram/pages/index_hjf/index_hjf.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/index_hjf/index_hjf.json b/src/map/miniprogram/pages/index_hjf/index_hjf.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/index_hjf/index_hjf.json rename to src/map/miniprogram/pages/index_hjf/index_hjf.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/index_hjf/index_hjf.wxml b/src/map/miniprogram/pages/index_hjf/index_hjf.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/index_hjf/index_hjf.wxml rename to src/map/miniprogram/pages/index_hjf/index_hjf.wxml diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/index_hjf/index_hjf.wxss b/src/map/miniprogram/pages/index_hjf/index_hjf.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/index_hjf/index_hjf.wxss rename to src/map/miniprogram/pages/index_hjf/index_hjf.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/location/location.js b/src/map/miniprogram/pages/location/location.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/location/location.js rename to src/map/miniprogram/pages/location/location.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/location/location.json b/src/map/miniprogram/pages/location/location.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/location/location.json rename to src/map/miniprogram/pages/location/location.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/location/location.wxml b/src/map/miniprogram/pages/location/location.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/location/location.wxml rename to src/map/miniprogram/pages/location/location.wxml diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/location/location.wxss b/src/map/miniprogram/pages/location/location.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/location/location.wxss rename to src/map/miniprogram/pages/location/location.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/login/login.js b/src/map/miniprogram/pages/login/login.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/login/login.js rename to src/map/miniprogram/pages/login/login.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/login/login.json b/src/map/miniprogram/pages/login/login.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/login/login.json rename to src/map/miniprogram/pages/login/login.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/login/login.wxml b/src/map/miniprogram/pages/login/login.wxml similarity index 61% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/login/login.wxml rename to src/map/miniprogram/pages/login/login.wxml index b8f69d0..5be0fb6 100644 --- a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/login/login.wxml +++ b/src/map/miniprogram/pages/login/login.wxml @@ -1,26 +1,6 @@ - + - @@ -36,4 +16,10 @@ 注册,忘记密码请联系qq:xx +--> + + + + + \ No newline at end of file diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/login/login.wxss b/src/map/miniprogram/pages/login/login.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/login/login.wxss rename to src/map/miniprogram/pages/login/login.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/login_1/login_1.js b/src/map/miniprogram/pages/login_1/login_1.js similarity index 97% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/login_1/login_1.js rename to src/map/miniprogram/pages/login_1/login_1.js index e00ec9d..5bcd6b8 100644 --- a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/login_1/login_1.js +++ b/src/map/miniprogram/pages/login_1/login_1.js @@ -68,7 +68,7 @@ Page({ if (mima == user.mima) { console.log('登陆成功') wx.reLaunch({ - url: '../Find directions/Find directions', + url: '../map/map', }) wx.showToast({ title: '登陆成功', diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/login_1/login_1.json b/src/map/miniprogram/pages/login_1/login_1.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/login_1/login_1.json rename to src/map/miniprogram/pages/login_1/login_1.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/login_1/login_1.wxml b/src/map/miniprogram/pages/login_1/login_1.wxml similarity index 71% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/login_1/login_1.wxml rename to src/map/miniprogram/pages/login_1/login_1.wxml index 6cdf64c..49b7eae 100644 --- a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/login_1/login_1.wxml +++ b/src/map/miniprogram/pages/login_1/login_1.wxml @@ -2,7 +2,7 @@ 输入账号 输入密码 - + diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/login_1/login_1.wxss b/src/map/miniprogram/pages/login_1/login_1.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/login_1/login_1.wxss rename to src/map/miniprogram/pages/login_1/login_1.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/logs/logs.js b/src/map/miniprogram/pages/logs/logs.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/logs/logs.js rename to src/map/miniprogram/pages/logs/logs.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/logs/logs.wxml b/src/map/miniprogram/pages/logs/logs.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/logs/logs.wxml rename to src/map/miniprogram/pages/logs/logs.wxml diff --git a/src/map/miniprogram/pages/map/map.js b/src/map/miniprogram/pages/map/map.js new file mode 100644 index 0000000..5bafa37 --- /dev/null +++ b/src/map/miniprogram/pages/map/map.js @@ -0,0 +1,946 @@ +var amapFile = require('../../utils/amap-wx.js'); +var QQMapWX = require('../../utils/qqmap-wx-jssdk.js'); +var app = getApp(); + +Page({ + data:{ + location_table:[{ + name:"中国民航大学", + longitude: 117.35002, + latitude: 39.11198, + },{ + name:"中国民航大学北苑南门", + longitude: 117.34731127236174, + latitude: 39.10971874275899, + },{ + name:"中国民航大学北苑西门", + longitude: 117.34878648731993, + latitude: 39.11463444059635, + },{ + name:"中国民航大学北苑北门", + longitude: 117.3517905614166, + latitude: 39.11623685901714, + },{ + name:"中国民航大学北苑操场", + longitude: 117.35193003628538, + latitude: 39.11286133256378, + },{ + name:"中国民航大学北苑体育场", + longitude: 117.35319067452238, + latitude: 39.11298620078748, + },{ + name:"中国民航大学北苑游泳馆", + longitude: 117.35225190136717, + latitude: 39.113331668385676, + },{ + name:"中国民航大学北教一", + longitude: 117.34819103691862, + latitude: 39.111167265141056, + },{ + name:"中国民航大学北教四", + longitude: 117.35005785439299, + latitude: 39.11041387072548, + },{ + name:"中国民航大学北教五", + longitude: 117.348979606369, + latitude: 39.110580367422955, + },{ + name:"中国民航大学北二十一宿舍楼", + longitude: 117.3529251358299, + latitude: 39.111835323611125, + },{ + name:"中国民航大学北一食堂", + longitude: 117.351141466835, + latitude: 39.11229109820452, + },{ + name:"中国民航大学北四食堂", + longitude: 117.34990228627012, + latitude: 39.11351064491374, + },{ + name:"中国民航大学北五食堂", + longitude: 117.35222507927702, + latitude: 39.114359736647195, + },{ + name:"中国民航大学北苑礼堂", + longitude: 117.34922100518034, + latitude: 39.11285300801614, + },{ + name:"中国民航大学文化艺术教育中心", + longitude: 117.35004712555693, + latitude: 39.11260327087659, + },{ + name:"中国民航大学北区实验大楼", + longitude: 117.35049773667143, + latitude: 39.111554365211944, + },{ + name:"中国民航大学南一教学楼", + longitude: 117.35323358986662, + latitude: 39.10597242612648, + },{ + name:"中国民航大学南二教学楼", + longitude: 117.35212851975248, + latitude: 39.10647610917062, + },{ + name:"中国民航大学南三教学楼", + longitude: 117.35269714806364, + latitude: 39.10509825692947, + },{ + name:"中国民航大学南四教学楼", + longitude: 117.35289563153074, + latitude: 39.104253216397744, + },{ + name:"中国民航大学南五教学楼", + longitude: 117.35373784516142, + latitude: 39.10181794441759, + },{ + name:"中国民航大学南三教学楼", + longitude: 117.35483755085752, + latitude: 39.1078414467564, + },{ + name:"中国民航大学南苑北门", + longitude: 117.35484023306654, + latitude: 39.10783936546857, + },{ + name:"中国民航大学南苑体育馆", + longitude: 117.35579778168486, + latitude: 39.10689653606183, + },{ + name:"中国民航大学南苑图书馆", + longitude: 117.35313703034208, + latitude: 39.10710050464082, + },{ + name:"中国民航大学南苑田径场西", + longitude: 117.3557870528488, + latitude: 39.104977537473204, + },{ + name:"中国民航大学南苑田径场东", + longitude: 117.35731054756926, + latitude: 39.105185674336425, + },{ + name:"中国民航大学南苑篮球场", + longitude: 117.3557870528488, + latitude: 39.1060598424514, + },{ + name:"中国民航大学南苑排球场", + longitude: 117.35521842453764, + latitude: 39.10398679758133, + },{ + name:"中国民航大学南苑网球场", + longitude: 117.35609818909452, + latitude: 39.10344563125516, + },{ + name:"中国民航大学南苑羽乒馆", + longitude: 117.35184957001493, + latitude: 39.105310556161044, + },{ + name:"中国民航大学南苑明德馆", + longitude: 117.35486437294767, + latitude: 39.10133087992974, + },{ + name:"中国民航大学南一食堂", + longitude: 117.35289026711271, + latitude: 39.10357884181467, + },{ + name:"中国民航大学南二食堂", + longitude: 117.35157598469542, + latitude: 39.1017846409744, + },{ + name:"中国民航大学南三食堂", + longitude: 117.35169400189207, + latitude: 39.10357467898941, + },{ + name:"中国民航大学南一宿舍楼", + longitude: 117.3534642598419, + latitude: 39.10355386485458, + },{ + name:"中国民航大学南苑菜鸟驿站", + longitude: 117.35596944306181, + latitude: 39.10322500071765, + }], + src: { + longitude: 1.1, + latitude: 1.1, + }, + des: { + longitude: 1.1, + latitude: 1.1, + }, + src_location: "", + des_location: "", + // 初始展示时的经纬度 + longitude: 117.35002, + latitude: 39.11198, + // 初始的缩放比例 + scale:15, + // 统一设置地图 + setting : { + skew: 0, + rotate: 0, + showLocation: false, + showScale: false, + subKey: '', + layerStyle: 1, + enableZoom: true, + enableScroll: true, + enableRotate: false, + showCompass: false, + enable3D: false, + enableOverlooking: false, + enableSatellite: false, + enableTraffic: false, + }, + // 初始化显示地标 + markers:[{ + //id: 1, + longitude: 117.35002, + latitude: 39.11198, + title:"中国民航大学", + iconPath:"../../images/tag.png", + width: 20, + height: 30 + }], + // 显示按钮是否被点击 + type_door: "type", + type_mess: "type", + type_bathroom: "type", + type_print_shop: "type", + type_supermarket: "type", + type_post_station: "type", + type_library: "type", + type_barber_shop: "type", + type_playground: "type", + type_gymnasium: "type", + type_cancel: "type", + distance: '', + cost: '', + polyline: [] + }, + + // 界面出现即执行 + onLoad:function(options){ + this.setData({ + // 仅设置的属性会生效，其它的不受影响 + setting: { + // 展示目前位置 + showLocation: true, + // 右上角指南针 + showCompass: true, + // 左下角比例尺 + showScale: true, + enable3D: true, + //enableTraffic: true + } + }) + }, + + // 输入框获取出发地 + getSrc_location: function(event){ + this.setData({ + src_location: event.detail.value + }) + console.log("获取出发地调用成功", event) + // 对内部使用变量重新赋值，否则无法使用 + let location_table = this.data.location_table + let src_location = this.data.src_location + var that = this; + var qqmapsdk = new QQMapWX({ + key: 'MVJBZ-KOICX-B6W4G-TH5QR-MKW2E-5YBJA' //必需，自己申请 + }) + // geoCoder 根据地址获取经纬度 + qqmapsdk.geocoder({ + address: this.data.src_location, //需要转换为经纬度的地址 + success: function (res) { //返回的数据里面有该地址的经纬度 + console.log("qqmapsdk.geocoder 接口调用成功返回的回调", res) + that.data.src.longitude = res.result.location.lng; + that.data.src.latitude = res.result.location.lat; + }, + fail: function (res) { + console.log("qqmapsdk.geocoder 接口调用失败返回的回调,准备查询本地映射表", res) + // 查询映射表 + // let location = app.globalData.location + // let location = this.data.location + let i + let length = location_table.length + for (i=0; i +出发地： + + +目的地： + + + + + + + + + + + + + + {{distance}} + {{cost}} + 详情 + + + + + + {{index==1? '校门':''}} + {{index==2? '食堂':''}} + {{index==3? '浴室':''}} + {{index==4? '打印店':''}} + {{index==5? '超市':''}} + {{index==6? '菜鸟驿站':''}} + {{index==7? '图书馆':''}} + {{index==8? '理发店':''}} + {{index==9? '操场':''}} + {{index==10? '体育馆':''}} + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/map/miniprogram/pages/map/map.wxss b/src/map/miniprogram/pages/map/map.wxss new file mode 100644 index 0000000..0618695 --- /dev/null +++ b/src/map/miniprogram/pages/map/map.wxss @@ -0,0 +1,137 @@ +/* 显示位置按钮 */ +/* map { + width: 750rpx; +} */ + +/* .show_all { + position: absolute; + right: 100rpx; + bottom: 100rpx; + color: rgb(62, 207, 142); + background-color: rgb(255, 255, 255); + box-shadow: 0 4px 6px rgba(50, 50, 93, .11), 0 1px 3px rgba(0, 0, 0, .08); +} */ + +/* .cover { + color: #fff; + height: 100rpx; + width: 220rpx; + line-height: 100rpx; + font-size: 35rpx; + text-align: center; + position: absolute; + left: 100rpx; + bottom: 100rpx; + border-radius: 50rpx; + text-shadow: 0 1px 3px rgba(36, 180, 126, .4); +} */ + +/* .add_me { + font-size: 30rpx; + color: #fff; + background-color: rgb(62, 207, 142); + width: 450rpx; + padding: 20rpx; + position: absolute; + right: 10rpx; + top: 20rpx; + text-align: center; +} */ + +/* .up { + position: absolute; + right: 150rpx; + top: 5rpx; + border-right: 20rpx solid transparent; + border-left: 20rpx solid transparent; + border-bottom: 20rpx solid rgb(62, 207, 142); +} */ + +/* .getLocation { + position: absolute; + left: 20rpx; + bottom: 250rpx; + text-align: center; + width: 20px; + background-color:rgb(255, 255, 255,0.9); + padding: 13px; + box-shadow: 1px 2px 3px #999999; + border-radius: 100px; +} */ + + /* .list { + position: absolute; + left: 20rpx; + bottom: 360rpx; + text-align: center; + width: 20px; + background-color: rgb(62, 207, 142,0.9); + padding: 13px; + box-shadow: 1px 2px 3px #999999; + border-radius: 100px; +} */ + +.tab-h{ + height: 400rpx; + width: 140rpx; + bottom:250rpx; + right: 12px; + box-sizing: border-box; + overflow: hidden; + line-height: 80rpx; + background: rgba(255, 255, 255, 0.9); + font-size: 16px; + white-space: nowrap; + position: fixed; + z-index: 99; + border-radius: 10px; +} +.chouse_type { + font-size: 32rpx; + color: rgb(62, 207, 142); + text-align: center; +} +.type { + font-size: 32rpx; + + color: rgb(192, 192, 192); + text-align: center; +} +scroll-view ::-webkit-scrollbar { + width: 0; + height: 0; + color: transparent; + display: none; +} + +/***************************************************************/ + +.text_box{ + position:absolute; + height: 90px; + bottom: 0px; + left: 0px; + right: 0px; +} +.text_box .text{ + margin: 15px; +} +.detail_button{ + position:absolute; + bottom: 30px; + right: 10px; + padding: 3px 5px; + color: #fff; + background: #0091ff; + width:50px; + text-align:center; + border-radius:5px; +} + +.weather_button{ + bottom:150rpx; + right: 12px; + font-size: 16px; + position: fixed; +} + diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/me/me.js b/src/map/miniprogram/pages/me/me.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/me/me.js rename to src/map/miniprogram/pages/me/me.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/me/me.json b/src/map/miniprogram/pages/me/me.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/me/me.json rename to src/map/miniprogram/pages/me/me.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/me/me.wxml b/src/map/miniprogram/pages/me/me.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/me/me.wxml rename to src/map/miniprogram/pages/me/me.wxml diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/me/me.wxss b/src/map/miniprogram/pages/me/me.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/me/me.wxss rename to src/map/miniprogram/pages/me/me.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/me1/me1.js b/src/map/miniprogram/pages/me1/me1.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/me1/me1.js rename to src/map/miniprogram/pages/me1/me1.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/me1/me1.json b/src/map/miniprogram/pages/me1/me1.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/me1/me1.json rename to src/map/miniprogram/pages/me1/me1.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/me1/me1.wxml b/src/map/miniprogram/pages/me1/me1.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/me1/me1.wxml rename to src/map/miniprogram/pages/me1/me1.wxml diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/me1/me1.wxss b/src/map/miniprogram/pages/me1/me1.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/me1/me1.wxss rename to src/map/miniprogram/pages/me1/me1.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectusers(ID)/index.js b/src/map/miniprogram/pages/selectusers(ID)/index.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectusers(ID)/index.js rename to src/map/miniprogram/pages/selectusers(ID)/index.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectusers(ID)/index.json b/src/map/miniprogram/pages/selectusers(ID)/index.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectusers(ID)/index.json rename to src/map/miniprogram/pages/selectusers(ID)/index.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectusers(ID)/index.wxml b/src/map/miniprogram/pages/selectusers(ID)/index.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectusers(ID)/index.wxml rename to src/map/miniprogram/pages/selectusers(ID)/index.wxml diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectusers(ID)/index.wxss b/src/map/miniprogram/pages/selectusers(ID)/index.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectusers(ID)/index.wxss rename to src/map/miniprogram/pages/selectusers(ID)/index.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectusers(college)/index.js b/src/map/miniprogram/pages/selectusers(college)/index.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectusers(college)/index.js rename to src/map/miniprogram/pages/selectusers(college)/index.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectusers(college)/index.json b/src/map/miniprogram/pages/selectusers(college)/index.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectusers(college)/index.json rename to src/map/miniprogram/pages/selectusers(college)/index.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectusers(college)/index.wxml b/src/map/miniprogram/pages/selectusers(college)/index.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectusers(college)/index.wxml rename to src/map/miniprogram/pages/selectusers(college)/index.wxml diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectusers(college)/index.wxss b/src/map/miniprogram/pages/selectusers(college)/index.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectusers(college)/index.wxss rename to src/map/miniprogram/pages/selectusers(college)/index.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectusers/index.js b/src/map/miniprogram/pages/selectusers/index.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectusers/index.js rename to src/map/miniprogram/pages/selectusers/index.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectusers/index.json b/src/map/miniprogram/pages/selectusers/index.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectusers/index.json rename to src/map/miniprogram/pages/selectusers/index.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectusers/index.wxml b/src/map/miniprogram/pages/selectusers/index.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectusers/index.wxml rename to src/map/miniprogram/pages/selectusers/index.wxml diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectusers/index.wxss b/src/map/miniprogram/pages/selectusers/index.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectusers/index.wxss rename to src/map/miniprogram/pages/selectusers/index.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectuserss/index.js b/src/map/miniprogram/pages/selectuserss/index.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectuserss/index.js rename to src/map/miniprogram/pages/selectuserss/index.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectuserss/index.json b/src/map/miniprogram/pages/selectuserss/index.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectuserss/index.json rename to src/map/miniprogram/pages/selectuserss/index.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectuserss/index.wxml b/src/map/miniprogram/pages/selectuserss/index.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectuserss/index.wxml rename to src/map/miniprogram/pages/selectuserss/index.wxml diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectuserss/index.wxss b/src/map/miniprogram/pages/selectuserss/index.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectuserss/index.wxss rename to src/map/miniprogram/pages/selectuserss/index.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectuserssuccess/index.js b/src/map/miniprogram/pages/selectuserssuccess/index.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectuserssuccess/index.js rename to src/map/miniprogram/pages/selectuserssuccess/index.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectuserssuccess/index.json b/src/map/miniprogram/pages/selectuserssuccess/index.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectuserssuccess/index.json rename to src/map/miniprogram/pages/selectuserssuccess/index.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectuserssuccess/index.wxml b/src/map/miniprogram/pages/selectuserssuccess/index.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectuserssuccess/index.wxml rename to src/map/miniprogram/pages/selectuserssuccess/index.wxml diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectuserssuccess/index.wxss b/src/map/miniprogram/pages/selectuserssuccess/index.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/selectuserssuccess/index.wxss rename to src/map/miniprogram/pages/selectuserssuccess/index.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/text/text.js b/src/map/miniprogram/pages/text/text.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/text/text.js rename to src/map/miniprogram/pages/text/text.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/text/text.json b/src/map/miniprogram/pages/text/text.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/text/text.json rename to src/map/miniprogram/pages/text/text.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/text/text.wxml b/src/map/miniprogram/pages/text/text.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/text/text.wxml rename to src/map/miniprogram/pages/text/text.wxml diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/text/text.wxss b/src/map/miniprogram/pages/text/text.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/text/text.wxss rename to src/map/miniprogram/pages/text/text.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/updateusers/index.js b/src/map/miniprogram/pages/updateusers/index.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/updateusers/index.js rename to src/map/miniprogram/pages/updateusers/index.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/updateusers/index.json b/src/map/miniprogram/pages/updateusers/index.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/updateusers/index.json rename to src/map/miniprogram/pages/updateusers/index.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/updateusers/index.wxml b/src/map/miniprogram/pages/updateusers/index.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/updateusers/index.wxml rename to src/map/miniprogram/pages/updateusers/index.wxml diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/updateusers/index.wxss b/src/map/miniprogram/pages/updateusers/index.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/updateusers/index.wxss rename to src/map/miniprogram/pages/updateusers/index.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/updateuserssuccess/index.js b/src/map/miniprogram/pages/updateuserssuccess/index.js similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/updateuserssuccess/index.js rename to src/map/miniprogram/pages/updateuserssuccess/index.js diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/updateuserssuccess/index.json b/src/map/miniprogram/pages/updateuserssuccess/index.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/updateuserssuccess/index.json rename to src/map/miniprogram/pages/updateuserssuccess/index.json diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/updateuserssuccess/index.wxml b/src/map/miniprogram/pages/updateuserssuccess/index.wxml similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/updateuserssuccess/index.wxml rename to src/map/miniprogram/pages/updateuserssuccess/index.wxml diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/updateuserssuccess/index.wxss b/src/map/miniprogram/pages/updateuserssuccess/index.wxss similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/pages/updateuserssuccess/index.wxss rename to src/map/miniprogram/pages/updateuserssuccess/index.wxss diff --git a/scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/sitemap.json b/src/map/miniprogram/sitemap.json similarity index 100% rename from scr/wechat-weapp-mapdemo-master/wechat-weapp-mapdemo-master - 副本/miniprogram/sitemap.json rename to src/map/miniprogram/sitemap.json diff --git a/src/map/miniprogram/utils/Find directions.wxml b/src/map/miniprogram/utils/Find directions.wxml new file mode 100644 index 0000000..088eb73 --- /dev/null +++ b/src/map/miniprogram/utils/Find directions.wxml @@ -0,0 +1,13 @@ +出发地： + + +目的地： + + + + + + + \ No newline at end of file diff --git a/src/map/miniprogram/utils/amap-wx.js b/src/map/miniprogram/utils/amap-wx.js new file mode 100644 index 0000000..c8dd42d --- /dev/null +++ b/src/map/miniprogram/utils/amap-wx.js @@ -0,0 +1 @@ +function AMapWX(a) { this.key = a.key, this.requestConfig = { key: a.key, s: "rsx", platform: "WXJS", appname: a.key, sdkversion: "1.2.0", logversion: "2.0" } } AMapWX.prototype.getWxLocation = function (a, b) { wx.getLocation({ type: "gcj02", success: function (a) { var c = a.longitude + "," + a.latitude; wx.setStorage({ key: "userLocation", data: c }), b(c) }, fail: function (c) { wx.getStorage({ key: "userLocation", success: function (a) { a.data && b(a.data) } }), a.fail({ errCode: "0", errMsg: c.errMsg || "" }) } }) }, AMapWX.prototype.getRegeo = function (a) { function c(c) { var d = b.requestConfig; wx.request({ url: "https://restapi.amap.com/v3/geocode/regeo", data: { key: b.key, location: c, extensions: "all", s: d.s, platform: d.platform, appname: b.key, sdkversion: d.sdkversion, logversion: d.logversion }, method: "GET", header: { "content-type": "application/json" }, success: function (b) { var d, e, f, g, h, i, j, k; b.data.status && "1" == b.data.status ? (d = b.data.regeocode, e = d.addressComponent, f = [], g = d.roads[0].name + "附近", h = c.split(",")[0], i = c.split(",")[1], d.pois && d.pois[0] && (g = d.pois[0].name + "附近", j = d.pois[0].location, j && (h = parseFloat(j.split(",")[0]), i = parseFloat(j.split(",")[1]))), e.provice && f.push(e.provice), e.city && f.push(e.city), e.district && f.push(e.district), e.streetNumber && e.streetNumber.street && e.streetNumber.number ? (f.push(e.streetNumber.street), f.push(e.streetNumber.number)) : f.push(d.roads[0].name), f = f.join(""), k = [{ iconPath: a.iconPath, width: a.iconWidth, height: a.iconHeight, name: f, desc: g, longitude: h, latitude: i, id: 0, regeocodeData: d }], a.success(k)) : a.fail({ errCode: b.data.infocode, errMsg: b.data.info }) }, fail: function (b) { a.fail({ errCode: "0", errMsg: b.errMsg || "" }) } }) } var b = this; a.location ? c(a.location) : b.getWxLocation(a, function (a) { c(a) }) }, AMapWX.prototype.getWeather = function (a) { function d(d) { var e = "base"; a.type && "forecast" == a.type && (e = "all"), wx.request({ url: "https://restapi.amap.com/v3/weather/weatherInfo", data: { key: b.key, city: d, extensions: e, s: c.s, platform: c.platform, appname: b.key, sdkversion: c.sdkversion, logversion: c.logversion }, method: "GET", header: { "content-type": "application/json" }, success: function (b) { function c(a) { var b = { city: { text: "城市", data: a.city }, weather: { text: "天气", data: a.weather }, temperature: { text: "温度", data: a.temperature }, winddirection: { text: "风向", data: a.winddirection + "风" }, windpower: { text: "风力", data: a.windpower + "级" }, humidity: { text: "湿度", data: a.humidity + "%" } }; return b } var d, e; b.data.status && "1" == b.data.status ? b.data.lives ? (d = b.data.lives, d && d.length > 0 && (d = d[0], e = c(d), e["liveData"] = d, a.success(e))) : b.data.forecasts && b.data.forecasts[0] && a.success({ forecast: b.data.forecasts[0] }) : a.fail({ errCode: b.data.infocode, errMsg: b.data.info }) }, fail: function (b) { a.fail({ errCode: "0", errMsg: b.errMsg || "" }) } }) } function e(e) { wx.request({ url: "https://restapi.amap.com/v3/geocode/regeo", data: { key: b.key, location: e, extensions: "all", s: c.s, platform: c.platform, appname: b.key, sdkversion: c.sdkversion, logversion: c.logversion }, method: "GET", header: { "content-type": "application/json" }, success: function (b) { var c, e; b.data.status && "1" == b.data.status ? (e = b.data.regeocode, e.addressComponent ? c = e.addressComponent.adcode : e.aois && e.aois.length > 0 && (c = e.aois[0].adcode), d(c)) : a.fail({ errCode: b.data.infocode, errMsg: b.data.info }) }, fail: function (b) { a.fail({ errCode: "0", errMsg: b.errMsg || "" }) } }) } var b = this, c = b.requestConfig; a.city ? d(a.city) : b.getWxLocation(a, function (a) { e(a) }) }, AMapWX.prototype.getPoiAround = function (a) { function d(d) { var e = { key: b.key, location: d, s: c.s, platform: c.platform, appname: b.key, sdkversion: c.sdkversion, logversion: c.logversion }; a.querytypes && (e["types"] = a.querytypes), a.querykeywords && (e["keywords"] = a.querykeywords), wx.request({ url: "https://restapi.amap.com/v3/place/around", data: e, method: "GET", header: { "content-type": "application/json" }, success: function (b) { var c, d, e, f; if (b.data.status && "1" == b.data.status) { if (b = b.data, b && b.pois) { for (c = [], d = 0; d < b.pois.length; d++)e = 0 == d ? a.iconPathSelected : a.iconPath, c.push({ latitude: parseFloat(b.pois[d].location.split(",")[1]), longitude: parseFloat(b.pois[d].location.split(",")[0]), iconPath: e, width: 22, height: 32, id: d, name: b.pois[d].name, address: b.pois[d].address }); f = { markers: c, poisData: b.pois }, a.success(f) } } else a.fail({ errCode: b.data.infocode, errMsg: b.data.info }) }, fail: function (b) { a.fail({ errCode: "0", errMsg: b.errMsg || "" }) } }) } var b = this, c = b.requestConfig; a.location ? d(a.location) : b.getWxLocation(a, function (a) { d(a) }) }, AMapWX.prototype.getStaticmap = function (a) { function f(b) { c.push("location=" + b), a.zoom && c.push("zoom=" + a.zoom), a.size && c.push("size=" + a.size), a.scale && c.push("scale=" + a.scale), a.markers && c.push("markers=" + a.markers), a.labels && c.push("labels=" + a.labels), a.paths && c.push("paths=" + a.paths), a.traffic && c.push("traffic=" + a.traffic); var e = d + c.join("&"); a.success({ url: e }) } var e, b = this, c = [], d = "https://restapi.amap.com/v3/staticmap?"; c.push("key=" + b.key), e = b.requestConfig, c.push("s=" + e.s), c.push("platform=" + e.platform), c.push("appname=" + e.appname), c.push("sdkversion=" + e.sdkversion), c.push("logversion=" + e.logversion), a.location ? f(a.location) : b.getWxLocation(a, function (a) { f(a) }) }, AMapWX.prototype.getInputtips = function (a) { var b = this, c = b.requestConfig, d = { key: b.key, s: c.s, platform: c.platform, appname: b.key, sdkversion: c.sdkversion, logversion: c.logversion }; a.location && (d["location"] = a.location), a.keywords && (d["keywords"] = a.keywords), a.type && (d["type"] = a.type), a.city && (d["city"] = a.city), a.citylimit && (d["citylimit"] = a.citylimit), wx.request({ url: "https://restapi.amap.com/v3/assistant/inputtips", data: d, method: "GET", header: { "content-type": "application/json" }, success: function (b) { b && b.data && b.data.tips && a.success({ tips: b.data.tips }) }, fail: function (b) { a.fail({ errCode: "0", errMsg: b.errMsg || "" }) } }) }, AMapWX.prototype.getDrivingRoute = function (a) { var b = this, c = b.requestConfig, d = { key: b.key, s: c.s, platform: c.platform, appname: b.key, sdkversion: c.sdkversion, logversion: c.logversion }; a.origin && (d["origin"] = a.origin), a.destination && (d["destination"] = a.destination), a.strategy && (d["strategy"] = a.strategy), a.waypoints && (d["waypoints"] = a.waypoints), a.avoidpolygons && (d["avoidpolygons"] = a.avoidpolygons), a.avoidroad && (d["avoidroad"] = a.avoidroad), wx.request({ url: "https://restapi.amap.com/v3/direction/driving", data: d, method: "GET", header: { "content-type": "application/json" }, success: function (b) { b && b.data && b.data.route && a.success({ paths: b.data.route.paths, taxi_cost: b.data.route.taxi_cost || "" }) }, fail: function (b) { a.fail({ errCode: "0", errMsg: b.errMsg || "" }) } }) }, AMapWX.prototype.getWalkingRoute = function (a) { var b = this, c = b.requestConfig, d = { key: b.key, s: c.s, platform: c.platform, appname: b.key, sdkversion: c.sdkversion, logversion: c.logversion }; a.origin && (d["origin"] = a.origin), a.destination && (d["destination"] = a.destination), wx.request({ url: "https://restapi.amap.com/v3/direction/walking", data: d, method: "GET", header: { "content-type": "application/json" }, success: function (b) { b && b.data && b.data.route && a.success({ paths: b.data.route.paths }) }, fail: function (b) { a.fail({ errCode: "0", errMsg: b.errMsg || "" }) } }) }, AMapWX.prototype.getTransitRoute = function (a) { var b = this, c = b.requestConfig, d = { key: b.key, s: c.s, platform: c.platform, appname: b.key, sdkversion: c.sdkversion, logversion: c.logversion }; a.origin && (d["origin"] = a.origin), a.destination && (d["destination"] = a.destination), a.strategy && (d["strategy"] = a.strategy), a.city && (d["city"] = a.city), a.cityd && (d["cityd"] = a.cityd), wx.request({ url: "https://restapi.amap.com/v3/direction/transit/integrated", data: d, method: "GET", header: { "content-type": "application/json" }, success: function (b) { if (b && b.data && b.data.route) { var c = b.data.route; a.success({ distance: c.distance || "", taxi_cost: c.taxi_cost || "", transits: c.transits }) } }, fail: function (b) { a.fail({ errCode: "0", errMsg: b.errMsg || "" }) } }) }, AMapWX.prototype.getRidingRoute = function (a) { var b = this, c = b.requestConfig, d = { key: b.key, s: c.s, platform: c.platform, appname: b.key, sdkversion: c.sdkversion, logversion: c.logversion }; a.origin && (d["origin"] = a.origin), a.destination && (d["destination"] = a.destination), wx.request({ url: "https://restapi.amap.com/v3/direction/riding", data: d, method: "GET", header: { "content-type": "application/json" }, success: function (b) { b && b.data && b.data.route && a.success({ paths: b.data.route.paths }) }, fail: function (b) { a.fail({ errCode: "0", errMsg: b.errMsg || "" }) } }) }, module.exports.AMapWX = AMapWX; \ No newline at end of file diff --git a/src/map/miniprogram/utils/location.js b/src/map/miniprogram/utils/location.js new file mode 100644 index 0000000..f5e6edd --- /dev/null +++ b/src/map/miniprogram/utils/location.js @@ -0,0 +1,40 @@ +// Page({ +// data:{ +// location:[{ +// id:0, +// name:"中国民航大学南一教学楼", +// longitude: 116.481028, +// latitude: 39.989643, +// },{ +// id:1, +// name:"中国民航大学南二教学楼", +// longitude: 116.481028, +// latitude: 39.989643, +// },{ +// id:3, +// name:"中国民航大学南三教学楼", +// longitude: 116.481028, +// latitude: 39.989643, +// } +// ] +// } +// }) + +module.exports.location = [ + { + id:0, + name:"中国民航大学南一教学楼", + longitude: 116.481028, + latitude: 39.989643, + },{ + id:1, + name:"中国民航大学南二教学楼", + longitude: 116.481028, + latitude: 39.989643, + },{ + id:3, + name:"中国民航大学南三教学楼", + longitude: 116.481028, + latitude: 39.989643, + } +] \ No newline at end of file diff --git a/src/map/miniprogram/utils/qqmap-wx-jssdk.js b/src/map/miniprogram/utils/qqmap-wx-jssdk.js new file mode 100644 index 0000000..b114e29 --- /dev/null +++ b/src/map/miniprogram/utils/qqmap-wx-jssdk.js @@ -0,0 +1,741 @@ +/** + * 微信小程序JavaScriptSDK + * + * @version 1.1 + * @date 2019-01-20 + */ + +var ERROR_CONF = { + KEY_ERR: 311, + KEY_ERR_MSG: 'key格式错误', + PARAM_ERR: 310, + PARAM_ERR_MSG: '请求参数信息有误', + SYSTEM_ERR: 600, + SYSTEM_ERR_MSG: '系统错误', + WX_ERR_CODE: 1000, + WX_OK_CODE: 200 +}; +var BASE_URL = 'https://apis.map.qq.com/ws/'; +var URL_SEARCH = BASE_URL + 'place/v1/search'; +var URL_SUGGESTION = BASE_URL + 'place/v1/suggestion'; +var URL_GET_GEOCODER = BASE_URL + 'geocoder/v1/'; +var URL_CITY_LIST = BASE_URL + 'district/v1/list'; +var URL_AREA_LIST = BASE_URL + 'district/v1/getchildren'; +var URL_DISTANCE = BASE_URL + 'distance/v1/'; +var EARTH_RADIUS = 6378136.49; +var Utils = { + /** + * 得到终点query字符串 + * @param {Array|String} 检索数据 + */ + location2query(data) { + if (typeof data == 'string') { + return data; + } + var query = ''; + for (var i = 0; i < data.length; i++) { + var d = data[i]; + if (!!query) { + query += ';'; + } + if (d.location) { + query = query + d.location.lat + ',' + d.location.lng; + } + if (d.latitude && d.longitude) { + query = query + d.latitude + ',' + d.longitude; + } + } + return query; + }, + + /** + * 计算角度 + */ + rad(d) { + return d * Math.PI / 180.0; + }, + /** + * 处理终点location数组 + * @return 返回终点数组 + */ + getEndLocation(location){ + var to = location.split(';'); + var endLocation = []; + for (var i = 0; i < to.length; i++) { + endLocation.push({ + lat: parseFloat(to[i].split(',')[0]), + lng: parseFloat(to[i].split(',')[1]) + }) + } + return endLocation; + }, + + /** + * 计算两点间直线距离 + * @param a 表示纬度差 + * @param b 表示经度差 + * @return 返回的是距离，单位m + */ + getDistance(latFrom, lngFrom, latTo, lngTo) { + var radLatFrom = this.rad(latFrom); + var radLatTo = this.rad(latTo); + var a = radLatFrom - radLatTo; + var b = this.rad(lngFrom) - this.rad(lngTo); + var distance = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLatFrom) * Math.cos(radLatTo) * Math.pow(Math.sin(b / 2), 2))); + distance = distance * EARTH_RADIUS; + distance = Math.round(distance * 10000) / 10000; + return parseFloat(distance.toFixed(0)); + }, + /** + * 使用微信接口进行定位 + */ + getWXLocation(success, fail, complete) { + wx.getLocation({ + type: 'gcj02', + success: success, + fail: fail, + complete: complete + }); + }, + + /** + * 获取location参数 + */ + getLocationParam(location) { + if (typeof location == 'string') { + var locationArr = location.split(','); + if (locationArr.length === 2) { + location = { + latitude: location.split(',')[0], + longitude: location.split(',')[1] + }; + } else { + location = {}; + } + } + return location; + }, + + /** + * 回调函数默认处理 + */ + polyfillParam(param) { + param.success = param.success || function () { }; + param.fail = param.fail || function () { }; + param.complete = param.complete || function () { }; + }, + + /** + * 验证param对应的key值是否为空 + * + * @param {Object} param 接口参数 + * @param {String} key 对应参数的key + */ + checkParamKeyEmpty(param, key) { + if (!param[key]) { + var errconf = this.buildErrorConfig(ERROR_CONF.PARAM_ERR, ERROR_CONF.PARAM_ERR_MSG + key +'参数格式有误'); + param.fail(errconf); + param.complete(errconf); + return true; + } + return false; + }, + + /** + * 验证参数中是否存在检索词keyword + * + * @param {Object} param 接口参数 + */ + checkKeyword(param){ + return !this.checkParamKeyEmpty(param, 'keyword'); + }, + + /** + * 验证location值 + * + * @param {Object} param 接口参数 + */ + checkLocation(param) { + var location = this.getLocationParam(param.location); + if (!location || !location.latitude || !location.longitude) { + var errconf = this.buildErrorConfig(ERROR_CONF.PARAM_ERR, ERROR_CONF.PARAM_ERR_MSG + ' location参数格式有误'); + param.fail(errconf); + param.complete(errconf); + return false; + } + return true; + }, + + /** + * 构造错误数据结构 + * @param {Number} errCode 错误码 + * @param {Number} errMsg 错误描述 + */ + buildErrorConfig(errCode, errMsg) { + return { + status: errCode, + message: errMsg + }; + }, + + /** + * + * 数据处理函数 + * 根据传入参数不同处理不同数据 + * @param {String} feature 功能名称 + * search 地点搜索 + * suggest关键词提示 + * reverseGeocoder逆地址解析 + * geocoder地址解析 + * getCityList获取城市列表：父集 + * getDistrictByCityId获取区县列表：子集 + * calculateDistance距离计算 + * @param {Object} param 接口参数 + * @param {Object} data 数据 + */ + handleData(param,data,feature){ + if (feature === 'search') { + var searchResult = data.data; + var searchSimplify = []; + for (var i = 0; i < searchResult.length; i++) { + searchSimplify.push({ + id: searchResult[i].id || null, + title: searchResult[i].title || null, + latitude: searchResult[i].location && searchResult[i].location.lat || null, + longitude: searchResult[i].location && searchResult[i].location.lng || null, + address: searchResult[i].address || null, + category: searchResult[i].category || null, + tel: searchResult[i].tel || null, + adcode: searchResult[i].ad_info && searchResult[i].ad_info.adcode || null, + city: searchResult[i].ad_info && searchResult[i].ad_info.city || null, + district: searchResult[i].ad_info && searchResult[i].ad_info.district || null, + province: searchResult[i].ad_info && searchResult[i].ad_info.province || null + }) + } + param.success(data, { + searchResult: searchResult, + searchSimplify: searchSimplify + }) + } else if (feature === 'suggest') { + var suggestResult = data.data; + var suggestSimplify = []; + for (var i = 0; i < suggestResult.length; i++) { + suggestSimplify.push({ + adcode: suggestResult[i].adcode || null, + address: suggestResult[i].address || null, + category: suggestResult[i].category || null, + city: suggestResult[i].city || null, + district: suggestResult[i].district || null, + id: suggestResult[i].id || null, + latitude: suggestResult[i].location && suggestResult[i].location.lat || null, + longitude: suggestResult[i].location && suggestResult[i].location.lng || null, + province: suggestResult[i].province || null, + title: suggestResult[i].title || null, + type: suggestResult[i].type || null + }) + } + param.success(data, { + suggestResult: suggestResult, + suggestSimplify: suggestSimplify + }) + } else if (feature === 'reverseGeocoder') { + var reverseGeocoderResult = data.result; + var reverseGeocoderSimplify = { + address: reverseGeocoderResult.address || null, + latitude: reverseGeocoderResult.location && reverseGeocoderResult.location.lat || null, + longitude: reverseGeocoderResult.location && reverseGeocoderResult.location.lng || null, + adcode: reverseGeocoderResult.ad_info && reverseGeocoderResult.ad_info.adcode || null, + city: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.city || null, + district: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.district || null, + nation: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.nation || null, + province: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.province || null, + street: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.street || null, + street_number: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.street_number || null, + recommend: reverseGeocoderResult.formatted_addresses && reverseGeocoderResult.formatted_addresses.recommend || null, + rough: reverseGeocoderResult.formatted_addresses && reverseGeocoderResult.formatted_addresses.rough || null + }; + if (reverseGeocoderResult.pois) {//判断是否返回周边poi + var pois = reverseGeocoderResult.pois; + var poisSimplify = []; + for (var i = 0;i < pois.length;i++) { + poisSimplify.push({ + id: pois[i].id || null, + title: pois[i].title || null, + latitude: pois[i].location && pois[i].location.lat || null, + longitude: pois[i].location && pois[i].location.lng || null, + address: pois[i].address || null, + category: pois[i].category || null, + adcode: pois[i].ad_info && pois[i].ad_info.adcode || null, + city: pois[i].ad_info && pois[i].ad_info.city || null, + district: pois[i].ad_info && pois[i].ad_info.district || null, + province: pois[i].ad_info && pois[i].ad_info.province || null + }) + } + param.success(data,{ + reverseGeocoderResult: reverseGeocoderResult, + reverseGeocoderSimplify: reverseGeocoderSimplify, + pois: pois, + poisSimplify: poisSimplify + }) + } else { + param.success(data, { + reverseGeocoderResult: reverseGeocoderResult, + reverseGeocoderSimplify: reverseGeocoderSimplify + }) + } + } else if (feature === 'geocoder') { + var geocoderResult = data.result; + var geocoderSimplify = { + title: geocoderResult.title || null, + latitude: geocoderResult.location && geocoderResult.location.lat || null, + longitude: geocoderResult.location && geocoderResult.location.lng || null, + adcode: geocoderResult.ad_info && geocoderResult.ad_info.adcode || null, + province: geocoderResult.address_components && geocoderResult.address_components.province || null, + city: geocoderResult.address_components && geocoderResult.address_components.city || null, + district: geocoderResult.address_components && geocoderResult.address_components.district || null, + street: geocoderResult.address_components && geocoderResult.address_components.street || null, + street_number: geocoderResult.address_components && geocoderResult.address_components.street_number || null, + level: geocoderResult.level || null + }; + param.success(data,{ + geocoderResult: geocoderResult, + geocoderSimplify: geocoderSimplify + }); + } else if (feature === 'getCityList') { + var provinceResult = data.result[0]; + var cityResult = data.result[1]; + var districtResult = data.result[2]; + param.success(data,{ + provinceResult: provinceResult, + cityResult: cityResult, + districtResult: districtResult + }); + } else if (feature === 'getDistrictByCityId') { + var districtByCity = data.result[0]; + param.success(data, districtByCity); + } else if (feature === 'calculateDistance') { + var calculateDistanceResult = data.result.elements; + var distance = []; + for (var i = 0; i < calculateDistanceResult.length; i++){ + distance.push(calculateDistanceResult[i].distance); + } + param.success(data, { + calculateDistanceResult: calculateDistanceResult, + distance: distance + }); + } else { + param.success(data); + } + }, + + /** + * 构造微信请求参数，公共属性处理 + * + * @param {Object} param 接口参数 + * @param {Object} param 配置项 + * @param {String} feature 方法名 + */ + buildWxRequestConfig(param, options, feature) { + var that = this; + options.header = { "content-type": "application/json" }; + options.method = 'GET'; + options.success = function (res) { + var data = res.data; + if (data.status === 0) { + that.handleData(param, data, feature); + } else { + param.fail(data); + } + }; + options.fail = function (res) { + res.statusCode = ERROR_CONF.WX_ERR_CODE; + param.fail(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)); + }; + options.complete = function (res) { + var statusCode = +res.statusCode; + switch(statusCode) { + case ERROR_CONF.WX_ERR_CODE: { + param.complete(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)); + break; + } + case ERROR_CONF.WX_OK_CODE: { + var data = res.data; + if (data.status === 0) { + param.complete(data); + } else { + param.complete(that.buildErrorConfig(data.status, data.message)); + } + break; + } + default:{ + param.complete(that.buildErrorConfig(ERROR_CONF.SYSTEM_ERR, ERROR_CONF.SYSTEM_ERR_MSG)); + } + + } + }; + return options; + }, + + /** + * 处理用户参数是否传入坐标进行不同的处理 + */ + locationProcess(param, locationsuccess, locationfail, locationcomplete) { + var that = this; + locationfail = locationfail || function (res) { + res.statusCode = ERROR_CONF.WX_ERR_CODE; + param.fail(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)); + }; + locationcomplete = locationcomplete || function (res) { + if (res.statusCode == ERROR_CONF.WX_ERR_CODE) { + param.complete(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)); + } + }; + if (!param.location) { + that.getWXLocation(locationsuccess, locationfail, locationcomplete); + } else if (that.checkLocation(param)) { + var location = Utils.getLocationParam(param.location); + locationsuccess(location); + } + } +}; + + +class QQMapWX { + + /** + * 构造函数 + * + * @param {Object} options 接口参数,key 为必选参数 + */ + constructor(options) { + if (!options.key) { + throw Error('key值不能为空'); + } + this.key = options.key; + }; + + /** + * POI周边检索 + * + * @param {Object} options 接口参数对象 + * + * 参数对象结构可以参考 + * @see http://lbs.qq.com/webservice_v1/guide-search.html + */ + search(options) { + var that = this; + options = options || {}; + + Utils.polyfillParam(options); + + if (!Utils.checkKeyword(options)) { + return; + } + + var requestParam = { + keyword: options.keyword, + orderby: options.orderby || '_distance', + page_size: options.page_size || 10, + page_index: options.page_index || 1, + output: 'json', + key: that.key + }; + + if (options.address_format) { + requestParam.address_format = options.address_format; + } + + if (options.filter) { + requestParam.filter = options.filter; + } + + var distance = options.distance || "1000"; + var auto_extend = options.auto_extend || 1; + var region = null; + var rectangle = null; + + //判断城市限定参数 + if (options.region) { + region = options.region; + } + + //矩形限定坐标(暂时只支持字符串格式) + if (options.rectangle) { + rectangle = options.rectangle; + } + + var locationsuccess = function (result) { + if (region && !rectangle) { + //城市限定参数拼接 + requestParam.boundary = "region(" + region + "," + auto_extend + "," + result.latitude + "," + result.longitude + ")"; + } else if (rectangle && !region) { + //矩形搜索 + requestParam.boundary = "rectangle(" + rectangle + ")"; + } else { + requestParam.boundary = "nearby(" + result.latitude + "," + result.longitude + "," + distance + "," + auto_extend + ")"; + } + wx.request(Utils.buildWxRequestConfig(options, { + url: URL_SEARCH, + data: requestParam + }, 'search')); + }; + Utils.locationProcess(options, locationsuccess); + }; + + /** + * sug模糊检索 + * + * @param {Object} options 接口参数对象 + * + * 参数对象结构可以参考 + * http://lbs.qq.com/webservice_v1/guide-suggestion.html + */ + getSuggestion(options) { + var that = this; + options = options || {}; + Utils.polyfillParam(options); + + if (!Utils.checkKeyword(options)) { + return; + } + + var requestParam = { + keyword: options.keyword, + region: options.region || '全国', + region_fix: options.region_fix || 0, + policy: options.policy || 0, + page_size: options.page_size || 10,//控制显示条数 + page_index: options.page_index || 1,//控制页数 + get_subpois : options.get_subpois || 0,//返回子地点 + output: 'json', + key: that.key + }; + //长地址 + if (options.address_format) { + requestParam.address_format = options.address_format; + } + //过滤 + if (options.filter) { + requestParam.filter = options.filter; + } + //排序 + if (options.location) { + var locationsuccess = function (result) { + requestParam.location = result.latitude + ',' + result.longitude; + wx.request(Utils.buildWxRequestConfig(options, { + url: URL_SUGGESTION, + data: requestParam + }, "suggest")); + }; + Utils.locationProcess(options, locationsuccess); + } else { + wx.request(Utils.buildWxRequestConfig(options, { + url: URL_SUGGESTION, + data: requestParam + }, "suggest")); + } + }; + + /** + * 逆地址解析 + * + * @param {Object} options 接口参数对象 + * + * 请求参数结构可以参考 + * http://lbs.qq.com/webservice_v1/guide-gcoder.html + */ + reverseGeocoder(options) { + var that = this; + options = options || {}; + Utils.polyfillParam(options); + var requestParam = { + coord_type: options.coord_type || 5, + get_poi: options.get_poi || 0, + output: 'json', + key: that.key + }; + if (options.poi_options) { + requestParam.poi_options = options.poi_options + } + + var locationsuccess = function (result) { + requestParam.location = result.latitude + ',' + result.longitude; + wx.request(Utils.buildWxRequestConfig(options, { + url: URL_GET_GEOCODER, + data: requestParam + }, 'reverseGeocoder')); + }; + Utils.locationProcess(options, locationsuccess); + }; + + /** + * 地址解析 + * + * @param {Object} options 接口参数对象 + * + * 请求参数结构可以参考 + * http://lbs.qq.com/webservice_v1/guide-geocoder.html + */ + geocoder(options) { + var that = this; + options = options || {}; + Utils.polyfillParam(options); + + if (Utils.checkParamKeyEmpty(options, 'address')) { + return; + } + + var requestParam = { + address: options.address, + output: 'json', + key: that.key + }; + + //城市限定 + if (options.region) { + requestParam.region = options.region; + } + + wx.request(Utils.buildWxRequestConfig(options, { + url: URL_GET_GEOCODER, + data: requestParam + },'geocoder')); + }; + + + /** + * 获取城市列表 + * + * @param {Object} options 接口参数对象 + * + * 请求参数结构可以参考 + * http://lbs.qq.com/webservice_v1/guide-region.html + */ + getCityList(options) { + var that = this; + options = options || {}; + Utils.polyfillParam(options); + var requestParam = { + output: 'json', + key: that.key + }; + + wx.request(Utils.buildWxRequestConfig(options, { + url: URL_CITY_LIST, + data: requestParam + },'getCityList')); + }; + + /** + * 获取对应城市ID的区县列表 + * + * @param {Object} options 接口参数对象 + * + * 请求参数结构可以参考 + * http://lbs.qq.com/webservice_v1/guide-region.html + */ + getDistrictByCityId(options) { + var that = this; + options = options || {}; + Utils.polyfillParam(options); + + if (Utils.checkParamKeyEmpty(options, 'id')) { + return; + } + + var requestParam = { + id: options.id || '', + output: 'json', + key: that.key + }; + + wx.request(Utils.buildWxRequestConfig(options, { + url: URL_AREA_LIST, + data: requestParam + },'getDistrictByCityId')); + }; + + /** + * 用于单起点到多终点的路线距离(非直线距离)计算： + * 支持两种距离计算方式：步行和驾车。 + * 起点到终点最大限制直线距离10公里。 + * + * 新增直线距离计算。 + * + * @param {Object} options 接口参数对象 + * + * 请求参数结构可以参考 + * http://lbs.qq.com/webservice_v1/guide-distance.html + */ + calculateDistance(options) { + var that = this; + options = options || {}; + Utils.polyfillParam(options); + + if (Utils.checkParamKeyEmpty(options, 'to')) { + return; + } + + var requestParam = { + mode: options.mode || 'walking', + to: Utils.location2query(options.to), + output: 'json', + key: that.key + }; + + if (options.from) { + options.location = options.from; + } + + //计算直线距离 + if(requestParam.mode == 'straight'){ + var locationsuccess = function (result) { + var locationTo = Utils.getEndLocation(requestParam.to);//处理终点坐标 + var data = { + message:"query ok", + result:{ + elements:[] + }, + status:0 + }; + for (var i = 0; i < locationTo.length; i++) { + data.result.elements.push({//将坐标存入 + distance: Utils.getDistance(result.latitude, result.longitude, locationTo[i].lat, locationTo[i].lng), + duration:0, + from:{ + lat: result.latitude, + lng:result.longitude + }, + to:{ + lat: locationTo[i].lat, + lng: locationTo[i].lng + } + }); + } + var calculateResult = data.result.elements; + var distanceResult = []; + for (var i = 0; i < calculateResult.length; i++) { + distanceResult.push(calculateResult[i].distance); + } + return options.success(data,{ + calculateResult: calculateResult, + distanceResult: distanceResult + }); + }; + + Utils.locationProcess(options, locationsuccess); + } else { + var locationsuccess = function (result) { + requestParam.from = result.latitude + ',' + result.longitude; + wx.request(Utils.buildWxRequestConfig(options, { + url: URL_DISTANCE, + data: requestParam + },'calculateDistance')); + }; + + Utils.locationProcess(options, locationsuccess); + } + } +}; + +module.exports = QQMapWX; \ No newline at end of file diff --git a/src/map/miniprogram/utils/qqmap-wx-jssdk.min.js b/src/map/miniprogram/utils/qqmap-wx-jssdk.min.js new file mode 100644 index 0000000..b8fbad4 --- /dev/null +++ b/src/map/miniprogram/utils/qqmap-wx-jssdk.min.js @@ -0,0 +1,3 @@ +var ERROR_CONF={KEY_ERR:311,KEY_ERR_MSG:'key格式错误',PARAM_ERR:310,PARAM_ERR_MSG:'请求参数信息有误',SYSTEM_ERR:600,SYSTEM_ERR_MSG:'系统错误',WX_ERR_CODE:1000,WX_OK_CODE:200};var BASE_URL='https://apis.map.qq.com/ws/';var URL_SEARCH=BASE_URL+'place/v1/search';var URL_SUGGESTION=BASE_URL+'place/v1/suggestion';var URL_GET_GEOCODER=BASE_URL+'geocoder/v1/';var URL_CITY_LIST=BASE_URL+'district/v1/list';var URL_AREA_LIST=BASE_URL+'district/v1/getchildren';var URL_DISTANCE=BASE_URL+'distance/v1/';var EARTH_RADIUS=6378136.49;var Utils={location2query(data){if(typeof data=='string'){return data}var query='';for(var i=0;i