From ae038d50b068a02c4fe53725095dc952bf75b797 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 15 Dec 2021 17:36:21 +0800
Subject: [PATCH] 冲突
---
src/pcviews/arc/dorm.vue | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/src/pcviews/arc/dorm.vue b/src/pcviews/arc/dorm.vue
index 4171422..06fe0d2 100644
--- a/src/pcviews/arc/dorm.vue
+++ b/src/pcviews/arc/dorm.vue
@@ -1,15 +1,35 @@
+/*
+ * @Author: Morpheus
+ * @Name: 学生宿舍
+ * @Date: 2021-11-15 17:14:47
+ * @Last Modified by: Morpheus
+ * @Last Modified time: 2021-12-15 11:48:43
+ */
<template>
- <div>
- 校内建筑
- </div>
+ <div>
+ <arc-nav-bar :title="title"
+ :arcCode="code"></arc-nav-bar>
+ </div>
</template>
<script>
export default {
-
+ data () {
+ return {
+ title: '学生宿舍',
+ code: 4
+ }
+ },
+ created () {
+ },
+ methods: {
+ closeModel () {
+ this.$store.dispatch('delVisitedViews', this.$route)
+ this.$router.push('/pcLayout/default')
+ }
+ }
}
</script>
<style>
-
</style>
--
Gitblit v1.9.3