Merge branch 'dev' of https://bdgit.educoder.net/psnreiywo/guoxinyu_project into wny_branch
# Conflicts:
# scr/map - 副本/.eslintrc.js
# scr/map - 副本/miniprogram/image/arrowright.png
# scr/map - 副本/miniprogram/image/icon64_appwx_logo.png
# scr/map - 副本/miniprogram/image/locate.png
# scr/map - 副本/miniprogram/image/locateHL.png
# scr/map - 副本/miniprogram/image/location-control.png
# scr/map - 副本/miniprogram/image/location.png
# scr/map - 副本/miniprogram/image/logo.png
# scr/map - 副本/miniprogram/image/map.png
# scr/map - 副本/miniprogram/image/map_active.png
# scr/map - 副本/miniprogram/image/navigator.jpg
# scr/map - 副本/miniprogram/image/pause.png
# scr/map - 副本/miniprogram/image/play.png
# scr/map - 副本/miniprogram/image/plus.png
# scr/map - 副本/miniprogram/image/record.png
# scr/map - 副本/miniprogram/image/screenshot-marker.png
# scr/map - 副本/miniprogram/image/screenshot1.png
# scr/map - 副本/miniprogram/image/screenshot2.png
# scr/map - 副本/miniprogram/image/stop.png
# scr/map - 副本/miniprogram/image/trash.png
# scr/map - 副本/miniprogram/image/wechat.png
# scr/map - 副本/miniprogram/image/wechatHL.png
# scr/map - 副本/miniprogram/images/dh.jpg
# scr/map - 副本/miniprogram/images/gps.jpg
# scr/map - 副本/miniprogram/images/hxLocation.png
# scr/map - 副本/miniprogram/images/logo1.png
# scr/map - 副本/miniprogram/images/sxaubg.jpg
# scr/map - 副本/miniprogram/images/xm.jpg
# scr/map - 副本/miniprogram/pages/ManageAccount/ManageAccount.js
# scr/map - 副本/miniprogram/pages/ManageAccount/ManageAccount.json
# scr/map - 副本/miniprogram/pages/ManageAccount/ManageAccount.wxss
# scr/map - 副本/miniprogram/pages/ModifyInformation/ModifyInformation.json
# scr/map - 副本/miniprogram/pages/ModifyInformation/ModifyInformation.wxss
# scr/map - 副本/miniprogram/pages/adduser/index.json
# scr/map - 副本/miniprogram/pages/addusers/index.json
# scr/map - 副本/miniprogram/pages/adlogin/adlogin.json
# scr/map - 副本/miniprogram/pages/delete/index.json
# scr/map - 副本/miniprogram/pages/deleteuser/index.json
# scr/map - 副本/miniprogram/pages/deleteusers/index.json
# scr/map - 副本/miniprogram/pages/home/home.js
# scr/map - 副本/miniprogram/pages/login/login.js
# scr/map - 副本/miniprogram/pages/login/login.wxss
# scr/map - 副本/miniprogram/pages/logs/logs.js
# scr/map - 副本/miniprogram/pages/logs/logs.wxml
# scr/map - 副本/miniprogram/pages/text/text.wxss
# scr/map - 副本/miniprogram/sitemap.json
# scr/wechat-weapp-mapdemo-master/image/arrowright.png
# scr/wechat-weapp-mapdemo-master/image/icon64_appwx_logo.png
# scr/wechat-weapp-mapdemo-master/image/locate.png
# scr/wechat-weapp-mapdemo-master/image/locateHL.png
# scr/wechat-weapp-mapdemo-master/image/location-control.png
# scr/wechat-weapp-mapdemo-master/image/location.png
# scr/wechat-weapp-mapdemo-master/image/logo.png
# scr/wechat-weapp-mapdemo-master/image/map.png
# scr/wechat-weapp-mapdemo-master/image/map_active.png
# scr/wechat-weapp-mapdemo-master/image/navigator.jpg
# scr/wechat-weapp-mapdemo-master/image/pause.png
# scr/wechat-weapp-mapdemo-master/image/play.png
# scr/wechat-weapp-mapdemo-master/image/plus.png
# scr/wechat-weapp-mapdemo-master/image/record.png
# scr/wechat-weapp-mapdemo-master/image/screenshot-marker.png
# scr/wechat-weapp-mapdemo-master/image/screenshot1.png
# scr/wechat-weapp-mapdemo-master/image/screenshot2.png
# scr/wechat-weapp-mapdemo-master/image/stop.png
# scr/wechat-weapp-mapdemo-master/image/trash.png
# scr/wechat-weapp-mapdemo-master/image/wechat.png
# scr/wechat-weapp-mapdemo-master/image/wechatHL.png
# scr/wechat-weapp-mapdemo-master/images/dh.jpg
# scr/wechat-weapp-mapdemo-master/images/gps.jpg
# scr/wechat-weapp-mapdemo-master/images/hxLocation.png
# scr/wechat-weapp-mapdemo-master/images/logo1.png
# scr/wechat-weapp-mapdemo-master/images/sxaubg.jpg
# scr/wechat-weapp-mapdemo-master/images/xm.jpg
# scr/wechat-weapp-mapdemo-master/pages/Find directions/Find directions.json
# scr/wechat-weapp-mapdemo-master/pages/ManageAccount/ManageAccount.js
# scr/wechat-weapp-mapdemo-master/pages/ManageAccount/ManageAccount.json
# scr/wechat-weapp-mapdemo-master/pages/ManageAccount/ManageAccount.wxss
# scr/wechat-weapp-mapdemo-master/pages/ModifyInformation/ModifyInformation.json
# scr/wechat-weapp-mapdemo-master/pages/ModifyInformation/ModifyInformation.wxss
# scr/wechat-weapp-mapdemo-master/pages/ModifyMap/ModifyMap.json
# scr/wechat-weapp-mapdemo-master/pages/location/location.json
# scr/wechat-weapp-mapdemo-master/pages/login/login.js
# scr/wechat-weapp-mapdemo-master/pages/login/login.json
# scr/wechat-weapp-mapdemo-master/pages/login/login.wxss
# scr/wechat-weapp-mapdemo-master/pages/logs/logs.js
# scr/wechat-weapp-mapdemo-master/pages/logs/logs.wxml
# scr/wechat-weapp-mapdemo-master/pages/text/text.js
# scr/wechat-weapp-mapdemo-master/pages/text/text.json
# scr/wechat-weapp-mapdemo-master/pages/text/text.wxss
# scr/weichat_work/.eslintrc.js
# scr/weichat_work/miniprogram/pages/index/index.json
# scr/weichat_work/miniprogram/sitemap.json
# src/map/.eslintrc.js
# src/map/miniprogram/image/arrowright.png
# src/map/miniprogram/image/icon64_appwx_logo.png
# src/map/miniprogram/image/locate.png
# src/map/miniprogram/image/locateHL.png
# src/map/miniprogram/image/location-control.png
# src/map/miniprogram/image/location.png
# src/map/miniprogram/image/logo.png
# src/map/miniprogram/image/map.png
# src/map/miniprogram/image/map_active.png
# src/map/miniprogram/image/navigator.jpg
# src/map/miniprogram/image/pause.png
# src/map/miniprogram/image/play.png
# src/map/miniprogram/image/plus.png
# src/map/miniprogram/image/record.png
# src/map/miniprogram/image/screenshot-marker.png
# src/map/miniprogram/image/screenshot1.png
# src/map/miniprogram/image/screenshot2.png
# src/map/miniprogram/image/stop.png
# src/map/miniprogram/image/trash.png
# src/map/miniprogram/image/wechat.png
# src/map/miniprogram/image/wechatHL.png
# src/map/miniprogram/images/dh.jpg
# src/map/miniprogram/images/gps.jpg
# src/map/miniprogram/images/hxLocation.png
# src/map/miniprogram/images/logo1.png
# src/map/miniprogram/images/sxaubg.jpg
# src/map/miniprogram/images/xm.jpg
# src/map/miniprogram/pages/Find directions/Find directions.js
# src/map/miniprogram/pages/Find directions/Find directions.json
# src/map/miniprogram/pages/Find directions/Find directions.wxml
# src/map/miniprogram/pages/Find directions/Find directions.wxss
# src/map/miniprogram/pages/ManageAccount/ManageAccount.js
# src/map/miniprogram/pages/ManageAccount/ManageAccount.json
# src/map/miniprogram/pages/ManageAccount/ManageAccount.wxml
# src/map/miniprogram/pages/ManageAccount/ManageAccount.wxss
# src/map/miniprogram/pages/ModifyInformation/ModifyInformation.js
# src/map/miniprogram/pages/ModifyInformation/ModifyInformation.json
# src/map/miniprogram/pages/ModifyInformation/ModifyInformation.wxml
# src/map/miniprogram/pages/ModifyInformation/ModifyInformation.wxss
# src/map/miniprogram/pages/ModifyMap/ModifyMap.js
# src/map/miniprogram/pages/ModifyMap/ModifyMap.json
# src/map/miniprogram/pages/ModifyMap/ModifyMap.wxml
# src/map/miniprogram/pages/ModifyMap/ModifyMap.wxss
# src/map/miniprogram/pages/adduser/index.json
# src/map/miniprogram/pages/addusers/index.json
# src/map/miniprogram/pages/adduserssuccess/index.json
# src/map/miniprogram/pages/adlogin/adlogin.json
# src/map/miniprogram/pages/location/location.js
# src/map/miniprogram/pages/location/location.wxml
# src/map/miniprogram/pages/location/location.wxss
# src/map/miniprogram/pages/login/login.js
# src/map/miniprogram/pages/login/login.wxss
# src/map/miniprogram/pages/logs/logs.js
# src/map/miniprogram/pages/logs/logs.wxml
# src/map/miniprogram/pages/text/text.js
# src/map/miniprogram/pages/text/text.wxml
# src/map/miniprogram/pages/text/text.wxss
# src/map/miniprogram/sitemap.json
|
wny