Merge branch 'cheney' into dev

src/views/product-manage/comment-detail/component/DataTable.vue

@@ -106,7 +106,7 @@ async function fetchList(isQuery = false) {
 	};
 	await useTableData(api.getTableData, query, gridOptions);
 	await gridRef.value.loadColumn(CompetitorMonitorCommentColumns);
-	// gridOptions.showHeader = Boolean(gridOptions.data?.length);
+	gridOptions.showHeader = Boolean(gridOptions.data?.length);
 }
 
 function handleRefresh() {

src/views/sku-manage/company-sku/component/ShowSkuDrawer.vue

@@ -108,7 +108,7 @@ onMounted(() => {
 <template>
 	<div class="drawer-container">
 
-	<el-drawer ref="showSkuDrawer" v-model="showOpen" style="width: 40%">
+	<el-drawer ref="showSkuDrawer" v-model="showOpen" style="width: 40%" :show-close="false">
 		<template #title>
 			<div>
 				<span style="font-size: 16px; font-weight: bold">当前SKU:</span>

src/views/sku-manage/product-attribute/component/ShowDetailDrawer.vue

@@ -36,7 +36,7 @@ onMounted(() => {
 
 <template>
 	<div class="drawer-container">
-		<el-drawer ref="showDetailDrawer" v-model="viewOpen" style="width: 40%" >
+		<el-drawer ref="showDetailDrawer" v-model="viewOpen" style="width: 40%" :show-close="false">
 			<template #title>
 				<div>
 					<span style="font-size: 16px; font-weight: bold">查看:</span>
@@ -84,4 +84,4 @@ onMounted(() => {
 
 <style scoped>
 
-</style>
+</style>