Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3

# Conflicts:
#	src/components/DiyEditor/components/mobile/PromotionCombination/index.vue
#	src/views/ai/mindmap/manager/index.vue

src/api/ai/mindmap/index.ts

 import { getAccessToken } from '@/utils/auth'
 import { getAccessToken } from '@/utils/auth'
 import { fetchEventSource } from '@microsoft/fetch-event-source'
 import { fetchEventSource } from '@microsoft/fetch-event-source'
 import { config } from '@/config/axios/config'
 import { config } from '@/config/axios/config'
-import request from '@/config/axios'
+import request from '@/config/axios' // AI 思维导图 VO
 
 
 // AI 思维导图 VO
 // AI 思维导图 VO
 export interface MindMapVO {
 export interface MindMapVO {

src/api/mall/promotion/coupon/couponTemplate.ts

@@ -74,7 +74,7 @@ export function getCouponTemplatePage(params: PageParam) {
 }
 }
 
 
 // 获得优惠劵模板分页
 // 获得优惠劵模板分页
-export function getCouponTemplateList(ids: number[]) {
+export function getCouponTemplateList(ids: number[]): Promise<CouponTemplateVO[]> {
   return request.get({
   return request.get({
     url: `/promotion/coupon-template/list?ids=${ids}`
     url: `/promotion/coupon-template/list?ids=${ids}`
   })
   })

src/api/mall/promotion/reward/rewardActivity.ts

 import request from '@/config/axios'
 import request from '@/config/axios'
 
 
-export interface DiscountActivityVO {
+export interface RewardActivityVO {
   id?: number
   id?: number
   name?: string
   name?: string
   startTime?: Date
   startTime?: Date
   endTime?: Date
   endTime?: Date
+  startAndEndTime?: Date[] // 只前端使用
   remark?: string
   remark?: string
   conditionType?: number
   conditionType?: number
   productScope?: number
   productScope?: number
+  rules: RewardRule[]
+  // 如下仅用于表单，不提交
+  productScopeValues?: number[] // 商品范围：值为品类编号列表、商品编号列表
+  productCategoryIds?: number[]
   productSpuIds?: number[]
   productSpuIds?: number[]
-  rules?: DiscountProductVO[]
 }
 }
 
 
 // 优惠规则
 // 优惠规则
-export interface DiscountProductVO {
-  limit: number
-  discountPrice: number
-  freeDelivery: boolean
+export interface RewardRule {
+  limit?: number
+  discountPrice?: number
+  freeDelivery?: boolean
   point: number
   point: number
-  couponIds: number[]
-  couponCounts: number[]
+  giveCouponTemplateCounts?: {
+    [key: number]: number
+  }
 }
 }
 
 
 // 新增满减送活动
 // 新增满减送活动
-export const createRewardActivity = async (data: DiscountActivityVO) => {
+export const createRewardActivity = async (data: RewardActivityVO) => {
   return await request.post({ url: '/promotion/reward-activity/create', data })
   return await request.post({ url: '/promotion/reward-activity/create', data })
 }
 }
 
 
 // 更新满减送活动
 // 更新满减送活动
-export const updateRewardActivity = async (data: DiscountActivityVO) => {
+export const updateRewardActivity = async (data: RewardActivityVO) => {
   return await request.put({ url: '/promotion/reward-activity/update', data })
   return await request.put({ url: '/promotion/reward-activity/update', data })
 }
 }
 
 

src/api/member/user/index.ts

@@ -46,8 +46,3 @@ export const updateUserLevel = async (data: any) => {
 export const updateUserPoint = async (data: any) => {
 export const updateUserPoint = async (data: any) => {
   return await request.put({ url: `/member/user/update-point`, data })
   return await request.put({ url: `/member/user/update-point`, data })
 }
 }
-
-// 修改会员用户余额
-export const updateUserBalance = async (data: any) => {
-  return await request.put({ url: `/member/user/update-balance`, data })
-}

src/api/pay/wallet/balance/index.ts

@@ -4,6 +4,7 @@ import request from '@/config/axios'
 export interface PayWalletUserReqVO {
 export interface PayWalletUserReqVO {
   userId: number
   userId: number
 }
 }
+
 /** 钱包 VO */
 /** 钱包 VO */
 export interface WalletVO {
 export interface WalletVO {
   id: number
   id: number
@@ -20,7 +21,12 @@ export const getWallet = async (params: PayWalletUserReqVO) => {
   return await request.get<WalletVO>({ url: `/pay/wallet/get`, params })
   return await request.get<WalletVO>({ url: `/pay/wallet/get`, params })
 }
 }
 
 
-// 查询会员钱包列表
-export const getWalletPage = async (params) => {
+/** 查询会员钱包列表 */
+export const getWalletPage = async (params: any) => {
   return await request.get({ url: `/pay/wallet/page`, params })
   return await request.get({ url: `/pay/wallet/page`, params })
 }
 }
+
+/** 修改会员钱包余额 */
+export const updateWalletBalance = async (data: any) => {
+  return await request.put({ url: `/pay/wallet/update-balance`, data })
+}

src/components/DictTag/src/DictTag.vue

 <script lang="tsx">
 <script lang="tsx">
-import { defineComponent, PropType, computed } from 'vue'
+import { computed, defineComponent, PropType } from 'vue'
 import { isHexColor } from '@/utils/color'
 import { isHexColor } from '@/utils/color'
 import { ElTag } from 'element-plus'
 import { ElTag } from 'element-plus'
 import { DictDataType, getDictOptions } from '@/utils/dict'
 import { DictDataType, getDictOptions } from '@/utils/dict'
-import { isArray, isString, isNumber, isBoolean } from '@/utils/is'
+import { isArray, isBoolean, isNumber, isString } from '@/utils/is'
 
 
 export default defineComponent({
 export default defineComponent({
   name: 'DictTag',
   name: 'DictTag',

src/components/DiyEditor/components/mobile/ProductCard/index.vue

@@ -67,15 +67,15 @@
             class="text-16px"
             class="text-16px"
             :style="{ color: property.fields.price.color }"
             :style="{ color: property.fields.price.color }"
           >
           >
-            ￥{{ spu.price }}
+            ￥{{ fenToYuan(spu.price) }}
           </span>
           </span>
           <!-- 市场价 -->
           <!-- 市场价 -->
           <span
           <span
             v-if="property.fields.marketPrice.show && spu.marketPrice"
             v-if="property.fields.marketPrice.show && spu.marketPrice"
             class="ml-4px text-10px line-through"
             class="ml-4px text-10px line-through"
             :style="{ color: property.fields.marketPrice.color }"
             :style="{ color: property.fields.marketPrice.color }"
-            >￥{{ spu.marketPrice }}</span
-          >
+            >￥{{ fenToYuan(spu.marketPrice) }}
+          </span>
         </div>
         </div>
         <div class="text-12px">
         <div class="text-12px">
           <!-- 销量 -->
           <!-- 销量 -->
@@ -117,6 +117,7 @@
 <script setup lang="ts">
 <script setup lang="ts">
 import { ProductCardProperty } from './config'
 import { ProductCardProperty } from './config'
 import * as ProductSpuApi from '@/api/mall/product/spu'
 import * as ProductSpuApi from '@/api/mall/product/spu'
+import { fenToYuan } from '../../../../../utils'
 
 
 /** 商品卡片 */
 /** 商品卡片 */
 defineOptions({ name: 'ProductCard' })
 defineOptions({ name: 'ProductCard' })

src/components/DiyEditor/components/mobile/ProductList/index.vue

@@ -54,7 +54,7 @@
               class="text-12px"
               class="text-12px"
               :style="{ color: property.fields.price.color }"
               :style="{ color: property.fields.price.color }"
             >
             >
-              ￥{{ spu.price }}
+              ￥{{ fenToYuan(spu.price) }}
             </span>
             </span>
           </div>
           </div>
         </div>
         </div>
@@ -65,6 +65,7 @@
 <script setup lang="ts">
 <script setup lang="ts">
 import { ProductListProperty } from './config'
 import { ProductListProperty } from './config'
 import * as ProductSpuApi from '@/api/mall/product/spu'
 import * as ProductSpuApi from '@/api/mall/product/spu'
+import { fenToYuan } from './index'
 
 
 /** 商品栏 */
 /** 商品栏 */
 defineOptions({ name: 'ProductList' })
 defineOptions({ name: 'ProductList' })

src/components/DiyEditor/components/mobile/PromotionSeckill/index.vue

 <template>
 <template>
-  <el-scrollbar class="z-1 min-h-30px" wrap-class="w-full" ref="containerRef">
+  <el-scrollbar ref="containerRef" class="z-1 min-h-30px" wrap-class="w-full">
     <!-- 商品网格 -->
     <!-- 商品网格 -->
     <div
     <div
-      class="grid overflow-x-auto"
       :style="{
       :style="{
         gridGap: `${property.space}px`,
         gridGap: `${property.space}px`,
         gridTemplateColumns,
         gridTemplateColumns,
         width: scrollbarWidth
         width: scrollbarWidth
       }"
       }"
+      class="grid overflow-x-auto"
     >
     >
       <!-- 商品 -->
       <!-- 商品 -->
       <div
       <div
-        class="relative box-content flex flex-row flex-wrap overflow-hidden bg-white"
+        v-for="(spu, index) in spuList"
+        :key="index"
         :style="{
         :style="{
           borderTopLeftRadius: `${property.borderRadiusTop}px`,
           borderTopLeftRadius: `${property.borderRadiusTop}px`,
           borderTopRightRadius: `${property.borderRadiusTop}px`,
           borderTopRightRadius: `${property.borderRadiusTop}px`,
           borderBottomLeftRadius: `${property.borderRadiusBottom}px`,
           borderBottomLeftRadius: `${property.borderRadiusBottom}px`,
           borderBottomRightRadius: `${property.borderRadiusBottom}px`
           borderBottomRightRadius: `${property.borderRadiusBottom}px`
         }"
         }"
-        v-for="(spu, index) in spuList"
-        :key="index"
+        class="relative box-content flex flex-row flex-wrap overflow-hidden bg-white"
       >
       >
         <!-- 角标 -->
         <!-- 角标 -->
         <div
         <div
           v-if="property.badge.show"
           v-if="property.badge.show"
           class="absolute left-0 top-0 z-1 items-center justify-center"
           class="absolute left-0 top-0 z-1 items-center justify-center"
         >
         >
-          <el-image fit="cover" :src="property.badge.imgUrl" class="h-26px w-38px" />
+          <el-image :src="property.badge.imgUrl" class="h-26px w-38px" fit="cover" />
         </div>
         </div>
         <!-- 商品封面图 -->
         <!-- 商品封面图 -->
-        <el-image fit="cover" :src="spu.picUrl" :style="{ width: imageSize, height: imageSize }" />
+        <el-image :src="spu.picUrl" :style="{ width: imageSize, height: imageSize }" fit="cover" />
         <div
         <div
           :class="[
           :class="[
             'flex flex-col gap-8px p-8px box-border',
             'flex flex-col gap-8px p-8px box-border',
@@ -42,8 +42,8 @@
           <!-- 商品名称 -->
           <!-- 商品名称 -->
           <div
           <div
             v-if="property.fields.name.show"
             v-if="property.fields.name.show"
-            class="truncate text-12px"
             :style="{ color: property.fields.name.color }"
             :style="{ color: property.fields.name.color }"
+            class="truncate text-12px"
           >
           >
             {{ spu.name }}
             {{ spu.name }}
           </div>
           </div>
@@ -51,8 +51,8 @@
             <!-- 商品价格 -->
             <!-- 商品价格 -->
             <span
             <span
               v-if="property.fields.price.show"
               v-if="property.fields.price.show"
-              class="text-12px"
               :style="{ color: property.fields.price.color }"
               :style="{ color: property.fields.price.color }"
+              class="text-12px"
             >
             >
               ￥{{ fenToYuan(spu.seckillPrice || spu.price || 0) }}
               ￥{{ fenToYuan(spu.seckillPrice || spu.price || 0) }}
             </span>
             </span>
@@ -62,11 +62,11 @@
     </div>
     </div>
   </el-scrollbar>
   </el-scrollbar>
 </template>
 </template>
-<script setup lang="ts">
+<script lang="ts" setup>
 import { PromotionSeckillProperty } from './config'
 import { PromotionSeckillProperty } from './config'
 import * as ProductSpuApi from '@/api/mall/product/spu'
 import * as ProductSpuApi from '@/api/mall/product/spu'
-import * as SeckillActivityApi from '@/api/mall/promotion/seckill/seckillActivity'
 import { Spu } from '@/api/mall/product/spu'
 import { Spu } from '@/api/mall/product/spu'
+import * as SeckillActivityApi from '@/api/mall/promotion/seckill/seckillActivity'
 import { SeckillProductVO } from '@/api/mall/promotion/seckill/seckillActivity'
 import { SeckillProductVO } from '@/api/mall/promotion/seckill/seckillActivity'
 import { fenToYuan } from '@/utils'
 import { fenToYuan } from '@/utils'
 
 
@@ -132,4 +132,4 @@ onMounted(() => {
 })
 })
 </script>
 </script>
 
 
-<style scoped lang="scss"></style>
+<style lang="scss" scoped></style>

src/components/Icon/src/IconSelect.vue

@@ -11,6 +11,10 @@ const props = defineProps({
   modelValue: {
   modelValue: {
     require: false,
     require: false,
     type: String
     type: String
+  },
+  clearable: {
+    require: false,
+    type: Boolean
   }
   }
 })
 })
 const emit = defineEmits<{ (e: 'update:modelValue', v: string) }>()
 const emit = defineEmits<{ (e: 'update:modelValue', v: string) }>()
@@ -92,6 +96,12 @@ function onCurrentChange(page) {
   currentPage.value = page
   currentPage.value = page
 }
 }
 
 
