Merge branch 'cheney' into dev

# Conflicts:
#	src/views/product-manage/comment-detail/component/NegativeLabel.vue

src/utils/useCopyText.ts

@@ -12,7 +12,10 @@ export function handleCopy(copyText: string) {
     if (successful) {
       ElMessage.info({
         dangerouslyUseHTMLString: true,
-        message: `<span class="font-medium" style="color: #1D2129;">${ textarea.value }</span> 已复制至剪切板`,
+        message: `<div class="flex items-center">
+                    <div class="font-medium text-ellipsis line-clamp-1" style="color: #1D2129; max-width: 300px">${ textarea.value }</div>
+                    <div class="ml-2">已复制至剪切板</div>
+                  </div>`,
         plain: true,
         icon: 'DocumentCopy'
       });

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

@@ -4,7 +4,7 @@
  * @Description: 负面标签
  * @Author: Cheney
  */
-import { Delete, DocumentCopy, Edit, InfoFilled, Plus } from '@element-plus/icons-vue';
+import { CopyDocument, Delete, InfoFilled, Plus } from '@element-plus/icons-vue';
 import * as api from '../api';
 import PermissionButton from '/@/components/PermissionButton/index.vue';
 import { usePagination } from '/@/utils/usePagination';
@@ -37,7 +37,7 @@ const gridRef = ref();
 const gridOptions: any = reactive({
   // id: 'NegativeLabel-table',
   // keepSource: true,
-  height: 620,
+  height: 800,
   size: 'mini',
   border: false,
   round: true,
@@ -135,12 +135,17 @@ onMounted(() => {
             </el-descriptions-item>
             <el-descriptions-item>
               <template #label>
-                <div class="title-item">评论内容</div>
+                <div class="title-item flex items-center">
+                  <span>
+                    评论内容
+                  </span>
+                  <el-icon class="ml-2 cursor-pointer" @click="handleCopy(rowData.content)">
+                    <CopyDocument />
+                  </el-icon>
+                </div>
               </template>
               <span class="cell-item">{{ rowData.content }}</span>
-              <el-icon class="ml-2 cursor-pointer" @click="handleCopy(rowData.content)">
-                <DocumentCopy />
-              </el-icon>
+              
             </el-descriptions-item>
           </el-descriptions>
         </el-card>
@@ -218,11 +223,11 @@ onMounted(() => {
 }
 
 .drawer-container :deep(.el-drawer__header) {
-	border-bottom: none;
-	font-weight: 500;
+  border-bottom: none;
+  font-weight: 500;
 }
 
 .drawer-container :deep(.el-drawer__title) {
-	font-size: 18px;
+  font-size: 18px;
 }
 </style>

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

@@ -7,7 +7,7 @@
 
 import { handleCopy } from '/@/utils/useCopyText';
 import VerticalDivider from '/@/components/VerticalDivider/index.vue';
-import { DocumentCopy, Picture as IconPicture } from '@element-plus/icons-vue';
+import { CopyDocument, DocumentCopy, Picture as IconPicture } from '@element-plus/icons-vue';
 
 
 const props = defineProps({
@@ -22,7 +22,7 @@ const { img, url, title, asin } = props;
 <template>
   <el-card body-class="flex justify-between items-center gap-5" class="border-none sticky top-5 z-10">
     <div class="flex">
-      <el-image :src="`https://d1ge0kk1l5kms0.cloudfront.net/images/I/${img}.jpg`" class="mr-3"
+      <el-image :src="`https://d1ge0kk1l5kms0.cloudfront.net/images/I/${img}.jpg`" class="mr-5"
                 fit="fill"
                 lazy style="min-width: 78px; height: 78px;">
         <template #error>
@@ -46,7 +46,7 @@ const { img, url, title, asin } = props;
         <div class="flex items-center">
           <div class="font-semibold italic">{{ asin }}</div>
           <VerticalDivider />
-          <el-button :icon="DocumentCopy" link class="ml-2 cursor-pointer" :disabled="!asin" @click="handleCopy(asin || '')">
+          <el-button :icon="CopyDocument" link class="ml-1 cursor-pointer" :disabled="!asin" @click="handleCopy(asin || '')">
           </el-button>
           <!--<el-icon class="ml-2 cursor-pointer" @click="handleCopy(asin || '')">-->
           <!--  <DocumentCopy />-->

src/views/product-manage/comment-detail/index.vue

@@ -37,7 +37,7 @@ const rowData: any = ref(route.query)
           <AverageMonthly :asin="rowData.asin" />
         </div>
         <!-- Data Table -->
-        <div class="mt-5">
+        <div class="my-5">
           <el-card class="border-none" shadow="hover">
             <DataTable :asin="rowData.asin" />
           </el-card>