fix:修改首页冲突

src/views/PortalPage/PortalPage.vue

@@ -2,60 +2,6 @@
 
   <!--  <PhotoChange></PhotoChange>-->
   <div id="portal-body">
-<<<<<<< HEAD
-
-    <!-- 去除轮播组件 -->
-    <!--<CarouselCard style="grid-column-start: 1; grid-column-end: 3;"/>-->
-
-    <div>
-      <el-card :style="{height: this.courseRowHeight + 'px'}">
-        <div class="portal-card-title">
-          <div class="portal-card-title-main">我的课程</div>
-          <div style="font-size: 10px; color: #777777" v-if="myCourseList.length>6">可滚动查看课程列表</div>
-        </div>
-        <el-divider class="portal-card-divider"/>
-        <div>
-
-          <div v-if="!isLogin"
-               :style="{height: (this.courseRowHeight - 63) + 'px', marginTop: (this.courseRowHeight / 2 - 100) + 'px'}"
-               class="portal-card-main" style="cursor: pointer"
-               @click="toAuth">
-            <el-icon :size="72" color="#bfbfbf">
-              <Lock/>
-            </el-icon>
-            <div class="tip">登录以查看</div>
-          </div>
-
-          <div v-if="isLogin && isStudent && myCourseList.length!==0"
-               :style="{height: (this.courseRowHeight - 63) + 'px'}"
-               class="portal-card-main">
-            <div class="portal-my-card-main" ref="a">
-              <MyCourseCard v-for="course in myCourseList" :key="course.id" :courseVO="course"/>
-            </div>
-          </div>
-
-          <div v-if="isLogin && isStudent && myCourseList.length===0"
-               :style="{height: (this.courseRowHeight - 63) + 'px', marginTop: (this.courseRowHeight / 2 - 100) + 'px'}"
-               class="portal-card-main" style="cursor: pointer"
-               @click="toCourse">
-            <el-icon :size="72" color="#bfbfbf">
-              <ShoppingCart/>
-            </el-icon>
-            <div class="tip">去选择课程</div>
-          </div>
-
-          <div v-show="isLogin && isTeacher"
-               :style="{height: (this.courseRowHeight - 63) + 'px', marginTop: (this.courseRowHeight / 2 - 100) + 'px'}"
-               class="portal-card-main" style="cursor: pointer"
-               @click="toManage">
-            <el-icon :size="72" color="#bfbfbf">
-              <SetUp/>
-            </el-icon>
-            <div class="tip">去管理课程</div>
-          </div>
-        </div>
-      </el-card>
-=======
     <!--  <img src="@/assets/seec-banner.png" id="portal-banner" alt="contain"/>-->
     <span id="hot-course-title">
     热门课程
@@ -64,7 +10,6 @@
       <div  v-for="course in hotCourseList" :key="course.title">
         <HotCourseCard :courseVO="course"/>
       </div>
->>>>>>> 1094909 (feat:作业模块增删查改)
     </div>
     <!-- 去除轮播组件 -->
     <!--    <CarouselCard style="grid-column-start: 1; grid-column-end: 3;"/>-->