school-web.git - Gitblit

智慧校园项目

Merge branch 'master' of http://192.168.0.105:10010/r/school-web

shuishen

2021-12-22 3310d0c14c90c4fd23360113449503b0d2dde75b

refs
author	shuishen <1109946754@qq.com>
	Wednesday, December 22, 2021 16:19 +0800
committer	shuishen <1109946754@qq.com>
	Wednesday, December 22, 2021 16:19 +0800
commit	3310d0c14c90c4fd23360113449503b0d2dde75b
tree	61db6cd8d06f661bd2126f316431e51e48846f16 tree \| zip \| gz
parent	8a83d73d3ec6c84adba425aab273bffbdf08629a view \| diff 7516c690110c83081f5212ec81e809f73ebd3179 view \| diff

Merge branch 'master' of http://192.168.0.105:10010/r/school-web

12 files modified

9 files added

	public/img/mobile/blue.png	diff \| view \| raw \| blame \| history
	public/img/mobile/brown.png	diff \| view \| raw \| blame \| history
	public/img/mobile/green.png	diff \| view \| raw \| blame \| history
	public/img/mobile/pink.png	diff \| view \| raw \| blame \| history
	public/img/mobile/popcorn.png	diff \| view \| raw \| blame \| history
	public/img/mobile/purple.png	diff \| view \| raw \| blame \| history
	public/img/mobile/yellow.png	diff \| view \| raw \| blame \| history
	src/api/mobile/livingFacilities/index.js	18 ●●●●● diff \| view \| raw \| blame \| history
	src/api/mobile/outIn/index.js	16 ●●●●● diff \| view \| raw \| blame \| history
	src/api/mobile/piont/index.js	71 ●●●●● diff \| view \| raw \| blame \| history
	src/components/mobileCortrol/index.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	src/components/mobileCortrolButtom/index.vue	7 ●●●●● diff \| view \| raw \| blame \| history
	src/components/mobileLeftNav/index.vue	527 ●●●●● diff \| view \| raw \| blame \| history
	src/components/mobilePopupOur/index.vue	42 ●●●●● diff \| view \| raw \| blame \| history
	src/components/mobilePopupOurAfter/index.vue	40 ●●●●● diff \| view \| raw \| blame \| history
	src/components/mobilePopupOurOnce/index.vue	10 ●●●●● diff \| view \| raw \| blame \| history
	src/components/mobileWindow/index.vue	20 ●●●●● diff \| view \| raw \| blame \| history
	src/components/mobilemap/index.vue	13 ●●●●● diff \| view \| raw \| blame \| history
	src/store/modules/mobile.js	70 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/entitys/text-entitys.scss	55 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/mobile/popup.scss	84 ●●●●● diff \| view \| raw \| blame \| history