From 15971b6feb67dabbfffe7773a3c65ca3d7eeb92f Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Sat, 26 Aug 2023 13:09:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=84=E8=AE=BA?=
 =?UTF-8?q?=EF=BC=9A=201.=E7=A7=BB=E9=99=A4scores=EF=BC=8C=E7=94=B1?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E8=87=AA=E5=8A=A8=E8=AE=A1=E7=AE=97=202.SPU?=
 =?UTF-8?q?=E3=80=81SKU=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=94=BE=E5=88=B0SPU=E7=BB=84=E4=BB=B6=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mall/product/comment/CommentForm.vue            | 8 ++------
 .../{comment => spu}/components/SkuTableSelect.vue        | 1 -
 .../{comment => spu}/components/SpuTableSelect.vue        | 1 -
 3 files changed, 2 insertions(+), 8 deletions(-)
 rename src/views/mall/product/{comment => spu}/components/SkuTableSelect.vue (97%)
 rename src/views/mall/product/{comment => spu}/components/SpuTableSelect.vue (98%)

diff --git a/src/views/mall/product/comment/CommentForm.vue b/src/views/mall/product/comment/CommentForm.vue
index f4180f45..8a60bef1 100644
--- a/src/views/mall/product/comment/CommentForm.vue
+++ b/src/views/mall/product/comment/CommentForm.vue
@@ -36,10 +36,6 @@
       <el-form-item label="评论内容" prop="content">
         <el-input type="textarea" v-model="formData.content" />
       </el-form-item>
-      <!-- TODO @疯狂：formData.scores 是通过后端计算的哈，不要前端传递 -->
-      <el-form-item label="评分星级" prop="scores">
-        <el-rate v-model="formData.scores" />
-      </el-form-item>
       <el-form-item label="描述星级" prop="descriptionScores">
         <el-rate v-model="formData.descriptionScores" />
       </el-form-item>
@@ -60,9 +56,9 @@
 </template>
 <script setup lang="ts">
 import * as CommentApi from '@/api/mall/product/comment'
-import SpuTableSelect from '@/views/mall/product/comment/components/SpuTableSelect.vue'
+import SpuTableSelect from '@/views/mall/product/spu/components/SpuTableSelect.vue'
 import * as ProductSpuApi from '@/api/mall/product/spu'
-import SkuTableSelect from '@/views/mall/product/comment/components/SkuTableSelect.vue'
+import SkuTableSelect from '@/views/mall/product/spu/components/SkuTableSelect.vue'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
diff --git a/src/views/mall/product/comment/components/SkuTableSelect.vue b/src/views/mall/product/spu/components/SkuTableSelect.vue
similarity index 97%
rename from src/views/mall/product/comment/components/SkuTableSelect.vue
rename to src/views/mall/product/spu/components/SkuTableSelect.vue
index f72870e4..8bbc50cf 100644
--- a/src/views/mall/product/comment/components/SkuTableSelect.vue
+++ b/src/views/mall/product/spu/components/SkuTableSelect.vue
@@ -37,7 +37,6 @@ import { ElTable } from 'element-plus'
 import * as ProductSpuApi from '@/api/mall/product/spu'
 import { propTypes } from '@/utils/propTypes'
 
