diff --git a/src/views/dashboard/analysis/components/CockpitReport.api.ts b/src/views/dashboard/analysis/components/CockpitReport.api.ts
new file mode 100644
index 0000000000000000000000000000000000000000..0a7b076a85e62a0be1a5ea52dae0eb43f97da32e
--- /dev/null
+++ b/src/views/dashboard/analysis/components/CockpitReport.api.ts
@@ -0,0 +1,87 @@
+import { defHttp } from '/@/utils/http/axios'
+import { Result } from '/#/axios'
+
+/**
+ * 支付金额
+ */
+export function getPayAmount(params: CockpitReportQuery) {
+  return defHttp.get<Result<number>>({
+    url: '/report/cockpit//getPayAmount',
+    method: 'post',
+    params: params,
+  })
+}
+/**
+ * 退款金额
+ */
+export function getRefundAmount(params: CockpitReportQuery) {
+  return defHttp.get<Result<number>>({
+    url: '/report/cockpit/getRefundAmount',
+    method: 'post',
+    params: params,
+  })
+}
+/**
+ * 退款金额
+ */
+export function getPayOrderCount(params: CockpitReportQuery) {
+  return defHttp.get<Result<number>>({
+    url: '/report/cockpit/getPayOrderCount',
+    method: 'post',
+    params: params,
+  })
+}
+/**
+ * 退款金额
+ */
+export function getRefundOrderCount(params: CockpitReportQuery) {
+  return defHttp.get<Result<number>>({
+    url: '/report/cockpit/getRefundOrderCount',
+    method: 'post',
+    params: params,
+  })
+}
+/**
+ * 退款金额
+ */
+export function getPayChannelInfo(params: CockpitReportQuery) {
+  return defHttp.get<Result<ChannelLineReport[]>>({
+    url: '/report/cockpit/getPayChannelInfo',
+    method: 'post',
+    params: params,
+  })
+}
+/**
+ * 退款金额
+ */
+export function getRefundChannelInfo(params: CockpitReportQuery) {
+  return defHttp.get<Result<ChannelLineReport[]>>({
+    url: '/report/cockpit/getRefundChannelInfo',
+    method: 'post',
+    params: params,
+  })
+}
+
+/**
+ * 支付通道折线图报表
+ */
+export interface ChannelLineReport {
+  // 支付通道编码
+  channelCode: string
+  // 支付通道名称
+  channelName: string
+  // 订单金额
+  orderAmount: number
+  // 订单数量
+  orderCount: number
+}
+
+/**
+ * 查询条件
+ */
+export interface CockpitReportQuery {
+  // 开始时间
+  startTime: string
+  // 结束时间
+  endTime: string
+}
diff --git a/src/views/dashboard/analysis/components/OrderAmount.vue b/src/views/dashboard/analysis/components/OrderAmount.vue
new file mode 100644
index 0000000000000000000000000000000000000000..76669a230d6ba5f16abb54b83eee50171b09a5a9
--- /dev/null
+++ b/src/views/dashboard/analysis/components/OrderAmount.vue
@@ -0,0 +1,52 @@
+<template>
+  <Card :tab-list="tabListTitle" v-bind="$attrs" :active-tab-key="activeKey" @tab-change="onTabChange">
+    <p v-if="activeKey === 't1'">
+      <OrderAmountLine :head="payHead" :data="payAmount" :max="payMax" />
+    </p>
+    <p v-if="activeKey === 't2'">
+      <OrderAmountLine :head="refundHead" :data="refundAmount" :max="refundMax" />
+    </p>
+  </Card>
+</template>
+<script lang="ts" setup>
+  import { computed, ref } from 'vue'
+  import { Card } from 'ant-design-vue'
+  import OrderAmountLine from './OrderAmountLine.vue'
+
+  const activeKey = ref('t1')
+  const tabListTitle = [
+    {
+      key: 't1',
+      tab: '支付金额',
+    },
+    {
+      key: 't2',
+      tab: '退款金额',
+    },
+  ]
+
+  const prop = defineProps({
+    payOrder: {
+      type: Array<object>,
+    },
+    refundOrder: {
+      type: Array<object>,
+    },
+  })
+
+  // 表头
+  const payHead = computed(() => (prop.payOrder as any).map((o) => o.name))
+  const refundHead = computed(() => (prop.refundOrder as any).map((o) => o.name))
+
+  // 订单金额
+  const payAmount = computed(() => (prop.payOrder as any).map((o) => o.value))
+  const refundAmount = computed(() => (prop.refundOrder as any).map((o) => o.value))
+
+  // 最大值
+  const payMax = computed(() => Math.max(...(prop.payOrder as any).map((o) => o.value)))
+  const refundMax = computed(() => Math.max(...(prop.refundOrder as any).map((o) => o.value)))
+
+  function onTabChange(key) {
+    activeKey.value = key
+  }
+</script>
diff --git a/src/views/dashboard/analysis/components/OrderAmountLine.vue b/src/views/dashboard/analysis/components/OrderAmountLine.vue
new file mode 100644
index 0000000000000000000000000000000000000000..acb4fb7011f91e3c10cf4e7156391f0c23f01c32
--- /dev/null
+++ b/src/views/dashboard/analysis/components/OrderAmountLine.vue
@@ -0,0 +1,87 @@
+<template>
+  <div ref="chartRef" :style="{ height: '280px', width: '95%' }"></div>
+</template>
+<script lang="ts" setup>
+  import { ref, Ref, watch } from 'vue'
+  import { useECharts } from '/@/hooks/web/useECharts'
+
+  const chartRef = ref<HTMLDivElement | null>(null)
+  const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>)
+
+  const prop = defineProps({
+    max: {
+      type: Number,
+      default: 100,
+    },
+    head: {
+      type: Array,
+      default: () => [],
+    },
+    data: {
+      type: Array,
+      default: () => [],
+    },
+  })
+
+  watch(
+    () => prop.data,
+    () => {
+      setOptions({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            lineStyle: {
+              width: 1,
+              color: '#019680',
+            },
+          },
+        },
+        xAxis: {
+          type: 'category',
+          boundaryGap: false,
+          data: ['', ...prop.head, ''] as any,
+          splitLine: {
+            show: true,
+            lineStyle: {
+              width: 1,
+              type: 'solid',
+              color: 'rgba(226,226,226,0.5)',
+            },
+          },
+          axisTick: {
+            show: false,
+          },
+        },
+        yAxis: [
+          {
+            type: 'value',
+            max: prop.max,
+            splitNumber: 4,
+            axisTick: {
+              show: false,
+            },
+            splitArea: {
+              show: true,
+              areaStyle: {
+                color: ['rgba(255,255,255,0.2)', 'rgba(226,226,226,0.2)'],
+              },
+            },
+          },
+        ],
+        grid: { left: '1%', right: '1%', top: '2  %', bottom: 0, containLabel: true },
+        series: [
+          {
+            smooth: true,
+            data: [0, ...prop.data, 0] as any,
+            type: 'line',
+            areaStyle: {},
+            itemStyle: {
+              color: '#5ab1ef',
+            },
+          },
+        ],
+      })
+    },
+    { immediate: true },
+  )
+</script>
diff --git a/src/views/dashboard/analysis/components/GrowCard.vue b/src/views/dashboard/analysis/components/OrderCount.vue
similarity index 50%
rename from src/views/dashboard/analysis/components/GrowCard.vue
rename to src/views/dashboard/analysis/components/OrderCount.vue
index 86305abf4e6d795e401c2b7b04f9fc35d7a7abc4..ebeb994362d0b2d0396bdb31f076fe857b181683 100644
--- a/src/views/dashboard/analysis/components/GrowCard.vue
+++ b/src/views/dashboard/analysis/components/OrderCount.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="md:flex">
-    <template v-for="(item, index) in growCardList" :key="item.title">
+    <template v-for="(item, index) in data" :key="item.title">
       <Card
         size="small"
         :loading="loading"
@@ -8,32 +8,29 @@
         class="md:w-1/4 w-full !md:mt-0"
         :class="{ '!md:mr-4': index + 1 < 4, '!mt-4': index > 0 }"
       >
-        <template #extra>
-          <Tag :color="item.color">{{ item.action }}</Tag>
+        <template v-if="item.action" #extra>
+          <Tag>{{ item.action }}</Tag>
         </template>
-
         <div class="py-4 px-4 flex justify-between items-center">
-          <CountTo prefix="$" :startVal="1" :endVal="item.value" class="text-2xl" />
+          <CountTo :startVal="0" :decimals="item.decimals" :endVal="item.value" class="text-2xl" />
           <Icon :icon="item.icon" :size="40" />
         </div>
-
-        <div class="p-2 px-4 flex justify-between">
-          <span>总{{ item.title }}</span>
-          <CountTo prefix="$" :startVal="1" :endVal="item.total" />
-        </div>
       </Card>
     </template>
   </div>
 </template>
 <script lang="ts" setup>
-  import { CountTo } from '/@/components/CountTo/index'
-  import { Icon } from '/@/components/Icon'
+  import { CountTo } from '/@/components/CountTo'
   import { Tag, Card } from 'ant-design-vue'
-  import { growCardList } from '../data'
+  import Icon from '/@/components/Icon/src/Icon.vue'
+  import { OrderCountData } from '/@/views/dashboard/analysis/data'
 
   defineProps({
     loading: {
       type: Boolean,
     },
+    data: {
+      type: Array<OrderCountData>,
+    },
   })
 </script>
