张含笑
2025-10-23 839acd1fe3dec49c00f89522aceda084987b2dfd
refs
author 张含笑 <zhx18749296735@163.com>
Thursday, October 23, 2025 08:44 +0800
committer 张含笑 <zhx18749296735@163.com>
Thursday, October 23, 2025 08:44 +0800
commit839acd1fe3dec49c00f89522aceda084987b2dfd
tree b44cb4387ff5f2c211aee745ccfc9456269c873b tree | zip | gz
parent e90ac69df5758e78da7fc1725674074f3cd5eb53 view | diff
ec8f1124209e89f7e4835731a82edf278e9bfa45 view | diff
Merge remote-tracking branch 'origin/master'

# Conflicts:
# src/pages/user/index.vue
8 files modified
12 files added
303 ■■■■ changed files
src/App.vue 7 ●●●●● diff | view | raw | blame | history
src/pages.json 37 ●●●● diff | view | raw | blame | history
src/pages/inspectionTask/index.vue 7 ●●●● diff | view | raw | blame | history
src/pages/map/index.vue 14 ●●●● diff | view | raw | blame | history
src/pages/user/index.vue 14 ●●●● diff | view | raw | blame | history
src/pages/work/index.vue 6 ●●●● diff | view | raw | blame | history
src/static/images/tabbar/add.png diff | view | raw | blame | history
src/static/images/tabbar/add.svg 10 ●●●●● diff | view | raw | blame | history
src/static/images/tabbar/icon_home.svg 10 ●●●●● diff | view | raw | blame | history
src/static/images/tabbar/icon_home_selected.svg 10 ●●●●● diff | view | raw | blame | history
src/static/images/tabbar/icon_list.svg 8 ●●●●● diff | view | raw | blame | history
src/static/images/tabbar/icon_list_selected.svg 8 ●●●●● diff | view | raw | blame | history
src/static/images/tabbar/icon_me.svg 7 ●●●●● diff | view | raw | blame | history
src/static/images/tabbar/icon_me_selected.svg 7 ●●●●● diff | view | raw | blame | history
src/static/images/tabbar/icon_order.svg 8 ●●●●● diff | view | raw | blame | history
src/static/images/tabbar/icon_order_selected.svg 8 ●●●●● diff | view | raw | blame | history
src/static/images/tabbar/mainLogo.png diff | view | raw | blame | history
src/subPackages/inspectionTask/taskDetails.vue 59 ●●●●● diff | view | raw | blame | history
src/subPackages/taskDetail/addTask/index.vue 19 ●●●● diff | view | raw | blame | history
src/subPackages/workDetail/mapWork/index.vue 64 ●●●●● diff | view | raw | blame | history