Merge remote-tracking branch 'origin/250321-bugfix-shl' into 250321-bugfix-shl

# Conflicts:
#	src/views/Login.vue

src/components/UserCenter/menu.vue

@@ -242,7 +242,6 @@
           <svg-icon :icon-class="activeMenu == '/user/medal'?'myxunzhang-active':'myxunzhang'"></svg-icon>
           <span slot="title">我的勋章</span>
       </el-menu-item>
-        <template v-if="showGrowthNav">
         <el-submenu index="myGrowth" v-show="curIdentity == 1">
           <template slot="title">
             <!-- <i class="el-icon-s-grid"></i> -->
@@ -254,8 +253,6 @@
             <span slot="title" class="study textl">专业力必修</span>
           </el-menu-item>
         </el-submenu>
-        </template>
-
         <el-submenu index="mystudy" v-show="curIdentity == 1">
           <template slot="title">
             <!-- <i class="el-icon-s-grid"></i> -->
@@ -399,7 +396,6 @@ import { mapGetters } from 'vuex';
 import apicourseStudy from "../../api/modules/courseStudy.js"
 import {pageList} from "@/api/modules/lecturer"
 import courseImage from "@/components/Course/courseImage.vue"
-import { listData } from "@/api/growth/growthpath"
 import testUser from '@/utils/testUsers.js'
 export default {
   name: 'UcMenu',
@@ -428,8 +424,7 @@ export default {
       isCollapse: false,
       lastStudy:{},
       overlayShow: false,
-      instructor:0,
+      instructor:0
-      showGrowthNav: false
     };
   },
   created() {
@@ -439,10 +434,6 @@ export default {
     //获取讲师认证中条数
     this.instructorCertification()
     console.log(this.userInfo,'userInfouserInfo')
-    //如果专业力必修没有学习任务则隐藏“我的必修按钮”
-    listData().then(res => {
-      this.showGrowthNav = !!res.data.length
-    })
   },
   mounted() {
     //console.log(this.userInfo.loginName,'this.userInfo.loginName');

src/views/Login.vue

@@ -1,3 +1,4 @@
+<!--
 <template>
   <div class="login" :style="`background: url(${webBaseUrl}/temp/background.jpg) no-repeat`">
     <el-form :model="form" ref="form" :rules="rules">
@@ -24,7 +25,7 @@
       <el-form-item>
         <section>
           <el-checkbox v-model="rememberMe">记住密码</el-checkbox>
-          <!-- <span>忘记密码</span> -->
+          &lt;!&ndash; <span>忘记密码</span> &ndash;&gt;
         </section>
       </el-form-item>
       <el-form-item><el-button type="primary" @click="loginSubmit">点击登录</el-button></el-form-item>
@@ -194,3 +195,4 @@
   }
 }
 </style>
+-->

src/views/course/ManageList.vue

@@ -676,8 +676,10 @@ export default {
       }
       apiCourse.pageList(this.params).then(rs=>{
           if(rs.status==200){
-            this.pageData = rs.result.list;
+            this.pageData = rs.result.list ? rs.result.list : [];
+            // this.pageData = rs.result.list;
             this.page.count = rs.result.count;
+            this.page.pageSize = rs.result.pageSize;
           }else{
             return this.$message.error(rs.message);
           }