-// TODO @疯狂：是不是挪到 spu 的 components 下哈
 defineOptions({ name: 'SkuTableSelect' })
 
 const props = defineProps({
diff --git a/src/views/mall/product/comment/components/SpuTableSelect.vue b/src/views/mall/product/spu/components/SpuTableSelect.vue
similarity index 98%
rename from src/views/mall/product/comment/components/SpuTableSelect.vue
rename to src/views/mall/product/spu/components/SpuTableSelect.vue
index 2a62a2fa..f8560aa3 100644
--- a/src/views/mall/product/comment/components/SpuTableSelect.vue
+++ b/src/views/mall/product/spu/components/SpuTableSelect.vue
@@ -86,7 +86,6 @@ import { defaultProps, handleTree } from '@/utils/tree'
 import * as ProductCategoryApi from '@/api/mall/product/category'
 import * as ProductSpuApi from '@/api/mall/product/spu'
 
-// TODO @疯狂：是不是挪到 spu 的 components 下哈
 defineOptions({ name: 'SpuTableSelect' })
 
 const message = useMessage() // 消息弹窗

From 3a1539009026fc71de16db0ef72f24d392479d75 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Sat, 26 Aug 2023 13:34:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=84=E8=AE=BA?=
 =?UTF-8?q?=EF=BC=9A=E5=9B=9E=E5=A4=8D=E8=A1=A8=E5=8D=95=E6=8F=90=E5=8F=96?=
 =?UTF-8?q?=E5=88=B0=E5=8D=95=E7=8B=AC=E7=9A=84=E7=BB=84=E4=BB=B6=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mall/product/comment/CommentForm.vue      |  3 -
 src/views/mall/product/comment/ReplyForm.vue  | 77 +++++++++++++++++++
 src/views/mall/product/comment/index.vue      | 58 ++------------
 3 files changed, 82 insertions(+), 56 deletions(-)
 create mode 100644 src/views/mall/product/comment/ReplyForm.vue

diff --git a/src/views/mall/product/comment/CommentForm.vue b/src/views/mall/product/comment/CommentForm.vue
index 8a60bef1..77557437 100644
--- a/src/views/mall/product/comment/CommentForm.vue
+++ b/src/views/mall/product/comment/CommentForm.vue
@@ -75,7 +75,6 @@ const formData = ref({
   spuId: undefined,
   spuName: undefined,
   skuId: undefined,
-  scores: 5,
   descriptionScores: 5,
   benefitScores: 5,
   content: undefined,
@@ -87,7 +86,6 @@ const formRules = reactive({
   userAvatar: [{ required: true, message: '用户头像不能为空', trigger: 'blur' }],
   userNickname: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
   content: [{ required: true, message: '评论内容不能为空', trigger: 'blur' }],
-  scores: [{ required: true, message: '评分星级不能为空', trigger: 'blur' }],
   descriptionScores: [{ required: true, message: '描述星级不能为空', trigger: 'blur' }],
   benefitScores: [{ required: true, message: '服务星级不能为空', trigger: 'blur' }]
 })
@@ -153,7 +151,6 @@ const resetForm = () => {
     userAvatar: undefined,
     spuId: undefined,
     skuId: undefined,
-    scores: 5,
     descriptionScores: 5,
     benefitScores: 5,
     content: undefined,
diff --git a/src/views/mall/product/comment/ReplyForm.vue b/src/views/mall/product/comment/ReplyForm.vue
new file mode 100644
index 00000000..4ce36781
--- /dev/null
+++ b/src/views/mall/product/comment/ReplyForm.vue
@@ -0,0 +1,77 @@
+<template>
+  <Dialog title="回复" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="回复内容" prop="replyContent">
+        <el-input type="textarea" v-model="formData.replyContent" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitReplyForm" type="primary" :disabled="formLoading">确 定 </el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+
+<script setup lang="ts">
+import * as CommentApi from '@/api/mall/product/comment'
+import { ElInput } from 'element-plus'
+
+defineOptions({ name: 'ProductComment' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  id: undefined,
+  replyContent: undefined
+})
+const formRules = reactive({
+  replyContent: [{ required: true, message: '回复内容不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (id?: number) => {
+  resetForm()
+  formData.value.id = id
+  dialogVisible.value = true
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+
+const submitReplyForm = async () => {
+  const valid = await formRef?.value?.validate()
+  if (!valid) return
+
+  formLoading.value = true
+  try {
+    await CommentApi.replyComment(formData.value)
+    message.success(t('common.createSuccess'))
+
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    replyContent: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/mall/product/comment/index.vue b/src/views/mall/product/comment/index.vue
index 7647aff1..4fe65a86 100644
--- a/src/views/mall/product/comment/index.vue
+++ b/src/views/mall/product/comment/index.vue
@@ -60,7 +60,6 @@
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="false">
       <el-table-column label="评论编号" align="center" prop="id" min-width="60" />
-      <!-- TODO @疯狂：后端貌似没读取？ -->
       <el-table-column label="用户名称" align="center" prop="userNickname" width="80" />
       <el-table-column label="商品信息" align="center" min-width="210">
         <template #default="scope">
@@ -144,33 +143,15 @@
 
   <!-- 表单弹窗：添加/修改 -->
   <CommentForm ref="formRef" @success="getList" />
-
-  <Dialog title="回复" v-model="replyDialog.visible">
-    <el-form
-      ref="replyFormRef"
-      :model="replyDialog.formData"
-      :rules="replyDialog.formRules"
-      label-width="100px"
-      v-loading="replyDialog.loading"
-    >
-      <el-form-item label="回复内容" prop="replyContent">
-        <el-input type="textarea" v-model="replyDialog.formData.replyContent" />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <el-button @click="submitReplyForm" type="primary" :disabled="replyDialog.loading"
-        >确 定
-      </el-button>
-      <el-button @click="replyDialog.visible = false">取 消</el-button>
-    </template>
-  </Dialog>
+  <!-- 回复表单弹窗 -->
+  <ReplyForm ref="replyFormRef" @success="getList" />
 </template>
 
 <script setup lang="ts">
 import { dateFormatter } from '@/utils/formatTime'
 import * as CommentApi from '@/api/mall/product/comment'
 import CommentForm from './CommentForm.vue'
-import { ElInput } from 'element-plus'
+import ReplyForm from '@/views/mall/product/comment/ReplyForm.vue'
 
 defineOptions({ name: 'ProductComment' })
 
@@ -242,39 +223,10 @@ const openForm = (type: string, id?: number) => {
   formRef.value.open(type, id)
 }
 
-// TODO @疯狂：要不回复，也搞一个组件出去？
-/** 回复 **/
+/** 回复按钮操作 **/
 const replyFormRef = ref()
-const replyDialog = reactive({
-  visible: false,
-  loading: false,
-  formData: {
-    id: -1,
-    replyContent: ''
-  },
-  formRules: {
-    replyContent: [{ required: true, message: '回复内容不能为空', trigger: 'blur' }]
-  }
-})
 const handleReply = (id: number) => {
-  replyDialog.formData.id = id
-  replyDialog.formData.replyContent = ''
-  replyDialog.visible = true
-}
-const submitReplyForm = async () => {
-  const valid = await replyFormRef?.value?.validate()
-  if (!valid) return
-
-  replyDialog.loading = true
-  try {
-    await CommentApi.replyComment(replyDialog.formData)
-    message.success(t('common.createSuccess'))
-
-    replyDialog.visible = false
-    await getList()
-  } finally {
-    replyDialog.loading = false
-  }
+  replyFormRef.value.open(id)
 }
 
 /** 显示/隐藏 **/