From e58fe91a2985bb3977f91854da6fd7ef0fdcbb55 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 20 Jun 2026 10:25:11 -0700
Subject: [PATCH] =?UTF-8?q?fix(ts):=20=E4=BF=AE=E5=A4=8D=20delete/?=
 =?UTF-8?q?=E8=81=94=E5=90=88=E7=B1=BB=E5=9E=8B/ECharts=20=E7=AD=89?=
 =?UTF-8?q?=E4=BD=8E=E9=A3=8E=E9=99=A9=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=20-=20delete=20=E6=93=8D=E4=BD=9C=E7=AC=A6=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E8=A7=A3=E6=9E=84=20rest=EF=BC=88afterSale/UserAftersale/Order?=
 =?UTF-8?q?UpdatePrice=20=E6=8F=90=E4=BA=A4=E5=8F=82=E6=95=B0=EF=BC=89=20-?=
 =?UTF-8?q?=20v-for=20=E7=B4=A2=E5=BC=95=E3=80=81createTime=20=E7=AD=89?=
 =?UTF-8?q?=E8=81=94=E5=90=88=E7=B1=BB=E5=9E=8B=E7=94=A8=20Number()=20?=
 =?UTF-8?q?=E6=94=B6=E6=95=9B=20-=20ECharts=20axisLabel.textStyle=20?=
 =?UTF-8?q?=E2=86=92=20axisLabel.color=EF=BC=88=E9=A1=BA=E5=B8=A6=E8=AE=A9?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=A2=9C=E8=89=B2=E7=9C=9F=E6=AD=A3=E7=94=9F?=
 =?UTF-8?q?=E6=95=88=EF=BC=89=20-=20AlipayChannelForm=20=E8=AF=81=E4=B9=A6?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8A=BD=E5=8F=96=20readCertFile=20=E5=B9=B6?=
 =?UTF-8?q?=E8=A1=A5=20UploadRequestHandler=20=E7=B1=BB=E5=9E=8B=20-=20Exp?=
 =?UTF-8?q?ressForm=20reset=20=E5=AF=B9=E9=BD=90=20DeliveryExpressVO?=
 =?UTF-8?q?=EF=BC=88=E7=A7=BB=E9=99=A4=20picUrl=E3=80=81=E8=A1=A5=20code/l?=
 =?UTF-8?q?ogo/sort=EF=BC=89=20ts:check=20795=20=E2=86=92=20768=EF=BC=8C?=
 =?UTF-8?q?=E6=97=A0=E6=96=B0=E5=A2=9E=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Menu/src/Menu.vue       |  3 +-
 .../conversation/ConversationList.vue         |  4 +-
 .../ai/knowledge/document/form/SplitStep.vue  |  2 +-
 .../product/detail/ProductDetailsHeader.vue   |  2 +-
 src/views/im/manager/message/group/index.vue  |  2 +-
 .../product/components/ProductSummary.vue     |  8 +---
 src/views/mall/trade/afterSale/index.vue      |  6 +--
 .../trade/delivery/express/ExpressForm.vue    |  4 +-
 .../trade/order/form/OrderUpdatePriceForm.vue |  4 +-
 .../member/user/detail/UserAftersaleList.vue  |  8 ++--
 .../components/channel/AlipayChannelForm.vue  | 48 +++++++++++--------
 src/views/system/mail/log/MailLogDetail.vue   |  6 +--
 src/views/system/mail/log/index.vue           |  6 +--
 13 files changed, 53 insertions(+), 50 deletions(-)

diff --git a/src/layout/components/Menu/src/Menu.vue b/src/layout/components/Menu/src/Menu.vue
index c04fea2cc..bc7d8ca14 100644
--- a/src/layout/components/Menu/src/Menu.vue
+++ b/src/layout/components/Menu/src/Menu.vue
@@ -1,6 +1,7 @@
 <script lang="tsx">
 import { PropType, nextTick, onBeforeUnmount, onMounted } from 'vue'
 import { ElMenu, ElScrollbar } from 'element-plus'
+import type { MenuInstance } from 'element-plus'
 import { useAppStore } from '@/store/modules/app'
 import { usePermissionStore } from '@/store/modules/permission'
 import { useRenderMenuItem } from './components/useRenderMenuItem'
