Merge branch 'test_zyh' of United_Software/k_online_ui into test

src/styles/vxeTable.scss

@@ -18,13 +18,16 @@
 
 // 重置表格stripe样式
 .vxe-table--render-default tr.vxe-body--row.row--stripe {
+  &>.vxe-body--column {
+    background-color: var(--color-table-stripe-bg) !important;
+  }
   background-color: var(--color-table-stripe-bg);
 }
 .vxe-table--render-default tr.vxe-body--row.row--current,
 .vxe-table--render-default tr.vxe-body--row.row--stripe.row--current {
-  background-color: rgba(255, 117, 0, 0.2) !important;
+  background-color: rgba(255, 117, 0, 0.2) ;
   &>.vxe-body--column {
-  background-color: rgba(255, 117, 0, 0.2) !important;
+  background-color: rgba(255, 117, 0, 0.2) ;
   }
 }
 .vxe-table--render-default .vxe-body--row.visited-row,

src/views/Layout/src/components/Header/components/NotificationDrawer.vue

@@ -24,7 +24,7 @@ const pageInfo = ref({
   cp: 1,
   ps: 30
 })
-const getNotificationList = (isChangeType: boolean) => {
+const getNotificationList = (isChangeType?: boolean) => {
   loading.value = true
   $api
     .getNotificationList({
@@ -90,6 +90,7 @@ const handleChangeNotificationType = async (value: string) => {
 const closeDrawer = () => {
   notificationList.value = []
   notificationType.value = 'all'
+  notificationMessageCardRef.value.adjustScrollTop(0)
   notificationMsgStore.markMessageAsRead()
   pageInfo.value.cp = 1
 }
@@ -98,7 +99,7 @@ const closeDrawer = () => {
 <template>
   <el-drawer
     ref="drawerRef"
-    @open="getNotificationList"
+    @open="getNotificationList(true)"
     @closed="closeDrawer"
     class="notice-drawer"
     size="432px"