Djyos/lock_Maintenance
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

This commit is contained in:
Aw0odMan 2024-08-29 17:43:41 +08:00
parent 0a3a13e0b4
commit efbda4407f
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pages.json
View File

@ -36,7 +36,6 @@
} }
}, },
{ {
<<<<<<< HEAD
"path": "pages/Message/Scheduling", "path": "pages/Message/Scheduling",
"style": { "style": {
"navigationBarTitleText": "排班通知", "navigationBarTitleText": "排班通知",
@ -54,17 +53,14 @@
"style": { "style": {
"navigationBarTitleText": "政策通知" "navigationBarTitleText": "政策通知"
} }
} },
======= {
"path" : "pages/Repair/RepairDetail", "path" : "pages/Repair/RepairDetail",
"style" : "style" :
{ {
"navigationBarTitleText" : "报修详情" "navigationBarTitleText" : "报修详情"
} }
} }
>>>>>>> bd19dfbd5ad48b7e36b032ccc036bd3138d76b52
], ],
"globalStyle": { "globalStyle": {
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",

4
pages/Message/Message.vue
View File

@ -48,7 +48,6 @@
</template> </template>
<script> <script>
<<<<<<< HEAD
import work from '../../components/messages/work.vue'; import work from '../../components/messages/work.vue';
import emergent from '../../components/messages/emergent.vue'; import emergent from '../../components/messages/emergent.vue';
import policy from '../../components/messages/policy.vue'; import policy from '../../components/messages/policy.vue';
@ -92,9 +91,6 @@
}, },
} }
} }
=======
>>>>>>> bd19dfbd5ad48b7e36b032ccc036bd3138d76b52
</script> </script>
<style lang="scss"> <style lang="scss">