diff --git a/src/components/Article/ucItems.vue b/src/components/Article/ucItems.vue
index c537e725..b5d9de4b 100644
--- a/src/components/Article/ucItems.vue
+++ b/src/components/Article/ucItems.vue
@@ -26,14 +26,10 @@
             <span>{{item.name}}{{(item.orgInfo)}}</span> -->
             <!-- <el-tag v-if="status === 0" type="success">已发布</el-tag>
             <el-tag type="warning" v-else>未发布</el-tag> -->
-            <span class="problem">
-
+            <span class="article-time">
               <span> 时间：{{item.sysCreateTime|sysCreateTimeFilter}}</span>
             </span>
-            <span v-if="!item.enabled">
-              已下架
-            </span>
-
+            <span v-if="!item.enabled">已下架</span>
           </div>
           <div class="article-info-tools-btns" v-if="item.status == 9">
             <!-- <interactBar :data="item" :type="2" :shares="false" :views="false"></interactBar> -->
@@ -312,8 +308,9 @@ width: 100%;
         color: #7b7b7b;
         margin-left:5px;
       }
-      .problem{
+      .article-time{
         margin-left: -5px;
+		border:0px;
         span{
           font-size: 14px;
         }
diff --git a/src/views/feedback/Index.vue b/src/views/feedback/Index.vue
index 6d243ca3..f54654db 100644
--- a/src/views/feedback/Index.vue
+++ b/src/views/feedback/Index.vue
@@ -185,7 +185,7 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .problem{
   margin: 10px;
   border: 1px solid #e4e4e4;
diff --git a/src/views/feedback/Manager.vue b/src/views/feedback/Manager.vue
index 9b422b66..fc205bef 100644
--- a/src/views/feedback/Manager.vue
+++ b/src/views/feedback/Manager.vue
@@ -186,7 +186,7 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .problem{
   margin: 10px;
   border: 1px solid #f0f0f0;
diff --git a/src/views/portal/course/Micro.vue b/src/views/portal/course/Micro.vue
index 5a9e7b35..2b0b0307 100644
--- a/src/views/portal/course/Micro.vue
+++ b/src/views/portal/course/Micro.vue
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <template>
   <div>
     <portal-header current="course" :goSearch="1"></portal-header>