From 38633f0dd78480448b21a5db1cd177bbe277fdb1 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 8 Dec 2025 16:28:44 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=96=B0=E4=BA=BA=E7=94=A8=E6=88=B7tag?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=B7=BB=E5=8A=A0=E3=80=81=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mall/promotion/banner/BannerForm.vue      | 25 ++++---------
 src/views/member/config/index.vue             | 14 +++++++
 src/views/member/recent/cmp/report-page.vue   | 37 ++++++++++++++++---
 src/views/member/report/index.vue             | 11 +++---
 4 files changed, 59 insertions(+), 28 deletions(-)

diff --git a/src/views/mall/promotion/banner/BannerForm.vue b/src/views/mall/promotion/banner/BannerForm.vue
index 29da5fab..8c678dbe 100644
--- a/src/views/mall/promotion/banner/BannerForm.vue
+++ b/src/views/mall/promotion/banner/BannerForm.vue
@@ -1,12 +1,6 @@
 <template>
   <Dialog v-model="dialogVisible" :title="dialogTitle">
-    <el-form
-      ref="formRef"
-      v-loading="formLoading"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-    >
+    <el-form ref="formRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="100px">
       <el-row>
         <el-col :span="24">
           <el-form-item label="标题" prop="title">
@@ -31,24 +25,18 @@
         <el-col :span="24">
           <el-form-item label="状态" prop="status">
             <el-radio-group v-model="formData.status">
-              <el-radio
-                v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
-                :key="dict.value"
-                :value="dict.value"
-              >
+              <el-radio v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" :key="dict.value"
+                :value="dict.value">
                 {{ dict.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="位置" prop="position">
+          <el-form-item v-if="false" label="位置" prop="position">
             <el-radio-group v-model="formData.position">
-              <el-radio
-                v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_BANNER_POSITION)"
-                :key="dict.value"
-                :value="dict.value"
-              >
+              <el-radio v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_BANNER_POSITION)" :key="dict.value"
+                :value="dict.value">
                 {{ dict.label }}
               </el-radio>
             </el-radio-group>
@@ -127,6 +115,7 @@ const submitForm = async () => {
   formLoading.value = true
   try {
     const data = formData.value as unknown as BannerApi.BannerVO
+    data.position = 6
     if (formType.value === 'create') {
       await BannerApi.createBanner(data)
       message.success(t('common.createSuccess'))
diff --git a/src/views/member/config/index.vue b/src/views/member/config/index.vue
index 1d47393d..f87fb04b 100644
--- a/src/views/member/config/index.vue
+++ b/src/views/member/config/index.vue
@@ -138,6 +138,19 @@
             </el-text>
           </el-form-item>
         </el-tab-pane>
+        <el-tab-pane label="新人">
+          <el-form-item label-width="200px" label="新人判定" prop="pointTradeDeductUnitPrice">
+            <el-input-number v-model="formData.newPersonDays" placeholder="" :min="1" :max="365" />
+            <el-text class="w-full" size="small" type="info">
+              <div>
+                <span>入驻平台未满</span>
+                <span class="color-red">{{ formData.newPersonDays }}</span>
+                <span>天,都视为新人</span>
+                <span class="color-blue">新人</span>
+              </div>
+            </el-text>
+          </el-form-item>
+        </el-tab-pane>
       </el-tabs>
 
       <el-form-item>
@@ -166,6 +179,7 @@ const formData = ref({
   vipChatUserCout: 0,
   vipChatUserMsgCout: 0,
   vipLookWechtCout: 0,
+  newPersonDays: 0,
   giftCashRatio: 0,
   pointTradeGivePoint: 0,
   reportTypeList: []
diff --git a/src/views/member/recent/cmp/report-page.vue b/src/views/member/recent/cmp/report-page.vue
index 383998a1..3510ee31 100644
--- a/src/views/member/recent/cmp/report-page.vue
+++ b/src/views/member/recent/cmp/report-page.vue
@@ -25,7 +25,34 @@
   </ContentWrap>
   <ContentWrap class="min-h-[500px]">
     <el-table v-loading="loading" :data="list" row-key="id">
-      <el-table-column label="操作人" align="center" prop="operatorMemberNickname" width="200px" />
+      <el-table-column label="操作人" align="center" width="300px">
+        <template #default="{ row }">
+          <div class="flex items-center gap-2">
+            <PreviewImage :src="row.operatorMemberAvatar" />
+            <div class="flex flex-col items-start">
+              <div class="table-cell">
+                <span>昵称:</span>
+                <span>{{ row.operatorMemberNickname }}</span>
+              </div>
+              <div class="table-cell">
+                <span>手机号:</span>
+                <span>{{ row.operatorMemberPhone }}</span>
+              </div>
+            </div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="举报类型" align="center" width="150">
+        <template #default="{ row }">
+          <el-tag type="danger">{{ row.reportType }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="举报图片" align="center" width="150">
+        <template #default="{ row }">
+          <PreviewImage :src="row.reportPic" />
+        </template>
+      </el-table-column>
+      <el-table-column label="举报内容" align="center" prop="reportDescription" min-width="100" />
       <el-table-column label="描述" align="center">
         <template #default="{ row }">
           <div>
@@ -33,10 +60,10 @@
             <span>在</span>
             <span class="color-red">{{ formatPast(row.createTime) }}</span>
             <span>以</span>
-            <span class="color-red">低俗</span>
-            <span>理由,举报了</span>
+            <span class="color-red">{{ row.reportType }}</span>
+            <span>理由,举报了我(</span>
             <span class="color-blue">{{ row.memberNickname }}</span>
-            <span>的动态</span>
+            <span>)的动态</span>
           </div>
         </template>
       </el-table-column>
@@ -72,7 +99,7 @@ const list = ref([])
 // 表单搜索
 const queryParams = ref({
   bizType: "6",
-  memberId: "",
+  memberId: props.memberId,
   operatorMemberNickname: "",
   createTime: [],
   pageNo: 1,
diff --git a/src/views/member/report/index.vue b/src/views/member/report/index.vue
index 5e8f0589..3a667bbb 100644
--- a/src/views/member/report/index.vue
+++ b/src/views/member/report/index.vue
@@ -22,7 +22,7 @@
   </ContentWrap>
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="举报用户" align="center" prop="icon" min-width="150">
+      <el-table-column label="举报用户" align="center" prop="icon" width="300">
         <template #default="{ row }">
           <div class="flex items-center gap-2">
             <PreviewImage :src="row.operatorMemberAvatar" />
@@ -39,7 +39,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="被举报用户" align="center" prop="icon" min-width="150">
+      <el-table-column label="被举报用户" align="center" prop="icon" width="300">
         <template #default="{ row }">
           <div class="flex items-center gap-2">
             <PreviewImage :src="row.memberAvatar" />
@@ -56,12 +56,12 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="举报类型" align="center" prop="icon" min-width="150">
+      <el-table-column label="举报类型" align="center" width="100">
         <template #default="{ row }">
-          <span>{{ row.operationType }}</span>
+          <el-tag type="danger">{{ row.reportType }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="图片" align="center" prop="icon" min-width="150">
+      <el-table-column label="举报图片" align="center" min-width="150">
         <template #default="{ row }">
           <PreviewImage :src="row.reportPic" />
         </template>
@@ -88,6 +88,7 @@ const total = ref(0)
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
+  bizType: "6",
   operatorMemberNickname: '',
   memberNickname: '',
   createTime: []