@@ -63,7 +64,7 @@ export default defineComponent({
 
     const menuWrapRef = ref<HTMLElement>()
 
-    const menuRef = ref<InstanceType<typeof ElMenu>>()
+    const menuRef = ref<MenuInstance>()
 
     const menuMode = computed(
       (): 'vertical' | 'horizontal' =>
diff --git a/src/views/ai/chat/index/components/conversation/ConversationList.vue b/src/views/ai/chat/index/components/conversation/ConversationList.vue
index d6d16e115..d8bf7857c 100644
--- a/src/views/ai/chat/index/components/conversation/ConversationList.vue
+++ b/src/views/ai/chat/index/components/conversation/ConversationList.vue
@@ -207,7 +207,7 @@ const getChatConversationList = async () => {
     conversationList.value = await ChatConversationApi.getChatConversationMyList()
     // 1.2 排序
     conversationList.value.sort((a, b) => {
-      return b.createTime - a.createTime
+      return Number(b.createTime || 0) - Number(a.createTime || 0)
     })
     // 1.3 没有任何对话情况
     if (conversationList.value.length === 0) {
@@ -254,7 +254,7 @@ const getConversationGroupByCreateTime = async (list: ChatConversationVO[]) => {
       continue
     }
     // 计算时间差（单位：毫秒）
-    const diff = now - conversation.createTime
+    const diff = now - Number(conversation.createTime || 0)
     // 根据时间间隔判断
     if (diff < oneDay) {
       groupMap['今天'].push(conversation)
diff --git a/src/views/ai/knowledge/document/form/SplitStep.vue b/src/views/ai/knowledge/document/form/SplitStep.vue
index 5b28ce31f..23e572212 100644
--- a/src/views/ai/knowledge/document/form/SplitStep.vue
+++ b/src/views/ai/knowledge/document/form/SplitStep.vue
@@ -72,7 +72,7 @@
         >
           <div v-for="(segment, index) in currentFile.segments" :key="index" class="mb-10px">
             <div class="text-gray-500 text-12px mb-5px">
-              分片-{{ index + 1 }} · {{ segment.contentLength || 0 }} 字符数 ·
+              分片-{{ Number(index) + 1 }} · {{ segment.contentLength || 0 }} 字符数 ·
               {{ segment.tokens || 0 }} Token
             </div>
             <div class="bg-white p-10px rounded-md">{{ segment.content }}</div>
diff --git a/src/views/crm/product/detail/ProductDetailsHeader.vue b/src/views/crm/product/detail/ProductDetailsHeader.vue
index 11286d6c7..285f5dc42 100644
--- a/src/views/crm/product/detail/ProductDetailsHeader.vue
+++ b/src/views/crm/product/detail/ProductDetailsHeader.vue
@@ -29,7 +29,7 @@
     </el-descriptions>
   </ContentWrap>
   <!-- 表单弹窗：添加/修改 -->
-  <ProductForm ref="formRef" @success="emit('refresh')" />
+  <ProductForm ref="formRef" @success="$emit('refresh')" />
 </template>
 <script setup lang="ts">
 import ProductForm from '@/views/crm/product/ProductForm.vue'
diff --git a/src/views/im/manager/message/group/index.vue b/src/views/im/manager/message/group/index.vue
index 15eb8359e..f4bf91e34 100644
--- a/src/views/im/manager/message/group/index.vue
+++ b/src/views/im/manager/message/group/index.vue
@@ -97,7 +97,7 @@
         <template #default="{ row }">
           <template v-if="row.atUserIds?.length">
             <span v-for="(userId, idx) in row.atUserIds" :key="userId">
-              <span v-if="idx > 0">、</span>
+              <span v-if="Number(idx) > 0">、</span>
               <template v-if="userId === IM_AT_ALL_USER_ID">@{{ IM_AT_ALL_NICKNAME }}</template>
               <template v-else>
                 @{{ row.atUserNicknames?.[idx] || userId }}
diff --git a/src/views/mall/statistics/product/components/ProductSummary.vue b/src/views/mall/statistics/product/components/ProductSummary.vue
index 06692234f..9f27eba64 100644
--- a/src/views/mall/statistics/product/components/ProductSummary.vue
+++ b/src/views/mall/statistics/product/components/ProductSummary.vue
@@ -214,9 +214,7 @@ const lineChartOptions = reactive<EChartsOption>({
         show: false
       },
       axisLabel: {
-        textStyle: {
-          color: '#7F8B9C'
-        }
+        color: '#7F8B9C'
       },
       splitLine: {
         show: true,
@@ -235,9 +233,7 @@ const lineChartOptions = reactive<EChartsOption>({
         show: false
       },
       axisLabel: {
-        textStyle: {
-          color: '#7F8B9C'
-        }
+        color: '#7F8B9C'
       },
       splitLine: {
         show: true,
diff --git a/src/views/mall/trade/afterSale/index.vue b/src/views/mall/trade/afterSale/index.vue
index 19d5727b9..ad8b74ba9 100644
--- a/src/views/mall/trade/afterSale/index.vue
+++ b/src/views/mall/trade/afterSale/index.vue
@@ -213,11 +213,9 @@ const getList = async () => {
   try {
     const data = cloneDeep(queryParams)
     // 处理掉全部的状态，不传就是全部
-    if (data.status === '0') {
-      delete data.status
-    }
+    const queryData = data.status === '0' ? (({ status: _status, ...rest }) => rest)(data) : data
     // 执行查询
-    const res = await AfterSaleApi.getAfterSalePage(data)
+    const res = await AfterSaleApi.getAfterSalePage(queryData)
     list.value = res.list as AfterSaleApi.TradeAfterSaleVO[]
     total.value = res.total
   } finally {
diff --git a/src/views/mall/trade/delivery/express/ExpressForm.vue b/src/views/mall/trade/delivery/express/ExpressForm.vue
index 8b759f288..695a346e0 100644
--- a/src/views/mall/trade/delivery/express/ExpressForm.vue
+++ b/src/views/mall/trade/delivery/express/ExpressForm.vue
@@ -117,8 +117,10 @@ const submitForm = async () => {
 const resetForm = () => {
   formData.value = {
     id: undefined,
+    code: '',
     name: '',
-    picUrl: '',
+    logo: '',
+    sort: 0,
     status: CommonStatusEnum.ENABLE
   }
   formRef.value?.resetFields()
diff --git a/src/views/mall/trade/order/form/OrderUpdatePriceForm.vue b/src/views/mall/trade/order/form/OrderUpdatePriceForm.vue
index 8332e31e8..791ee7a48 100644
--- a/src/views/mall/trade/order/form/OrderUpdatePriceForm.vue
+++ b/src/views/mall/trade/order/form/OrderUpdatePriceForm.vue
@@ -68,10 +68,8 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = cloneDeep(unref(formData))
+    const { payPrice: _payPrice, newPayPrice: _newPayPrice, ...data } = cloneDeep(unref(formData))
     data.adjustPrice = convertToInteger(data.adjustPrice)
-    delete data.payPrice
-    delete data.newPayPrice
     await TradeOrderApi.updateOrderPrice(data)
     message.success(t('common.updateSuccess'))
     dialogVisible.value = false
diff --git a/src/views/member/user/detail/UserAftersaleList.vue b/src/views/member/user/detail/UserAftersaleList.vue
index 03f3a5350..2f92fc118 100644
--- a/src/views/member/user/detail/UserAftersaleList.vue
+++ b/src/views/member/user/detail/UserAftersaleList.vue
@@ -213,14 +213,12 @@ const getList = async () => {
   try {
     const data = cloneDeep(queryParams.value)
     // 处理掉全部的状态，不传就是全部
-    if (data.status === '0') {
-      delete data.status
-    }
+    const queryData = data.status === '0' ? (({ status: _status, ...rest }) => rest)(data) : data
     // 执行查询
     if (props.userId) {
-      data.userId = props.userId as any
+      queryData.userId = props.userId as any
     }
-    const res = await AfterSaleApi.getAfterSalePage(data)
+    const res = await AfterSaleApi.getAfterSalePage(queryData)
     list.value = res.list as AfterSaleApi.TradeAfterSaleVO[]
     total.value = res.total
   } finally {
diff --git a/src/views/pay/app/components/channel/AlipayChannelForm.vue b/src/views/pay/app/components/channel/AlipayChannelForm.vue
index 89a141e6a..cf0f469a4 100644
--- a/src/views/pay/app/components/channel/AlipayChannelForm.vue
+++ b/src/views/pay/app/components/channel/AlipayChannelForm.vue
@@ -191,6 +191,7 @@
 import { CommonStatusEnum } from '@/utils/constants'
 import { DICT_TYPE, getDictOptions } from '@/utils/dict'
 import * as ChannelApi from '@/api/pay/channel'
+import type { UploadRequestHandler, UploadRequestOptions } from 'element-plus'
 
 defineOptions({ name: 'AlipayChannelForm' })
 
@@ -312,7 +313,7 @@ const resetForm = (appId, code) => {
   formRef.value?.resetFields()
 }
 
-const fileBeforeUpload = (file) => {
+const fileBeforeUpload = (file: File) => {
   let format = '.' + file.name.split('.')[1]
   if (format !== fileAccept) {
     message.error(`请上传指定格式"${fileAccept}"文件`)
@@ -325,27 +326,36 @@ const fileBeforeUpload = (file) => {
   return isRightSize
 }
 
-const appCertUpload = (event) => {
-  const readFile = new FileReader()
-  readFile.onload = (e: any) => {
-    formData.value.config.appCertContent = e.target.result
-  }
-  readFile.readAsText(event.file)
+const readCertFile = (
+  event: UploadRequestOptions,
+  setContent: (content: string) => void
+): Promise<void> => {
+  return new Promise((resolve, reject) => {
+    const readFile = new FileReader()
+    readFile.onload = (e) => {
+      setContent(String(e.target?.result || ''))
+      resolve()
+    }
+    readFile.onerror = () => reject(readFile.error)
+    readFile.readAsText(event.file)
+  })
 }
 
-const alipayPublicCertUpload = (event) => {
-  const readFile = new FileReader()
-  readFile.onload = (e: any) => {
-    formData.value.config.alipayPublicCertContent = e.target.result
-  }
-  readFile.readAsText(event.file)
+const appCertUpload: UploadRequestHandler = (event) => {
+  return readCertFile(event, (content) => {
+    formData.value.config.appCertContent = content
+  })
 }
 
-const rootCertUpload = (event) => {
-  const readFile = new FileReader()
-  readFile.onload = (e: any) => {
-    formData.value.config.rootCertContent = e.target.result
-  }
-  readFile.readAsText(event.file)
+const alipayPublicCertUpload: UploadRequestHandler = (event) => {
+  return readCertFile(event, (content) => {
+    formData.value.config.alipayPublicCertContent = content
+  })
+}
+
+const rootCertUpload: UploadRequestHandler = (event) => {
+  return readCertFile(event, (content) => {
+    formData.value.config.rootCertContent = content
+  })
 }
 </script>
diff --git a/src/views/system/mail/log/MailLogDetail.vue b/src/views/system/mail/log/MailLogDetail.vue
index 37d757a3d..79a2eb490 100644
--- a/src/views/system/mail/log/MailLogDetail.vue
+++ b/src/views/system/mail/log/MailLogDetail.vue
@@ -25,19 +25,19 @@
           <div v-if="detailData.toMails && detailData.toMails.length > 0">
             收件：
             <span v-for="(mail, index) in detailData.toMails" :key="mail">
-              {{ mail }}<span v-if="index < detailData.toMails.length - 1">、</span>
+              {{ mail }}<span v-if="Number(index) < detailData.toMails.length - 1">、</span>
             </span>
           </div>
           <div v-if="detailData.ccMails && detailData.ccMails.length > 0">
             抄送：
             <span v-for="(mail, index) in detailData.ccMails" :key="mail">
-              {{ mail }}<span v-if="index < detailData.ccMails.length - 1">、</span>
+              {{ mail }}<span v-if="Number(index) < detailData.ccMails.length - 1">、</span>
             </span>
           </div>
           <div v-if="detailData.bccMails && detailData.bccMails.length > 0">
             密送：
             <span v-for="(mail, index) in detailData.bccMails" :key="mail">
-              {{ mail }}<span v-if="index < detailData.bccMails.length - 1">、</span>
+              {{ mail }}<span v-if="Number(index) < detailData.bccMails.length - 1">、</span>
             </span>
           </div>
         </div>
diff --git a/src/views/system/mail/log/index.vue b/src/views/system/mail/log/index.vue
index 37a3657ed..31b08abb2 100644
--- a/src/views/system/mail/log/index.vue
+++ b/src/views/system/mail/log/index.vue
@@ -134,19 +134,19 @@
             <div v-if="scope.row.toMails && scope.row.toMails.length > 0">
               收件：
               <span v-for="(mail, index) in scope.row.toMails" :key="mail">
-                {{ mail }}<span v-if="index < scope.row.toMails.length - 1">、</span>
+                {{ mail }}<span v-if="Number(index) < scope.row.toMails.length - 1">、</span>
               </span>
             </div>
             <div v-if="scope.row.ccMails && scope.row.ccMails.length > 0">
               抄送：
               <span v-for="(mail, index) in scope.row.ccMails" :key="mail">
-                {{ mail }}<span v-if="index < scope.row.ccMails.length - 1">、</span>
+                {{ mail }}<span v-if="Number(index) < scope.row.ccMails.length - 1">、</span>
               </span>
             </div>
             <div v-if="scope.row.bccMails && scope.row.bccMails.length > 0">
               密送：
               <span v-for="(mail, index) in scope.row.bccMails" :key="mail">
-                {{ mail }}<span v-if="index < scope.row.bccMails.length - 1">、</span>
+                {{ mail }}<span v-if="Number(index) < scope.row.bccMails.length - 1">、</span>
               </span>
             </div>
           </div>