From d40af76800dc836e0f02d66b3ce5fef5ae52e36f Mon Sep 17 00:00:00 2001
From: cgd_mac <349008059@qq.com>
Date: Fri, 25 Feb 2022 19:47:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A9=BA=E5=9B=BE=E7=89=87=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js                                   |  4 +++-
 src/views/index/welcome.vue                   | 24 +++++++++++--------
 src/views/mycollection/index.vue              |  2 +-
 .../mycourseList/CourseRecommendation.vue     |  2 +-
 src/views/myhome/index.vue                    |  3 ++-
 src/views/mypractice/index.vue                |  2 +-
 src/views/user/Login.vue                      |  6 ++++-
 7 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/main.js b/src/main.js
index ffdba7f..6ecd7bf 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,7 +18,7 @@ import './permission' // permission control
 import './utils/filter' // global filter
 import './global.less'
 import moment from 'moment'
-import { FormModel } from 'ant-design-vue'
+import { FormModel, Empty } from 'ant-design-vue'
 import { hasBtnPermission } from './utils/permissions'
 
 window.Vue = Vue
@@ -35,7 +35,9 @@ window.Vue = Vue
 // } from 'echarts/components'
 
 Vue.use(FormModel)
+Vue.use(Empty)
 Vue.prototype.hasPerm = hasBtnPermission
+Vue.prototype.$emptyImg = Empty.PRESENTED_IMAGE_SIMPLE
 
 Vue.config.productionTip = false
 
diff --git a/src/views/index/welcome.vue b/src/views/index/welcome.vue
index b8a4c9b..6559d28 100644
--- a/src/views/index/welcome.vue
+++ b/src/views/index/welcome.vue
@@ -1,22 +1,26 @@
 <template>
-  <div>
-    <Myhome v-if="currentRole && currentRole.code === 'student'"></Myhome>
-    <a-card v-else :bordered="false" style="display: flex;justify-content:center;height: 100%">
-      <div style="margin:100px auto;">
-        <img src="~@/assets/welcome.png" class="logo" alt="logo" />
-      </div>
-    </a-card>
-  </div>
+  <a-card :bordered="false" style="display: flex;justify-content:center;height: 100%">
+    <div style="margin:100px auto;">
+      <img src="~@/assets/welcome.png" class="logo" alt="logo" />
+    </div>
+  </a-card>
 </template>
 
 <script>
 import { mapState } from 'vuex'
-import Myhome from '@/views/myhome/index.vue'
+// import Myhome from '@/views/myhome/index.vue'
 export default {
-  components: { Myhome },
   data () {
     return {}
   },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      const code = vm.$store.state.user && vm.$store.state.user.currentRole.code
+      if (code === 'student') {
+        vm.$router.replace({ path: '/myhome' })
+      }
+    })
+  },
   computed: {
     ...mapState({
       currentRole: state => state.user.currentRole
diff --git a/src/views/mycollection/index.vue b/src/views/mycollection/index.vue
index d0db6f2..1d47012 100644
--- a/src/views/mycollection/index.vue
+++ b/src/views/mycollection/index.vue
@@ -98,7 +98,7 @@
             />
           </div>
         </template>
-        <a-empty v-else></a-empty>
+        <a-empty v-else :image="$emptyImg"></a-empty>
       </a-tab-pane>
     </a-tabs>
   </a-card>
diff --git a/src/views/mycourse/mycourseList/CourseRecommendation.vue b/src/views/mycourse/mycourseList/CourseRecommendation.vue
index 0fbb1aa..0f864fc 100644
--- a/src/views/mycourse/mycourseList/CourseRecommendation.vue
+++ b/src/views/mycourse/mycourseList/CourseRecommendation.vue
@@ -14,7 +14,7 @@
         </a-card>
       </a-col>
     </a-row>
-    <a-empty v-else></a-empty>
+    <a-empty v-else :image="$emptyImg"></a-empty>
   </a-card>
 </template>
 
diff --git a/src/views/myhome/index.vue b/src/views/myhome/index.vue
index 98eb5af..10936e2 100644
--- a/src/views/myhome/index.vue
+++ b/src/views/myhome/index.vue
@@ -76,7 +76,7 @@
     <!-- 系统推荐课程 start -->
     <a-col :span="24" :style="{ marginBottom: '24px' }">
       <a-card :bordered="false" title="系统推荐课程" :style="{ height: '100%' }">
-        <a-row :gutter="16">
+        <a-row v-if="sysList && sysList.length>0" :gutter="16">
           <a-col :span="6" :md="4" :sm="6" v-for="(item, index) in sysList" :key="index">
             <a-card
               @click="handlerContinue(item)"
@@ -94,6 +94,7 @@
             </a-card>
           </a-col>
         </a-row>
+        <a-empty v-else :image="$emptyImg"></a-empty>
       </a-card>
     </a-col>
     <!-- 系统推荐课程 end -->
diff --git a/src/views/mypractice/index.vue b/src/views/mypractice/index.vue
index 91b67aa..95a2612 100644
--- a/src/views/mypractice/index.vue
+++ b/src/views/mypractice/index.vue
@@ -48,7 +48,7 @@
         </a-row>
       </a-card>
     </template>
-    <a-empty v-else />
+    <a-empty v-else :image="$emptyImg" />
 
   </a-card>
 </template>
diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
index c7dab8f..56112df 100644
--- a/src/views/user/Login.vue
+++ b/src/views/user/Login.vue
@@ -88,7 +88,11 @@ export default {
     },
     loginSuccess (res) {
       this.loading = false
-      this.$router.push({ path: '/' })
+      if (this.form.roleCode === 'student') {
+        this.$router.push({ path: '/myhome' })
+      } else {
+        this.$router.push({ path: '/' })
+      }
       // 延迟 1 秒显示欢迎信息
       setTimeout(() => {
         this.$notification.success({