Merge pull request '11' (#36 ) from huangyao_branch into master

1
Merge pull request 'zz' (#34 ) from huangyao_branch into master
1383 changed files with 35805 additions and 1473 deletions
--- a/README.md
+++ b/README.md
@ -1,2 +1,6 @@
 # guoxinyu_project1
 系统简介：本程序为微信小程序，使用微信开发者工具编写，本程序名称为中国民航大学导航系统，旨在帮助同学进行校园导航。
 配置环境：安卓操作系统和ios操作系统，微信7.0及以上版本。
 说明：头歌平台测试代码11182行，我们经计算代码量约16000行左右。
--- a/doc/软件系统的需求构思及描述.docx
+++ b/doc/软件系统的需求构思及描述.docx
--- a/doc/软件设计规格说明书.docx
+++ b/doc/软件设计规格说明书.docx
--- a/doc/软件需求规格说明书.docx
+++ b/doc/软件需求规格说明书.docx
--- a/model/体系结构/体系结构逻辑视图
+++ b/model/体系结构/体系结构逻辑视图
--- a/model/体系结构/体系结构逻辑视图.jpg
+++ b/model/体系结构/体系结构逻辑视图.jpg
--- a/model/体系结构/体系结构逻辑视图3.png
+++ b/model/体系结构/体系结构逻辑视图3.png
--- a/model/分析类图/-分析类图1.png
+++ b/model/分析类图/-分析类图1.png
--- a/model/分析类图/中航大导航系统.vsdx
+++ b/model/分析类图/中航大导航系统.vsdx
--- a/model/分析类图/分析类图.jpg
+++ b/model/分析类图/分析类图.jpg
--- a/model/数据设计/数据模型.png
+++ b/model/数据设计/数据模型.png
--- a/model/数据设计类图/系统数据设计类图.jpg
+++ b/model/数据设计类图/系统数据设计类图.jpg
--- a/model/时序图/(4)列写备忘录.jpg
+++ b/model/时序图/(4)列写备忘录.jpg
--- a/model/时序图/(5)管理用户信息.jpg
+++ b/model/时序图/(5)管理用户信息.jpg
--- a/model/时序图/（1）登录系统.jpg
+++ b/model/时序图/（1）登录系统.jpg
--- a/model/时序图/（2）导航.jpg
+++ b/model/时序图/（2）导航.jpg
--- a/model/时序图/（2）查看基本地图.jpg
+++ b/model/时序图/（2）查看基本地图.jpg
--- a/model/时序图/（3）定位.jpg
+++ b/model/时序图/（3）定位.jpg
--- a/model/时序图/（3）查看天气.jpg
+++ b/model/时序图/（3）查看天气.jpg
--- a/model/时序图/（4）查看公告.jpg
+++ b/model/时序图/（4）查看公告.jpg
--- a/model/时序图/（5）导航.jpg
+++ b/model/时序图/（5）导航.jpg
--- a/model/时序图/（6）修改地图信息.jpg
+++ b/model/时序图/（6）修改地图信息.jpg
--- a/model/时序图/（6）更新公告栏.jpg
+++ b/model/时序图/（6）更新公告栏.jpg
--- a/model/时序图/（7）查看基本地图信息.jpg
+++ b/model/时序图/（7）查看基本地图信息.jpg
--- a/model/时序图/（7）管理用户信息.jpg
+++ b/model/时序图/（7）管理用户信息.jpg
--- a/model/时序图/（8）更新公告栏.jpg
+++ b/model/时序图/（8）更新公告栏.jpg
--- a/model/时序图/（9）修改校车时刻表.jpg
+++ b/model/时序图/（9）修改校车时刻表.jpg
--- a/model/用例图/QQ截图20221002162812.png
+++ b/model/用例图/QQ截图20221002162812.png
--- a/model/用例图/图片1.jpg
+++ b/model/用例图/图片1.jpg
--- a/model/用例图/地图用例图.eddx
+++ b/model/用例图/地图用例图.eddx
--- a/model/用例描述/导航系统用例描述
+++ b/model/用例描述/导航系统用例描述
--- a/model/用例描述/导航系统用例描述.doc
+++ b/model/用例描述/导航系统用例描述.doc
--- a/model/用例设计顺序图/“导航”用例设计顺序图.jpg
+++ b/model/用例设计顺序图/“导航”用例设计顺序图.jpg
--- a/model/用例设计顺序图/“更新公告栏”用例设计顺序图.jpg
+++ b/model/用例设计顺序图/“更新公告栏”用例设计顺序图.jpg
--- a/model/用例设计顺序图/“查看公告”用例设计顺序图.jpg
+++ b/model/用例设计顺序图/“查看公告”用例设计顺序图.jpg
--- a/model/用例设计顺序图/“查看基本地图信息”用例设计顺序图.jpg
+++ b/model/用例设计顺序图/“查看基本地图信息”用例设计顺序图.jpg
--- a/model/用例设计顺序图/“查看天气”用例设计顺序图.jpg
+++ b/model/用例设计顺序图/“查看天气”用例设计顺序图.jpg
--- a/model/用例设计顺序图/“登录”用例设计顺序图.jpg
+++ b/model/用例设计顺序图/“登录”用例设计顺序图.jpg
--- a/model/用例设计顺序图/“管理用户信息”用例设计顺序图.jpg
+++ b/model/用例设计顺序图/“管理用户信息”用例设计顺序图.jpg
--- a/model/界面流图/1.jpg
+++ b/model/界面流图/1.jpg
--- a/model/界面流图/主界面.jpg
+++ b/model/界面流图/主界面.jpg
--- a/model/界面流图/主页面类图.jpg
+++ b/model/界面流图/主页面类图.jpg
--- a/model/界面流图/修改用户界面.jpg
+++ b/model/界面流图/修改用户界面.jpg
--- a/model/界面流图/修改用户界面类图.jpg
+++ b/model/界面流图/修改用户界面类图.jpg
--- a/model/界面流图/公告栏历史公告界面.jpg
+++ b/model/界面流图/公告栏历史公告界面.jpg
--- a/model/界面流图/公告栏历史公告界面类图.jpg
+++ b/model/界面流图/公告栏历史公告界面类图.jpg
--- a/model/界面流图/公告栏发布界面.jpg
+++ b/model/界面流图/公告栏发布界面.jpg
--- a/model/界面流图/公告栏发布界面类图.jpg
+++ b/model/界面流图/公告栏发布界面类图.jpg
--- a/model/界面流图/公告栏我关注的公告页面.jpg
+++ b/model/界面流图/公告栏我关注的公告页面.jpg
--- a/model/界面流图/公告栏我关注的公告页面类图.jpg
+++ b/model/界面流图/公告栏我关注的公告页面类图.jpg
--- a/model/界面流图/公告栏我发布的公告页面.jpg
+++ b/model/界面流图/公告栏我发布的公告页面.jpg
--- a/model/界面流图/公告栏我发布的公告页面类图.jpg
+++ b/model/界面流图/公告栏我发布的公告页面类图.jpg
--- a/model/界面流图/公告栏我发布的管理员个人信息界面.jpg
+++ b/model/界面流图/公告栏我发布的管理员个人信息界面.jpg
--- a/model/界面流图/公告栏我发布的管理员个人信息界面类图.jpg
+++ b/model/界面流图/公告栏我发布的管理员个人信息界面类图.jpg
--- a/model/界面流图/公告栏我发布的管理员主页界面.jpg
+++ b/model/界面流图/公告栏我发布的管理员主页界面.jpg
--- a/model/界面流图/公告栏我发布的管理员主页界面类图.jpg
+++ b/model/界面流图/公告栏我发布的管理员主页界面类图.jpg
--- a/model/界面流图/公告栏我发布的管理员历史公告界面.jpg
+++ b/model/界面流图/公告栏我发布的管理员历史公告界面.jpg
--- a/model/界面流图/公告栏我发布的管理员历史公告界面类图.jpg
+++ b/model/界面流图/公告栏我发布的管理员历史公告界面类图.jpg
--- a/model/界面流图/公告栏用户信息界面.jpg
+++ b/model/界面流图/公告栏用户信息界面.jpg
--- a/model/界面流图/公告栏用户信息界面类图.jpg
+++ b/model/界面流图/公告栏用户信息界面类图.jpg
--- a/model/界面流图/公告栏管理员我关注的公告页面.jpg
+++ b/model/界面流图/公告栏管理员我关注的公告页面.jpg
--- a/model/界面流图/公告栏管理员我关注的公告页面类图.jpg
+++ b/model/界面流图/公告栏管理员我关注的公告页面类图.jpg
--- a/model/界面流图/公告栏首页界面.jpg
+++ b/model/界面流图/公告栏首页界面.jpg
--- a/model/界面流图/公告栏首页界面类图.jpg
+++ b/model/界面流图/公告栏首页界面类图.jpg
--- a/model/界面流图/公告设置界面.jpg
+++ b/model/界面流图/公告设置界面.jpg
--- a/model/界面流图/公告设置界面类图.jpg
+++ b/model/界面流图/公告设置界面类图.jpg
--- a/model/界面流图/删除单个用户界面.jpg
+++ b/model/界面流图/删除单个用户界面.jpg
--- a/model/界面流图/删除单个用户界面类图.jpg
+++ b/model/界面流图/删除单个用户界面类图.jpg
--- a/model/界面流图/删除用户界面.jpg
+++ b/model/界面流图/删除用户界面.jpg
--- a/model/界面流图/删除用户界面类图.jpg
+++ b/model/界面流图/删除用户界面类图.jpg
--- a/model/界面流图/增加用户界面.jpg
+++ b/model/界面流图/增加用户界面.jpg
--- a/model/界面流图/增加用户界面类图.jpg
+++ b/model/界面流图/增加用户界面类图.jpg
--- a/model/界面流图/天气界面.jpg
+++ b/model/界面流图/天气界面.jpg
--- a/model/界面流图/天气界面类图.jpg
+++ b/model/界面流图/天气界面类图.jpg
--- a/model/界面流图/导航界面.jpg
+++ b/model/界面流图/导航界面.jpg
--- a/model/界面流图/导航页面类图.jpg
+++ b/model/界面流图/导航页面类图.jpg
--- a/model/界面流图/按学号查询界面.jpg
+++ b/model/界面流图/按学号查询界面.jpg
--- a/model/界面流图/按学号查询界面类图.jpg
+++ b/model/界面流图/按学号查询界面类图.jpg
--- a/model/界面流图/查找所有用户界面.jpg
+++ b/model/界面流图/查找所有用户界面.jpg
--- a/model/界面流图/查找所有用户界面类图.jpg
+++ b/model/界面流图/查找所有用户界面类图.jpg
--- a/model/界面流图/查询用户界面.jpg
+++ b/model/界面流图/查询用户界面.jpg
--- a/model/界面流图/查询用户界面类图.jpg
+++ b/model/界面流图/查询用户界面类图.jpg
--- a/model/界面流图/查询用户详细界面.jpg
+++ b/model/界面流图/查询用户详细界面.jpg
--- a/model/界面流图/注册界面.jpg
+++ b/model/界面流图/注册界面.jpg
--- a/model/界面流图/注册页面类图.jpg
+++ b/model/界面流图/注册页面类图.jpg
--- a/model/界面流图/界面流图-信息栏.jpg
+++ b/model/界面流图/界面流图-信息栏.jpg
--- a/model/界面流图/界面流图-修改信息栏信息.jpg
+++ b/model/界面流图/界面流图-修改信息栏信息.jpg
--- a/model/界面流图/界面流图-修改地图信息.jpg
+++ b/model/界面流图/界面流图-修改地图信息.jpg
--- a/model/界面流图/界面流图-修改密码.jpg
+++ b/model/界面流图/界面流图-修改密码.jpg
--- a/model/界面流图/界面流图-导航.jpg
+++ b/model/界面流图/界面流图-导航.jpg
--- a/model/界面流图/界面流图-查询路线.jpg
+++ b/model/界面流图/界面流图-查询路线.jpg
--- a/model/界面流图/界面流图-登陆.jpg
+++ b/model/界面流图/界面流图-登陆.jpg
--- a/model/界面流图/界面流图-管理账户信息.jpg
+++ b/model/界面流图/界面流图-管理账户信息.jpg
--- a/model/界面流图/界面跳转.jpg
+++ b/model/界面流图/界面跳转.jpg
--- a/model/界面流图/登录页面类图.jpg
+++ b/model/界面流图/登录页面类图.jpg
--- a/model/界面流图/登陆界面.jpg
+++ b/model/界面流图/登陆界面.jpg
--- a/model/界面流图/管理员管理界面.jpg
+++ b/model/界面流图/管理员管理界面.jpg
--- a/model/界面流图/管理员管理界面类图.jpg
+++ b/model/界面流图/管理员管理界面类图.jpg
--- a/model/界面流图/管理员页面类图.jpg
+++ b/model/界面流图/管理员页面类图.jpg
--- a/model/界面流图/详细删除用户界面.jpg
+++ b/model/界面流图/详细删除用户界面.jpg
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
psnreiywo	0f040c9608	Merge pull request '11' (#36 ) from huangyao_branch into master	2 years ago
黄瑶	19ef1bdd74	1	2 years ago
psnreiywo	a13538f59a	Merge pull request 'zz' (#34 ) from huangyao_branch into master	2 years ago
黄瑶	04f2170ed2	1	2 years ago
黄瑶	85856a3aab	Merge branch 'dev' of https://bdgit.educoder.net/psnreiywo/guoxinyu_project into huangyao_branch	2 years ago
psnreiywo	f533b0c0d6	Merge pull request '111' (#33 ) from dev into master	2 years ago
chargehand	e95fa8bf3c	1	2 years ago
psnreiywo	2f95b522b8	Merge pull request '终版' (#32 ) from dev into master	2 years ago
chargehand	0382528b93	终	2 years ago
chargehand	edfb63252a	g	2 years ago
psnreiywo	249754a7b4	Merge pull request '111' (#31 ) from dev into master	2 years ago
chargehand	741333ff11	g	2 years ago
psnreiywo	380ace761d	Merge pull request '111' (#30 ) from dev into master	2 years ago
psnreiywo	666433a936	Merge pull request '1' (#28 ) from wny_branch into dev	2 years ago
wny	e4479fccd0	1	2 years ago
psnreiywo	75ef4f46c1	Merge pull request '111' (#27 ) from master into dev	2 years ago
psnreiywo	5cdd96e9b6	Merge pull request '1' (#25 ) from wny_branch into master	2 years ago
wny	82b1e77413	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	2 years ago
wny	1acc73cf87	1	2 years ago
wny	263177911b	1	2 years ago
psnreiywo	f53233a227	Merge pull request '111' (#23 ) from dev into master	2 years ago
chargehand	872710dc11	g	2 years ago
黄瑶	1dff77350e	111	2 years ago
黄瑶	a7bf55880f	123	2 years ago
psnreiywo	a1cdb4a861	Merge pull request '123' (#15 ) from gongduhaii_branch into master	2 years ago