diff --git a/src/views/dashboard/analysis/components/VisitSource.vue b/src/views/dashboard/analysis/components/PayOrderCount.vue
similarity index 67%
rename from src/views/dashboard/analysis/components/VisitSource.vue
rename to src/views/dashboard/analysis/components/PayOrderCount.vue
index 65bb84f11ba11635f16738a1b7afb5564f01dde0..2815a752fefdc36cd450ddbc243b16953d5fa56d 100644
--- a/src/views/dashboard/analysis/components/VisitSource.vue
+++ b/src/views/dashboard/analysis/components/PayOrderCount.vue
@@ -1,6 +1,6 @@
 <template>
-  <Card title="访问来源" :loading="loading">
-    <div ref="chartRef" :style="{ width, height }"></div>
+  <Card title="支付各通道分布" :loading="loading">
+    <div ref="chartRef" :style="{ width: '100%', height: '300px' }"></div>
   </Card>
 </template>
 <script lang="ts" setup>
@@ -9,24 +9,16 @@
   import { useECharts } from '/@/hooks/web/useECharts'
   const props = defineProps({
     loading: Boolean,
-    width: {
-      type: String as PropType<string>,
-      default: '100%',
-    },
-    height: {
-      type: String as PropType<string>,
-      default: '300px',
+    data: {
+      type: Array,
     },
   })
   const chartRef = ref<HTMLDivElement | null>(null)
   const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>)
 
   watch(
-    () => props.loading,
+    () => props.data,
     () => {
-      if (props.loading) {
-        return
-      }
       setOptions({
         tooltip: {
           trigger: 'item',
@@ -37,8 +29,7 @@
         },
         series: [
           {
-            color: ['#5ab1ef', '#b6a2de', '#67e0e3', '#2ec7c9'],
-            name: '访问来源',
+            name: '支付通道',
             type: 'pie',
             radius: ['40%', '70%'],
             avoidLabelOverlap: false,
@@ -61,12 +52,7 @@
             labelLine: {
               show: false,
             },
-            data: [
-              { value: 1048, name: '搜索引擎' },
-              { value: 735, name: '直接访问' },
-              { value: 580, name: '邮件营销' },
-              { value: 484, name: '联盟广告' },
-            ],
+            data: props.data as any,
             animationType: 'scale',
             animationEasing: 'exponentialInOut',
             animationDelay: function () {
diff --git a/src/views/dashboard/analysis/components/SalesProductPie.vue b/src/views/dashboard/analysis/components/RefundOrderCount.vue
similarity index 56%
rename from src/views/dashboard/analysis/components/SalesProductPie.vue
rename to src/views/dashboard/analysis/components/RefundOrderCount.vue
index 5e90f17ea550351a597157a323c186eb510d4c0f..1e2ba2b1c2e1649a85cba9a5415b628fdff4f4d5 100644
--- a/src/views/dashboard/analysis/components/SalesProductPie.vue
+++ b/src/views/dashboard/analysis/components/RefundOrderCount.vue
@@ -1,6 +1,6 @@
 <template>
-  <Card title="成交占比" :loading="loading">
-    <div ref="chartRef" :style="{ width, height }"></div>
+  <Card title="退款各通道分布" :loading="loading">
+    <div ref="chartRef" :style="{ width: '100%', height: '300px' }"></div>
   </Card>
 </template>
 <script lang="ts" setup>
@@ -10,13 +10,8 @@
 
   const props = defineProps({
     loading: Boolean,
-    width: {
-      type: String as PropType<string>,
-      default: '100%',
-    },
-    height: {
-      type: String as PropType<string>,
-      default: '300px',
+    data: {
+      type: Array,
     },
   })
 
@@ -24,11 +19,8 @@
   const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>)
 
   watch(
-    () => props.loading,
+    () => props.data,
     () => {
-      if (props.loading) {
-        return
-      }
       setOptions({
         tooltip: {
           trigger: 'item',
@@ -40,15 +32,7 @@
             type: 'pie',
             radius: '80%',
             center: ['50%', '50%'],
-            color: ['#5ab1ef', '#b6a2de', '#67e0e3', '#2ec7c9'],
-            data: [
-              { value: 500, name: '电子产品' },
-              { value: 310, name: '服装' },
-              { value: 274, name: '化妆品' },
-              { value: 400, name: '家居' },
-            ].sort(function (a, b) {
-              return a.value - b.value
-            }),
+            data: props.data as any,
             roseType: 'radius',
             animationType: 'scale',
             animationEasing: 'exponentialInOut',
diff --git a/src/views/dashboard/analysis/components/SiteAnalysis.vue b/src/views/dashboard/analysis/components/SiteAnalysis.vue
deleted file mode 100644
index 1652c4718739bf64a0045cffe8e85e8f06b93881..0000000000000000000000000000000000000000
--- a/src/views/dashboard/analysis/components/SiteAnalysis.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-<template>
-  <Card :tab-list="tabListTitle" v-bind="$attrs" :active-tab-key="activeKey" @tab-change="onTabChange">
-    <p v-if="activeKey === 'tab1'">
-      <VisitAnalysis />
-    </p>
-    <p v-if="activeKey === 'tab2'">
-      <VisitAnalysisBar />
-    </p>
-  </Card>
-</template>
-<script lang="ts" setup>
-  import { ref } from 'vue'
-  import { Card } from 'ant-design-vue'
-  import VisitAnalysis from './VisitAnalysis.vue'
-  import VisitAnalysisBar from './VisitAnalysisBar.vue'
-
-  const activeKey = ref('tab1')
-
-  const tabListTitle = [
-    {
-      key: 'tab1',
-      tab: '流量趋势',
-    },
-    {
-      key: 'tab2',
-      tab: '访问量',
-    },
-  ]
-
-  function onTabChange(key) {
-    activeKey.value = key
-  }
-</script>
diff --git a/src/views/dashboard/analysis/components/VisitAnalysis.vue b/src/views/dashboard/analysis/components/VisitAnalysis.vue
deleted file mode 100644
index b168f3d2138e0c34f06f5b5451379450af0e7b41..0000000000000000000000000000000000000000
--- a/src/views/dashboard/analysis/components/VisitAnalysis.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-<template>
-  <div ref="chartRef" :style="{ height, width }"></div>
-</template>
-<script lang="ts">
-  import { basicProps } from './props'
-</script>
-<script lang="ts" setup>
-  import { onMounted, ref, Ref } from 'vue'
-  import { useECharts } from '/@/hooks/web/useECharts'
-
-  defineProps({
-    ...basicProps,
-  })
-  const chartRef = ref<HTMLDivElement | null>(null)
-  const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>)
-
-  onMounted(() => {
-    setOptions({
-      tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-          lineStyle: {
-            width: 1,
-            color: '#019680',
-          },
-        },
-      },
-      xAxis: {
-        type: 'category',
-        boundaryGap: false,
-        data: [...new Array(18)].map((_item, index) => `${index + 6}:00`),
-        splitLine: {
-          show: true,
-          lineStyle: {
-            width: 1,
-            type: 'solid',
-            color: 'rgba(226,226,226,0.5)',
-          },
-        },
-        axisTick: {
-          show: false,
-        },
-      },
-      yAxis: [
-        {
-          type: 'value',
-          max: 80000,
-          splitNumber: 4,
-          axisTick: {
-            show: false,
-          },
-          splitArea: {
-            show: true,
-            areaStyle: {
-              color: ['rgba(255,255,255,0.2)', 'rgba(226,226,226,0.2)'],
-            },
-          },
-        },
-      ],
-      grid: { left: '1%', right: '1%', top: '2  %', bottom: 0, containLabel: true },
-      series: [
-        {
-          smooth: true,
-          data: [
-            111, 222, 4000, 18000, 33333, 55555, 66666, 33333, 14000, 36000, 66666, 44444, 22222, 11111, 4000, 2000, 500, 333, 222, 111,
-          ],
-          type: 'line',
-          areaStyle: {},
-          itemStyle: {
-            color: '#5ab1ef',
-          },
-        },
-        {
-          smooth: true,
-          data: [33, 66, 88, 333, 3333, 5000, 18000, 3000, 1200, 13000, 22000, 11000, 2221, 1201, 390, 198, 60, 30, 22, 11],
-          type: 'line',
-          areaStyle: {},
-          itemStyle: {
-            color: '#019680',
-          },
-        },
-      ],
-    })
-  })
-</script>
diff --git a/src/views/dashboard/analysis/data.ts b/src/views/dashboard/analysis/data.ts
index e160ef07033bcca458518cb0f2c7e345d882bd27..b92df8f7de33d2bb13dc6cfd00b7794bd8e85aa2 100644
--- a/src/views/dashboard/analysis/data.ts
+++ b/src/views/dashboard/analysis/data.ts
@@ -1,43 +1,10 @@
-export interface GrowCardItem {
-  icon: string
+/**
+ * 订单数量信息
+ */
+export interface OrderCountData {
   title: string
-  value: number
-  total: number
-  color: string
   action: string
+  icon: string
+  value: number
+  decimals: number
 }
-
-export const growCardList: GrowCardItem[] = [
-  {
-    title: '访问数',
-    icon: 'visit-count|svg',
-    value: 2000,
-    total: 120000,
-    color: 'green',
-    action: '月',
-  },
-  {
-    title: '成交额',
-    icon: 'total-sales|svg',
-    value: 20000,
-    total: 500000,
-    color: 'blue',
-    action: '月',
-  },
-  {
-    title: '下载数',
-    icon: 'download-count|svg',
-    value: 8000,
-    total: 120000,
-    color: 'orange',
-    action: '周',
-  },
-  {
-    title: '成交数',
-    icon: 'transaction|svg',
-    value: 5000,
-    total: 50000,
-    color: 'purple',
-    action: '年',
-  },
-]
diff --git a/src/views/dashboard/analysis/index.vue b/src/views/dashboard/analysis/index.vue
index 97831f86eaa627155f1d3261fe6f35a22866bd15..dd6a7a325ae8acf07a4f1a88311337fbd1af7598 100644
--- a/src/views/dashboard/analysis/index.vue
+++ b/src/views/dashboard/analysis/index.vue
@@ -1,16 +1,138 @@
 <template>
   <div class="p-4">
-    <a-card :bordered="false" :loading="loading">
-      <h1>欢迎使用后台管理系统</h1>
-    </a-card>
+    <!--  订单数  -->
+    <OrderCount :loading="loading" :data="orderListData" class="enter-y" />
+    <!--  占比图  -->
+    <div class="md:flex !my-4 enter-y">
+      <!--   支付   -->
+      <PayOrderCount class="md:w-1/2 !md:my-0 !my-4 w-full" :loading="loading" :data="payOrderChannelCount" />
+      <!--   退款   -->
+      <RefundOrderCount class="md:w-1/2 !md:mx-4 w-full" :loading="loading" :data="refundOrderChannelCount" />
+    </div>
+    <!--  订单折线图  -->
+    <OrderAmount class="!my-4 enter-y" :loading="loading" :payOrder="payOrderChannelAmount" :refundOrder="refundOrderChannelAmount" />
   </div>
 </template>
 <script lang="ts" setup>
-  import { ref } from 'vue'
+  import { computed, onMounted, ref } from 'vue'
+  import OrderCount from './components/OrderCount.vue'
+  import OrderAmount from './components/OrderAmount.vue'
+  import PayOrderCount from './components/PayOrderCount.vue'
+  import RefundOrderCount from './components/RefundOrderCount.vue'
+  import dayjs from 'dayjs'
+  import {
+    CockpitReportQuery,
+    getPayAmount,
+    getPayChannelInfo,
+    getPayOrderCount,
+    getRefundAmount,
+    getRefundChannelInfo,
+    getRefundOrderCount,
+  } from '/@/views/dashboard/analysis/components/CockpitReport.api'
+  import { $ref } from 'vue/macros'
 
-  const loading = ref(true)
+  const loading = ref(false)
 
-  setTimeout(() => {
-    loading.value = false
-  }, 1500)
+  let param = $ref<CockpitReportQuery>({ startTime: '', endTime: '' })
+
+  /**
+   * 初始化
+   */
+  onMounted(() => {
+    initTime()
+    initOrderCount()
+    initPayChannelInfo()
+    initRefundChannelInfo()
+  })
+
+  /**
+   * 初始化时间
+   */
+  function initTime() {
+    const now = dayjs()
+    param.startTime = now.startOf('day').format('YYYY-MM-DD HH:mm:ss')
+    param.endTime = now.endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  }
+
+  // 订单数量信息
+  let payAmount = $ref<number>(0)
+  let refundAmount = $ref<number>(0)
+  let payCount = $ref<number>(0)
+  let refundCount = $ref<number>(0)
+  // 支付订单通道数量分布
+  let payOrderChannelCount = $ref<any>([])
+  // 退款订单通道数量分布
+  let refundOrderChannelCount = $ref<any>([])
+  // 支付订单通道金额分布
+  let payOrderChannelAmount = $ref<any>([])
+  // 退款订单通道金额分布
+  let refundOrderChannelAmount = $ref<any>([])
+
+  const orderListData = computed(() => [
+    {
+      title: '支付金额',
+      value: payAmount,
+      icon: 'total-sales|svg',
+      action: '单位(元)',
+      decimals: 2,
+    },
+    {
+      title: '支付订单数',
+      value: payCount,
+      icon: 'transaction|svg',
+      action: '',
+      decimals: 0,
+    },
+    {
+      title: '退款金额',
+      value: refundAmount,
+      icon: 'total-sales|svg',
+      action: '单位(元)',
+      decimals: 2,
+    },
+    {
+      title: '退款订单数',
+      value: refundCount,
+      icon: 'transaction|svg',
+      action: '',
+      decimals: 0,
+    },
+  ])
+  /**
+   * 初始化订单信息
+   */
+  function initOrderCount() {
+    getPayAmount(param).then(({ data }) => (payAmount = data / 100.0))
+    getRefundAmount(param).then(({ data }) => (refundAmount = data / 100.0))
+    getPayOrderCount(param).then(({ data }) => (payCount = data))
+    getRefundOrderCount(param).then(({ data }) => (refundCount = data))
+  }
+
+  /**
+   * 初始化支付通道订单数量
+   */
+  function initPayChannelInfo() {
+    getPayChannelInfo(param).then(({ data }) => {
+      payOrderChannelCount = data.map((o) => {
+        return { name: o.channelName, value: o.orderCount }
+      })
+      payOrderChannelAmount = data.map((o) => {
+        return { name: o.channelName, value: o.orderAmount / 100.0 }
+      })
+    })
+  }
+
+  /**
+   * 初始化退款通道订单数量
+   */
+  function initRefundChannelInfo() {
+    getRefundChannelInfo(param).then(({ data }) => {
+      refundOrderChannelCount = data.map((o) => {
+        return { name: o.channelName, value: o.orderCount }
+      })
+      refundOrderChannelAmount = data.map((o) => {
+        return { name: o.channelName, value: o.orderAmount / 100.0 }
+      })
+    })
+  }
 </script>
diff --git a/src/views/demo/cashier/Cashier.vue b/src/views/demo/cashier/Cashier.vue
index d3ddbef97d9b3e1c5587ad0c49200931232ed6b6..ab69f10dcd13800513a6d1960deb38cbb5acbb2c 100644
--- a/src/views/demo/cashier/Cashier.vue
+++ b/src/views/demo/cashier/Cashier.vue
@@ -1,7 +1,8 @@
 <template>
   <div style="background-color: #f5f5f7">
+    <div v-html="payForm"></div>
     <div class="page paydemo">
-      <div class="blog-container" id="container" style="margin-top: 80px">
+      <div class="blog-container" id="container">
         <a-spin :spinning="loading">
           <div class="content" style="padding-top: 20px">
             <div style="width: 100%">
@@ -50,6 +51,19 @@
                     </div>
                   </div>
                 </div>
+                <div class="paydemo-type-name">
+                  <span> 云闪付支付（沙箱环境） </span>
+                  <a target="_blank" href="https://open.unionpay.com/tjweb/support/faq/mchlist?id=4">测试卡信息</a>、
+                  <a target="_blank" href="https://open.unionpay.com/tjweb/ij/tool/qrcodeFormPage">条码仿真工具</a>
+                </div>
+                <div class="paydemo-type-body">
+                  <div v-for="item in UniPayList" :key="item.payInfo.payWay" @click="handleActive(item.payInfo)">
+                    <div :class="item.payInfo === currentActive ? 'colorChange' : 'paydemoType'">
+                      <img :src="item.img" class="paydemo-type-img" />
+                      <span class="color-change">{{ item.title }}</span>
+                    </div>
+                  </div>
+                </div>
                 <div class="paydemo-type-name">聚合支付</div>
                 <div class="paydemo-type-body">
                   <div v-for="item in aggregationPayList" :key="item.payInfo.payWay" @click="handleActive(item.payInfo)">
@@ -121,7 +135,7 @@
   import { aggregateBarCodePay, createAggregatePayUrl, findStatusByBusinessId, getUniCashierUrl, simplePayCashier } from './Cashier.api'
   import { useMessage } from '/@/hooks/web/useMessage'
   import { $ref } from 'vue/macros'
-  import { onMounted, onUnmounted } from 'vue'
+  import { nextTick, onMounted, onUnmounted } from 'vue'
   import QrCode from '/@/components/Qrcode/src/Qrcode.vue'
   import { useIntervalFn } from '@vueuse/core'
   import { payChannelEnum } from '/@/enums/payment/payChannelEnum'
@@ -132,6 +146,8 @@
   const cashierQrCode = $ref<any>()
   const cashierBarCode = $ref<any>()
 
+  let payForm = $ref<string>()
+
   // 业务单号
   let businessNo = $ref<string>('')
   let title = $ref<string>('测试支付')
@@ -188,6 +204,29 @@
       payInfo: { payChannel: payChannelEnum.WECHAT, payWay: payWayEnum.WAP },
     },
   ])
+  // 云闪付
+  let UniPayList = $ref([
+    {
+      img: new URL('./imgs/wechat/wx_native.svg', import.meta.url),
+      title: '扫码支付',
+      payInfo: { payChannel: payChannelEnum.UNION_PAY, payWay: payWayEnum.QRCODE },
+    },
+    {
+      img: new URL('./imgs/wechat/wx_bar.svg', import.meta.url),
+      title: '条码支付',
+      payInfo: { payChannel: payChannelEnum.UNION_PAY, payWay: payWayEnum.BARCODE },
+    },
+    {
+      img: new URL('./imgs/wechat/wx_h5.svg', import.meta.url).href,
+      title: 'wap支付',
+      payInfo: { payChannel: payChannelEnum.UNION_PAY, payWay: payWayEnum.WAP },
+    },
+    {
+      img: new URL('./imgs/ali/ali_pc.svg', import.meta.url).href,
+      title: 'web支付',
+      payInfo: { payChannel: payChannelEnum.UNION_PAY, payWay: payWayEnum.WEB },
+    },
+  ])
   let aggregationPayList = $ref([
     {
       img: new URL('./imgs/aggregate/qr_cashier.svg', import.meta.url).href,
@@ -271,7 +310,7 @@
     // 聚合支付
     if (payChannel === payChannelEnum.AGGREGATION) {
       if (payWay === payWayEnum.BARCODE) {
-        cashierBarCode.init('请输入支付宝条码或微信条码')
+        cashierBarCode.init('请输入支付宝、微信或云闪付条码')
       } else {
         aggregationQr()
       }
@@ -280,7 +319,15 @@
 
     // 普通支付
     if (payWay === payWayEnum.BARCODE) {
-      cashierBarCode.init(payChannel === payChannelEnum.ALI ? '请输入支付宝条码' : '请输入微信条码')
+      let msg: string
+      if (payChannel === payChannelEnum.ALI) {
+        msg = '请输入支付宝条码'
+      } else if (payChannel === payChannelEnum.WECHAT) {
+        msg = '请输入微信条码'
+      } else {
+        msg = '请输入云闪付条码，使用二维码仿真工具获取'
+      }
+      cashierBarCode.init(msg)
     } else {
       qrPay(payChannel, payWay)
     }
@@ -298,7 +345,7 @@
     // 获取聚合支付中间页地址
     const { data: qrUrl } = await createAggregatePayUrl(param)
     resume()
-    cashierQrCode.init(qrUrl, '请使用支付宝或微信"扫一扫"进行支付')
+    cashierQrCode.init(qrUrl, '请使用支付宝、微信扫码支付')
   }
 
   /**
@@ -340,15 +387,27 @@
     const { data } = await simplePayCashier(param).finally(() => {
       loading = false
     })
-    // pc支付
-    if ([payWayEnum.WAP, payWayEnum.WEB].includes(payWay)) {
+    // 云闪付wap和web支付
+    if ([payWayEnum.WAP, payWayEnum.WEB].includes(payWay) && payChannel === payChannelEnum.UNION_PAY) {
+      payForm = data.payBody
+      // 本地提交提交支付表单
+      nextTick(() => {
+        console.log(document.forms[0])
+        document.forms[0].submit()
+      })
+    }
+    // pc支付(微信/支付宝)
+    else if ([payWayEnum.WAP, payWayEnum.WEB].includes(payWay)) {
       window.open(data.payBody)
     } else if (payChannel === payChannelEnum.ALI) {
       cashierQrCode.init(data.payBody, '请使用支付宝"扫一扫"进行支付')
       resume()
-    } else {
+    } else if (payChannel === payChannelEnum.WECHAT) {
       cashierQrCode.init(data.payBody, '请使用微信"扫一扫"进行支付')
       resume()
+    } else {
+      cashierQrCode.init(data.payBody, '请解析二维码后使用二维码仿真工具进行支付')
+      resume()
     }
   }
   /**
diff --git a/src/views/demo/cashier/FromPay.vue b/src/views/demo/cashier/FromPay.vue
new file mode 100644
index 0000000000000000000000000000000000000000..5df35b2ed9a2bb50403a7a724b6fba586f4bdc48
--- /dev/null
+++ b/src/views/demo/cashier/FromPay.vue
@@ -0,0 +1,11 @@
+<template>
+
+</template>
+
+<script setup lang="ts">
+
+</script>
+
+<style scoped lang="less">
+
+</style>
diff --git a/src/views/demo/cashier/style.less b/src/views/demo/cashier/style.less
index d94294354aef804b4f87a14610e67e13f9d01fd9..2f514e2dad5524ca2ed3b4b2a380a852f44d9e5f 100644
--- a/src/views/demo/cashier/style.less
+++ b/src/views/demo/cashier/style.less
@@ -1,8 +1,8 @@
 .page {
   box-sizing: border-box;
   min-height: 100%;
-  padding-bottom: 80px;
-  margin-top: 81px;
+  //padding-bottom: 80px;
+  //margin-top: 81px;
 }
 .paydemo {
   .content {
@@ -11,7 +11,7 @@
   }
   .paydemo-type-content {
     padding: 20px;
-    margin-bottom: 20px;
+    margin-bottom: 10px;
     background-color: #FFFFFF;
     border-radius: 6px;
     p {
@@ -47,7 +47,7 @@
     display: flex;
     flex-direction: row;
     align-items: center;
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   .paydemo-type-h5 {
     padding: 12px;
diff --git a/src/views/payment/channel/alipay/config/AlipayConfig.api.ts b/src/views/payment/channel/alipay/config/AlipayConfig.api.ts
index 5730ccb161485955f5dc979703155fc209c28b41..585e67e9f6fedb75a084803547dbb6747795262c 100644
--- a/src/views/payment/channel/alipay/config/AlipayConfig.api.ts
+++ b/src/views/payment/channel/alipay/config/AlipayConfig.api.ts
@@ -38,6 +38,10 @@ export interface AlipayConfig extends BaseEntity {
   appId?: string
   // 是否启用
   enable: boolean
+  // 支付限额
+  singleLimit: number
+  // 商户账号ID
+  alipayUserId?: string
   // 服务器异步通知页面路径
   notifyUrl?: string
   // 页面跳转同步通知页面路径
diff --git a/src/views/payment/channel/alipay/config/AlipayConfigEdit.vue b/src/views/payment/channel/alipay/config/AlipayConfigEdit.vue
index 49744c67efce4bf686e53d4e438bd5c7be4ef7da..1f9b9a595dd2da3f76b22998dbfabf9b73a10a68 100644
--- a/src/views/payment/channel/alipay/config/AlipayConfigEdit.vue
+++ b/src/views/payment/channel/alipay/config/AlipayConfigEdit.vue
@@ -27,6 +27,18 @@
         <a-form-item label="是否启用" name="enable">
           <a-switch checked-children="启用" un-checked-children="停用" v-model:checked="form.enable" />
         </a-form-item>
+        <a-form-item name="alipayUserId">
+          <template #label>
+            <basic-title
+              helpMessage="是商家与支付宝签约后，商家获得的支付宝商家唯一识别码，以 2088 开头的 16 位数字组成，在开放平台中账户中心获取"
+              >合作者身份ID
+            </basic-title>
+          </template>
+          <a-input v-model:value="form.alipayUserId" placeholder="请输入合作者身份ID" />
+        </a-form-item>
+        <a-form-item label="单次支付限额(分)" name="singleLimit">
+          <a-input-number :precision="0" :min="1" v-model:value="form.singleLimit" placeholder="请输入单次支付限额(分)" />
+        </a-form-item>
         <a-form-item name="notifyUrl">
           <template #label>
             <basic-title helpMessage="此处为本网关接收通知的地址, 而不是客户系统接收通知所需的地址"> 异步通知地址 </basic-title>
@@ -139,9 +151,6 @@
         <a-form-item label="应用私钥" name="privateKey">
           <a-textarea :rows="5" v-model:value="form.privateKey" placeholder="请输入应用私钥" />
         </a-form-item>
-        <a-form-item label="备注" name="remark">
-          <a-textarea v-model:value="form.remark" placeholder="请输入备注" />
-        </a-form-item>
       </a-form>
     </a-spin>
     <template #footer>
@@ -177,6 +186,7 @@
   let form = $ref({
     appId: '',
     enable: false,
+    singleLimit: 20000,
     notifyUrl: '',
     returnUrl: '',
     serverUrl: '',
@@ -197,6 +207,7 @@
     return {
       appId: [{ required: true, message: '请输入AppId' }],
       enable: [{ required: true, message: '请选择是否启用' }],
+      singleLimit: [{ required: true, message: '请选择单次支付限额' }],
       notifyUrl: [{ required: true, message: '请输入异步通知页面地址' }],
       returnUrl: [{ required: true, message: '请输入同步通知页面地址' }],
       serverUrl: [{ required: true, message: '请输入请求网关地址' }],
diff --git a/src/views/payment/channel/cash/config/CashConfigEdit.vue b/src/views/payment/channel/cash/config/CashConfigEdit.vue
index e8df90fbf861250e3c0ce4446118183b49cbd2f7..85624f8ff492712506996f00c2abca58b6114e2f 100644
--- a/src/views/payment/channel/cash/config/CashConfigEdit.vue
+++ b/src/views/payment/channel/cash/config/CashConfigEdit.vue
@@ -16,11 +16,8 @@
         <a-form-item label="是否启用" name="enable">
           <a-switch checked-children="启用" un-checked-children="停用" v-model:checked="form.enable" />
         </a-form-item>
-        <a-form-item name="singleLimit">
-          <template #label>
-            <basic-title helpMessage="一次支付中，最多可以通过用钱包进行支付的金额"> 支付限额 </basic-title>
-          </template>
-          <a-input-number v-model:value="form.singleLimit" placeholder="请输入支付限额" />
+        <a-form-item label="单次支付限额(分)" name="singleLimit">
+          <a-input-number :precision="0" :min="1" v-model:value="form.singleLimit" placeholder="请输入单次支付限额(分)" />
         </a-form-item>
         <a-form-item label="支持支付方式" name="payWays">
           <a-select
diff --git a/src/views/payment/channel/union/config/UnionPayConfig.api.ts b/src/views/payment/channel/union/config/UnionPayConfig.api.ts
index 1e3c2e6d94190187457cbb760c4bbaaf8cadcc78..dcfb88d270b3d65b3093aa0234bc882c9c4dffd1 100644
--- a/src/views/payment/channel/union/config/UnionPayConfig.api.ts
+++ b/src/views/payment/channel/union/config/UnionPayConfig.api.ts
@@ -40,6 +40,8 @@ export interface UnionPayConfig extends BaseEntity {
   seller?: string
   // 是否启用
   enable: boolean
+  // 支付限额
+  singleLimit: number
   // 签名类型
   signType?: string
   // 是否为证书签名
diff --git a/src/views/payment/channel/union/config/UnionPayConfigEdit.vue b/src/views/payment/channel/union/config/UnionPayConfigEdit.vue
index 0b8a5b7b88a852f3039c092b764221d6524d004e..c476657f480784154af80b9675b172f998c0347c 100644
--- a/src/views/payment/channel/union/config/UnionPayConfigEdit.vue
+++ b/src/views/payment/channel/union/config/UnionPayConfigEdit.vue
@@ -27,6 +27,9 @@
         <a-form-item label="是否启用" name="enable">
           <a-switch checked-children="启用" un-checked-children="停用" v-model:checked="form.enable" />
         </a-form-item>
+        <a-form-item label="单次支付限额(分)" name="singleLimit">
+          <a-input-number :precision="0" :min="1" v-model:value="form.singleLimit" placeholder="请输入单次支付限额(分)" />
+        </a-form-item>
         <a-form-item label="签名类型" name="signType">
           <a-select
             allowClear
@@ -132,9 +135,6 @@
         <a-form-item label="测试环境" name="sandbox">
           <a-switch checked-children="是" un-checked-children="否" v-model:checked="form.sandbox" />
         </a-form-item>
-        <a-form-item label="备注" name="remark">
-          <a-textarea v-model:value="form.remark" :disabled="showable" placeholder="请输入备注" />
-        </a-form-item>
       </a-form>
     </a-spin>
     <template #footer>
@@ -173,6 +173,7 @@
   let form = $ref<UnionPayConfig>({
     id: null,
     seller: '',
+    singleLimit: 20000,
     enable: false,
     notifyUrl: '',
     returnUrl: '',
@@ -184,6 +185,7 @@
     return {
       machId: [{ required: true, message: '请输入商户号' }],
       wxAppId: [{ required: true, message: '请输入应用编号' }],
+      singleLimit: [{ required: true, message: '请选择单次支付限额' }],
       // certSign: [{ required: true, message: '请选择是否为证书签名' }],
       signType: [{ required: true, message: '请选择签名类型' }],
       keyPrivateCert: [{ required: true, message: '请上传应用私钥证书' }],
diff --git a/src/views/payment/channel/voucher/config/VoucherConfigEdit.vue b/src/views/payment/channel/voucher/config/VoucherConfigEdit.vue
index 053f05b0c5dd817ed9cdc0f45a0fca360655b314..4183866179146fdaf27fd85608c858293c7f639a 100644
--- a/src/views/payment/channel/voucher/config/VoucherConfigEdit.vue
+++ b/src/views/payment/channel/voucher/config/VoucherConfigEdit.vue
@@ -16,11 +16,8 @@
         <a-form-item label="是否启用" name="enable">
           <a-switch checked-children="启用" un-checked-children="停用" v-model:checked="form.enable" />
         </a-form-item>
-        <a-form-item name="singleLimit">
-          <template #label>
-            <basic-title helpMessage="一次支付中，最多可以通过用钱包进行支付的金额"> 支付限额 </basic-title>
-          </template>
-          <a-input-number v-model:value="form.singleLimit" placeholder="请输入支付限额" />
+        <a-form-item label="单次支付限额(分)" name="singleLimit">
+          <a-input-number :precision="0" :min="1" v-model:value="form.singleLimit" placeholder="请输入单次支付限额(分)" />
         </a-form-item>
         <a-form-item label="支持支付方式" name="payWays">
           <a-select
diff --git a/src/views/payment/channel/wallet/config/WalletConfigEdit.vue b/src/views/payment/channel/wallet/config/WalletConfigEdit.vue
index 7c95fedf084206bc15f183696b833351b228bc41..ed9e5753e633cf1a588179320e2d87749992845b 100644
--- a/src/views/payment/channel/wallet/config/WalletConfigEdit.vue
+++ b/src/views/payment/channel/wallet/config/WalletConfigEdit.vue
@@ -24,11 +24,8 @@
         <a-form-item label="是否启用" name="enable">
           <a-switch checked-children="启用" un-checked-children="停用" v-model:checked="form.enable" />
         </a-form-item>
-        <a-form-item name="singleLimit">
-          <template #label>
-            <basic-title helpMessage="一次支付中，最多可以通过用钱包进行支付的金额"> 支付限额 </basic-title>
-          </template>
-          <a-input-number v-model:value="form.singleLimit" placeholder="请输入支付限额" />
+        <a-form-item label="单次支付限额(分)" name="singleLimit">
+          <a-input-number :precision="0" :min="1" v-model:value="form.singleLimit" placeholder="请输入单次支付限额(分)" />
         </a-form-item>
         <a-form-item label="支持支付方式" name="payWays">
           <a-select
diff --git a/src/views/payment/channel/wechat/config/WechatPayConfig.api.ts b/src/views/payment/channel/wechat/config/WechatPayConfig.api.ts
index 1a96aff58c84968e7a870eff01e1d180dba9f82e..3f84215b2ea642afcf17d57af64d3415b4e105cc 100644
--- a/src/views/payment/channel/wechat/config/WechatPayConfig.api.ts
+++ b/src/views/payment/channel/wechat/config/WechatPayConfig.api.ts
@@ -40,6 +40,10 @@ export interface WechatPayConfig extends BaseEntity {
   wxMchId?: string
   // 是否启用
   enable: boolean
+  // 支付限额
+  singleLimit: number
+  // API 版本
+  apiVersion: string
   // 商户平台「API安全」中的 APIv2 密钥
   apiKeyV2?: string
   // 商户平台「API安全」中的 APIv3 密钥
diff --git a/src/views/payment/channel/wechat/config/WechatPayConfigEdit.vue b/src/views/payment/channel/wechat/config/WechatPayConfigEdit.vue
index 5974abf12bb51f6b5f7403093f7d2d4b8366c549..cf0434717958abb669b17dbb121d8dc69eee4780 100644
--- a/src/views/payment/channel/wechat/config/WechatPayConfigEdit.vue
+++ b/src/views/payment/channel/wechat/config/WechatPayConfigEdit.vue
@@ -25,6 +25,9 @@
         <a-form-item label="是否启用" name="enable">
           <a-switch checked-children="启用" un-checked-children="停用" v-model:checked="form.enable" />
         </a-form-item>
+        <a-form-item label="单次支付限额(分)" name="singleLimit">
+          <a-input-number :precision="0" :min="1" v-model:value="form.singleLimit" placeholder="请输入单次支付限额(分)" />
+        </a-form-item>
         <a-form-item name="notifyUrl">
           <template #label>
             <basic-title helpMessage="此处为本网关接收通知的地址, 而不是客户系统接收通知所需的地址"> 异步通知地址 </basic-title>
@@ -51,6 +54,12 @@
         <a-form-item label="沙箱环境" name="sandbox">
           <a-switch checked-children="是" un-checked-children="否" v-model:checked="form.sandbox" />
         </a-form-item>
+        <a-form-item label="API版本" name="apiVersion">
+          <a-radio-group v-model:value="form.apiVersion" button-style="solid">
+            <a-radio-button value="apiV2"> Api_V2 </a-radio-button>
+            <a-radio-button value="apiV3"> Api_V3 </a-radio-button>
+          </a-radio-group>
+        </a-form-item>
         <a-form-item label="APIv2密钥" name="apiKeyV2">
           <a-textarea :rows="3" :disabled="showable" v-model:value="form.apiKeyV2" placeholder="请输入APIv2密钥" />
         </a-form-item>
@@ -82,10 +91,6 @@
             </template>
           </a-input>
         </a-form-item>
-
-        <a-form-item label="备注" name="remark">
-          <a-textarea v-model:value="form.remark" :disabled="showable" placeholder="请输入备注" />
-        </a-form-item>
       </a-form>
     </a-spin>
     <template #footer>
@@ -122,6 +127,8 @@
   let form = $ref<WechatPayConfig>({
     id: null,
     enable: false,
+    singleLimit: 20000,
+    apiVersion: 'apiV2',
     wxMchId: '',
     wxAppId: '',
     appSecret: '',
@@ -138,15 +145,16 @@
   const rules = computed(() => {
     return {
       wxMchId: [{ required: true, message: '请输入商户号' }],
+      singleLimit: [{ required: true, message: '请选择单次支付限额' }],
       wxAppId: [{ required: true, message: '请输入应用编号' }],
       appSecret: [{ required: true, message: '请输入AppSecret' }],
       enable: [{ required: true, message: '请选择是否启用' }],
       notifyUrl: [{ required: true, message: '请输入异步通知页面地址' }],
       returnUrl: [{ required: true, message: '请输入同步通知页面地址' }],
-      apiVersion: [{ required: true, message: '请选择支付API版本' }],
-      apiKeyV2: [{ required: true, message: '请输入V2秘钥' }],
       sandbox: [{ required: true, message: '请选择是否为沙箱环境' }],
-      // apiKeyV3: [{ required: true, message: '请输入V3秘钥' }],
+      apiVersion: [{ required: true, message: '请选择支付API版本' }],
+      apiKeyV2: [{ required: form.apiVersion === 'apiV2', message: '请输入V2秘钥' }],
+      apiKeyV3: [{ required: form.apiVersion === 'apiV3', message: '请输入V3秘钥' }],
       // p12: [{ required: true, message: '请上传p12证书' }],
       payWays: [{ required: true, message: '请选择支持的支付类型' }],
     } as Record<string, Rule[]>
diff --git a/src/views/payment/order/pay/PayChannelOrderInfo.vue b/src/views/payment/order/pay/PayChannelOrderInfo.vue
index 9e26ff558d7849e1df539f78b70f50479088bdd6..e7d308a8f163bba202fe89eb2846f2c4626ddd0b 100644
--- a/src/views/payment/order/pay/PayChannelOrderInfo.vue
+++ b/src/views/payment/order/pay/PayChannelOrderInfo.vue
@@ -10,23 +10,23 @@
   >
     <a-descriptions bordered title="" :column="{ md: 1, sm: 1, xs: 1 }">
       <a-descriptions-item label="通道支付单ID">
-        <a-tag>{{ form.id }}</a-tag>
+         {{ form.id }} 
       </a-descriptions-item>
       <a-descriptions-item label="支付通道">
-        <a-tag>{{ dictConvert('PayChannel', form.channel) }}</a-tag>
+         {{ dictConvert('PayChannel', form.channel) }} 
       </a-descriptions-item>
       <a-descriptions-item label="异步支付">
-        <a-tag v-if="form.async" color="green">是</a-tag>
-        <a-tag v-else color="red">否</a-tag>
+        <span v-if="form.async" style="color:green">是</span>
+        <span v-else style="color:red">否</span>
       </a-descriptions-item>
       <a-descriptions-item label="支付方式">
-        <a-tag>{{ dictConvert('PayWay', form.payWay) }}</a-tag>
+        {{ dictConvert('PayWay', form.payWay) }} 
       </a-descriptions-item>
       <a-descriptions-item label="订单金额">
         {{ form.amount }}
       </a-descriptions-item>
       <a-descriptions-item label="支付状态">
-        <a-tag>{{ dictConvert('PayStatus', form.status) }}</a-tag>
+        <span :style="dynamicStyle(form.status)"> {{ dictConvert('PayStatus', form.status) }}</span>
       </a-descriptions-item>
       <a-descriptions-item label="支付时间">
         {{ form.payTime }}
@@ -75,6 +75,21 @@
       confirmLoading.value = false
     })
   }
+  function dynamicStyle(item: string){
+    if (item == 'success') {
+      return { color: 'green' }
+    }
+    if (item == 'fail') {
+      return { color: 'red' }
+    }
+    if (item == 'progress') {
+      return { color: 'orange' }
+    }
+    if (item == 'close') {
+      return { color: 'gray' }
+    }
+    return { color: 'red' }
+  }
   defineExpose({
     init,
   })
diff --git a/src/views/payment/order/pay/PayChannelOrderList.vue b/src/views/payment/order/pay/PayChannelOrderList.vue
index 7c7aea5f720408a30514d5758e725125cf46d655..787db63cd15bce87ed76cc44dfb65627e405c74d 100644
--- a/src/views/payment/order/pay/PayChannelOrderList.vue
+++ b/src/views/payment/order/pay/PayChannelOrderList.vue
@@ -1,30 +1,30 @@
 <template>
   <basic-drawer forceRender v-bind="$attrs" title="通道订单列表" width="60%" :visible="visible" @close="visible = false">
     <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
-    <vxe-table row-id="id" ref="xTable" :data="records" :loading="loading">
+    <vxe-table row-id="id" ref="xTable" :data="records" :loading="loading" :cell-style="cellStyle">
       <vxe-column type="seq" width="60" />
       <vxe-column field="id" title="通道支付单ID" width="170" />
       <vxe-column field="channel" title="支付通道">
         <template #default="{ row }">
-          <a-tag>{{ dictConvert('PayChannel', row.channel) }}</a-tag>
+          {{ dictConvert('PayChannel', row.channel) }}
         </template>
       </vxe-column>
       <vxe-column field="payWay" title="支付方式">
         <template #default="{ row }">
-          <a-tag>{{ dictConvert('PayWay', row.payWay) }}</a-tag>
+          {{ dictConvert('PayWay', row.payWay) }}
         </template>
       </vxe-column>
       <vxe-column field="amount" title="订单金额" />
       <vxe-column field="refundableBalance" title="可退款金额" />
       <vxe-column field="async" title="异步支付">
         <template #default="{ row }">
-          <a-tag v-if="row.async" color="green">是</a-tag>
-          <a-tag v-else color="red">否</a-tag>
+          <span v-if="row.async" style="color: green">是</span>
+          <span v-else style="color: red">否</span>
         </template>
       </vxe-column>
       <vxe-column field="status" title="支付状态">
         <template #default="{ row }">
-          <a-tag>{{ dictConvert('PayStatus', row.status) }}</a-tag>
+          {{ dictConvert('PayStatus', row.status) }}
         </template>
       </vxe-column>
       <vxe-column field="payTime" title="支付时间" />
@@ -93,6 +93,38 @@
   function show(record) {
     payChannelOrderInfo.init(record)
   }
+
+  function cellStyle({ row, column }) {
+    if (column.field == 'status') {
+      if (row.status == 'success') {
+        return { color: 'green' }
+      }
+      if (row.status == 'fail') {
+        return { color: 'red' }
+      }
+      if (row.status == 'progress') {
+        return { color: 'orange' }
+      }
+      if (row.status == 'close') {
+        return { color: 'gray' }
+      }
+      return { color: 'red' }
+    }
+    if (column.field == 'asyncPay') {
+      if (row.asyncPay) {
+        return { color: 'green' }
+      } else {
+        return { color: 'gray' }
+      }
+    }
+    if (column.field == 'combinationPay') {
+      if (row.combinationPay) {
+        return { color: 'green' }
+      } else {
+        return { color: 'gray' }
+      }
+    }
+  }
   defineExpose({
     init,
   })
diff --git a/src/views/payment/order/pay/PayOrderList.vue b/src/views/payment/order/pay/PayOrderList.vue
index 73fc9819b56290640d4ecf89dcc504d7e449f3a3..1e478675f88d5fed396d52db6a12de4f166ca4ff 100644
--- a/src/views/payment/order/pay/PayOrderList.vue
+++ b/src/views/payment/order/pay/PayOrderList.vue
@@ -8,39 +8,33 @@
       <vxe-table
         row-id="id"
         ref="xTable"
+        :cell-style="cellStyle"
         :data="pagination.records"
         :loading="loading"
         :sort-config="{ remote: true, trigger: 'cell' }"
         @sort-change="sortChange"
       >
         <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="id" title="支付ID" sortable width="170" />
-        <vxe-column field="businessNo" title="业务号" />
-        <vxe-column field="title" title="标题" />
-        <vxe-column field="amount" title="金额(分)" sortable />
-        <vxe-column field="refundableBalance" title="可退余额(分)" sortable />
-        <vxe-column field="status" title="支付状态">
-          <template #default="{ row }">
-            <a-tag>{{ dictConvert('PayStatus', row.status) }}</a-tag>
-          </template>
+        <vxe-column field="businessNo" title="业务号" width="180" />
+        <vxe-column field="title" title="标题" width="220" />
+        <vxe-column field="amount" title="金额(分)" width="120" sortable />
+        <vxe-column field="refundableBalance" title="可退余额(分)" width="120" sortable />
+        <vxe-column field="status" title="支付状态" width="120">
+          <template #default="{ row }">{{ dictConvert('PayStatus', row.status) }}</template>
         </vxe-column>
-        <vxe-column field="asyncPay" title="异步支付">
-          <template #default="{ row }">
-            <a-tag>{{ row.asyncPay ? '是' : '否' }}</a-tag>
-          </template>
+        <vxe-column field="createTime" title="创建时间" sortable width="220" />
+        <vxe-column field="id" title="支付ID" sortable width="220" />
+
+        <vxe-column field="asyncPay" title="异步支付" width="120">
+          <template #default="{ row }">{{ row.asyncPay ? '是' : '否' }}</template>
         </vxe-column>
-        <vxe-column field="combinationPayMode" title="组合支付">
-          <template #default="{ row }">
-            <a-tag>{{ row.combinationPayMode ? '是' : '否' }}</a-tag>
-          </template>
+        <vxe-column field="combinationPay" title="组合支付" width="120">
+          <template #default="{ row }">{{ row.combinationPay ? '是' : '否' }}</template>
         </vxe-column>
-        <vxe-column field="asyncChannel" title="异步支付方式">
-          <template #default="{ row }">
-            <a-tag>{{ dictConvert('PayChannel', row.asyncChannel) || '无' }}</a-tag>
-          </template>
+        <vxe-column field="asyncChannel" title="异步支付方式" width="160">
+          <template #default="{ row }">{{ dictConvert('PayChannel', row.asyncChannel) || '无' }}</template>
         </vxe-column>
-        <vxe-column field="expiredTime" title="过期时间" sortable />
-        <vxe-column field="createTime" title="创建时间" sortable />
+        <vxe-column field="expiredTime" title="过期时间" sortable width="220" />
         <vxe-column fixed="right" width="200" :showOverflow="false" title="操作">
           <template #default="{ row }">
             <a-link @click="show(row)">查看</a-link>
@@ -48,7 +42,10 @@
             <a-link @click="showChannel(row)">通道订单</a-link>
             <a-divider type="vertical" />
             <a-dropdown>
-              <a> 更多 <icon icon="ant-design:down-outlined" :size="12" /></a>
+              <a>
+                更多
+                <icon icon="ant-design:down-outlined" :size="12" />
+              </a>
               <template #overlay>
                 <a-menu>
                   <a-menu-item>
@@ -210,6 +207,38 @@
   function refund(record) {
     refundModel.init(record.id)
   }
+
+  function cellStyle({ row, column }) {
+    if (column.field == 'status') {
+      if (row.status == 'success') {
+        return { color: 'green' }
+      }
+      if (row.status == 'fail') {
+        return { color: 'red' }
+      }
+      if (row.status == 'progress') {
+        return { color: 'orange' }
+      }
+      if (row.status == 'close') {
+        return { color: 'gray' }
+      }
+      return { color: 'red' }
+    }
+    if (column.field == 'asyncPay') {
+      if (row.asyncPay) {
+        return { color: 'green' }
+      } else {
+        return { color: 'gray' }
+      }
+    }
+    if (column.field == 'combinationPay') {
+      if (row.combinationPay) {
+        return { color: 'green' }
+      } else {
+        return { color: 'gray' }
+      }
+    }
+  }
 </script>
 
 <style lang="less" scoped></style>
diff --git a/src/views/payment/order/reconcile/order/ReconcileOrderInfo.vue b/src/views/payment/order/reconcile/order/ReconcileOrderInfo.vue
index e1459560f9088f54f82f96d0a82f3e8b00157bd6..f2ba307c12c7057c8c7c16725522cebfbe5a6c40 100644
--- a/src/views/payment/order/reconcile/order/ReconcileOrderInfo.vue
+++ b/src/views/payment/order/reconcile/order/ReconcileOrderInfo.vue
@@ -18,9 +18,9 @@
       <a-descriptions-item label="支付通道">
         <a-tag>{{ dictConvert('PayChannel', form.channel) }}</a-tag>
       </a-descriptions-item>
-      <a-descriptions-item label="对账单下载">
-        <a-tag v-if="form?.down" color="green">已下载</a-tag>
-        <a-tag v-else color="red">未下载</a-tag>
+      <a-descriptions-item label="对账单下载/上传">
+        <a-tag v-if="form?.down" color="green">完成下载/上传</a-tag>
+        <a-tag v-else color="red">未下载/上传</a-tag>
       </a-descriptions-item>
       <a-descriptions-item label="对账单比对">
         <a-tag v-if="form?.compare" color="green">已比对</a-tag>
diff --git a/src/views/payment/order/reconcile/order/ReconcileOrderList.vue b/src/views/payment/order/reconcile/order/ReconcileOrderList.vue
index a217c51f18b8afc14c56edd07f0281f9fca4700d..11cfdc4daa2faecf4c79c4e6a0583ed5ad9fc82f 100644
--- a/src/views/payment/order/reconcile/order/ReconcileOrderList.vue
+++ b/src/views/payment/order/reconcile/order/ReconcileOrderList.vue
@@ -27,13 +27,29 @@
             <a-tag>{{ dictConvert('PayChannel', row.channel) }}</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="down" title="对账单下载">
+        <vxe-column field="down" title="下载或上传">
           <template #default="{ row }">
-            <a-tag v-if="row.down" color="green">已下载</a-tag>
-            <a-link v-else color="red" @click="down(row)">下载</a-link>
+            <template v-if="row.down">
+              <a-tag v-if="row.down" color="green">已完成</a-tag>
+            </template>
+            <template v-else>
+              <a-link color="red" @click="down(row)">下载</a-link>
+              <a-divider type="vertical" />
+              <a-upload
+                name="file"
+                :multiple="false"
+                :action="uploadAction"
+                :headers="tokenHeader"
+                :data="{ id: row.id }"
+                :showUploadList="false"
+                @change="handleChange"
+              >
+                <a-link color="red">上传</a-link>
+              </a-upload>
+            </template>
           </template>
         </vxe-column>
-        <vxe-column field="compare" title="对账单比对">
+        <vxe-column field="compare" title="比对">
           <template #default="{ row }">
             <a-tag v-if="row.compare" color="green">已比对</a-tag>
             <a-link v-else :disabled="!row.down" color="red" @click="compareOrder(row)">比对</a-link>
@@ -91,12 +107,15 @@
   import ReconcileOrderCreate from './ReconcileOrderCreate.vue'
   import ALink from '/@/components/Link/Link.vue'
   import ReconcileDiffListModel from '/@/views/payment/order/reconcile/diff/ReconcileDiffListModel.vue'
+  import { useUpload } from '/@/hooks/bootx/useUpload'
 
   // 使用hooks
   const { handleTableChange, pageQueryResHandel, resetQueryParams, sortChange, sortParam, pagination, pages, model, loading } =
     useTablePage(queryPage)
   const { notification, createMessage, createConfirm } = useMessage()
   const { dictConvert, dictDropDown } = useDict()
+  // 手动上传对账单
+  const { tokenHeader, uploadAction } = useUpload('/order/reconcile/upload')
 
   let payChannelList = $ref<LabeledValue[]>([])
 
@@ -201,6 +220,22 @@
     })
   }
 
+  /**
+   * 上传完成回调
+   */
+  function handleChange(info) {
+    if (info.file.status === 'done') {
+      if (!info.file.response.code) {
+        queryPage()
+        createMessage.success(`${info.file.name} 上传成功!`)
+      } else {
+        createMessage.error(`${info.file.response.msg}`)
+      }
+    } else if (info.file.status === 'error') {
+      createMessage.error('上传失败')
+    }
+  }
+
   /**
    * 创建对账订单
    */
diff --git a/src/views/payment/order/refund/RefundChannelOrderInfo.vue b/src/views/payment/order/refund/RefundChannelOrderInfo.vue
index 748bb0624e74c5979295bd5161a6c2ead487bfd3..a0ca62fa3e79eaac663e72a915a3995ae6276628 100644
--- a/src/views/payment/order/refund/RefundChannelOrderInfo.vue
+++ b/src/views/payment/order/refund/RefundChannelOrderInfo.vue
@@ -28,7 +28,7 @@
         {{ dictConvert('PayChannel', form.channel) }}
       </a-descriptions-item>
       <a-descriptions-item label="状态">
-        <a-tag>{{ dictConvert('RefundStatus', form.status) }}</a-tag>
+        <span :style="dynamicStyle(form.status)">{{ dictConvert('RefundStatus', form.status) }}</span>
       </a-descriptions-item>
     </a-descriptions>
 
@@ -74,6 +74,21 @@
       confirmLoading.value = false
     })
   }
+  function dynamicStyle(item: string){
+    if (item == 'success') {
+      return { color: 'green' }
+    }
+    if (item == 'fail') {
+      return { color: 'red' }
+    }
+    if (item == 'progress') {
+      return { color: 'orange' }
+    }
+    if (item == 'close') {
+      return { color: 'gray' }
+    }
+    return { color: 'red' }
+  }
   defineExpose({
     init,
   })
diff --git a/src/views/payment/order/refund/RefundChannelOrderList.vue b/src/views/payment/order/refund/RefundChannelOrderList.vue
index 95ef533bed2290779eefdec7c503cff8e8f68b84..ea32e537597e4342791c604a2a0d121810dbe467 100644
--- a/src/views/payment/order/refund/RefundChannelOrderList.vue
+++ b/src/views/payment/order/refund/RefundChannelOrderList.vue
@@ -1,20 +1,16 @@
 <template>
   <basic-drawer forceRender v-bind="$attrs" title="通道退款订单列表" width="60%" :visible="visible" @close="visible = false">
     <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
-    <vxe-table row-id="id" ref="xTable" :data="records" :loading="loading">
+    <vxe-table row-id="id" ref="xTable" :cell-style="cellStyle" :data="records" :loading="loading">
       <vxe-column type="seq" width="60" />
       <vxe-column field="channel" title="退款通道">
-        <template #default="{ row }">
-          <a-tag>{{ dictConvert('PayChannel', row.channel) }}</a-tag>
-        </template>
+        <template #default="{ row }">{{ dictConvert('PayChannel', row.channel) }}</template>
       </vxe-column>
       <vxe-column field="orderAmount" title="订单金额" />
       <vxe-column field="amount" title="退款金额" />
       <vxe-column field="refundableAmount" title="剩余可退余额" />
       <vxe-column field="refundStatus" title="状态">
-        <template #default="{ row }">
-          <a-tag>{{ dictConvert('RefundStatus', row.status) }}</a-tag>
-        </template>
+        <template #default="{ row }">{{ dictConvert('RefundStatus', row.status) }}</template>
       </vxe-column>
       <vxe-column field="payChannelId" title="通道支付单ID" />
       <vxe-column fixed="right" width="60" :showOverflow="false" title="操作">
@@ -30,61 +26,79 @@
 </template>
 
 <script setup lang="ts">
-  import { nextTick } from 'vue'
-  import { $ref } from 'vue/macros'
-  import useTablePage from '/@/hooks/bootx/useTablePage'
-  import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
-  import { useMessage } from '/@/hooks/web/useMessage'
-  import BasicDrawer from '/@/components/Drawer/src/BasicDrawer.vue'
-  import { useDict } from '/@/hooks/bootx/useDict'
-  import { listByChannel, RefundOrder } from './RefundOrder.api'
-  import RefundChannelOrderInfo from './RefundChannelOrderInfo.vue'
+import { nextTick } from 'vue'
+import { $ref } from 'vue/macros'
+import useTablePage from '/@/hooks/bootx/useTablePage'
+import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
+import { useMessage } from '/@/hooks/web/useMessage'
+import BasicDrawer from '/@/components/Drawer/src/BasicDrawer.vue'
+import { useDict } from '/@/hooks/bootx/useDict'
+import { listByChannel, RefundOrder } from './RefundOrder.api'
+import RefundChannelOrderInfo from './RefundChannelOrderInfo.vue'
 
-  // 使用hooks
-  const { resetQueryParams, model, loading } = useTablePage(queryPage)
-  const { notification, createMessage } = useMessage()
-  const { dictDropDown, dictConvert } = useDict()
+// 使用hooks
+const { resetQueryParams, model, loading } = useTablePage(queryPage)
+const { notification, createMessage } = useMessage()
+const { dictDropDown, dictConvert } = useDict()
 
-  let visible = $ref(false)
-  let refundOrder = $ref<RefundOrder>()
-  let records = $ref<RefundOrder[]>([])
-  const xTable = $ref<VxeTableInstance>()
-  const xToolbar = $ref<VxeToolbarInstance>()
-  const refundChannelOrderInfo = $ref<any>()
+let visible = $ref(false)
+let refundOrder = $ref<RefundOrder>()
+let records = $ref<RefundOrder[]>([])
+const xTable = $ref<VxeTableInstance>()
+const xToolbar = $ref<VxeToolbarInstance>()
+const refundChannelOrderInfo = $ref<any>()
 
-  nextTick(() => {
-    xTable?.connect(xToolbar as VxeToolbarInstance)
-  })
+nextTick(() => {
+  xTable?.connect(xToolbar as VxeToolbarInstance)
+})
 
-  /**
-   * 入口
-   * @param record
-   */
-  function init(record) {
-    visible = true
-    refundOrder = record
-    queryPage()
-  }
+/**
+ * 入口
+ * @param record
+ */
+function init(record) {
+  visible = true
+  refundOrder = record
+  queryPage()
+}
 
-  /**
-   * 分页查询
-   */
-  function queryPage() {
-    loading.value = true
-    listByChannel(refundOrder?.id).then(({ data }) => {
-      records = data
-      loading.value = false
-    })
-  }
-  /**
-   * 查看
-   */
-  function show(record) {
-    refundChannelOrderInfo.init(record)
-  }
-  defineExpose({
-    init,
+/**
+ * 分页查询
+ */
+function queryPage() {
+  loading.value = true
+  listByChannel(refundOrder?.id).then(({ data }) => {
+    records = data
+    loading.value = false
   })
+}
+/**
+ * 查看
+ */
+function show(record) {
+  refundChannelOrderInfo.init(record)
+}
+
+function cellStyle({ row, column }) {
+  if (column.field == 'refundStatus') {
+    if (row.status == 'success') {
+      return { color: 'green' }
+    }
+    if (row.status == 'fail') {
+      return { color: 'red' }
+    }
+    if (row.status == 'progress') {
+      return { color: 'orange' }
+    }
+    if (row.status == 'close') {
+      return { color: 'gray' }
+    }
+    return { color: 'red' }
+  }
+}
+defineExpose({
+  init,
+})
 </script>
 
 <style scoped lang="less"></style>
diff --git a/src/views/payment/order/refund/RefundOrderList.vue b/src/views/payment/order/refund/RefundOrderList.vue
index e4bcd17234968c0da779b671d2e960327c37a033..c4fa4576a2af209280924276e9761792dad2a26a 100644
--- a/src/views/payment/order/refund/RefundOrderList.vue
+++ b/src/views/payment/order/refund/RefundOrderList.vue
@@ -14,6 +14,7 @@
       <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
       <vxe-table
         row-id="id"
+        :cell-style="cellStyle"
         ref="xTable"
         :sort-config="{ remote: true, trigger: 'cell' }"
         :data="pagination.records"
@@ -21,9 +22,10 @@
         @sort-change="sortChange"
       >
         <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="id" title="退款ID" width="180" />
-        <vxe-column field="title" title="原支付标题" />
-        <vxe-column field="paymentId" title="原支付ID" width="170">
+        <vxe-column field="id" title="退款ID" width="220" />
+        <vxe-column field="refundTime" title="退款时间" sortable width="180" />
+        <vxe-column field="title" title="原支付标题" width="160" />
+        <vxe-column field="paymentId" title="原支付ID" width="220">
           <template #default="{ row }">
             <a @click="showPayment(row.paymentId)">
               {{ row.paymentId }}
@@ -31,21 +33,20 @@
           </template>
         </vxe-column>
         <vxe-column field="businessNo" title="原业务号" :visible="false" />
-        <vxe-column field="amount" title="退款金额" sortable />
-        <vxe-column field="refundableBalance" title="剩余可退金额" sortable />
-        <vxe-column field="async" title="包含异步通道">
+        <vxe-column field="amount" title="退款金额(分)" sortable width="140" />
+        <vxe-column field="refundableBalance" title="剩余可退金额(分)" sortable width="160" />
+        <vxe-column field="async" title="包含异步通道" width="120">
           <template #default="{ row }">
-            <a-tag color="green">{{ row.asyncPay ? '是' : '否' }}</a-tag>
+            {{ row.asyncPay ? '是' : '否' }}
           </template>
         </vxe-column>
-        <vxe-column field="gatewayOrderNo" title="支付网关订单号" :visible="false" />
-        <vxe-column field="refundTime" title="退款时间" sortable />
-        <vxe-column field="refundStatus" title="状态">
+        <vxe-column field="gatewayOrderNo" title="支付网关订单号" :visible="false" width="220" />
+        <vxe-column field="refundStatus" title="状态" width="80">
           <template #default="{ row }">
-            <a-tag>{{ dictConvert('RefundStatus', row.status) }}</a-tag>
+            {{ dictConvert('RefundStatus', row.status) }}
           </template>
         </vxe-column>
-        <vxe-column field="reason" title="原因" />
+        <vxe-column field="reason" title="原因" width="160" />
         <vxe-column fixed="right" width="220" :showOverflow="false" title="操作">
           <template #default="{ row }">
             <a-link @click="show(row)">查看</a-link>
@@ -214,6 +215,38 @@
   function showChannel(record) {
     refundChannelOrderList.init(record)
   }
+
+  function cellStyle({ row, column }) {
+    if (column.field == 'refundStatus') {
+      if (row.status == 'success') {
+        return { color: 'green' }
+      }
+      if (row.status == 'fail') {
+        return { color: 'red' }
+      }
+      if (row.status == 'progress') {
+        return { color: 'orange' }
+      }
+      if (row.status == 'close') {
+        return { color: 'gray' }
+      }
+      return { color: 'red' }
+    }
+    if (column.field == 'async') {
+      if (row.asyncPay) {
+        return { color: 'green' }
+      } else {
+        return { color: 'gray' }
+      }
+    }
+    if (column.field == 'combinationPay') {
+      if (row.combinationPay) {
+        return { color: 'green' }
+      } else {
+        return { color: 'gray' }
+      }
+    }
+  }
 </script>
 
 <style lang="less" scoped></style>
diff --git a/src/views/payment/system/platform/PayPlatformConfig.api.ts b/src/views/payment/system/platform/PayPlatformConfig.api.ts
index 654d9ea712e33ba44b72fb69240b057023c327c4..0ea3a10d5cb44dbb249020f7214fefd058681f72 100644
--- a/src/views/payment/system/platform/PayPlatformConfig.api.ts
+++ b/src/views/payment/system/platform/PayPlatformConfig.api.ts
@@ -25,8 +25,6 @@ export function update(param: PayPlatformConfig) {
  * 支付平台配置
  */
 export interface PayPlatformConfig extends BaseEntity {
-  // 网站地址
-  websiteUrl?: string
   // 签名方式
   signType?: string
   // 签名秘钥
@@ -35,6 +33,8 @@ export interface PayPlatformConfig extends BaseEntity {
   notifyUrl?: string
   // 同步支付通知地址
   returnUrl?: string
+  // 订单限额(分)
+  limitAmount?: number
   // 订单默认超时时间(分钟)
   orderTimeout?: number
 }
diff --git a/src/views/payment/system/platform/PayPlatformConfig.vue b/src/views/payment/system/platform/PayPlatformConfig.vue
index 4744834d0485aa9a812a0f78d7d4c1d1cf00f82d..db154016ff6cdbb6ed3a410dcd35dc9fa2456740 100644
--- a/src/views/payment/system/platform/PayPlatformConfig.vue
+++ b/src/views/payment/system/platform/PayPlatformConfig.vue
@@ -5,8 +5,11 @@
         <a-form ref="formRef" :validate-trigger="['blur', 'change']" :label-col="{ span: 12 }" :model="form" :rules="rules">
           <a-row>
             <a-col :offset="2" :span="10">
-              <a-form-item label="网站地址" class="w-400px" name="websiteUrl">
-                <a-input placeholder="请输入网站地址" v-model:value="form.websiteUrl" :disabled="!edit" />
+              <a-form-item class="w-400px" name="limitAmount">
+                <template #label>
+                  <basic-title helpMessage="一次订单支付时最高可以支付的金额，单位为分"> 订单限额(分) </basic-title>
+                </template>
+                <a-input placeholder="请输入订单限额" v-model:value="form.limitAmount" :disabled="!edit" />
               </a-form-item>
             </a-col>
             <a-col :span="10">
@@ -54,7 +57,7 @@
                     同步支付通知地址
                   </basic-title>
                 </template>
-                <a-input placeholder="请输入同步支付通知地址" v-model:value="form.returnUrl" :disabled="!edit" />
+                <a-input placeholder="请输入同步支付跳转地址" v-model:value="form.returnUrl" :disabled="!edit" />
               </a-form-item>
             </a-col>
           </a-row>
@@ -87,10 +90,10 @@
   let edit = $ref(false)
 
   const rules = reactive({
-    websiteUrl: [{ required: true, message: '请输入网站地址', trigger: 'blur' }],
-    signType: [{ required: true, message: '请选择签名类型', trigger: 'blur' }],
-    signSecret: [{ required: true, message: '请输入签名密钥', trigger: 'blur' }],
-    orderTimeout: [{ required: true, message: '请输入订单默认超时时间(分钟)', trigger: 'blur' }],
+    limitAmount: [{ required: true, message: '请输入订单支付限额' }],
+    signType: [{ required: true, message: '请选择签名类型' }],
+    signSecret: [{ required: true, message: '请输入签名密钥' }],
+    orderTimeout: [{ required: true, message: '请输入订单默认超时时间(分钟)' }],
   } as Record<string, Rule[]>)
 
   onMounted(() => initData())
diff --git a/src/views/payment/task/notice/ClientNoticeTask.api.ts b/src/views/payment/task/notice/ClientNoticeTask.api.ts
index 7d82a8acba30a085eae2ae92b79a403beac9bb82..e2d5de564cb8d61cc48c43add3b5bf8594f87236 100644
--- a/src/views/payment/task/notice/ClientNoticeTask.api.ts
+++ b/src/views/payment/task/notice/ClientNoticeTask.api.ts
@@ -5,7 +5,7 @@ import { BaseEntity } from '/#/web'
 /**
  * 重新发送消息通知
  */
-export function resetSendNotice(taskId){
+export function resetSendNotice(taskId) {
   return defHttp.post<Result>({
     url: '/task/notice/resetSend',
     method: 'post',