qfqk-android.git

Merge remote-tracking branch 'origin/master'

zengh

2021-11-03 116298d545317448e497ab78ad85ff90ff13e298

refs
author	zengh <123456>
	Wednesday, November 3, 2021 15:58 +0800
committer	zengh <123456>
	Wednesday, November 3, 2021 15:58 +0800
commit	116298d545317448e497ab78ad85ff90ff13e298
tree	aebfe55124d41301e400e8796393727bd22f805f tree \| zip \| gz
parent	f55c6af89e056bdd12caa626f351cc6119264346 view \| diff 7d712855cdf187d29b7b909d2264a500f9cdc5a6 view \| diff

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pages/home/home.vue

8 files modified

113 files added

	grabOrdersMap/css/body.css	131 ●●●●● diff \| view \| raw \| blame \| history
	grabOrdersMap/css/elementUI.css	1 ●●●●● diff \| view \| raw \| blame \| history
	grabOrdersMap/css/fonts/element-icons.ttf	diff \| view \| raw \| blame \| history
	grabOrdersMap/css/fonts/element-icons.woff	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/alarm.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/alarm_time.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/alarm_type.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/beizhu.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/desc.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/desc2.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/dianhua.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/dingw.gif	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/dingwei.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/gaunbi.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/gray.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/green.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/huifang.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/leixing.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/people.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/people1.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/phone call.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/phone.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/phone1.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/red.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/ren.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/shijian.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/shiping.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/shiping11.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/shiyongren.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/type.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/type1.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/xiangji.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/yellow.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/zd.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/zd2.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/刷新.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/定位.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/手.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/打开.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/排队数.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/提示.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/img/文件.png	diff \| view \| raw \| blame \| history
	grabOrdersMap/js/geolocation.min.js	94 ●●●●● diff \| view \| raw \| blame \| history
	grabOrdersMap/js/move.js	132 ●●●●● diff \| view \| raw \| blame \| history
	grabOrdersMap/js/vueMain.js	495 ●●●●● diff \| view \| raw \| blame \| history
	grabOrdersMap/lid/MarkerCluster.Default.css	60 ●●●●● diff \| view \| raw \| blame \| history
	grabOrdersMap/lid/MarkerCluster.css	14 ●●●●● diff \| view \| raw \| blame \| history
	grabOrdersMap/lid/axios.js	659 ●●●●● diff \| view \| raw \| blame \| history
	grabOrdersMap/lid/elementUi.css	1 ●●●●● diff \| view \| raw \| blame \| history
	grabOrdersMap/lid/elementUi.js	1 ●●●●● diff \| view \| raw \| blame \| history
	grabOrdersMap/lid/jquery.js	2 ●●●●● diff \| view \| raw \| blame \| history
	grabOrdersMap/lid/leaflet.css	640 ●●●●● diff \| view \| raw \| blame \| history
	grabOrdersMap/lid/leaflet.js	5222 ●●●●● diff \| view \| raw \| blame \| history
	grabOrdersMap/lid/leaflet.markercluster-src.js	2707 ●●●●● diff \| view \| raw \| blame \| history
	grabOrdersMap/lid/proj4.js	5485 ●●●●● diff \| view \| raw \| blame \| history
	grabOrdersMap/lid/proj4leaflet.js	263 ●●●●● diff \| view \| raw \| blame \| history
	grabOrdersMap/popup/user.html	37 ●●●●● diff \| view \| raw \| blame \| history
	grabOrdersMap/xcxmap.html	150 ●●●●● diff \| view \| raw \| blame \| history
	pages.json	64 ●●●●● diff \| view \| raw \| blame \| history
	pages/article/article.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	pages/business/business.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	pages/grabOrders/feedback.vue	382 ●●●●● diff \| view \| raw \| blame \| history
	pages/grabOrders/grabOrders.vue	285 ●●●●● diff \| view \| raw \| blame \| history
	pages/grabOrders/map.vue	41 ●●●●● diff \| view \| raw \| blame \| history
	pages/grabOrders/once.vue	38 ●●●●● diff \| view \| raw \| blame \| history
	pages/grabOrders/task - 副本.vue	88 ●●●●● diff \| view \| raw \| blame \| history
	pages/grabOrders/task.vue	88 ●●●●● diff \| view \| raw \| blame \| history
	pages/home/home.vue	22 ●●●●● diff \| view \| raw \| blame \| history
	pages/issue/issue.vue	228 ●●●●● diff \| view \| raw \| blame \| history
	pages/myself/myself.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	static/images/lssue/selectVideo.png	diff \| view \| raw \| blame \| history
	static/tabbar/addIcon.png	diff \| view \| raw \| blame \| history
	static/tabbar/addSelectedIcon.png	diff \| view \| raw \| blame \| history
	store/state.js	45 ●●●●● diff \| view \| raw \| blame \| history
	vue.config.js	28 ●●●●● diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/css/body.css	315 ●●●●● diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/css/elementUI.css	1 ●●●●● diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/css/fonts/element-icons.ttf	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/css/fonts/element-icons.woff	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/alarm.png	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/alarm_time.png	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/alarm_type.png	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/beizhu.png	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/desc.png	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/desc2.png	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/dianhua.png	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/dingw.gif	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/dingwei.png	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/gaunbi.png	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/gray.png	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/green.png	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/huifang.png	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/leixing.png	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/people.png	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/people1.png	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/phone call.png	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/phone.png	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/phone1.png	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/red.png	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/ren.png	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/shijian.png	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/shiping.png	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/shiping11.png	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/shiyongren.png	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/type.png	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/type1.png	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/xiangji.png	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/img/yellow.png	diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/js/geolocation.min.js	94 ●●●●● diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/js/move.js	132 ●●●●● diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/js/vueMain.js	348 ●●●●● diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/lid/MarkerCluster.Default.css	60 ●●●●● diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/lid/MarkerCluster.css	14 ●●●●● diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/lid/leaflet.css	640 ●●●●● diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/lid/leaflet.js	5222 ●●●●● diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/lid/leaflet.markercluster-src.js	2707 ●●●●● diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/lid/proj4.js	5485 ●●●●● diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/lid/proj4leaflet.js	263 ●●●●● diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/popup/user.html	37 ●●●●● diff \| view \| raw \| blame \| history
	xcxMapJQ - 副本/xcxmap.html	92 ●●●●● diff \| view \| raw \| blame \| history
	xcxMapJQ/img/alarm_time.png	diff \| view \| raw \| blame \| history