diff --git a/src/App.vue b/src/App.vue
index 62a9c07..e0db509 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,6 +27,7 @@ export default {
'/video-detail',
'/add-school',
'/choose-school',
+ '/choose-department',
'/declare-school',
];
const toDepth = routeDeep.indexOf(to.path)
diff --git a/src/pages/me/userinfo/AddSchool.vue b/src/pages/me/userinfo/AddSchool.vue
index 1542bce..674bdb3 100644
--- a/src/pages/me/userinfo/AddSchool.vue
+++ b/src/pages/me/userinfo/AddSchool.vue
@@ -18,10 +18,10 @@
-
+
院系
-
{{ isEmpty(school.department) }}
+
{{ isEmpty(localSchool.department) }}
@@ -64,11 +64,11 @@ export default {
}
},
created() {
- let val = localStorage.getItem('changeSchool')
- if (val) {
- this.localSchool.name = val
- localStorage.clear()
- }
+ let school = localStorage.getItem('changeSchool')
+ let department = localStorage.getItem('changeDepartment')
+ if (school) this.localSchool.name = school
+ if (department) this.localSchool.department = department
+ localStorage.clear()
},
computed: {
isChanged() {
@@ -92,6 +92,10 @@ export default {
isEmpty(val) {
if (val) return val
return '点击设置'
+ },
+ checkGo(path) {
+ if (!this.localSchool.name) return this.$notice('请先选择学校 ')
+ this.$nav(path)
}
}
}
diff --git a/src/pages/me/userinfo/ChooseDepartment.vue b/src/pages/me/userinfo/ChooseDepartment.vue
new file mode 100644
index 0000000..06d8b93
--- /dev/null
+++ b/src/pages/me/userinfo/ChooseDepartment.vue
@@ -0,0 +1,88 @@
+
+
+
+
+ 选择院系
+
+
+ 没有找到?
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/me/userinfo/ChooseSchool.vue b/src/pages/me/userinfo/ChooseSchool.vue
index 1f6c4c3..7776369 100644
--- a/src/pages/me/userinfo/ChooseSchool.vue
+++ b/src/pages/me/userinfo/ChooseSchool.vue
@@ -5,7 +5,7 @@
添加学校
- 没有找到?
+ 没有找到?
@@ -49,7 +49,7 @@
搜索结果为空
没有搜索到相关的内容
-
没有学校信息?去申报
+
没有学校信息?去申报
@@ -57,9 +57,7 @@
@@ -88,6 +94,32 @@ export default {
}
}
+ .department-row {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+
+ .label {
+ color: white;
+ font-size: 1.6rem;
+ margin-right: 3rem;
+ }
+
+ .right {
+ padding: 1.2rem 0;
+ display: flex;
+ align-items: center;
+ color: $second-text-color;
+
+ img {
+ margin-left: 5px;
+ width: 1.2rem;
+ }
+ }
+
+
+ }
+
.notice {
margin-top: 2rem;
color: $second-text-color;
diff --git a/src/router/index.js b/src/router/index.js
index 43d3d38..07e6cf2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -15,6 +15,7 @@ import EditUserInfoItem from "../pages/me/userinfo/EditUserInfoItem";
import AddSchool from "../pages/me/userinfo/AddSchool";
import ChooseSchool from "../pages/me/userinfo/ChooseSchool";
import DeclareSchool from "../pages/me/userinfo/DeclareSchool";
+import ChooseDepartment from "../pages/me/userinfo/ChooseDepartment";
const routes = [
// {path: '', component: Music},
@@ -34,6 +35,7 @@ const routes = [
{path: '/add-school', component: AddSchool},
{path: '/choose-school', component: ChooseSchool},
{path: '/declare-school', component: DeclareSchool},
+ {path: '/choose-department', component: ChooseDepartment},
]
export default VueRouter.createRouter({
diff --git a/src/utils/global-methods.js b/src/utils/global-methods.js
index a8de5c3..46f9c16 100644
--- a/src/utils/global-methods.js
+++ b/src/utils/global-methods.js
@@ -1,5 +1,14 @@
export default {
- $back(){
+ $notice(val) {
+ let div = document.createElement('div')
+ div.classList.add('global-notice')
+ div.textContent = val
+ document.body.append(div)
+ setTimeout(() => {
+ document.body.removeChild(div)
+ }, 1000)
+ },
+ $back() {
window.history.back()
},
$stopPropagation(e) {