+function clearIcon() {
+  icon.value = ''
+  emit('update:modelValue', '')
+  visible.value = false
+}
+
 watch(
 watch(
   () => {
   () => {
     return props.modelValue
     return props.modelValue
@@ -115,7 +125,7 @@ watch(
 
 
 <template>
 <template>
   <div class="selector">
   <div class="selector">
-    <ElInput v-model="inputValue" @click="visible = !visible">
+    <ElInput v-model="inputValue" @click="visible = !visible" :clearable="props.clearable" @clear="clearIcon">
       <template #append>
       <template #append>
         <ElPopover
         <ElPopover
           :popper-options="{
           :popper-options="{

src/components/UploadFile/src/UploadFile.vue

 <template>
 <template>
-  <div class="upload-file">
+  <div v-if="!disabled" class="upload-file">
     <el-upload
     <el-upload
       ref="uploadRef"
       ref="uploadRef"
       v-model:file-list="fileList"
       v-model:file-list="fileList"
@@ -20,11 +20,11 @@
       class="upload-file-uploader"
       class="upload-file-uploader"
       name="file"
       name="file"
     >
     >
-      <el-button v-if="!disabled" type="primary">
+      <el-button type="primary">
         <Icon icon="ep:upload-filled" />
         <Icon icon="ep:upload-filled" />
         选取文件
         选取文件
       </el-button>
       </el-button>
-      <template v-if="isShowTip && !disabled" #tip>
+      <template v-if="isShowTip" #tip>
         <div style="font-size: 8px">
         <div style="font-size: 8px">
           大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
           大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
         </div>
         </div>
@@ -32,7 +32,6 @@
           格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b> 的文件
           格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b> 的文件
         </div>
         </div>
       </template>
       </template>
-      <!-- TODO @puhui999：1）表单展示的时候，位置会偏掉，已发微信；2）disable 的时候，应该把【删除】按钮也隐藏掉？ -->
       <template #file="row">
       <template #file="row">
         <div class="flex items-center">
         <div class="flex items-center">
           <span>{{ row.file.name }}</span>
           <span>{{ row.file.name }}</span>
@@ -54,6 +53,18 @@
       </template>
       </template>
     </el-upload>
     </el-upload>
   </div>
   </div>
+
+  <!-- 上传操作禁用时 -->
+  <div v-if="disabled" class="upload-file">
+    <div v-for="(file, index) in fileList" :key="index" class="flex items-center file-list-item">
+      <span>{{ file.name }}</span>
+      <div class="ml-10px">
+        <el-link :href="file.url" :underline="false" download target="_blank" type="primary">
+          下载
+        </el-link>
+      </div>
+    </div>
+  </div>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
 import { propTypes } from '@/utils/propTypes'
 import { propTypes } from '@/utils/propTypes'
@@ -211,4 +222,9 @@ const emitUpdateModelValue = () => {
 :deep(.ele-upload-list__item-content-action .el-link) {
 :deep(.ele-upload-list__item-content-action .el-link) {
   margin-right: 10px;
   margin-right: 10px;
 }
 }
+
+.file-list-item {
+  border: 1px dashed var(--el-border-color-darker);
+  border-radius: 8px;
+}
 </style>
 </style>

src/config/axios/service.ts

@@ -206,15 +206,12 @@ const refreshToken = async () => {
 const handleAuthorized = () => {
 const handleAuthorized = () => {
   const { t } = useI18n()
   const { t } = useI18n()
   if (!isRelogin.show) {
   if (!isRelogin.show) {
-    // 如果已经到重新登录页面则不进行弹窗提示
-    if (window.location.href.includes('login?redirect=')) {
-      return
-    }
     isRelogin.show = true
     isRelogin.show = true
     ElMessageBox.confirm(t('sys.api.timeoutMessage'), t('common.confirmTitle'), {
     ElMessageBox.confirm(t('sys.api.timeoutMessage'), t('common.confirmTitle'), {
       showCancelButton: false,
       showCancelButton: false,
       closeOnClickModal: false,
       closeOnClickModal: false,
       showClose: false,
       showClose: false,
+      closeOnPressEscape: false,
       confirmButtonText: t('login.relogin'),
       confirmButtonText: t('login.relogin'),
       type: 'warning'
       type: 'warning'
     }).then(() => {
     }).then(() => {

src/layout/components/TagsView/src/TagsView.vue

 <script lang="ts" setup>
 <script lang="ts" setup>
-import { onMounted, watch, computed, unref, ref, nextTick } from 'vue'
-import { useRouter } from 'vue-router'
+import { computed, nextTick, onMounted, ref, unref, watch } from 'vue'
 import type { RouteLocationNormalizedLoaded, RouterLinkProps } from 'vue-router'
 import type { RouteLocationNormalizedLoaded, RouterLinkProps } from 'vue-router'
+import { useRouter } from 'vue-router'
 import { usePermissionStore } from '@/store/modules/permission'
 import { usePermissionStore } from '@/store/modules/permission'
 import { useTagsViewStore } from '@/store/modules/tagsView'
 import { useTagsViewStore } from '@/store/modules/tagsView'
 import { useAppStore } from '@/store/modules/app'
 import { useAppStore } from '@/store/modules/app'
@@ -273,16 +273,28 @@ watch(
       @click="move(-200)"
       @click="move(-200)"
     >
     >
       <Icon
       <Icon
-        icon="ep:d-arrow-left"
-        color="var(--el-text-color-placeholder)"
         :hover-color="isDark ? '#fff' : 'var(--el-color-black)'"
         :hover-color="isDark ? '#fff' : 'var(--el-color-black)'"
+        color="var(--el-text-color-placeholder)"
+        icon="ep:d-arrow-left"
       />
       />
     </span>
     </span>
     <div class="flex-1 overflow-hidden">
     <div class="flex-1 overflow-hidden">
       <ElScrollbar ref="scrollbarRef" class="h-full" @scroll="scroll">
       <ElScrollbar ref="scrollbarRef" class="h-full" @scroll="scroll">
         <div class="h-[var(--tags-view-height)] flex">
         <div class="h-[var(--tags-view-height)] flex">
           <ContextMenu
           <ContextMenu
+            v-for="item in visitedViews"
+            :key="item.fullPath"
             :ref="itemRefs.set"
             :ref="itemRefs.set"
+            :class="[
+              `${prefixCls}__item`,
+              tagsViewImmerse ? `${prefixCls}__item--immerse` : '',
+              tagsViewIcon ? `${prefixCls}__item--icon` : '',
+              tagsViewImmerse && tagsViewIcon ? `${prefixCls}__item--immerse--icon` : '',
+              item?.meta?.affix ? `${prefixCls}__item--affix` : '',
+              {
+                'is-active': isActive(item)
+              }
+            ]"
             :schema="[
             :schema="[
               {
               {
                 icon: 'ep:refresh',
                 icon: 'ep:refresh',
@@ -340,26 +352,14 @@ watch(
                 }
                 }
               }
               }
             ]"
             ]"
-            v-for="item in visitedViews"
-            :key="item.fullPath"
             :tag-item="item"
             :tag-item="item"
-            :class="[
-              `${prefixCls}__item`,
-              tagsViewImmerse ? `${prefixCls}__item--immerse` : '',
-              tagsViewIcon ? `${prefixCls}__item--icon` : '',
-              tagsViewImmerse && tagsViewIcon ? `${prefixCls}__item--immerse--icon` : '',
-              item?.meta?.affix ? `${prefixCls}__item--affix` : '',
-              {
-                'is-active': isActive(item)
-              }
-            ]"
             @visible-change="visibleChange"
             @visible-change="visibleChange"
           >
           >
             <div>
             <div>
-              <router-link :ref="tagLinksRefs.set" :to="{ ...item }" custom v-slot="{ navigate }">
+              <router-link :ref="tagLinksRefs.set" v-slot="{ navigate }" :to="{ ...item }" custom>
                 <div
                 <div
-                  @click="navigate"
                   :class="`h-full flex items-center justify-center whitespace-nowrap pl-15px ${prefixCls}__item--label`"
                   :class="`h-full flex items-center justify-center whitespace-nowrap pl-15px ${prefixCls}__item--label`"
+                  @click="navigate"
                 >
                 >
                   <Icon
                   <Icon
                     v-if="
                     v-if="
@@ -376,9 +376,9 @@ watch(
                   {{ t(item?.meta?.title as string) }}
                   {{ t(item?.meta?.title as string) }}
                   <Icon
                   <Icon
                     :class="`${prefixCls}__item--close`"
                     :class="`${prefixCls}__item--close`"
+                    :size="12"
                     color="#333"
                     color="#333"
                     icon="ep:close"
                     icon="ep:close"
-                    :size="12"
                     @click.prevent.stop="closeSelectedTag(item)"
                     @click.prevent.stop="closeSelectedTag(item)"
                   />
                   />
                 </div>
                 </div>
@@ -394,9 +394,9 @@ watch(
       @click="move(200)"
       @click="move(200)"
     >
     >
       <Icon
       <Icon
-        icon="ep:d-arrow-right"
-        color="var(--el-text-color-placeholder)"
         :hover-color="isDark ? '#fff' : 'var(--el-color-black)'"
         :hover-color="isDark ? '#fff' : 'var(--el-color-black)'"
+        color="var(--el-text-color-placeholder)"
+        icon="ep:d-arrow-right"
       />
       />
     </span>
     </span>
     <span
     <span
@@ -405,13 +405,12 @@ watch(
       @click="refreshSelectedTag(selectedTag)"
       @click="refreshSelectedTag(selectedTag)"
     >
     >
       <Icon
       <Icon
-        icon="ep:refresh-right"
-        color="var(--el-text-color-placeholder)"
         :hover-color="isDark ? '#fff' : 'var(--el-color-black)'"
         :hover-color="isDark ? '#fff' : 'var(--el-color-black)'"
+        color="var(--el-text-color-placeholder)"
+        icon="ep:refresh-right"
       />
       />
     </span>
     </span>
     <ContextMenu
     <ContextMenu
-      trigger="click"
       :schema="[
       :schema="[
         {
         {
           icon: 'ep:refresh',
           icon: 'ep:refresh',
@@ -463,15 +462,16 @@ watch(
           }
           }
         }
         }
       ]"
       ]"
+      trigger="click"
     >
     >
       <span
       <span
         :class="tagsViewImmerse ? '' : `${prefixCls}__tool`"
         :class="tagsViewImmerse ? '' : `${prefixCls}__tool`"
         class="block h-[var(--tags-view-height)] w-[var(--tags-view-height)] flex cursor-pointer items-center justify-center"
         class="block h-[var(--tags-view-height)] w-[var(--tags-view-height)] flex cursor-pointer items-center justify-center"
       >
       >
         <Icon
         <Icon
-          icon="ep:menu"
-          color="var(--el-text-color-placeholder)"
           :hover-color="isDark ? '#fff' : 'var(--el-color-black)'"
           :hover-color="isDark ? '#fff' : 'var(--el-color-black)'"
+          color="var(--el-text-color-placeholder)"
+          icon="ep:menu"
         />
         />
       </span>
       </span>
     </ContextMenu>
     </ContextMenu>
@@ -532,6 +532,7 @@ $prefix-cls: #{$namespace}-tags-view;
       display: none;
       display: none;
       transform: translate(0, -50%);
       transform: translate(0, -50%);
     }
     }
+
     &:not(.#{$prefix-cls}__item--affix):hover {
     &:not(.#{$prefix-cls}__item--affix):hover {
       .#{$prefix-cls}__item--close {
       .#{$prefix-cls}__item--close {
         display: block;
         display: block;
@@ -553,6 +554,7 @@ $prefix-cls: #{$namespace}-tags-view;
     color: var(--el-color-white);
     color: var(--el-color-white);
     background-color: var(--el-color-primary);
     background-color: var(--el-color-primary);
     border: 1px solid var(--el-color-primary);
     border: 1px solid var(--el-color-primary);
+
     .#{$prefix-cls}__item--close {
     .#{$prefix-cls}__item--close {
       :deep(span) {
       :deep(span) {
         color: var(--el-color-white) !important;
         color: var(--el-color-white) !important;
@@ -568,9 +570,11 @@ $prefix-cls: #{$namespace}-tags-view;
     border: none !important;
     border: none !important;
     -webkit-mask-box-image: url("data:image/svg+xml,%3Csvg width='68' height='34' viewBox='0 0 68 34' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='m27,0c-7.99582,0 -11.95105,0.00205 -12,12l0,6c0,8.284 -0.48549,16.49691 -8.76949,16.49691l54.37857,-0.11145c-8.284,0 -8.60908,-8.10146 -8.60908,-16.38546l0,-6c0.11145,-12.08445 -4.38441,-12 -12,-12l-13,0z' fill='%23409eff'/%3E%3C/svg%3E")
     -webkit-mask-box-image: url("data:image/svg+xml,%3Csvg width='68' height='34' viewBox='0 0 68 34' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='m27,0c-7.99582,0 -11.95105,0.00205 -12,12l0,6c0,8.284 -0.48549,16.49691 -8.76949,16.49691l54.37857,-0.11145c-8.284,0 -8.60908,-8.10146 -8.60908,-16.38546l0,-6c0.11145,-12.08445 -4.38441,-12 -12,-12l-13,0z' fill='%23409eff'/%3E%3C/svg%3E")
       12 27 15;
       12 27 15;
+
     .#{$prefix-cls}__item--label {
     .#{$prefix-cls}__item--label {
       padding-left: 35px;
       padding-left: 35px;
     }
     }
+
     .#{$prefix-cls}__item--close {
     .#{$prefix-cls}__item--close {
       right: 20px;
       right: 20px;
     }
     }
@@ -584,6 +588,7 @@ $prefix-cls: #{$namespace}-tags-view;
     &:hover {
     &:hover {
       color: var(--el-color-white);
       color: var(--el-color-white);
       background-color: var(--el-color-primary);
       background-color: var(--el-color-primary);
+
       .#{$prefix-cls}__item--close {
       .#{$prefix-cls}__item--close {
         :deep(span) {
         :deep(span) {
           color: var(--el-color-white) !important;
           color: var(--el-color-white) !important;
@@ -617,6 +622,7 @@ $prefix-cls: #{$namespace}-tags-view;
       color: var(--el-color-white);
       color: var(--el-color-white);
       background-color: var(--el-color-primary);
       background-color: var(--el-color-primary);
       border: 1px solid var(--el-color-primary);
       border: 1px solid var(--el-color-primary);
+
       .#{$prefix-cls}__item--close {
       .#{$prefix-cls}__item--close {
         :deep(span) {
         :deep(span) {
           color: var(--el-color-white) !important;
           color: var(--el-color-white) !important;

src/store/modules/app.ts

 import { defineStore } from 'pinia'
 import { defineStore } from 'pinia'
 import { store } from '../index'
 import { store } from '../index'
-import { setCssVar, humpToUnderline } from '@/utils'
+import { humpToUnderline, setCssVar } from '@/utils'
 import { ElMessage } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { ElementPlusSize } from '@/types/elementPlus'
 import { ElementPlusSize } from '@/types/elementPlus'

src/utils/is.ts

@@ -18,8 +18,8 @@ export const isObject = (val: any): val is Record<any, any> => {
   return val !== null && is(val, 'Object')
   return val !== null && is(val, 'Object')
 }
 }
 
 
-export const isEmpty = <T = unknown>(val: T): val is T => {
-  if (val === null) {
+export const isEmpty = (val: any): boolean => {
+  if (val === null || val === undefined || typeof val === 'undefined') {
     return true
     return true
   }
   }
   if (isArray(val) || isString(val)) {
   if (isArray(val) || isString(val)) {

src/views/Login/SocialLogin.vue

@@ -114,9 +114,9 @@
                         </el-checkbox>
                         </el-checkbox>
                       </el-col>
                       </el-col>
                       <el-col :offset="6" :span="12">
                       <el-col :offset="6" :span="12">
-                        <el-link style="float: right" type="primary">{{
-                          t('login.forgetPassword')
-                        }}</el-link>
+                        <el-link style="float: right" type="primary"
+                          >{{ t('login.forgetPassword') }}
+                        </el-link>
                       </el-col>
                       </el-col>
                     </el-row>
                     </el-row>
                   </el-form-item>
                   </el-form-item>

src/views/Login/components/QrCodeForm.vue

 <template>
 <template>
-  <el-row class="login-form" v-show="getShow" style="margin-right: -10px; margin-left: -10px">
+  <el-row v-show="getShow" class="login-form" style="margin-right: -10px; margin-left: -10px">
     <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
     <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
       <LoginFormTitle style="width: 100%" />
       <LoginFormTitle style="width: 100%" />
     </el-col>
     </el-col>

src/views/ai/mindmap/index/components/Right.vue

@@ -4,7 +4,7 @@
       <h3 class="m-0 px-7 shrink-0 flex items-center justify-between">
       <h3 class="m-0 px-7 shrink-0 flex items-center justify-between">
         <span>思维导图预览</span>
         <span>思维导图预览</span>
         <!-- 展示在右上角 -->
         <!-- 展示在右上角 -->
-        <el-button type="primary" v-show="isEnd" @click="downloadImage" size="small">
+        <el-button v-show="isEnd" size="small" type="primary" @click="downloadImage">
           <template #icon>
           <template #icon>
             <Icon icon="ph:copy-bold" />
             <Icon icon="ph:copy-bold" />
           </template>
           </template>
@@ -20,14 +20,14 @@
       </div>
       </div>
 
 
       <div ref="mindMapRef" class="wh-full">
       <div ref="mindMapRef" class="wh-full">
-        <svg ref="svgRef" class="w-full" :style="{ height: `${contentAreaHeight}px` }" />
+        <svg ref="svgRef" :style="{ height: `${contentAreaHeight}px` }" class="w-full" />
         <div ref="toolBarRef" class="absolute bottom-[10px] right-5"></div>
         <div ref="toolBarRef" class="absolute bottom-[10px] right-5"></div>
       </div>
       </div>
     </div>
     </div>
   </el-card>
   </el-card>
 </template>
 </template>
 
 
-<script setup lang="ts">
+<script lang="ts" setup>
 import { Markmap } from 'markmap-view'
 import { Markmap } from 'markmap-view'
 import { Transformer } from 'markmap-lib'
 import { Transformer } from 'markmap-lib'
 import { Toolbar } from 'markmap-toolbar'
 import { Toolbar } from 'markmap-toolbar'
@@ -137,6 +137,7 @@ defineExpose({
     height: 0;
     height: 0;
   }
   }
 }
 }
+
 .my-card {
 .my-card {
   display: flex;
   display: flex;
   flex-direction: column;
   flex-direction: column;
@@ -149,13 +150,16 @@ defineExpose({
     @extend .hide-scroll-bar;
     @extend .hide-scroll-bar;
   }
   }
 }
 }
+
 // markmap的tool样式覆盖
 // markmap的tool样式覆盖
 :deep(.markmap) {
 :deep(.markmap) {
   width: 100%;
   width: 100%;
 }
 }
+
 :deep(.mm-toolbar-brand) {
 :deep(.mm-toolbar-brand) {
   display: none;
   display: none;
 }
 }
+
 :deep(.mm-toolbar) {
 :deep(.mm-toolbar) {
   display: flex;
   display: flex;
   flex-direction: row;
   flex-direction: row;

src/views/ai/mindmap/index/index.vue

@@ -3,9 +3,9 @@
     <!--表单区域-->
     <!--表单区域-->
     <Left
     <Left
       ref="leftRef"
       ref="leftRef"
+      :is-generating="isGenerating"
       @submit="submit"
       @submit="submit"
       @direct-generate="directGenerate"
       @direct-generate="directGenerate"
-      :is-generating="isGenerating"
     />
     />
     <!--右边生成思维导图区域-->
     <!--右边生成思维导图区域-->
     <Right
     <Right
@@ -18,7 +18,7 @@
   </div>
   </div>
 </template>
 </template>
 
 
-<script setup lang="ts">
+<script lang="ts" setup>
 import Left from './components/Left.vue'
 import Left from './components/Left.vue'
 import Right from './components/Right.vue'
 import Right from './components/Right.vue'
 import { AiMindMapApi, AiMindMapGenerateReqVO } from '@/api/ai/mindmap'
 import { AiMindMapApi, AiMindMapGenerateReqVO } from '@/api/ai/mindmap'

src/views/ai/write/index/components/Left.vue

@@ -2,8 +2,8 @@
   <!-- 定义 tab 组件：撰写/回复等 -->
   <!-- 定义 tab 组件：撰写/回复等 -->
   <DefineTab v-slot="{ active, text, itemClick }">
   <DefineTab v-slot="{ active, text, itemClick }">
     <span
     <span
-      class="inline-block w-1/2 rounded-full cursor-pointer text-center leading-[30px] relative z-1 text-[5C6370] hover:text-black"
       :class="active ? 'text-black shadow-md' : 'hover:bg-[#DDDFE3]'"
       :class="active ? 'text-black shadow-md' : 'hover:bg-[#DDDFE3]'"
+      class="inline-block w-1/2 rounded-full cursor-pointer text-center leading-[30px] relative z-1 text-[5C6370] hover:text-black"
       @click="itemClick"
       @click="itemClick"
     >
     >
       {{ text }}
       {{ text }}
@@ -14,9 +14,9 @@
     <h3 class="mt-5 mb-3 flex items-center justify-between text-[14px]">
     <h3 class="mt-5 mb-3 flex items-center justify-between text-[14px]">
       <span>{{ label }}</span>
       <span>{{ label }}</span>
       <span
       <span
-        @click="hintClick"
         v-if="hint"
         v-if="hint"
         class="flex items-center text-[12px] text-[#846af7] cursor-pointer select-none"
         class="flex items-center text-[12px] text-[#846af7] cursor-pointer select-none"
+        @click="hintClick"
       >
       >
         <Icon icon="ep:question-filled" />
         <Icon icon="ep:question-filled" />
         {{ hint }}
         {{ hint }}
@@ -29,17 +29,17 @@
     <div class="w-full pt-2 bg-[#f5f7f9] flex justify-center">
     <div class="w-full pt-2 bg-[#f5f7f9] flex justify-center">
       <div class="w-[303px] rounded-full bg-[#DDDFE3] p-1 z-10">
       <div class="w-[303px] rounded-full bg-[#DDDFE3] p-1 z-10">
         <div
         <div
-          class="flex items-center relative after:content-[''] after:block after:bg-white after:h-[30px] after:w-1/2 after:absolute after:top-0 after:left-0 after:transition-transform after:rounded-full"
           :class="
           :class="
             selectedTab === AiWriteTypeEnum.REPLY && 'after:transform after:translate-x-[100%]'
             selectedTab === AiWriteTypeEnum.REPLY && 'after:transform after:translate-x-[100%]'
           "
           "
+          class="flex items-center relative after:content-[''] after:block after:bg-white after:h-[30px] after:w-1/2 after:absolute after:top-0 after:left-0 after:transition-transform after:rounded-full"
         >
         >
           <ReuseTab
           <ReuseTab
             v-for="tab in tabs"
             v-for="tab in tabs"
             :key="tab.value"
             :key="tab.value"
-            :text="tab.text"
             :active="tab.value === selectedTab"
             :active="tab.value === selectedTab"
             :itemClick="() => switchTab(tab.value)"
             :itemClick="() => switchTab(tab.value)"
+            :text="tab.text"
           />
           />
         </div>
         </div>
       </div>
       </div>
@@ -49,36 +49,36 @@
     >
     >
       <div>
       <div>
         <template v-if="selectedTab === 1">
         <template v-if="selectedTab === 1">
-          <ReuseLabel label="写作内容" hint="示例" :hint-click="() => example('write')" />
+          <ReuseLabel :hint-click="() => example('write')" hint="示例" label="写作内容" />
           <el-input
           <el-input
-            type="textarea"
-            :rows="5"
-            :maxlength="500"
             v-model="formData.prompt"
             v-model="formData.prompt"
+            :maxlength="500"
+            :rows="5"
             placeholder="请输入写作内容"
             placeholder="请输入写作内容"
             showWordLimit
             showWordLimit
+            type="textarea"
           />
           />
         </template>
         </template>
 
 
         <template v-else>
         <template v-else>
-          <ReuseLabel label="原文" hint="示例" :hint-click="() => example('reply')" />
+          <ReuseLabel :hint-click="() => example('reply')" hint="示例" label="原文" />
           <el-input
           <el-input
-            type="textarea"
-            :rows="5"
-            :maxlength="500"
             v-model="formData.originalContent"
             v-model="formData.originalContent"
+            :maxlength="500"
+            :rows="5"
             placeholder="请输入原文"
             placeholder="请输入原文"
             showWordLimit
             showWordLimit
+            type="textarea"
           />
           />
 
 
           <ReuseLabel label="回复内容" />
           <ReuseLabel label="回复内容" />
           <el-input
           <el-input
-            type="textarea"
-            :rows="5"
-            :maxlength="500"
             v-model="formData.prompt"
             v-model="formData.prompt"
+            :maxlength="500"
+            :rows="5"
             placeholder="请输入回复内容"
             placeholder="请输入回复内容"
             showWordLimit
             showWordLimit
+            type="textarea"
           />
           />
         </template>
         </template>
 
 
@@ -93,14 +93,14 @@
 
 
         <div class="flex items-center justify-center mt-3">
         <div class="flex items-center justify-center mt-3">
           <el-button :disabled="isWriting" @click="reset">重置</el-button>
           <el-button :disabled="isWriting" @click="reset">重置</el-button>
-          <el-button :loading="isWriting" @click="submit" color="#846af7">生成</el-button>
+          <el-button :loading="isWriting" color="#846af7" @click="submit">生成</el-button>
         </div>
         </div>
       </div>
       </div>
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>
 
 
-<script setup lang="ts">
+<script lang="ts" setup>
 import { createReusableTemplate } from '@vueuse/core'
 import { createReusableTemplate } from '@vueuse/core'
 import { ref } from 'vue'
 import { ref } from 'vue'
 import Tag from './Tag.vue'
 import Tag from './Tag.vue'

src/views/mall/home/components/OperationDataCard.vue

@@ -11,9 +11,9 @@
         @click="handleClick(item.routerName)"
         @click="handleClick(item.routerName)"
       >
       >
         <CountTo
         <CountTo
-          :prefix="item.prefix"
-          :end-val="item.value"
           :decimals="item.decimals"
           :decimals="item.decimals"
+          :end-val="item.value"
+          :prefix="item.prefix"
           class="text-3xl"
           class="text-3xl"
         />
         />
         <span class="text-center">{{ item.name }}</span>
         <span class="text-center">{{ item.name }}</span>

src/views/mall/product/spu/components/SkuList.vue

@@ -180,17 +180,17 @@
     </el-table-column>
     </el-table-column>
     <el-table-column align="center" label="销售价(元)" min-width="80">
     <el-table-column align="center" label="销售价(元)" min-width="80">
       <template #default="{ row }">
       <template #default="{ row }">
-        {{ row.price }}
+        {{ formatToFraction(row.price) }}
       </template>
       </template>
     </el-table-column>
     </el-table-column>
     <el-table-column align="center" label="市场价(元)" min-width="80">
     <el-table-column align="center" label="市场价(元)" min-width="80">
       <template #default="{ row }">
       <template #default="{ row }">
-        {{ row.marketPrice }}
+        {{ formatToFraction(row.marketPrice) }}
       </template>
       </template>
     </el-table-column>
     </el-table-column>
     <el-table-column align="center" label="成本价(元)" min-width="80">
     <el-table-column align="center" label="成本价(元)" min-width="80">
       <template #default="{ row }">
       <template #default="{ row }">
-        {{ row.costPrice }}
+        {{ formatToFraction(row.costPrice) }}
       </template>
       </template>
     </el-table-column>
     </el-table-column>
     <el-table-column align="center" label="库存" min-width="80">
     <el-table-column align="center" label="库存" min-width="80">
@@ -211,12 +211,12 @@
     <template v-if="formData!.subCommissionType">
     <template v-if="formData!.subCommissionType">
       <el-table-column align="center" label="一级返佣(元)" min-width="80">
       <el-table-column align="center" label="一级返佣(元)" min-width="80">
         <template #default="{ row }">
         <template #default="{ row }">
-          {{ row.firstBrokeragePrice }}
+          {{ formatToFraction(row.firstBrokeragePrice) }}
         </template>
         </template>
       </el-table-column>
       </el-table-column>
       <el-table-column align="center" label="二级返佣(元)" min-width="80">
       <el-table-column align="center" label="二级返佣(元)" min-width="80">
         <template #default="{ row }">
         <template #default="{ row }">
-          {{ row.secondBrokeragePrice }}
+          {{ formatToFraction(row.secondBrokeragePrice) }}
         </template>
         </template>
       </el-table-column>
       </el-table-column>
     </template>
     </template>
@@ -260,17 +260,17 @@
     </el-table-column>
     </el-table-column>
     <el-table-column align="center" label="销售价(元)" min-width="80">
     <el-table-column align="center" label="销售价(元)" min-width="80">
       <template #default="{ row }">
       <template #default="{ row }">
-        {{ row.price }}
+        {{ formatToFraction(row.price) }}
       </template>
       </template>
     </el-table-column>
     </el-table-column>
     <el-table-column align="center" label="市场价(元)" min-width="80">
     <el-table-column align="center" label="市场价(元)" min-width="80">
       <template #default="{ row }">
       <template #default="{ row }">
-        {{ row.marketPrice }}
+        {{ formatToFraction(row.marketPrice) }}
       </template>
       </template>
     </el-table-column>
     </el-table-column>
     <el-table-column align="center" label="成本价(元)" min-width="80">
     <el-table-column align="center" label="成本价(元)" min-width="80">
       <template #default="{ row }">
       <template #default="{ row }">
-        {{ row.costPrice }}
+        {{ formatToFraction(row.costPrice) }}
       </template>
       </template>
     </el-table-column>
     </el-table-column>
     <el-table-column align="center" label="库存" min-width="80">
     <el-table-column align="center" label="库存" min-width="80">
@@ -284,7 +284,7 @@
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
 import { PropType, Ref } from 'vue'
 import { PropType, Ref } from 'vue'
-import { copyValueToTarget } from '@/utils'
+import { copyValueToTarget, formatToFraction } from '@/utils'
 import { propTypes } from '@/utils/propTypes'
 import { propTypes } from '@/utils/propTypes'
 import { UploadImg } from '@/components/UploadFile'
 import { UploadImg } from '@/components/UploadFile'
 import type { Property, Sku, Spu } from '@/api/mall/product/spu'
 import type { Property, Sku, Spu } from '@/api/mall/product/spu'

src/views/mall/product/spu/form/ProductAttributes.vue

@@ -19,19 +19,19 @@
         {{ value.name }}
         {{ value.name }}
       </el-tag>
       </el-tag>
       <el-select
       <el-select
+        v-show="inputVisible(index)"
         :id="`input${index}`"
         :id="`input${index}`"
         :ref="setInputRef"
         :ref="setInputRef"
-        v-show="inputVisible(index)"
         v-model="inputValue"
         v-model="inputValue"
-        filterable
+        :reserve-keyword="false"
         allow-create
         allow-create
+        class="!w-30"
         default-first-option
         default-first-option
-        :reserve-keyword="false"
+        filterable
         size="small"
         size="small"
-        class="!w-30"
         @blur="handleInputConfirm(index, item.id)"
         @blur="handleInputConfirm(index, item.id)"
-        @keyup.enter="handleInputConfirm(index, item.id)"
         @change="handleInputConfirm(index, item.id)"
         @change="handleInputConfirm(index, item.id)"
+        @keyup.enter="handleInputConfirm(index, item.id)"
       >
       >
         <el-option
         <el-option
           v-for="item2 in attributeOptions"
           v-for="item2 in attributeOptions"

src/views/mall/product/spu/form/ProductPropertyAddForm.vue

@@ -12,12 +12,12 @@
       <el-form-item label="属性名称" prop="name">
       <el-form-item label="属性名称" prop="name">
         <el-select
         <el-select
           v-model="formData.name"
           v-model="formData.name"
-          filterable
+          :reserve-keyword="false"
           allow-create
           allow-create
+          class="!w-360px"
           default-first-option
           default-first-option
-          :reserve-keyword="false"
+          filterable
           placeholder="请选择属性名称。如果不存在，可手动输入选择"
           placeholder="请选择属性名称。如果不存在，可手动输入选择"
-          class="!w-360px"
         >
         >
           <el-option
           <el-option
             v-for="item in attributeOptions"
             v-for="item in attributeOptions"

src/views/mall/product/spu/form/SkuForm.vue

@@ -2,11 +2,11 @@
 <template>
 <template>
   <el-form
   <el-form
     ref="formRef"
     ref="formRef"
+    v-loading="formLoading"
     :disabled="isDetail"
     :disabled="isDetail"
     :model="formData"
     :model="formData"
     :rules="rules"
     :rules="rules"
     label-width="120px"
     label-width="120px"
-    v-loading="formLoading"
   >
   >
     <el-form-item label="分销类型" props="subCommissionType">
     <el-form-item label="分销类型" props="subCommissionType">
       <el-radio-group
       <el-radio-group

src/views/mall/promotion/components/SpuAndSkuList.vue

@@ -29,15 +29,14 @@
     </el-table-column>
     </el-table-column>
     <el-table-column align="center" label="销量" min-width="90" prop="salesCount" />
     <el-table-column align="center" label="销量" min-width="90" prop="salesCount" />
     <el-table-column align="center" label="库存" min-width="90" prop="stock" />
     <el-table-column align="center" label="库存" min-width="90" prop="stock" />
-    <el-table-column v-if="spuData.length > 1 && isDelete" align="center" label="操作" min-width="90" >
-      <template #default="scope">
-        <el-button
-          type="primary"
-          link
-          @click="deleteSpu(scope.row.id)"
+    <el-table-column
+      v-if="spuData.length > 1 && isDelete"
+      align="center"
+      label="操作"
+      min-width="90"
     >
     >
-          删除
-        </el-button>
+      <template #default="scope">
+        <el-button type="primary" link @click="deleteSpu(scope.row.id)"> 删除 </el-button>
       </template>
       </template>
     </el-table-column>
     </el-table-column>
   </el-table>
   </el-table>
@@ -57,7 +56,7 @@ const props = defineProps<{
   spuList: T[]
   spuList: T[]
   ruleConfig: RuleConfig[]
   ruleConfig: RuleConfig[]
   spuPropertyListP: SpuProperty<T>[]
   spuPropertyListP: SpuProperty<T>[]
-  isDelete?: boolean //spu是否可以多选
+  isDelete?: boolean // SPU 是否可删除；TODO deletable 换成这个名字好点。
 }>()
 }>()
 
 
 const spuData = ref<Spu[]>([]) // spu 详情数据列表
 const spuData = ref<Spu[]>([]) // spu 详情数据列表
@@ -96,12 +95,12 @@ const emits = defineEmits<{
   (e: 'delete', spuId: number): void
   (e: 'delete', spuId: number): void
 }>()
 }>()
 
 
-/** 多选时可以删除spu **/
+/** 多选时可以删除 SPU **/
 const deleteSpu = async (spuId: number) => {
 const deleteSpu = async (spuId: number) => {
   await message.confirm('是否删除商品编号为' + spuId + '的数据？')
   await message.confirm('是否删除商品编号为' + spuId + '的数据？')
-  let index = spuData.value.findIndex((item) => item.id == spuId)
-  spuData.value.splice(index,1);
-  emits('delete',spuId)
+  const index = spuData.value.findIndex((item) => item.id == spuId)
+  spuData.value.splice(index, 1)
+  emits('delete', spuId)
 }
 }
 
 
 /**
 /**

src/views/mall/promotion/coupon/components/CouponSelect.vue

@@ -33,32 +33,6 @@
             />
             />
           </el-select>
           </el-select>
         </el-form-item>
         </el-form-item>
-        <el-form-item label="优惠券状态" prop="status">
-          <el-select
-            v-model="queryParams.status"
-            class="!w-240px"
-            clearable
-            placeholder="请选择优惠券状态"
-          >
-            <el-option
-              v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="创建时间" prop="createTime">
-          <el-date-picker
-            v-model="queryParams.createTime"
-            :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-            class="!w-240px"
-            end-placeholder="结束日期"
-            start-placeholder="开始日期"
-            type="daterange"
-            value-format="YYYY-MM-DD HH:mm:ss"
-          />
-        </el-form-item>
         <el-form-item>
         <el-form-item>
           <el-button @click="handleQuery">
           <el-button @click="handleQuery">
             <Icon class="mr-5px" icon="ep:search" />
             <Icon class="mr-5px" icon="ep:search" />
@@ -118,13 +92,6 @@
             <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
             <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
           </template>
           </template>
         </el-table-column>
         </el-table-column>
-        <el-table-column
-          :formatter="dateFormatter"
-          align="center"
-          label="创建时间"
-          prop="createTime"
-          width="180"
-        />
       </el-table>
       </el-table>
       <!-- 分页 -->
       <!-- 分页 -->
       <Pagination
       <Pagination
@@ -148,16 +115,17 @@ import {
   takeLimitCountFormat,
   takeLimitCountFormat,
   validityTypeFormat
   validityTypeFormat
 } from '@/views/mall/promotion/coupon/formatter'
 } from '@/views/mall/promotion/coupon/formatter'
-import { dateFormatter } from '@/utils/formatTime'
 import * as CouponTemplateApi from '@/api/mall/promotion/coupon/couponTemplate'
 import * as CouponTemplateApi from '@/api/mall/promotion/coupon/couponTemplate'
 
 
 defineOptions({ name: 'CouponSelect' })
 defineOptions({ name: 'CouponSelect' })
 
 
-defineProps<{
-  multipleSelection: CouponTemplateApi.CouponTemplateVO[]
+const props = defineProps<{
+  multipleSelection?: CouponTemplateApi.CouponTemplateVO[]
+  takeType: number // 领取方式
 }>()
 }>()
 const emit = defineEmits<{
 const emit = defineEmits<{
-  (e: 'update:multipleSelection', v: CouponTemplateApi.CouponTemplateVO[])
+  (e: 'update:multipleSelection', v: CouponTemplateApi.CouponTemplateVO[]): void
+  (e: 'change', v: CouponTemplateApi.CouponTemplateVO[]): void
 }>()
 }>()
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('选择优惠卷') // 弹窗的标题
 const dialogTitle = ref('选择优惠卷') // 弹窗的标题
@@ -169,18 +137,18 @@ const queryParams = reactive({
   pageNo: 1,
   pageNo: 1,
   pageSize: 10,
   pageSize: 10,
   name: null,
   name: null,
-  status: null,
   discountType: null,
   discountType: null,
-  type: null,
-  createTime: []
+  canTakeTypes: null
 })
 })
 const queryFormRef = ref() // 搜索的表单
 const queryFormRef = ref() // 搜索的表单
+const selectedCouponList = ref<CouponTemplateApi.CouponTemplateVO[]>([]) // 选择的数据
 
 
 /** 查询列表 */
 /** 查询列表 */
 const getList = async () => {
 const getList = async () => {
   loading.value = true
   loading.value = true
   try {
   try {
     // 执行查询
     // 执行查询
+    queryParams.canTakeTypes = [props.takeType] as any
     const data = await CouponTemplateApi.getCouponTemplatePage(queryParams)
     const data = await CouponTemplateApi.getCouponTemplatePage(queryParams)
     list.value = data.list
     list.value = data.list
     total.value = data.total
     total.value = data.total
@@ -209,11 +177,15 @@ const open = async () => {
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 
 const handleSelectionChange = (val: CouponTemplateApi.CouponTemplateVO[]) => {
 const handleSelectionChange = (val: CouponTemplateApi.CouponTemplateVO[]) => {
+  if (props.multipleSelection) {
     emit('update:multipleSelection', val)
     emit('update:multipleSelection', val)
+    return
+  }
+  selectedCouponList.value = val
 }
 }
 
 
 const submitForm = () => {
 const submitForm = () => {
   dialogVisible.value = false
   dialogVisible.value = false
+  emit('change', selectedCouponList.value)
 }
 }
-// TODO @puhui999：提前 todo，先不用改；未来单独成组件，其它模块可以服用；例如说，满减送，可以选择优惠劵；
 </script>
 </script>

src/views/mall/promotion/discountActivity/DiscountActivityForm.vue

@@ -49,7 +49,7 @@ import { cloneDeep } from 'lodash-es'
 import * as DiscountActivityApi from '@/api/mall/promotion/discount/discountActivity'
 import * as DiscountActivityApi from '@/api/mall/promotion/discount/discountActivity'
 import * as ProductSpuApi from '@/api/mall/product/spu'
 import * as ProductSpuApi from '@/api/mall/product/spu'
 import { getPropertyList, RuleConfig } from '@/views/mall/product/spu/components'
 import { getPropertyList, RuleConfig } from '@/views/mall/product/spu/components'
-import {formatToFraction} from "@/utils";
+import { formatToFraction } from '@/utils'
 
 
 defineOptions({ name: 'PromotionDiscountActivityForm' })
 defineOptions({ name: 'PromotionDiscountActivityForm' })
 
 
@@ -68,7 +68,7 @@ const spuAndSkuListRef = ref() // sku 限时折扣  配置组件Ref
 const ruleConfig: RuleConfig[] = []
 const ruleConfig: RuleConfig[] = []
 const spuList = ref<DiscountActivityApi.SpuExtension[]>([]) // 选择的 spu
 const spuList = ref<DiscountActivityApi.SpuExtension[]>([]) // 选择的 spu
 const spuPropertyList = ref<SpuProperty<DiscountActivityApi.SpuExtension>[]>([])
 const spuPropertyList = ref<SpuProperty<DiscountActivityApi.SpuExtension>[]>([])
-const spuIds = ref<number[]>([]);
+const spuIds = ref<number[]>([])
 const selectSpu = (spuId: number, skuIds: number[]) => {
 const selectSpu = (spuId: number, skuIds: number[]) => {
   getSpuDetails(spuId, skuIds)
   getSpuDetails(spuId, skuIds)
 }
 }
@@ -81,12 +81,12 @@ const getSpuDetails = async (
   products?: DiscountActivityApi.DiscountProductVO[],
   products?: DiscountActivityApi.DiscountProductVO[],
   type?: string
   type?: string
 ) => {
 ) => {
-  //如果已经包含spu则跳过
-  if(spuIds.value.includes(spuId)){
-    if(type !== "load"){
-      message.error("数据重复选择！")
+  // 如果已经包含 SPU 则跳过
+  if (spuIds.value.includes(spuId)) {
+    if (type !== 'load') {
+      message.error('数据重复选择！')
     }
     }
-    return;
+    return
   }
   }
   spuIds.value.push(spuId)
   spuIds.value.push(spuId)
   const res = (await ProductSpuApi.getSpuDetailList([spuId])) as DiscountActivityApi.SpuExtension[]
   const res = (await ProductSpuApi.getSpuDetailList([spuId])) as DiscountActivityApi.SpuExtension[]
@@ -143,7 +143,12 @@ const open = async (type: string, id?: number) => {
       )) as DiscountActivityApi.DiscountActivityVO
       )) as DiscountActivityApi.DiscountActivityVO
       for (let productsKey in data.products) {
       for (let productsKey in data.products) {
         const supId = data.products[productsKey].spuId
         const supId = data.products[productsKey].spuId
-        await getSpuDetails(supId!, data.products?.map((sku) => sku.skuId), data.products,"load")
+        await getSpuDetails(
+          supId!,
+          data.products?.map((sku) => sku.skuId),
+          data.products,
+          'load'
+        )
       }
       }
       formRef.value.setValues(data)
       formRef.value.setValues(data)
     } finally {
     } finally {
@@ -164,21 +169,23 @@ const submitForm = async () => {
   formLoading.value = true
   formLoading.value = true
   try {
   try {
     const data = formRef.value.formModel as DiscountActivityApi.DiscountActivityVO
     const data = formRef.value.formModel as DiscountActivityApi.DiscountActivityVO
-    // 获取 折扣商品配置
+    // 获取折扣商品配置
     const products = cloneDeep(spuAndSkuListRef.value.getSkuConfigs('productConfig'))
     const products = cloneDeep(spuAndSkuListRef.value.getSkuConfigs('productConfig'))
-    let timp = false;
+    // 校验优惠金额、折扣百分比，是否正确
+    // TODO @puhui999：这个交互，可以参考下 youzan 的
+    let discountInvalid = false
     products.forEach((item: DiscountActivityApi.DiscountProductVO) => {
     products.forEach((item: DiscountActivityApi.DiscountProductVO) => {
-      if(item.discountPrice != null && item.discountPrice > 0){
+      if (item.discountPrice != null && item.discountPrice > 0) {
         item.discountType = 1
         item.discountType = 1
-      }else if(item.discountPercent != null && item.discountPercent > 0){
+      } else if (item.discountPercent != null && item.discountPercent > 0) {
         item.discountType = 2
         item.discountType = 2
-      }else{
-        timp = true
+      } else {
+        discountInvalid = true
       }
       }
     })
     })
-    if(timp){
-      message.error("优惠金额和折扣百分比需要填写一个");
-      return;
+    if (discountInvalid) {
+      message.error('优惠金额和折扣百分比需要填写一个')
+      return
     }
     }
     data.products = products
     data.products = products
     // 真正提交
     // 真正提交
@@ -207,10 +214,16 @@ const resetForm = async () => {
 }
 }
 
 
 /**
 /**
- * 删除spu
+ * 删除 SPU
  */
  */
 const deleteSpu = (spuId: number) => {
 const deleteSpu = (spuId: number) => {
-  spuIds.value.splice(spuIds.value.findIndex((item) => item == spuId), 1)
-  spuPropertyList.value.splice(spuPropertyList.value.findIndex((item) => item.spuId == spuId), 1)
+  spuIds.value.splice(
+    spuIds.value.findIndex((item) => item == spuId),
+    1
+  )
+  spuPropertyList.value.splice(
+    spuPropertyList.value.findIndex((item) => item.spuId == spuId),
+    1
+  )
 }
 }
 </script>
 </script>

src/views/mall/promotion/rewardActivity/RewardForm.vue

 <template>
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog v-model="dialogVisible" :title="dialogTitle" width="65%">
     <el-form
     <el-form
       ref="formRef"
       ref="formRef"
+      v-loading="formLoading"
       :model="formData"
       :model="formData"
       :rules="formRules"
       :rules="formRules"
       label-width="80px"
       label-width="80px"
-      v-loading="formLoading"
     >
     >
       <el-form-item label="活动名称" prop="name">
       <el-form-item label="活动名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入活动名称" />
         <el-input v-model="formData.name" placeholder="请输入活动名称" />
@@ -13,10 +13,11 @@
       <el-form-item label="活动时间" prop="startAndEndTime">
       <el-form-item label="活动时间" prop="startAndEndTime">
         <el-date-picker
         <el-date-picker
           v-model="formData.startAndEndTime"
           v-model="formData.startAndEndTime"
-          type="datetimerange"
-          range-separator="-"
-          :start-placeholder="t('common.startTimeText')"
           :end-placeholder="t('common.endTimeText')"
           :end-placeholder="t('common.endTimeText')"
+          :start-placeholder="t('common.startTimeText')"
+          range-separator="-"
+          type="datetimerange"
+          value-format="x"
         />
         />
       </el-form-item>
       </el-form-item>
       <el-form-item label="条件类型" prop="conditionType">
       <el-form-item label="条件类型" prop="conditionType">
@@ -24,187 +25,83 @@
           <el-radio
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_CONDITION_TYPE)"
             v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_CONDITION_TYPE)"
             :key="dict.value"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
           >
             {{ dict.label }}
             {{ dict.label }}
           </el-radio>
           </el-radio>
         </el-radio-group>
         </el-radio-group>
       </el-form-item>
       </el-form-item>
       <el-form-item label="优惠设置">
       <el-form-item label="优惠设置">
-        <template v-for="(item, index) in formData.rules" :key="index">
-          <el-row type="flex">
-            <el-col :span="24" style="display: flex; font-weight: bold">
-              活动层级{{ index + 1 }}
-              <el-button
-                link
-                type="danger"
-                style="margin-left: auto"
-                v-if="index != 0"
-                @click="deleteActivityRule(index)"
-              >
-                删除
-              </el-button>
-            </el-col>
-            <el-form :ref="'formRef' + index" :model="item">
-              <el-form-item
-                label="优惠门槛:"
-                prop="limit"
-                label-width="100px"
-                style="padding-left: 50px"
-              >
-                满
-                <el-input
-                  style="width: 150px; padding: 0 10px"
-                  v-model="item.limit"
-                  type="number"
-                  placeholder=""
-                />
-                元
+        <RewardRule ref="rewardRuleRef" v-model="formData" />
       </el-form-item>
       </el-form-item>
-              <el-form-item label="优惠内容:" label-width="100px" style="padding-left: 50px">
-                <el-checkbox-group v-model="activityRules[index]" style="width: 100%">
-                  <el-col :span="24">
-                    <el-checkbox label="订单金额优惠" value="订单金额优惠" name="type" />
-                    <el-form-item v-if="activityRules[index].includes('订单金额优惠')">
-                      减
-                      <el-input
-                        style="width: 150px; padding: 0 20px"
-                        v-model="item.discountPrice"
-                        type="number"
-                        placeholder=""
-                      />
-                      元
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="24">
-                    <el-checkbox
-                      v-model="item.freeDelivery"
-                      label="包邮"
-                      value="包邮"
-                      name="type"
-                    />
-                  </el-col>
-                  <el-col :span="24">
-                    <el-checkbox label="送积分" value="送积分" name="type" />
-                    <el-form-item v-if="activityRules[index].includes('送积分')">
-                      送
-                      <el-input
-                        style="width: 150px; padding: 0 20px"
-                        v-model="item.point"
-                        type="number"
-                        placeholder=""
-                      />
-                      积分
-                    </el-form-item>
-                  </el-col>
-                  <!-- 优惠券待处理  也可以参考优惠劵的SpuShowcase-->
-                  <!-- TODO 待实现！-->
-                  <el-col :span="24">
-                    <el-checkbox label="送优惠券" value="送优惠券" name="type" />
-                  </el-col>
-                </el-checkbox-group>
-              </el-form-item>
-            </el-form>
-          </el-row>
-        </template>
-        <!-- TODO 实现：建议改成放在每一个【活动层级】的下面，有点类似主子表 -->
-        <el-button type="primary" @click="addActivityStratum">添加活动层级</el-button>
-      </el-form-item>
-      <el-form-item label="活动商品" prop="productScope">
+      <el-form-item label="活动范围" prop="productScope">
         <el-radio-group v-model="formData.productScope">
         <el-radio-group v-model="formData.productScope">
           <el-radio
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_PRODUCT_SCOPE)"
             v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_PRODUCT_SCOPE)"
             :key="dict.value"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
           >
             {{ dict.label }}
             {{ dict.label }}
           </el-radio>
           </el-radio>
         </el-radio-group>
         </el-radio-group>
       </el-form-item>
       </el-form-item>
-      <!-- TODO：活动商品的开发，可以参考优惠劵的，已经搞好啦； -->
       <el-form-item
       <el-form-item
         v-if="formData.productScope === PromotionProductScopeEnum.SPU.scope"
         v-if="formData.productScope === PromotionProductScopeEnum.SPU.scope"
         prop="productSpuIds"
         prop="productSpuIds"
       >
       >
-        <el-select
-          v-model="formData.productSpuIds"
-          placeholder="请选择活动商品"
-          clearable
-          size="small"
-          multiple
-          filterable
-          style="width: 400px"
+        <SpuShowcase v-model="formData.productSpuIds" />
+      </el-form-item>
+      <el-form-item
+        v-if="formData.productScope === PromotionProductScopeEnum.CATEGORY.scope"
+        label="分类"
+        prop="productCategoryIds"
       >
       >
-          <el-option v-for="item in productSpus" :key="item.id" :label="item.name" :value="item.id">
-            <span style="float: left">{{ item.name }}</span>
-            <span style="float: right; font-size: 13px; color: #8492a6">
-              ￥{{ (item.price / 100.0).toFixed(2) }}
-            </span>
-          </el-option>
-        </el-select>
+        <ProductCategorySelect v-model="formData.productCategoryIds" />
       </el-form-item>
       </el-form-item>
       <el-form-item label="备注" prop="remark">
       <el-form-item label="备注" prop="remark">
         <el-input v-model="formData.remark" placeholder="请输入备注" />
         <el-input v-model="formData.remark" placeholder="请输入备注" />
       </el-form-item>
       </el-form-item>
     </el-form>
     </el-form>
     <template #footer>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
     </template>
   </Dialog>
   </Dialog>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
-import { getSpuSimpleList } from '@/api/mall/product/spu'
+import RewardRule from './components/RewardRule.vue'
+import SpuShowcase from '@/views/mall/product/spu/components/SpuShowcase.vue'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import * as RewardActivityApi from '@/api/mall/promotion/reward/rewardActivity'
 import * as RewardActivityApi from '@/api/mall/promotion/reward/rewardActivity'
 import { PromotionConditionTypeEnum, PromotionProductScopeEnum } from '@/utils/constants'
 import { PromotionConditionTypeEnum, PromotionProductScopeEnum } from '@/utils/constants'
+import ProductCategorySelect from '@/views/mall/product/category/components/ProductCategorySelect.vue'
+import { cloneDeep } from 'lodash-es'
+import { fenToYuan, yuanToFen } from '@/utils'
 
 
-/** 初始化 **/
-onMounted(() => {
-  getSpuSimpleList().then((response) => {
-    productSpus.value = response
-  })
-})
 defineOptions({ name: 'ProductBrandForm' })
 defineOptions({ name: 'ProductBrandForm' })
 
 
 const { t } = useI18n() // 国际化
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 const message = useMessage() // 消息弹窗
 
 
-const productSpus = ref<any[]>([]) // 商品数据
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-  id: undefined,
-  name: undefined,
-  startAndEndTime: undefined,
-  startTime: undefined,
-  endTime: undefined,
+const formData = ref<RewardActivityApi.RewardActivityVO>({
   conditionType: PromotionConditionTypeEnum.PRICE.type,
   conditionType: PromotionConditionTypeEnum.PRICE.type,
-  remark: undefined,
   productScope: PromotionProductScopeEnum.ALL.scope,
   productScope: PromotionProductScopeEnum.ALL.scope,
-  productSpuIds: undefined,
-  rules: [
-    {
-      limit: undefined,
-      discountPrice: undefined,
-      freeDelivery: undefined,
-      point: undefined,
-      couponIds: [],
-      couponCounts: []
-    }
-  ]
-})
-const activityRules = reactive([]) // 优惠设置。每个元素都是一个 []，放“包邮”、“送积分”、“订单金额优惠”
+  rules: []
+} as RewardActivityApi.RewardActivityVO)
 const formRules = reactive({
 const formRules = reactive({
   name: [{ required: true, message: '活动名称不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '活动名称不能为空', trigger: 'blur' }],
   startAndEndTime: [{ required: true, message: '活动时间不能为空', trigger: 'blur' }],
   startAndEndTime: [{ required: true, message: '活动时间不能为空', trigger: 'blur' }],
   conditionType: [{ required: true, message: '条件类型不能为空', trigger: 'change' }],
   conditionType: [{ required: true, message: '条件类型不能为空', trigger: 'change' }],
   productScope: [{ required: true, message: '商品范围不能为空', trigger: 'blur' }],
   productScope: [{ required: true, message: '商品范围不能为空', trigger: 'blur' }],
-  productSpuIds: [{ required: true, message: '商品范围不能为空', trigger: 'blur' }]
+  productSpuIds: [{ required: true, message: '商品不能为空', trigger: 'blur' }],
+  productCategoryIds: [{ required: true, message: '商品分类不能为空', trigger: 'blur' }]
 })
 })
-const formRef = ref([]) // 表单 Ref
+const formRef = ref() // 表单 Ref
+const rewardRuleRef = ref<InstanceType<typeof RewardRule>>() // 活动规则 Ref
 
 
 /** 打开弹窗 */
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
 const open = async (type: string, id?: number) => {
@@ -216,24 +113,16 @@ const open = async (type: string, id?: number) => {
   if (id) {
   if (id) {
     formLoading.value = true
     formLoading.value = true
     try {
     try {
-      let data = await RewardActivityApi.getReward(id)
-      data.startAndEndTime = [new Date(data.startTime), new Date(data.endTime)]
-      activityRules.splice(0, activityRules.length)
-      data.rules.forEach((item) => {
-        // TODO 是不是不用 reactive，直接 [] 就可以了？
-        let array: string[] = reactive([])
-        if (item.freeDelivery) {
-          array.push('包邮')
-        }
-        if (item.point) {
-          array.push('送积分')
-        }
-        if (item.discountPrice) {
-          array.push('订单金额优惠')
-        }
-        activityRules.push(array)
+      const data = await RewardActivityApi.getReward(id)
+      // 转区段时间
+      data.startAndEndTime = [data.startTime, data.endTime]
+      // 规则分转元
+      data.rules?.forEach((item: any) => {
+        item.discountPrice = fenToYuan(item.discountPrice || 0)
       })
       })
       formData.value = data
       formData.value = data
+      // 获得商品范围
+      await getProductScope()
     } finally {
     } finally {
       formLoading.value = false
       formLoading.value = false
     }
     }
@@ -245,26 +134,26 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
 const submitForm = async () => {
   // 校验表单
   // 校验表单
-  if (!formRef) return
+  if (!formRef.value) return
   const valid = await formRef.value.validate()
   const valid = await formRef.value.validate()
   if (!valid) return
   if (!valid) return
-  // 处理下数据兼容接口
-  formData.value.startTime = +new Date(formData.value.startAndEndTime[0])
-  formData.value.endTime = +new Date(formData.value.startAndEndTime[1])
-  activityRules.forEach((item, index) => {
-    formData.value.rules[index].freeDelivery = !!item.includes('包邮')
-    if (!item.includes('送积分')) {
-      formData.value.rules[index].point = undefined
-    }
-    if (!item.includes('订单金额优惠')) {
-      formData.value.rules[index].discountPrice = undefined
-    }
-  })
 
 
   // 提交请求
   // 提交请求
   formLoading.value = true
   formLoading.value = true
   try {
   try {
-    const data = formData.value as RewardActivityApi.DiscountActivityVO
+    // 设置活动规则优惠券
+    rewardRuleRef.value?.setRuleCoupon()
+    const data = cloneDeep(formData.value)
+    // 时间段转换
+    data.startTime = data.startAndEndTime![0]
+    data.endTime = data.startAndEndTime![1]
+    delete data.startAndEndTime
+    // 规则元转分
+    data.rules.forEach((item) => {
+      item.discountPrice = yuanToFen(item.discountPrice || 0)
+    })
+    // 设置商品范围
+    setProductScopeValues(data)
     if (formType.value === 'create') {
     if (formType.value === 'create') {
       await RewardActivityApi.createRewardActivity(data)
       await RewardActivityApi.createRewardActivity(data)
       message.success(t('common.createSuccess'))
       message.success(t('common.createSuccess'))
@@ -280,51 +169,50 @@ const submitForm = async () => {
   }
   }
 }
 }
 
 
-const addActivityStratum = () => {
-  formData.value.rules.push({
-    limit: undefined,
-    discountPrice: undefined,
-    freeDelivery: undefined,
-    point: undefined,
-    couponIds: [],
-    couponCounts: []
-  })
-  activityRules.push([])
-}
-
-const deleteActivityRule = (index) => {
-  formData.value.rules.splice(index, 1)
-  activityRules.splice(index, 1)
-}
-
 /** 重置表单 */
 /** 重置表单 */
 const resetForm = () => {
 const resetForm = () => {
   formData.value = {
   formData.value = {
-    id: undefined,
-    name: undefined,
-    startAndEndTime: undefined,
-    startTime: undefined,
-    endTime: undefined,
     conditionType: PromotionConditionTypeEnum.PRICE.type,
     conditionType: PromotionConditionTypeEnum.PRICE.type,
-    remark: undefined,
     productScope: PromotionProductScopeEnum.ALL.scope,
     productScope: PromotionProductScopeEnum.ALL.scope,
-    productSpuIds: undefined,
-    rules: [
-      {
-        limit: undefined,
-        discountPrice: undefined,
-        freeDelivery: undefined,
-        point: undefined,
-        couponIds: [],
-        couponCounts: []
+    rules: []
+  } as RewardActivityApi.RewardActivityVO
+}
+
+/** 获得商品范围 */
+const getProductScope = async () => {
+  switch (formData.value.productScope) {
+    case PromotionProductScopeEnum.SPU.scope:
+      // 设置商品编号
+      formData.value.productSpuIds = formData.value.productScopeValues
+      break
+    case PromotionProductScopeEnum.CATEGORY.scope:
+      await nextTick()
+      let productCategoryIds = formData.value.productScopeValues as any
+      if (Array.isArray(productCategoryIds) && productCategoryIds.length > 0) {
+        // 单选时使用数组不能反显
+        productCategoryIds = productCategoryIds[0]
       }
       }
-    ]
+      // 设置品类编号
+      formData.value.productCategoryIds = productCategoryIds
+      break
+    default:
+      break
+  }
+}
+
+/** 设置商品范围 */
+function setProductScopeValues(data: any) {
+  switch (formData.value.productScope) {
+    case PromotionProductScopeEnum.SPU.scope:
+      data.productScopeValues = formData.value.productSpuIds
+      break
+    case PromotionProductScopeEnum.CATEGORY.scope:
+      data.productScopeValues = Array.isArray(formData.value.productCategoryIds)
+        ? formData.value.productCategoryIds
+        : [formData.value.productCategoryIds]
+      break
+    default:
+      break
   }
   }
-  activityRules.splice(0, activityRules.length)
-  activityRules.push(reactive([]))
-  // 解决下有时刷新页面第一次点编辑报错
-  nextTick(() => {
-    formRef.value?.resetFields()
-  })
 }
 }
 </script>
 </script>

src/views/mall/promotion/rewardActivity/components/RewardRule.vue

+<template>
+  <!-- 满减送活动规则组件 -->
+  <el-row>
+    <template v-if="formData.rules">
+      <el-col v-for="(rule, index) in formData.rules" :key="index" :span="24">
+        <span class="font-bold">活动层级{{ index + 1 }}</span>
+        <el-button v-if="index !== 0" link type="danger" @click="deleteRule(index)">
+          删除
+        </el-button>
+        <el-form ref="formRef" :model="rule">
+          <el-form-item label="优惠门槛:" label-width="100px" prop="limit">
+            满
+            <el-input
+              v-model="rule.limit"
+              :min="0"
+              class="w-150px! p-x-20px!"
+              placeholder=""
+              type="number"
+            />
+            <!-- TODO @puhui999：走字典数据？ -->
+            {{ PromotionConditionTypeEnum.PRICE.type === formData.conditionType ? '元' : '件' }}
+          </el-form-item>
+          <el-form-item label="优惠内容:" label-width="100px">
+            <el-col :span="24">
+              订单金额优惠
+              <el-form-item>
+                减
+                <el-input-number
+                  v-model="rule.discountPrice"
+                  :min="0"
+                  :precision="2"
+                  :step="0.1"
+                  class="w-150px! p-x-20px!"
+                  controls-position="right"
+                />
+                元
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <span>包邮：</span>
+              <el-switch
+                v-model="rule.freeDelivery"
+                active-text="是"
+                inactive-text="否"
+                inline-prompt
+              />
+            </el-col>
+            <el-col :span="24">
+              <span>送积分：</span>
+              <el-form-item>
+                送
+                <el-input
+                  v-model="rule.point"
+                  class="w-150px! p-x-20px!"
+                  placeholder=""
+                  type="number"
+                />
+                积分
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <span>送优惠券：</span>
+              <RewardRuleCouponSelect ref="rewardRuleCouponSelectRef" v-model="rule!" />
+            </el-col>
+          </el-form-item>
+        </el-form>
+      </el-col>
+    </template>
+    <el-col :span="24" class="mt-10px">
+      <el-button type="primary" @click="addRule">添加优惠规则</el-button>
+    </el-col>
+    <el-col :span="24">
+      <el-tag type="warning"> 赠送积分为 0 时不赠送。未选优惠券时不赠送。</el-tag>
+    </el-col>
+  </el-row>
+</template>
+
+<script lang="ts" setup>
+import RewardRuleCouponSelect from './RewardRuleCouponSelect.vue'
+import { RewardActivityVO } from '@/api/mall/promotion/reward/rewardActivity'
+import { PromotionConditionTypeEnum } from '@/utils/constants'
+import { useVModel } from '@vueuse/core'
+import { isEmpty } from '@/utils/is'
+
+defineOptions({ name: 'RewardRule' })
+
+const props = defineProps<{
+  modelValue: RewardActivityVO
+}>()
+
+const emits = defineEmits<{
+  (e: 'update:modelValue', v: any): void
+  (e: 'deleteRule', v: number): void
+}>()
+
+const formData = useVModel(props, 'modelValue', emits) // 活动数据
+const rewardRuleCouponSelectRef = ref<InstanceType<typeof RewardRuleCouponSelect>[]>() // 活动规则优惠券 Ref
+
+/** 删除优惠规则 */
+const deleteRule = (ruleIndex: number) => {
+  formData.value.rules.splice(ruleIndex, 1)
+}
+
+/** 添加优惠规则 */
+const addRule = () => {
+  if (isEmpty(formData.value.rules)) {
+    formData.value.rules = []
+  }
+  formData.value.rules.push({
+    limit: 0,
+    discountPrice: 0,
+    freeDelivery: false,
+    point: 0
+  })
+}
+
+/** 设置规则优惠券-提交时 */
+const setRuleCoupon = () => {
+  if (isEmpty(rewardRuleCouponSelectRef.value)) {
+    return
+  }
+
+  rewardRuleCouponSelectRef.value?.forEach((item) => item.setGiveCouponList())
+}
+
+defineExpose({ setRuleCoupon })
+</script>

src/views/mall/promotion/rewardActivity/components/RewardRuleCouponSelect.vue

+<template>
+  <el-button class="ml-10px" type="text" @click="selectCoupon">添加优惠卷</el-button>
+
+  <div
+    v-for="(item, index) in list"
+    :key="item.id"
+    class="coupon-list-item p-x-10px mb-10px flex justify-between"
+  >
+    <div class="coupon-list-item-left flex items-center flex-wrap">
+      <div class="mr-10px"> 优惠券名称：{{ item.name }}</div>
+      <div class="mr-10px">
+        范围：
+        <dict-tag :type="DICT_TYPE.PROMOTION_PRODUCT_SCOPE" :value="item.productScope" />
+      </div>
+      <div class="flex items-center">
+        优惠：
+        <dict-tag :type="DICT_TYPE.PROMOTION_DISCOUNT_TYPE" :value="item.discountType" />
+        {{ discountFormat(item) }}
+      </div>
+    </div>
+    <div class="coupon-list-item-right">
+      送
+      <el-input v-model="item.giveCount" class="w-150px! p-x-20px!" placeholder="" type="number" />
+      张
+      <el-button class="ml-20px" link type="danger" @click="deleteCoupon(index)">删除</el-button>
+    </div>
+  </div>
+
+  <!-- 优惠券选择 -->
+  <CouponSelect
+    ref="couponSelectRef"
+    :take-type="CouponTemplateTakeTypeEnum.ADMIN.type"
+    @change="handleCouponChange"
+  />
+</template>
+
+<script lang="ts" setup>
+import { CouponSelect } from '@/views/mall/promotion/coupon/components'
+import * as CouponTemplateApi from '@/api/mall/promotion/coupon/couponTemplate'
+import { RewardRule } from '@/api/mall/promotion/reward/rewardActivity'
+import { DICT_TYPE } from '@/utils/dict'
+import { CouponTemplateTakeTypeEnum } from '@/utils/constants'
+import { discountFormat } from '@/views/mall/promotion/coupon/formatter'
+import { isEmpty } from '@/utils/is'
+import { useVModel } from '@vueuse/core'
+
+defineOptions({ name: 'RewardRuleCouponSelect' })
+
+const props = defineProps<{
+  modelValue: RewardRule
+}>()
+
+const emits = defineEmits<{
+  (e: 'update:modelValue', v: any): void
+}>()
+
+const rewardRule = useVModel(props, 'modelValue', emits) // 赠送规则
+const list = ref<GiveCouponVO[]>([]) // 选择的优惠券列表
+
+/** 选择赠送的优惠卷类型拓展 */
+interface GiveCouponVO extends CouponTemplateApi.CouponTemplateVO {
+  giveCount?: number
+}
+
+/** 选择优惠券 */
+const couponSelectRef = ref<InstanceType<typeof CouponSelect>>() // 优惠券选择
+const selectCoupon = () => {
+  couponSelectRef.value?.open()
+}
+
+/** 选择优惠券后的回调 */
+const handleCouponChange = (val: CouponTemplateApi.CouponTemplateVO[]) => {
+  for (const item of val) {
+    if (list.value.some((v) => v.id === item.id)) {
+      continue
+    }
+    list.value.push(item)
+  }
+}
+
+/** 删除优惠券 */
+const deleteCoupon = (index: number) => {
+  list.value.splice(index, 1)
+}
+
+/** 初始化赠送的优惠券列表 */
+const initGiveCouponList = async () => {
+  // 校验优惠券存在
+  if (isEmpty(rewardRule.value) || isEmpty(rewardRule.value.giveCouponTemplateCounts)) {
+    return
+  }
+  const tempLateIds = Object.keys(rewardRule.value.giveCouponTemplateCounts!).map((item) =>
+    parseInt(item)
+  )
+  const data = await CouponTemplateApi.getCouponTemplateList(tempLateIds)
+  if (!data) {
+    return
+  }
+  // 回显
+  data.forEach((coupon) => {
+    list.value.push({
+      ...coupon,
+      giveCount: rewardRule.value.giveCouponTemplateCounts![coupon.id]
+    })
+  })
+}
+
+/** 设置赠送的优惠券 */
+const setGiveCouponList = () => {
+  if (isEmpty(rewardRule.value) || isEmpty(list.value)) {
+    return
+  }
+
+  // 设置优惠券和其数量的对应
+  list.value.forEach((rule) => {
+    if (!rewardRule.value.giveCouponTemplateCounts) {
+      rewardRule.value.giveCouponTemplateCounts = {}
+    }
+    rewardRule.value.giveCouponTemplateCounts[rule.id] = rule.giveCount!
+  })
+}
+defineExpose({ setGiveCouponList })
+
+/** 组件初始化 */
+onMounted(async () => {
+  await nextTick()
+  await initGiveCouponList()
+})
+</script>
+
+<style lang="scss" scoped>
+.coupon-list-item {
+  border: 1px dashed var(--el-border-color-darker);
+  border-radius: 8px;
+}
+</style>

src/views/mall/promotion/rewardActivity/index.vue

@@ -4,27 +4,27 @@
   <!-- 搜索工作栏 -->
   <!-- 搜索工作栏 -->
   <ContentWrap>
   <ContentWrap>
     <el-form
     <el-form
-      class="-mb-15px"
-      :model="queryParams"
       ref="queryFormRef"
       ref="queryFormRef"
       :inline="true"
       :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
       label-width="68px"
       label-width="68px"
     >
     >
       <el-form-item label="活动名称" prop="name">
       <el-form-item label="活动名称" prop="name">
         <el-input
         <el-input
           v-model="queryParams.name"
           v-model="queryParams.name"
-          placeholder="请输入活动名称"
+          class="!w-240px"
           clearable
           clearable
+          placeholder="请输入活动名称"
           @keyup.enter="handleQuery"
           @keyup.enter="handleQuery"
-          class="!w-240px"
         />
         />
       </el-form-item>
       </el-form-item>
       <el-form-item label="活动状态" prop="status">
       <el-form-item label="活动状态" prop="status">
         <el-select
         <el-select
           v-model="queryParams.status"
           v-model="queryParams.status"
-          placeholder="请选择活动状态"
-          clearable
           class="!w-240px"
           class="!w-240px"
+          clearable
+          placeholder="请选择活动状态"
         >
         >
           <el-option
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_ACTIVITY_STATUS)"
             v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_ACTIVITY_STATUS)"
@@ -37,24 +37,31 @@
       <el-form-item label="活动时间" prop="createTime">
       <el-form-item label="活动时间" prop="createTime">
         <el-date-picker
         <el-date-picker
           v-model="queryParams.createTime"
           v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="活动开始日期"
-          end-placeholder="活动结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           class="!w-240px"
           class="!w-240px"
+          end-placeholder="活动结束日期"
+          start-placeholder="活动开始日期"
+          type="daterange"
+          value-format="YYYY-MM-DD HH:mm:ss"
         />
         />
       </el-form-item>
       </el-form-item>
       <el-form-item>
       <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
         <el-button
         <el-button
-          type="primary"
+          v-hasPermi="['product:brand:create']"
           plain
           plain
+          type="primary"
           @click="openForm('create')"
           @click="openForm('create')"
-          v-hasPermi="['product:brand:create']"
         >
         >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
+          <Icon class="mr-5px" icon="ep:plus" />
+          新增
         </el-button>
         </el-button>
       </el-form-item>
       </el-form-item>
     </el-form>
     </el-form>
@@ -62,47 +69,47 @@
 
 
   <!-- 列表 -->
   <!-- 列表 -->
   <ContentWrap>
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" row-key="id" default-expand-all>
+    <el-table v-loading="loading" :data="list" default-expand-all row-key="id">
       <el-table-column label="活动名称" prop="name" />
       <el-table-column label="活动名称" prop="name" />
       <el-table-column
       <el-table-column
-        label="活动开始时间"
+        :formatter="dateFormatter"
         align="center"
         align="center"
+        label="活动开始时间"
         prop="startTime"
         prop="startTime"
-        :formatter="dateFormatter"
       />
       />
       <el-table-column
       <el-table-column
-        label="活动结束时间"
+        :formatter="dateFormatter"
         align="center"
         align="center"
+        label="活动结束时间"
         prop="endTime"
         prop="endTime"
-        :formatter="dateFormatter"
       />
       />
-      <el-table-column label="状态" align="center" prop="status">
+      <el-table-column align="center" label="状态" prop="status">
         <template #default="scope">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.PROMOTION_ACTIVITY_STATUS" :value="scope.row.status" />
           <dict-tag :type="DICT_TYPE.PROMOTION_ACTIVITY_STATUS" :value="scope.row.status" />
         </template>
         </template>
       </el-table-column>
       </el-table-column>
       <el-table-column
       <el-table-column
-        label="创建时间"
+        :formatter="dateFormatter"
         align="center"
         align="center"
+        label="创建时间"
         prop="createTime"
         prop="createTime"
         width="180"
         width="180"
-        :formatter="dateFormatter"
       />
       />
-      <el-table-column label="操作" align="center">
+      <el-table-column align="center" label="操作">
         <template #default="scope">
         <template #default="scope">
           <el-button
           <el-button
+            v-hasPermi="['product:brand:update']"
             link
             link
             type="primary"
             type="primary"
             @click="openForm('update', scope.row.id)"
             @click="openForm('update', scope.row.id)"
-            v-hasPermi="['product:brand:update']"
           >
           >
             编辑
             编辑
           </el-button>
           </el-button>
           <el-button
           <el-button
+            v-hasPermi="['product:brand:delete']"
             link
             link
             type="danger"
             type="danger"
             @click="handleDelete(scope.row.id)"
             @click="handleDelete(scope.row.id)"
-            v-hasPermi="['product:brand:delete']"
           >
           >
             删除
             删除
           </el-button>
           </el-button>
@@ -111,9 +118,9 @@
     </el-table>
     </el-table>
     <!-- 分页 -->
     <!-- 分页 -->
     <Pagination
     <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
       v-model:limit="queryParams.pageSize"
       v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
       @pagination="getList"
       @pagination="getList"
     />
     />
   </ContentWrap>
   </ContentWrap>
@@ -168,9 +175,9 @@ const resetQuery = () => {
 }
 }
 
 
 /** 添加/修改操作 */
 /** 添加/修改操作 */
-const formRef = ref()
+const formRef = ref<InstanceType<typeof RewardForm>>()
 const openForm = (type: string, id?: number) => {
 const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
+  formRef.value?.open(type, id)
 }
 }
 
 
 /** 删除按钮操作 */
 /** 删除按钮操作 */

src/views/mall/trade/afterSale/index.vue

@@ -135,7 +135,7 @@
           </div>
           </div>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
-      <el-table-column align="center" label="订单金额" prop="refundPrice" min-width="120">
+      <el-table-column align="center" label="订单金额" min-width="120" prop="refundPrice">
         <template #default="scope">
         <template #default="scope">
           <span>{{ fenToYuan(scope.row.refundPrice) }} 元</span>
           <span>{{ fenToYuan(scope.row.refundPrice) }} 元</span>
         </template>
         </template>

src/views/member/user/components/UserBalanceUpdateForm.vue

+<template>
+  <Dialog v-model="dialogVisible" title="修改用户余额" width="600">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="130px"
+    >
+      <el-form-item label="用户编号" prop="id">
+        <el-input v-model="formData.id" class="!w-240px" disabled />
+      </el-form-item>
+      <el-form-item label="用户昵称" prop="nickname">
+        <el-input v-model="formData.nickname" class="!w-240px" disabled />
+      </el-form-item>
+      <el-form-item label="变动前余额(元)" prop="balance">
+        <el-input :model-value="formData.balance" class="!w-240px" disabled />
+      </el-form-item>
+      <el-form-item label="变动类型" prop="changeType">
+        <el-radio-group v-model="formData.changeType">
+          <el-radio :label="1">增加</el-radio>
+          <el-radio :label="-1">减少</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="变动余额(元)" prop="changeBalance">
+        <el-input-number
+          v-model="formData.changeBalance"
+          :min="0"
+          :precision="2"
+          :step="0.1"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="变动后余额(元)">
+        <el-input :model-value="balanceResult" class="!w-240px" disabled />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import * as UserApi from '@/api/member/user'
+import * as WalletApi from '@/api/pay/wallet/balance'
+import { convertToInteger, formatToFraction } from '@/utils'
+
+/** 修改用户余额表单 */
+defineOptions({ name: 'UpdateBalanceForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  id: undefined,
+  nickname: undefined,
+  balance: '0',
+  changeBalance: 0,
+  changeType: 1
+})
+const formRules = reactive({
+  changeBalance: [{ required: true, message: '变动余额不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (id?: number) => {
+  dialogVisible.value = true
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      const user = await UserApi.getUser(id)
+      const wallet = await WalletApi.getWallet({ userId: user.id || 0 })
+      formData.value.id = user.id
+      formData.value.nickname = user.nickname
+      formData.value.balance = formatToFraction(wallet.balance)
+      formData.value.changeType = 1 // 默认增加余额
+      formData.value.changeBalance = 0 // 变动余额默认0
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+
+  if (formData.value.changeBalance <= 0) {
+    message.error('变动余额不能为零')
+    return
+  }
+  if (convertToInteger(balanceResult.value) < 0) {
+    message.error('变动后的余额不能小于 0')
+    return
+  }
+
+  // 提交请求
+  formLoading.value = true
+  try {
+    await WalletApi.updateWalletBalance({
+      userId: formData.value.id,
+      balance: convertToInteger(formData.value.changeBalance) * formData.value.changeType
+    })
+
+    message.success(t('common.updateSuccess'))
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    nickname: undefined,
+    balance: '0',
+    changeBalance: 0,
+    changeType: 1
+  }
+  formRef.value?.resetFields()
+}
+
+/** 变动后的余额 */
+const balanceResult = computed(() =>
+  formatToFraction(
+    convertToInteger(formData.value.balance) +
+      convertToInteger(formData.value.changeBalance) * formData.value.changeType
+  )
+)
+</script>

src/views/member/user/UserPointUpdateForm.vue → src/views/member/user/components/UserPointUpdateForm.vue

 <template>
 <template>
-  <Dialog title="修改用户积分" v-model="dialogVisible" width="600">
+  <Dialog v-model="dialogVisible" title="修改用户积分" width="600">
     <el-form
     <el-form
       ref="formRef"
       ref="formRef"
+      v-loading="formLoading"
       :model="formData"
       :model="formData"
       :rules="formRules"
       :rules="formRules"
       label-width="100px"
       label-width="100px"
-      v-loading="formLoading"
     >
     >
       <el-form-item label="用户编号" prop="id">
       <el-form-item label="用户编号" prop="id">
         <el-input v-model="formData.id" class="!w-240px" disabled />
         <el-input v-model="formData.id" class="!w-240px" disabled />
@@ -23,19 +23,19 @@
         </el-radio-group>
         </el-radio-group>
       </el-form-item>
       </el-form-item>
       <el-form-item label="变动积分" prop="changePoint">
       <el-form-item label="变动积分" prop="changePoint">
-        <el-input-number v-model="formData.changePoint" class="!w-240px" :min="0" :precision="0" />
+        <el-input-number v-model="formData.changePoint" :min="0" :precision="0" class="!w-240px" />
       </el-form-item>
       </el-form-item>
       <el-form-item label="变动后积分">
       <el-form-item label="变动后积分">
         <el-input-number v-model="pointResult" class="!w-240px" disabled />
         <el-input-number v-model="pointResult" class="!w-240px" disabled />
       </el-form-item>
       </el-form-item>
     </el-form>
     </el-form>
     <template #footer>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
     </template>
   </Dialog>
   </Dialog>
 </template>
 </template>
-<script setup lang="ts">
+<script lang="ts" setup>
 import * as UserApi from '@/api/member/user'
 import * as UserApi from '@/api/member/user'
 
 
 /** 修改用户积分表单 */
 /** 修改用户积分表单 */
@@ -115,8 +115,9 @@ const resetForm = () => {
   formData.value = {
   formData.value = {
     id: undefined,
     id: undefined,
     nickname: undefined,
     nickname: undefined,
-    levelId: undefined,
-    reason: undefined
+    point: 0,
+    changePoint: 0,
+    changeType: 1
   }
   }
   formRef.value?.resetFields()
   formRef.value?.resetFields()
 }
 }

src/views/member/user/components/balance-list.vue

-<script lang="ts">
-import { defineComponent } from 'vue'
-
-export default defineComponent({
-  name: 'BalanceList'
-})
-</script>
-
-<!-- TODO @芋艿：未来实现，等周建的 -->
-<template>
-  <div>余额列表</div>
-</template>
-
-<style scoped lang="scss"></style>

src/views/member/user/detail/UserAccountInfo.vue

@@ -2,57 +2,57 @@
   <el-descriptions :column="2">
   <el-descriptions :column="2">
     <el-descriptions-item>
     <el-descriptions-item>
       <template #label>
       <template #label>
-        <descriptions-item-label label=" 等级 " icon="svg-icon:member_level" />
+        <descriptions-item-label icon="svg-icon:member_level" label=" 等级 " />
       </template>
       </template>
       {{ user.levelName || '无' }}
       {{ user.levelName || '无' }}
     </el-descriptions-item>
     </el-descriptions-item>
     <el-descriptions-item>
     <el-descriptions-item>
       <template #label>
       <template #label>
-        <descriptions-item-label label=" 成长值 " icon="ep:suitcase" />
+        <descriptions-item-label icon="ep:suitcase" label=" 成长值 " />
       </template>
       </template>
       {{ user.experience || 0 }}
       {{ user.experience || 0 }}
     </el-descriptions-item>
     </el-descriptions-item>
     <el-descriptions-item>
     <el-descriptions-item>
       <template #label>
       <template #label>
-        <descriptions-item-label label=" 当前积分 " icon="ep:coin" />
+        <descriptions-item-label icon="ep:coin" label=" 当前积分 " />
       </template>
       </template>
       {{ user.point || 0 }}
       {{ user.point || 0 }}
     </el-descriptions-item>
     </el-descriptions-item>
     <el-descriptions-item>
     <el-descriptions-item>
       <template #label>
       <template #label>
-        <descriptions-item-label label=" 总积分 " icon="ep:coin" />
+        <descriptions-item-label icon="ep:coin" label=" 总积分 " />
       </template>
       </template>
       {{ user.totalPoint || 0 }}
       {{ user.totalPoint || 0 }}
     </el-descriptions-item>
     </el-descriptions-item>
     <el-descriptions-item>
     <el-descriptions-item>
       <template #label>
       <template #label>
-        <descriptions-item-label label=" 当前余额 " icon="svg-icon:member_balance" />
+        <descriptions-item-label icon="svg-icon:member_balance" label=" 当前余额 " />
       </template>
       </template>
       {{ fenToYuan(wallet.balance || 0) }}
       {{ fenToYuan(wallet.balance || 0) }}
     </el-descriptions-item>
     </el-descriptions-item>
     <el-descriptions-item>
     <el-descriptions-item>
       <template #label>
       <template #label>
-        <descriptions-item-label label=" 支出金额 " icon="svg-icon:member_expenditure_balance" />
+        <descriptions-item-label icon="svg-icon:member_expenditure_balance" label=" 支出金额 " />
       </template>
       </template>
       {{ fenToYuan(wallet.totalExpense || 0) }}
       {{ fenToYuan(wallet.totalExpense || 0) }}
     </el-descriptions-item>
     </el-descriptions-item>
     <el-descriptions-item>
     <el-descriptions-item>
       <template #label>
       <template #label>
-        <descriptions-item-label label=" 充值金额 " icon="svg-icon:member_recharge_balance" />
+        <descriptions-item-label icon="svg-icon:member_recharge_balance" label=" 充值金额 " />
       </template>
       </template>
       {{ fenToYuan(wallet.totalRecharge || 0) }}
       {{ fenToYuan(wallet.totalRecharge || 0) }}
     </el-descriptions-item>
     </el-descriptions-item>
   </el-descriptions>
   </el-descriptions>
 </template>
 </template>
-<script setup lang="ts">
+<script lang="ts" setup>
 import { DescriptionsItemLabel } from '@/components/Descriptions'
 import { DescriptionsItemLabel } from '@/components/Descriptions'
 import * as UserApi from '@/api/member/user'
 import * as UserApi from '@/api/member/user'
 import * as WalletApi from '@/api/pay/wallet/balance'
 import * as WalletApi from '@/api/pay/wallet/balance'
-import { UserTypeEnum } from '@/utils/constants'
 import { fenToYuan } from '@/utils'
 import { fenToYuan } from '@/utils'
-const props = defineProps<{ user: UserApi.UserVO; wallet: WalletApi.WalletVO }>() // 用户信息
+
+defineProps<{ user: UserApi.UserVO; wallet: WalletApi.WalletVO }>() // 用户信息
 </script>
 </script>
-<style scoped lang="scss">
+<style lang="scss" scoped>
 .cell-item {
 .cell-item {
   display: inline;
   display: inline;
 }
 }

src/views/member/user/detail/UserAftersaleList.vue

@@ -133,7 +133,7 @@
           </div>
           </div>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
-      <el-table-column align="center" label="订单金额" prop="refundPrice" min-width="120">
+      <el-table-column align="center" label="订单金额" min-width="120" prop="refundPrice">
         <template #default="scope">
         <template #default="scope">
           <span>{{ fenToYuan(scope.row.refundPrice) }} 元</span>
           <span>{{ fenToYuan(scope.row.refundPrice) }} 元</span>
         </template>
         </template>
@@ -153,7 +153,7 @@
           <dict-tag :type="DICT_TYPE.TRADE_AFTER_SALE_WAY" :value="scope.row.way" />
           <dict-tag :type="DICT_TYPE.TRADE_AFTER_SALE_WAY" :value="scope.row.way" />
         </template>
         </template>
       </el-table-column>
       </el-table-column>
-      <el-table-column align="center" fixed="right" label="操作" width="160">
+      <el-table-column align="center" fixed="right" label="操作" width="120">
         <template #default="{ row }">
         <template #default="{ row }">
           <el-button link type="primary" @click="openAfterSaleDetail(row.id)">处理退款</el-button>
           <el-button link type="primary" @click="openAfterSaleDetail(row.id)">处理退款</el-button>
         </template>
         </template>
@@ -180,7 +180,7 @@ import { fenToYuan } from '@/utils'
 defineOptions({ name: 'UserAfterSaleList' })
 defineOptions({ name: 'UserAfterSaleList' })
 
 
 const { push } = useRouter() // 路由跳转
 const { push } = useRouter() // 路由跳转
-const { userId } = defineProps<{
+const props = defineProps<{
   userId: number
   userId: number
 }>()
 }>()
 const loading = ref(true) // 列表的加载中
 const loading = ref(true) // 列表的加载中
@@ -197,14 +197,14 @@ const queryFormRef = ref() // 搜索的表单
 const queryParams = ref({
 const queryParams = ref({
   pageNo: 1,
   pageNo: 1,
   pageSize: 10,
   pageSize: 10,
-  userId,
   no: null,
   no: null,
   status: '0',
   status: '0',
   orderNo: null,
   orderNo: null,
   spuName: null,
   spuName: null,
   createTime: [],
   createTime: [],
   way: null,
   way: null,
-  type: null
+  type: null,
+  userId: null
 })
 })
 
 
 /** 查询列表 */
 /** 查询列表 */
@@ -217,7 +217,9 @@ const getList = async () => {
       delete data.status
       delete data.status
     }
     }
     // 执行查询
     // 执行查询
-    // TODO @芋艿：接口需要通过userId进行筛选返回值
+    if (props.userId) {
+      data.userId = props.userId as any
+    }
     const res = await AfterSaleApi.getAfterSalePage(data)
     const res = await AfterSaleApi.getAfterSalePage(data)
     list.value = res.list as AfterSaleApi.TradeAfterSaleVO[]
     list.value = res.list as AfterSaleApi.TradeAfterSaleVO[]
     total.value = res.total
     total.value = res.total
@@ -235,13 +237,12 @@ const handleQuery = async () => {
 /** 重置按钮操作 */
 /** 重置按钮操作 */
 const resetQuery = () => {
 const resetQuery = () => {
   queryFormRef.value?.resetFields()
   queryFormRef.value?.resetFields()
-  queryParams.value.userId = userId
   handleQuery()
   handleQuery()
 }
 }
 
 
 /** tab 切换 */
 /** tab 切换 */
 const tabClick = async (tab: TabsPaneContext) => {
 const tabClick = async (tab: TabsPaneContext) => {
-  queryParams.value.status = tab.paneName
+  queryParams.value.status = tab.paneName as any
   await getList()
   await getList()
 }
 }
 
 

src/views/member/user/detail/UserBalanceList.vue

 <template>
 <template>
   <ContentWrap>
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="钱包编号" align="center" prop="walletId" />
-      <el-table-column label="关联业务标题" align="center" prop="title" />
-      <el-table-column label="交易金额" align="center" prop="price">
+    <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
+      <el-table-column align="center" label="编号" prop="id" />
+      <el-table-column align="center" label="关联业务标题" prop="title" />
+      <el-table-column align="center" label="交易金额" prop="price">
         <template #default="{ row }"> {{ fenToYuan(row.price) }} 元</template>
         <template #default="{ row }"> {{ fenToYuan(row.price) }} 元</template>
       </el-table-column>
       </el-table-column>
-      <el-table-column label="钱包余额" align="center" prop="balance">
+      <el-table-column align="center" label="钱包余额" prop="balance">
         <template #default="{ row }"> {{ fenToYuan(row.balance) }} 元</template>
         <template #default="{ row }"> {{ fenToYuan(row.balance) }} 元</template>
       </el-table-column>
       </el-table-column>
       <el-table-column
       <el-table-column
-        label="交易时间"
+        :formatter="dateFormatter"
         align="center"
         align="center"
+        label="交易时间"
         prop="createTime"
         prop="createTime"
-        :formatter="dateFormatter"
         width="180px"
         width="180px"
       />
       />
     </el-table>
     </el-table>
     <!-- 分页 -->
     <!-- 分页 -->
     <Pagination
     <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
       v-model:limit="queryParams.pageSize"
       v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
       @pagination="getList"
       @pagination="getList"
     />
     />
   </ContentWrap>
   </ContentWrap>
@@ -32,8 +31,9 @@
 import { dateFormatter } from '@/utils/formatTime'
 import { dateFormatter } from '@/utils/formatTime'
 import * as WalletTransactionApi from '@/api/pay/wallet/transaction'
 import * as WalletTransactionApi from '@/api/pay/wallet/transaction'
 import { fenToYuan } from '@/utils'
 import { fenToYuan } from '@/utils'
+
 defineOptions({ name: 'UserBalanceList' })
 defineOptions({ name: 'UserBalanceList' })
-const { walletId }: { walletId: number } = defineProps({
+const props = defineProps({
   walletId: {
   walletId: {
     type: Number,
     type: Number,
     required: false
     required: false
@@ -52,7 +52,7 @@ const list = ref([]) // 列表的数据
 const getList = async () => {
 const getList = async () => {
   loading.value = true
   loading.value = true
   try {
   try {
-    queryParams.walletId = walletId
+    queryParams.walletId = props.walletId as any
     const data = await WalletTransactionApi.getWalletTransactionPage(queryParams)
     const data = await WalletTransactionApi.getWalletTransactionPage(queryParams)
     list.value = data.list
     list.value = data.list
     total.value = data.total
     total.value = data.total
@@ -65,4 +65,3 @@ onMounted(() => {
   getList()
   getList()
 })
 })
 </script>
 </script>
-<style scoped lang="scss"></style>

src/views/member/user/detail/index.vue

@@ -7,7 +7,7 @@
           <template #header>
           <template #header>
             <div class="card-header">
             <div class="card-header">
               <CardTitle title="基本信息" />
               <CardTitle title="基本信息" />
-              <el-button type="primary" size="small" text @click="openForm('update')">
+              <el-button size="small" text type="primary" @click="openForm('update')">
                 编辑
                 编辑
               </el-button>
               </el-button>
             </div>
             </div>
@@ -16,16 +16,16 @@
       </el-col>
       </el-col>
       <!-- 右上角：账户信息 -->
       <!-- 右上角：账户信息 -->
       <el-col :span="10" class="detail-info-item">
       <el-col :span="10" class="detail-info-item">
-        <el-card shadow="never" class="h-full">
+        <el-card class="h-full" shadow="never">
           <template #header>
           <template #header>
             <CardTitle title="账户信息" />
             <CardTitle title="账户信息" />
           </template>
           </template>
-          <UserAccountInfo :user="user" :wallet="wallet"/>
+          <UserAccountInfo :user="user" :wallet="wallet" />
         </el-card>
         </el-card>
       </el-col>
       </el-col>
       <!-- 下边：账户明细 -->
       <!-- 下边：账户明细 -->
       <!-- TODO 芋艿：【订单管理】【售后管理】【收藏记录】-->
       <!-- TODO 芋艿：【订单管理】【售后管理】【收藏记录】-->
-      <el-card header="账户明细" style="width: 100%; margin-top: 20px" shadow="never">
+      <el-card header="账户明细" shadow="never" style="width: 100%; margin-top: 20px">
         <template #header>
         <template #header>
           <CardTitle title="账户明细" />
           <CardTitle title="账户明细" />
         </template>
         </template>
@@ -39,7 +39,6 @@
           <el-tab-pane label="成长值" lazy>
           <el-tab-pane label="成长值" lazy>
             <UserExperienceRecordList :user-id="id" />
             <UserExperienceRecordList :user-id="id" />
           </el-tab-pane>
           </el-tab-pane>
-          <!-- TODO @jason：增加一个余额变化； -->
           <el-tab-pane label="余额" lazy>
           <el-tab-pane label="余额" lazy>
             <UserBalanceList :wallet-id="wallet.id" />
             <UserBalanceList :wallet-id="wallet.id" />
           </el-tab-pane>
           </el-tab-pane>
@@ -69,7 +68,7 @@
   <!-- 表单弹窗：添加/修改 -->
   <!-- 表单弹窗：添加/修改 -->
   <UserForm ref="formRef" @success="getUserData(id)" />
   <UserForm ref="formRef" @success="getUserData(id)" />
 </template>
 </template>
-<script setup lang="ts">
+<script lang="ts" setup>
 import * as WalletApi from '@/api/pay/wallet/balance'
 import * as WalletApi from '@/api/pay/wallet/balance'
 import * as UserApi from '@/api/member/user'
 import * as UserApi from '@/api/member/user'
 import { useTagsViewStore } from '@/store/modules/tagsView'
 import { useTagsViewStore } from '@/store/modules/tagsView'
@@ -85,6 +84,7 @@ import UserPointList from './UserPointList.vue'
 import UserSignList from './UserSignList.vue'
 import UserSignList from './UserSignList.vue'
 import UserFavoriteList from './UserFavoriteList.vue'
 import UserFavoriteList from './UserFavoriteList.vue'
 import UserAfterSaleList from './UserAftersaleList.vue'
 import UserAfterSaleList from './UserAftersaleList.vue'
+import UserBalanceList from './UserBalanceList.vue'
 import { CardTitle } from '@/components/Card/index'
 import { CardTitle } from '@/components/Card/index'
 import { ElMessage } from 'element-plus'
 import { ElMessage } from 'element-plus'
 
 
@@ -142,7 +142,7 @@ onMounted(() => {
   getUserWallet()
   getUserWallet()
 })
 })
 </script>
 </script>
-<style scoped lang="css">
+<style lang="css" scoped>
 .detail-info-item:first-child {
 .detail-info-item:first-child {
   padding-left: 0 !important;
   padding-left: 0 !important;
 }
 }

src/views/member/user/index.vue

@@ -172,7 +172,7 @@
                     v-if="checkPermi(['member:user:update-balance'])"
                     v-if="checkPermi(['member:user:update-balance'])"
                     command="handleUpdateBlance"
                     command="handleUpdateBlance"
                   >
                   >
-                    修改余额(WIP)
+                    修改余额
                   </el-dropdown-item>
                   </el-dropdown-item>
                 </el-dropdown-menu>
                 </el-dropdown-menu>
               </template>
               </template>
@@ -196,6 +196,8 @@
   <UserLevelUpdateForm ref="updateLevelFormRef" @success="getList" />
   <UserLevelUpdateForm ref="updateLevelFormRef" @success="getList" />
   <!-- 修改用户积分弹窗 -->
   <!-- 修改用户积分弹窗 -->
   <UserPointUpdateForm ref="updatePointFormRef" @success="getList" />
   <UserPointUpdateForm ref="updatePointFormRef" @success="getList" />
+  <!-- 修改用户余额弹窗 -->
+  <UserBalanceUpdateForm ref="UpdateBalanceFormRef" @success="getList" />
   <!-- 发送优惠券弹窗 -->
   <!-- 发送优惠券弹窗 -->
   <CouponSendForm ref="couponSendFormRef" />
   <CouponSendForm ref="couponSendFormRef" />
 </template>
 </template>
@@ -207,8 +209,9 @@ import UserForm from './UserForm.vue'
 import MemberTagSelect from '@/views/member/tag/components/MemberTagSelect.vue'
 import MemberTagSelect from '@/views/member/tag/components/MemberTagSelect.vue'
 import MemberLevelSelect from '@/views/member/level/components/MemberLevelSelect.vue'
 import MemberLevelSelect from '@/views/member/level/components/MemberLevelSelect.vue'
 import MemberGroupSelect from '@/views/member/group/components/MemberGroupSelect.vue'
 import MemberGroupSelect from '@/views/member/group/components/MemberGroupSelect.vue'
-import UserLevelUpdateForm from './UserLevelUpdateForm.vue'
-import UserPointUpdateForm from './UserPointUpdateForm.vue'
+import UserLevelUpdateForm from './components/UserLevelUpdateForm.vue'
+import UserPointUpdateForm from './components/UserPointUpdateForm.vue'
+import UserBalanceUpdateForm from './components/UserBalanceUpdateForm.vue'
 import { CouponSendForm } from '@/views/mall/promotion/coupon/components'
 import { CouponSendForm } from '@/views/mall/promotion/coupon/components'
 import { checkPermi } from '@/utils/permission'
 import { checkPermi } from '@/utils/permission'
 
 
@@ -233,6 +236,7 @@ const queryParams = reactive({
 const queryFormRef = ref() // 搜索的表单
 const queryFormRef = ref() // 搜索的表单
 const updateLevelFormRef = ref() // 修改会员等级表单
 const updateLevelFormRef = ref() // 修改会员等级表单
 const updatePointFormRef = ref() // 修改会员积分表单
 const updatePointFormRef = ref() // 修改会员积分表单
+const UpdateBalanceFormRef = ref() // 修改用户余额表单
 const selectedIds = ref<number[]>([]) // 表格的选中 ID 数组
 const selectedIds = ref<number[]>([]) // 表格的选中 ID 数组
 
 
 /** 查询列表 */
 /** 查询列表 */
@@ -299,7 +303,7 @@ const handleCommand = (command: string, row: UserApi.UserVO) => {
       updatePointFormRef.value.open(row.id)
       updatePointFormRef.value.open(row.id)
       break
       break
     case 'handleUpdateBlance':
     case 'handleUpdateBlance':
-      // todo @jason：增加一个【修改余额】
+      UpdateBalanceFormRef.value.open(row.id)
       break
       break
     default:
     default:
       break
       break

src/views/pay/app/components/channel/AlipayChannelForm.vue

 <template>
 <template>
   <div>
   <div>
-    <Dialog v-model="dialogVisible" :title="dialogTitle" @closed="close" width="830px">
+    <Dialog v-model="dialogVisible" :title="dialogTitle" width="830px" @closed="close">
       <el-form
       <el-form
         ref="formRef"
         ref="formRef"
+        v-loading="formLoading"
         :model="formData"
         :model="formData"
         :rules="formRules"
         :rules="formRules"
         label-width="100px"
         label-width="100px"
-        v-loading="formLoading"
       >
       >
-        <el-form-item label-width="180px" label="渠道费率" prop="feeRate">
-          <el-input v-model="formData.feeRate" placeholder="请输入渠道费率" clearable>
+        <el-form-item label="渠道费率" label-width="180px" prop="feeRate">
+          <el-input v-model="formData.feeRate" clearable placeholder="请输入渠道费率">
             <template #append>%</template>
             <template #append>%</template>
           </el-input>
           </el-input>
         </el-form-item>
         </el-form-item>
-        <el-form-item label-width="180px" label="开放平台 APPID" prop="config.appId">
-          <el-input v-model="formData.config.appId" placeholder="请输入开放平台 APPID" clearable />
+        <el-form-item label="开放平台 APPID" label-width="180px" prop="config.appId">
+          <el-input v-model="formData.config.appId" clearable placeholder="请输入开放平台 APPID" />
         </el-form-item>
         </el-form-item>
-        <el-form-item label-width="180px" label="渠道状态" prop="status">
+        <el-form-item label="渠道状态" label-width="180px" prop="status">
           <el-radio-group v-model="formData.status">
           <el-radio-group v-model="formData.status">
             <el-radio
             <el-radio
               v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)"
               v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)"
@@ -27,7 +27,7 @@
             </el-radio>
             </el-radio>
           </el-radio-group>
           </el-radio-group>
         </el-form-item>
         </el-form-item>
-        <el-form-item label-width="180px" label="网关地址" prop="config.serverUrl">
+        <el-form-item label="网关地址" label-width="180px" prop="config.serverUrl">
           <el-radio-group v-model="formData.config.serverUrl">
           <el-radio-group v-model="formData.config.serverUrl">
             <el-radio value="https://openapi.alipay.com/gateway.do">线上环境</el-radio>
             <el-radio value="https://openapi.alipay.com/gateway.do">线上环境</el-radio>
             <el-radio value="https://openapi-sandbox.dl.alipaydev.com/gateway.do">
             <el-radio value="https://openapi-sandbox.dl.alipaydev.com/gateway.do">
@@ -35,145 +35,148 @@
             </el-radio>
             </el-radio>
           </el-radio-group>
           </el-radio-group>
         </el-form-item>
         </el-form-item>
-        <el-form-item label-width="180px" label="算法类型" prop="config.signType">
+        <el-form-item label="算法类型" label-width="180px" prop="config.signType">
           <el-radio-group v-model="formData.config.signType">
           <el-radio-group v-model="formData.config.signType">
             <el-radio key="RSA2" value="RSA2">RSA2</el-radio>
             <el-radio key="RSA2" value="RSA2">RSA2</el-radio>
           </el-radio-group>
           </el-radio-group>
         </el-form-item>
         </el-form-item>
-        <el-form-item label-width="180px" label="公钥类型" prop="config.mode">
+        <el-form-item label="公钥类型" label-width="180px" prop="config.mode">
           <el-radio-group v-model="formData.config.mode">
           <el-radio-group v-model="formData.config.mode">
             <el-radio key="公钥模式" :value="1">公钥模式</el-radio>
             <el-radio key="公钥模式" :value="1">公钥模式</el-radio>
             <el-radio key="证书模式" :value="2">证书模式</el-radio>
             <el-radio key="证书模式" :value="2">证书模式</el-radio>
           </el-radio-group>
           </el-radio-group>
         </el-form-item>
         </el-form-item>
         <div v-if="formData.config.mode === 1">
         <div v-if="formData.config.mode === 1">
-          <el-form-item label-width="180px" label="应用私钥" prop="config.privateKey">
+          <el-form-item label="应用私钥" label-width="180px" prop="config.privateKey">
             <el-input
             <el-input
-              type="textarea"
-              :autosize="{ minRows: 8, maxRows: 8 }"
               v-model="formData.config.privateKey"
               v-model="formData.config.privateKey"
-              placeholder="请输入应用私钥"
-              clearable
+              :autosize="{ minRows: 8, maxRows: 8 }"
               :style="{ width: '100%' }"
               :style="{ width: '100%' }"
+              clearable
+              placeholder="请输入应用私钥"
+              type="textarea"
             />
             />
           </el-form-item>
           </el-form-item>
-          <el-form-item label-width="180px" label="支付宝公钥" prop="config.alipayPublicKey">
+          <el-form-item label="支付宝公钥" label-width="180px" prop="config.alipayPublicKey">
             <el-input
             <el-input
-              type="textarea"
-              :autosize="{ minRows: 8, maxRows: 8 }"
               v-model="formData.config.alipayPublicKey"
               v-model="formData.config.alipayPublicKey"
-              placeholder="请输入支付宝公钥"
-              clearable
+              :autosize="{ minRows: 8, maxRows: 8 }"
               :style="{ width: '100%' }"
               :style="{ width: '100%' }"
+              clearable
+              placeholder="请输入支付宝公钥"
+              type="textarea"
             />
             />
           </el-form-item>
           </el-form-item>
         </div>
         </div>
         <div v-if="formData.config.mode === 2">
         <div v-if="formData.config.mode === 2">
-          <el-form-item label-width="180px" label="应用私钥" prop="config.privateKey">
+          <el-form-item label="应用私钥" label-width="180px" prop="config.privateKey">
             <el-input
             <el-input
-              type="textarea"
-              :autosize="{ minRows: 8, maxRows: 8 }"
               v-model="formData.config.privateKey"
               v-model="formData.config.privateKey"
-              placeholder="请输入应用私钥"
-              clearable
+              :autosize="{ minRows: 8, maxRows: 8 }"
               :style="{ width: '100%' }"
               :style="{ width: '100%' }"
+              clearable
+              placeholder="请输入应用私钥"
+              type="textarea"
             />
             />
           </el-form-item>
           </el-form-item>
-          <el-form-item label-width="180px" label="商户公钥应用证书" prop="config.appCertContent">
+          <el-form-item label="商户公钥应用证书" label-width="180px" prop="config.appCertContent">
             <el-input
             <el-input
               v-model="formData.config.appCertContent"
               v-model="formData.config.appCertContent"
-              type="textarea"
-              placeholder="请上传商户公钥应用证书"
-              readonly
               :autosize="{ minRows: 8, maxRows: 8 }"
               :autosize="{ minRows: 8, maxRows: 8 }"
               :style="{ width: '100%' }"
               :style="{ width: '100%' }"
+              placeholder="请上传商户公钥应用证书"
+              readonly
+              type="textarea"
             />
             />
           </el-form-item>
           </el-form-item>
-          <el-form-item label-width="180px" label="">
+          <el-form-item label="" label-width="180px">
             <el-upload
             <el-upload
-              action=""
               ref="privateKeyContentFile"
               ref="privateKeyContentFile"
-              :limit="1"
               :accept="fileAccept"
               :accept="fileAccept"
-              :http-request="appCertUpload"
               :before-upload="fileBeforeUpload"
               :before-upload="fileBeforeUpload"
+              :http-request="appCertUpload"
+              :limit="1"
+              action=""
             >
             >
               <el-button type="primary">
               <el-button type="primary">
-                <Icon icon="ep:upload" class="mr-5px" /> 点击上传
+                <Icon class="mr-5px" icon="ep:upload" />
+                点击上传
               </el-button>
               </el-button>
             </el-upload>
             </el-upload>
           </el-form-item>
           </el-form-item>
           <el-form-item
           <el-form-item
-            label-width="180px"
             label="支付宝公钥证书"
             label="支付宝公钥证书"
+            label-width="180px"
             prop="config.alipayPublicCertContent"
             prop="config.alipayPublicCertContent"
           >
           >
             <el-input
             <el-input
               v-model="formData.config.alipayPublicCertContent"
               v-model="formData.config.alipayPublicCertContent"
-              type="textarea"
-              placeholder="请上传支付宝公钥证书"
-              readonly
               :autosize="{ minRows: 8, maxRows: 8 }"
               :autosize="{ minRows: 8, maxRows: 8 }"
               :style="{ width: '100%' }"
               :style="{ width: '100%' }"
+              placeholder="请上传支付宝公钥证书"
+              readonly
+              type="textarea"
             />
             />
           </el-form-item>
           </el-form-item>
-          <el-form-item label-width="180px" label="">
+          <el-form-item label="" label-width="180px">
             <el-upload
             <el-upload
               ref="privateCertContentFile"
               ref="privateCertContentFile"
-              action=""
-              :limit="1"
               :accept="fileAccept"
               :accept="fileAccept"
               :before-upload="fileBeforeUpload"
               :before-upload="fileBeforeUpload"
               :http-request="alipayPublicCertUpload"
               :http-request="alipayPublicCertUpload"
+              :limit="1"
+              action=""
             >
             >
               <el-button type="primary">
               <el-button type="primary">
-                <Icon icon="ep:upload" class="mr-5px" /> 点击上传
+                <Icon class="mr-5px" icon="ep:upload" />
+                点击上传
               </el-button>
               </el-button>
             </el-upload>
             </el-upload>
           </el-form-item>
           </el-form-item>
-          <el-form-item label-width="180px" label="根证书" prop="config.rootCertContent">
+          <el-form-item label="根证书" label-width="180px" prop="config.rootCertContent">
             <el-input
             <el-input
               v-model="formData.config.rootCertContent"
               v-model="formData.config.rootCertContent"
-              type="textarea"
-              placeholder="请上传根证书"
-              readonly
               :autosize="{ minRows: 8, maxRows: 8 }"
               :autosize="{ minRows: 8, maxRows: 8 }"
               :style="{ width: '100%' }"
               :style="{ width: '100%' }"
+              placeholder="请上传根证书"
+              readonly
+              type="textarea"
             />
             />
           </el-form-item>
           </el-form-item>
-          <el-form-item label-width="180px" label="">
+          <el-form-item label="" label-width="180px">
             <el-upload
             <el-upload
               ref="privateCertContentFile"
               ref="privateCertContentFile"
-              :limit="1"
               :accept="fileAccept"
               :accept="fileAccept"
-              action=""
               :before-upload="fileBeforeUpload"
               :before-upload="fileBeforeUpload"
               :http-request="rootCertUpload"
               :http-request="rootCertUpload"
+              :limit="1"
+              action=""
             >
             >
               <el-button type="primary">
               <el-button type="primary">
-                <Icon icon="ep:upload" class="mr-5px" /> 点击上传
+                <Icon class="mr-5px" icon="ep:upload" />
+                点击上传
               </el-button>
               </el-button>
             </el-upload>
             </el-upload>
           </el-form-item>
           </el-form-item>
         </div>
         </div>
 
 
-        <el-form-item label-width="180px" label="接口内容加密方式" prop="config.encryptType">
+        <el-form-item label="接口内容加密方式" label-width="180px" prop="config.encryptType">
           <el-radio-group v-model="formData.config.encryptType">
           <el-radio-group v-model="formData.config.encryptType">
             <el-radio key="NONE" label="">无加密</el-radio>
             <el-radio key="NONE" label="">无加密</el-radio>
             <el-radio key="AES" label="AES">AES</el-radio>
             <el-radio key="AES" label="AES">AES</el-radio>
           </el-radio-group>
           </el-radio-group>
         </el-form-item>
         </el-form-item>
         <div v-if="formData.config.encryptType === 'AES'">
         <div v-if="formData.config.encryptType === 'AES'">
-          <el-form-item label-width="180px" label="接口内容加密密钥" prop="config.encryptKey">
+          <el-form-item label="接口内容加密密钥" label-width="180px" prop="config.encryptKey">
             <el-input
             <el-input
               v-model="formData.config.encryptKey"
               v-model="formData.config.encryptKey"
-              placeholder="请输入接口内容加密密钥"
               clearable
               clearable
+              placeholder="请输入接口内容加密密钥"
             />
             />
           </el-form-item>
           </el-form-item>
         </div>
         </div>
 
 
-        <el-form-item label-width="180px" label="备注" prop="remark">
+        <el-form-item label="备注" label-width="180px" prop="remark">
           <el-input v-model="formData.remark" :style="{ width: '100%' }" />
           <el-input v-model="formData.remark" :style="{ width: '100%' }" />
         </el-form-item>
         </el-form-item>
       </el-form>
       </el-form>

src/views/pay/app/components/channel/MockChannelForm.vue

@@ -3,12 +3,12 @@
     <Dialog v-model="dialogVisible" :title="dialogTitle" width="800px">
     <Dialog v-model="dialogVisible" :title="dialogTitle" width="800px">
       <el-form
       <el-form
         ref="formRef"
         ref="formRef"
+        v-loading="formLoading"
         :model="formData"
         :model="formData"
         :rules="formRules"
         :rules="formRules"
         label-width="100px"
         label-width="100px"
-        v-loading="formLoading"
       >
       >
-        <el-form-item label-width="180px" label="渠道状态" prop="status">
+        <el-form-item label="渠道状态" label-width="180px" prop="status">
           <el-radio-group v-model="formData.status">
           <el-radio-group v-model="formData.status">
             <el-radio
             <el-radio
               v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)"
               v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)"
@@ -19,7 +19,7 @@
             </el-radio>
             </el-radio>
           </el-radio-group>
           </el-radio-group>
         </el-form-item>
         </el-form-item>
-        <el-form-item label-width="180px" label="备注" prop="remark">
+        <el-form-item label="备注" label-width="180px" prop="remark">
           <el-input v-model="formData.remark" :style="{ width: '100%' }" />
           <el-input v-model="formData.remark" :style="{ width: '100%' }" />
         </el-form-item>
         </el-form-item>
       </el-form>
       </el-form>

src/views/pay/app/components/channel/WalletChannelForm.vue

@@ -3,12 +3,12 @@
     <Dialog v-model="dialogVisible" :title="dialogTitle" width="800px">
     <Dialog v-model="dialogVisible" :title="dialogTitle" width="800px">
       <el-form
       <el-form
         ref="formRef"
         ref="formRef"
+        v-loading="formLoading"
         :model="formData"
         :model="formData"
         :rules="formRules"
         :rules="formRules"
         label-width="100px"
         label-width="100px"
-        v-loading="formLoading"
       >
       >
-        <el-form-item label-width="180px" label="渠道状态" prop="status">
+        <el-form-item label="渠道状态" label-width="180px" prop="status">
           <el-radio-group v-model="formData.status">
           <el-radio-group v-model="formData.status">
             <el-radio
             <el-radio
               v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)"
               v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)"
@@ -19,7 +19,7 @@
             </el-radio>
             </el-radio>
           </el-radio-group>
           </el-radio-group>
         </el-form-item>
         </el-form-item>
-        <el-form-item label-width="180px" label="备注" prop="remark">
+        <el-form-item label="备注" label-width="180px" prop="remark">
           <el-input v-model="formData.remark" :style="{ width: '100%' }" />
           <el-input v-model="formData.remark" :style="{ width: '100%' }" />
         </el-form-item>
         </el-form-item>
       </el-form>
       </el-form>

src/views/pay/app/components/channel/WeixinChannelForm.vue

@@ -3,33 +3,33 @@
     <Dialog v-model="dialogVisible" :title="dialogTitle" width="800px">
     <Dialog v-model="dialogVisible" :title="dialogTitle" width="800px">
       <el-form
       <el-form
         ref="formRef"
         ref="formRef"
+        v-loading="formLoading"
         :model="formData"
         :model="formData"
         :rules="formRules"
         :rules="formRules"
         label-width="120px"
         label-width="120px"
-        v-loading="formLoading"
       >
       >
-        <el-form-item label-width="180px" label="渠道费率" prop="feeRate">
+        <el-form-item label="渠道费率" label-width="180px" prop="feeRate">
           <el-input
           <el-input
             v-model="formData.feeRate"
             v-model="formData.feeRate"
-            placeholder="请输入渠道费率"
-            clearable
             :style="{ width: '100%' }"
             :style="{ width: '100%' }"
+            clearable
+            placeholder="请输入渠道费率"
           >
           >
             <template #append>%</template>
             <template #append>%</template>
           </el-input>
           </el-input>
         </el-form-item>
         </el-form-item>
-        <el-form-item label-width="180px" label="微信 APPID" prop="config.appId">
+        <el-form-item label="微信 APPID" label-width="180px" prop="config.appId">
           <el-input
           <el-input
             v-model="formData.config.appId"
             v-model="formData.config.appId"
-            placeholder="请输入微信 APPID"
-            clearable
             :style="{ width: '100%' }"
             :style="{ width: '100%' }"
+            clearable
+            placeholder="请输入微信 APPID"
           />
           />
         </el-form-item>
         </el-form-item>
-        <el-form-item label-width="180px" label="商户号" prop="config.mchId">
+        <el-form-item label="商户号" label-width="180px" prop="config.mchId">
           <el-input v-model="formData.config.mchId" :style="{ width: '100%' }" />
           <el-input v-model="formData.config.mchId" :style="{ width: '100%' }" />
         </el-form-item>
         </el-form-item>
-        <el-form-item label-width="180px" label="渠道状态" prop="status">
+        <el-form-item label="渠道状态" label-width="180px" prop="status">
           <el-radio-group v-model="formData.status">
           <el-radio-group v-model="formData.status">
             <el-radio
             <el-radio
               v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)"
               v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)"
@@ -40,91 +40,91 @@
             </el-radio>
             </el-radio>
           </el-radio-group>
           </el-radio-group>
         </el-form-item>
         </el-form-item>
-        <el-form-item label-width="180px" label="API 版本" prop="config.apiVersion">
+        <el-form-item label="API 版本" label-width="180px" prop="config.apiVersion">
           <el-radio-group v-model="formData.config.apiVersion">
           <el-radio-group v-model="formData.config.apiVersion">
             <el-radio value="v2">v2</el-radio>
             <el-radio value="v2">v2</el-radio>
             <el-radio value="v3">v3</el-radio>
             <el-radio value="v3">v3</el-radio>
           </el-radio-group>
           </el-radio-group>
         </el-form-item>
         </el-form-item>
         <div v-if="formData.config.apiVersion === 'v2'">
         <div v-if="formData.config.apiVersion === 'v2'">
-          <el-form-item label-width="180px" label="商户密钥" prop="config.mchKey">
-            <el-input v-model="formData.config.mchKey" placeholder="请输入商户密钥" clearable />
+          <el-form-item label="商户密钥" label-width="180px" prop="config.mchKey">
+            <el-input v-model="formData.config.mchKey" clearable placeholder="请输入商户密钥" />
           </el-form-item>
           </el-form-item>
           <el-form-item
           <el-form-item
-            label-width="180px"
             label="apiclient_cert.p12 证书"
             label="apiclient_cert.p12 证书"
+            label-width="180px"
             prop="config.keyContent"
             prop="config.keyContent"
           >
           >
             <el-input
             <el-input
               v-model="formData.config.keyContent"
               v-model="formData.config.keyContent"
-              type="textarea"
-              placeholder="请上传 apiclient_cert.p12 证书"
-              readonly
               :autosize="{ minRows: 8, maxRows: 8 }"
               :autosize="{ minRows: 8, maxRows: 8 }"
               :style="{ width: '100%' }"
               :style="{ width: '100%' }"
+              placeholder="请上传 apiclient_cert.p12 证书"
+              readonly
+              type="textarea"
             />
             />
           </el-form-item>
           </el-form-item>
-          <el-form-item label-width="180px" label="">
+          <el-form-item label="" label-width="180px">
             <el-upload
             <el-upload
+              :before-upload="p12FileBeforeUpload"
+              :http-request="keyContentUpload"
               :limit="1"
               :limit="1"
               accept=".p12"
               accept=".p12"
               action=""
               action=""
-              :before-upload="p12FileBeforeUpload"
-              :http-request="keyContentUpload"
             >
             >
               <el-button type="primary">
               <el-button type="primary">
-                <Icon icon="ep:upload" class="mr-5px" />
+                <Icon class="mr-5px" icon="ep:upload" />
                 点击上传
                 点击上传
               </el-button>
               </el-button>
             </el-upload>
             </el-upload>
           </el-form-item>
           </el-form-item>
         </div>
         </div>
         <div v-if="formData.config.apiVersion === 'v3'">
         <div v-if="formData.config.apiVersion === 'v3'">
-          <el-form-item label-width="180px" label="API V3 密钥" prop="config.apiV3Key">
+          <el-form-item label="API V3 密钥" label-width="180px" prop="config.apiV3Key">
             <el-input
             <el-input
               v-model="formData.config.apiV3Key"
               v-model="formData.config.apiV3Key"
-              placeholder="请输入 API V3 密钥"
               clearable
               clearable
+              placeholder="请输入 API V3 密钥"
             />
             />
           </el-form-item>
           </el-form-item>
           <el-form-item
           <el-form-item
-            label-width="180px"
             label="apiclient_key.pem 证书"
             label="apiclient_key.pem 证书"
+            label-width="180px"
             prop="config.privateKeyContent"
             prop="config.privateKeyContent"
           >
           >
             <el-input
             <el-input
               v-model="formData.config.privateKeyContent"
               v-model="formData.config.privateKeyContent"
-              type="textarea"
-              placeholder="请上传 apiclient_key.pem 证书"
-              readonly
               :autosize="{ minRows: 8, maxRows: 8 }"
               :autosize="{ minRows: 8, maxRows: 8 }"
               :style="{ width: '100%' }"
               :style="{ width: '100%' }"
+              placeholder="请上传 apiclient_key.pem 证书"
+              readonly
+              type="textarea"
             />
             />
           </el-form-item>
           </el-form-item>
-          <el-form-item label-width="180px" label="" prop="privateKeyContentFile">
+          <el-form-item label="" label-width="180px" prop="privateKeyContentFile">
             <el-upload
             <el-upload
               ref="privateKeyContentFile"
               ref="privateKeyContentFile"
+              :before-upload="pemFileBeforeUpload"
+              :http-request="privateKeyContentUpload"
               :limit="1"
               :limit="1"
               accept=".pem"
               accept=".pem"
               action=""
               action=""
-              :before-upload="pemFileBeforeUpload"
-              :http-request="privateKeyContentUpload"
             >
             >
               <el-button type="primary">
               <el-button type="primary">
-                <Icon icon="ep:upload" class="mr-5px" />
+                <Icon class="mr-5px" icon="ep:upload" />
                 点击上传
                 点击上传
               </el-button>
               </el-button>
             </el-upload>
             </el-upload>
           </el-form-item>
           </el-form-item>
-          <el-form-item label-width="180px" label="证书序列号" prop="config.certSerialNo">
+          <el-form-item label="证书序列号" label-width="180px" prop="config.certSerialNo">
             <el-input
             <el-input
               v-model="formData.config.certSerialNo"
               v-model="formData.config.certSerialNo"
-              placeholder="请输入证书序列号"
               clearable
               clearable
+              placeholder="请输入证书序列号"
             />
             />
           </el-form-item>
           </el-form-item>
         </div>
         </div>
-        <el-form-item label-width="180px" label="备注" prop="remark">
+        <el-form-item label="备注" label-width="180px" prop="remark">
           <el-input v-model="formData.remark" :style="{ width: '100%' }" />
           <el-input v-model="formData.remark" :style="{ width: '100%' }" />
         </el-form-item>
         </el-form-item>
       </el-form>
       </el-form>

src/views/pay/app/index.vue

@@ -3,27 +3,27 @@
   <!-- 搜索 -->
   <!-- 搜索 -->
   <ContentWrap>
   <ContentWrap>
     <el-form
     <el-form
-      class="-mb-15px"
-      :model="queryParams"
       ref="queryFormRef"
       ref="queryFormRef"
       :inline="true"
       :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
       label-width="68px"
       label-width="68px"
     >
     >
       <el-form-item label="应用名" prop="name">
       <el-form-item label="应用名" prop="name">
         <el-input
         <el-input
           v-model="queryParams.name"
           v-model="queryParams.name"
-          placeholder="请输入应用名"
+          class="!w-240px"
           clearable
           clearable
+          placeholder="请输入应用名"
           @keyup.enter="handleQuery"
           @keyup.enter="handleQuery"
-          class="!w-240px"
         />
         />
       </el-form-item>
       </el-form-item>
       <el-form-item label="开启状态" prop="status">
       <el-form-item label="开启状态" prop="status">
         <el-select
         <el-select
           v-model="queryParams.status"
           v-model="queryParams.status"
-          placeholder="请选择开启状态"
-          clearable
           class="!w-240px"
           class="!w-240px"
+          clearable
+          placeholder="请选择开启状态"
         >
         >
           <el-option
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
@@ -36,25 +36,25 @@
       <el-form-item label="创建时间" prop="createTime">
       <el-form-item label="创建时间" prop="createTime">
         <el-date-picker
         <el-date-picker
           v-model="queryParams.createTime"
           v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           class="!w-240px"
           class="!w-240px"
+          end-placeholder="结束日期"
+          start-placeholder="开始日期"
+          type="daterange"
+          value-format="YYYY-MM-DD HH:mm:ss"
         />
         />
       </el-form-item>
       </el-form-item>
       <el-form-item>
       <el-form-item>
         <el-button @click="handleQuery">
         <el-button @click="handleQuery">
-          <Icon icon="ep:search" class="mr-5px" />
+          <Icon class="mr-5px" icon="ep:search" />
           搜索
           搜索
         </el-button>
         </el-button>
         <el-button @click="resetQuery">
         <el-button @click="resetQuery">
-          <Icon icon="ep:refresh" class="mr-5px" />
+          <Icon class="mr-5px" icon="ep:refresh" />
           重置
           重置
         </el-button>
         </el-button>
-        <el-button type="primary" plain @click="openForm('create')" v-hasPermi="['pay:app:create']">
-          <Icon icon="ep:plus" class="mr-5px" />
+        <el-button v-hasPermi="['pay:app:create']" plain type="primary" @click="openForm('create')">
+          <Icon class="mr-5px" icon="ep:plus" />
           新增
           新增
         </el-button>
         </el-button>
       </el-form-item>
       </el-form-item>
@@ -64,9 +64,9 @@
   <!-- 列表 -->
   <!-- 列表 -->
   <ContentWrap>
   <ContentWrap>
     <el-table v-loading="loading" :data="list">
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="应用标识" align="center" prop="appKey" />
-      <el-table-column label="应用名" align="center" prop="name" min-width="90" />
-      <el-table-column label="开启状态" align="center" prop="status">
+      <el-table-column align="center" label="应用标识" prop="appKey" />
+      <el-table-column align="center" label="应用名" min-width="90" prop="name" />
+      <el-table-column align="center" label="开启状态" prop="status">
         <template #default="scope">
         <template #default="scope">
           <el-switch
           <el-switch
             v-model="scope.row.status"
             v-model="scope.row.status"
@@ -76,28 +76,28 @@
           />
           />
         </template>
         </template>
       </el-table-column>
       </el-table-column>
-      <el-table-column label="支付宝配置" align="center">
+      <el-table-column align="center" label="支付宝配置">
         <el-table-column
         <el-table-column
-          :label="channel.name.replace('支付宝', '')"
-          align="center"
           v-for="channel in alipayChannels"
           v-for="channel in alipayChannels"
           :key="channel.code"
           :key="channel.code"
+          :label="channel.name.replace('支付宝', '')"
+          align="center"
         >
         >
           <template #default="scope">
           <template #default="scope">
             <el-button
             <el-button
-              type="success"
               v-if="isChannelExists(scope.row.channelCodes, channel.code)"
               v-if="isChannelExists(scope.row.channelCodes, channel.code)"
-              @click="openChannelForm(scope.row, channel.code)"
               circle
               circle
               size="small"
               size="small"
+              type="success"
+              @click="openChannelForm(scope.row, channel.code)"
             >
             >
               <Icon icon="ep:check" />
               <Icon icon="ep:check" />
             </el-button>
             </el-button>
             <el-button
             <el-button
               v-else
               v-else
-              type="danger"
               circle
               circle
               size="small"
               size="small"
+              type="danger"
               @click="openChannelForm(scope.row, channel.code)"
               @click="openChannelForm(scope.row, channel.code)"
             >
             >
               <Icon icon="ep:close" />
               <Icon icon="ep:close" />
@@ -105,28 +105,28 @@
           </template>
           </template>
         </el-table-column>
         </el-table-column>
       </el-table-column>
       </el-table-column>
-      <el-table-column label="微信配置" align="center">
+      <el-table-column align="center" label="微信配置">
         <el-table-column
         <el-table-column
-          :label="channel.name.replace('微信', '')"
-          align="center"
           v-for="channel in wxChannels"
           v-for="channel in wxChannels"
           :key="channel.code"
           :key="channel.code"
+          :label="channel.name.replace('微信', '')"
+          align="center"
         >
         >
           <template #default="scope">
           <template #default="scope">
             <el-button
             <el-button
-              type="success"
               v-if="isChannelExists(scope.row.channelCodes, channel.code)"
               v-if="isChannelExists(scope.row.channelCodes, channel.code)"
-              @click="openChannelForm(scope.row, channel.code)"
               circle
               circle
               size="small"
               size="small"
+              type="success"
+              @click="openChannelForm(scope.row, channel.code)"
             >
             >
               <Icon icon="ep:check" />
               <Icon icon="ep:check" />
             </el-button>
             </el-button>
             <el-button
             <el-button
               v-else
               v-else
-              type="danger"
               circle
               circle
               size="small"
               size="small"
+              type="danger"
               @click="openChannelForm(scope.row, channel.code)"
               @click="openChannelForm(scope.row, channel.code)"
             >
             >
               <Icon icon="ep:close" />
               <Icon icon="ep:close" />
@@ -134,23 +134,23 @@
           </template>
           </template>
         </el-table-column>
         </el-table-column>
       </el-table-column>
       </el-table-column>
-      <el-table-column label="钱包支付配置" align="center">
+      <el-table-column align="center" label="钱包支付配置">
         <el-table-column :label="PayChannelEnum.WALLET.name" align="center">
         <el-table-column :label="PayChannelEnum.WALLET.name" align="center">
           <template #default="scope">
           <template #default="scope">
             <el-button
             <el-button
-              type="success"
+              v-if="isChannelExists(scope.row.channelCodes, PayChannelEnum.WALLET.code)"
               circle
               circle
               size="small"
               size="small"
-              v-if="isChannelExists(scope.row.channelCodes, PayChannelEnum.WALLET.code)"
+              type="success"
               @click="openChannelForm(scope.row, PayChannelEnum.WALLET.code)"
               @click="openChannelForm(scope.row, PayChannelEnum.WALLET.code)"
             >
             >
               <Icon icon="ep:check" />
               <Icon icon="ep:check" />
             </el-button>
             </el-button>
             <el-button
             <el-button
               v-else
               v-else
-              type="danger"
               circle
               circle
               size="small"
               size="small"
+              type="danger"
               @click="openChannelForm(scope.row, PayChannelEnum.WALLET.code)"
               @click="openChannelForm(scope.row, PayChannelEnum.WALLET.code)"
             >
             >
               <Icon icon="ep:close" />
               <Icon icon="ep:close" />
@@ -158,23 +158,23 @@
           </template>
           </template>
         </el-table-column>
         </el-table-column>
       </el-table-column>
       </el-table-column>
-      <el-table-column label="模拟支付配置" align="center">
+      <el-table-column align="center" label="模拟支付配置">
         <el-table-column :label="PayChannelEnum.MOCK.name" align="center">
         <el-table-column :label="PayChannelEnum.MOCK.name" align="center">
           <template #default="scope">
           <template #default="scope">
             <el-button
             <el-button
-              type="success"
+              v-if="isChannelExists(scope.row.channelCodes, PayChannelEnum.MOCK.code)"
               circle
               circle
               size="small"
               size="small"
-              v-if="isChannelExists(scope.row.channelCodes, PayChannelEnum.MOCK.code)"
+              type="success"
               @click="openChannelForm(scope.row, PayChannelEnum.MOCK.code)"
               @click="openChannelForm(scope.row, PayChannelEnum.MOCK.code)"
             >
             >
               <Icon icon="ep:check" />
               <Icon icon="ep:check" />
             </el-button>
             </el-button>
             <el-button
             <el-button
               v-else
               v-else
-              type="danger"
               circle
               circle
               size="small"
               size="small"
+              type="danger"
               @click="openChannelForm(scope.row, PayChannelEnum.MOCK.code)"
               @click="openChannelForm(scope.row, PayChannelEnum.MOCK.code)"
             >
             >
               <Icon icon="ep:close" />
               <Icon icon="ep:close" />
@@ -182,21 +182,21 @@
           </template>
           </template>
         </el-table-column>
         </el-table-column>
       </el-table-column>
       </el-table-column>
-      <el-table-column label="操作" align="center" min-width="110" fixed="right">
+      <el-table-column align="center" fixed="right" label="操作" min-width="110">
         <template #default="scope">
         <template #default="scope">
           <el-button
           <el-button
+            v-hasPermi="['pay:app:update']"
             link
             link
             type="primary"
             type="primary"
             @click="openForm('update', scope.row.id)"
             @click="openForm('update', scope.row.id)"
-            v-hasPermi="['pay:app:update']"
           >
           >
             编辑
             编辑
           </el-button>
           </el-button>
           <el-button
           <el-button
+            v-hasPermi="['pay:app:delete']"
             link
             link
             type="danger"
             type="danger"
             @click="handleDelete(scope.row.id)"
             @click="handleDelete(scope.row.id)"
-            v-hasPermi="['pay:app:delete']"
           >
           >
             删除
             删除
           </el-button>
           </el-button>
@@ -205,9 +205,9 @@
     </el-table>
     </el-table>
     <!-- 分页 -->
     <!-- 分页 -->
     <Pagination
     <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
       v-model:limit="queryParams.pageSize"
       v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
       @pagination="getList"
       @pagination="getList"
     />
     />
   </ContentWrap>
   </ContentWrap>

src/views/pay/wallet/transaction/WalletTransactionList.vue

 <template>
 <template>
   <ContentWrap>
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="钱包编号" align="center" prop="walletId" />
-      <el-table-column label="关联业务标题" align="center" prop="title" />
-      <el-table-column label="交易金额" align="center" prop="price">
+    <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
+      <el-table-column align="center" label="编号" prop="id" />
+      <el-table-column align="center" label="钱包编号" prop="walletId" />
+      <el-table-column align="center" label="关联业务标题" prop="title" />
+      <el-table-column align="center" label="交易金额" prop="price">
         <template #default="{ row }"> {{ fenToYuan(row.price) }} 元</template>
         <template #default="{ row }"> {{ fenToYuan(row.price) }} 元</template>
       </el-table-column>
       </el-table-column>
-      <el-table-column label="钱包余额" align="center" prop="balance">
+      <el-table-column align="center" label="钱包余额" prop="balance">
         <template #default="{ row }"> {{ fenToYuan(row.balance) }} 元</template>
         <template #default="{ row }"> {{ fenToYuan(row.balance) }} 元</template>
       </el-table-column>
       </el-table-column>
       <el-table-column
       <el-table-column
-        label="交易时间"
+        :formatter="dateFormatter"
         align="center"
         align="center"
+        label="交易时间"
         prop="createTime"
         prop="createTime"
-        :formatter="dateFormatter"
         width="180px"
         width="180px"
       />
       />
     </el-table>
     </el-table>
     <!-- 分页 -->
     <!-- 分页 -->
     <Pagination
     <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
       v-model:limit="queryParams.pageSize"
       v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
       @pagination="getList"
       @pagination="getList"
     />
     />
   </ContentWrap>
   </ContentWrap>
@@ -31,12 +31,18 @@
 <script lang="ts" setup>
 <script lang="ts" setup>
 import { dateFormatter } from '@/utils/formatTime'
 import { dateFormatter } from '@/utils/formatTime'
 import * as WalletTransactionApi from '@/api/pay/wallet/transaction'
 import * as WalletTransactionApi from '@/api/pay/wallet/transaction'
+import * as WalletApi from '@/api/pay/wallet/balance'
 import { fenToYuan } from '@/utils'
 import { fenToYuan } from '@/utils'
+
 defineOptions({ name: 'WalletTransactionList' })
 defineOptions({ name: 'WalletTransactionList' })
-const { walletId }: { walletId: number } = defineProps({
+const props = defineProps({
   walletId: {
   walletId: {
     type: Number,
     type: Number,
     required: false
     required: false
+  },
+  userId: {
+    type: Number,
+    required: false
   }
   }
 })
 })
 
 
@@ -52,7 +58,12 @@ const list = ref([]) // 列表的数据
 const getList = async () => {
 const getList = async () => {
   loading.value = true
   loading.value = true
   try {
   try {
-    queryParams.walletId = walletId
+    if (props.userId) {
+      const wallet = await WalletApi.getWallet({ userId: props.userId })
+      queryParams.walletId = wallet.id as any
+    } else {
+      queryParams.walletId = props.walletId as any
+    }
     const data = await WalletTransactionApi.getWalletTransactionPage(queryParams)
     const data = await WalletTransactionApi.getWalletTransactionPage(queryParams)
     list.value = data.list
     list.value = data.list
     total.value = data.total
     total.value = data.total
@@ -65,4 +76,4 @@ onMounted(() => {
   getList()
   getList()
 })
 })
 </script>
 </script>
-<style scoped lang="scss"></style>
+<style lang="scss" scoped></style>

vite.config.ts

-import { resolve } from 'path'
-import { loadEnv } from 'vite'
-import type { UserConfig, ConfigEnv } from 'vite'
-import { createVitePlugins } from './build/vite'
-import { include, exclude } from "./build/vite/optimize"
+import {resolve} from 'path'
+import type {ConfigEnv, UserConfig} from 'vite'
+import {loadEnv} from 'vite'
+import {createVitePlugins} from './build/vite'
+import {exclude, include} from "./build/vite/optimize"
 // 当前执行node命令时文件夹的地址(工作目录)
 // 当前执行node命令时文件夹的地址(工作目录)
 const root = process.cwd()
 const root = process.cwd()
 
 
@@ -12,7 +12,7 @@ function pathResolve(dir: string) {
 }
 }
 
 
 // https://vitejs.dev/config/
 // https://vitejs.dev/config/
-export default ({ command, mode }: ConfigEnv): UserConfig => {
+export default ({command, mode}: ConfigEnv): UserConfig => {
     let env = {} as any
     let env = {} as any
     const isBuild = command === 'build'
     const isBuild = command === 'build'
     if (!isBuild) {
     if (!isBuild) {
@@ -80,6 +80,6 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
                 },
                 },
             },
             },
         },
         },
-    optimizeDeps: { include, exclude }
+        optimizeDeps: {include, exclude}
     }
     }
 }
 }