diff --git a/src/views/business/mer_list/index.vue b/src/views/business/mer_list/index.vue
index baf217c..339a9ac 100644
--- a/src/views/business/mer_list/index.vue
+++ b/src/views/business/mer_list/index.vue
@@ -128,7 +128,7 @@
           <n-form-item label="手续费比例:" path="scale">
             <n-input-number v-model:value="formValue.scale" placeholder="请输入手续费比例" />
           </n-form-item>
-          <n-form-item label="聚合积分额度:" path="quota">
+          <!-- <n-form-item label="聚合积分额度:" path="quota">
             <n-input-number v-model:value="formValue.quota" placeholder="请输入聚合积分额度" />
           </n-form-item>
           <n-form-item label="聚合兑换比例:" path="ratio">
@@ -137,7 +137,7 @@
               placeholder="请输入聚合兑换比例"
               :precision="2"
             />
-          </n-form-item>
+          </n-form-item> -->
           <!-- <n-form-item label="聚合appid:" path="appid">
             <n-input v-model:value="formValue.appid" placeholder="请输入聚合appid" />
           </n-form-item>
@@ -322,24 +322,24 @@ const columns = ref([
           ),
           [[vPerms, ['/admin/store/edit']]]
         ),
-        withDirectives(
-          h(
-            NButton,
-            {
-              class: 'ml-10',
-              type: 'primary',
-              text: true,
-              size: 'small',
-              onClick: () => {
-                model.value.name = row.name
-                model.value.bid = row.bid
-                showModalJf.value = true
-              },
-            },
-            () => '退积分'
-          ),
-          [[vPerms, ['/admin/store/set/integral']]]
-        ),
+        // withDirectives(
+        //   h(
+        //     NButton,
+        //     {
+        //       class: 'ml-10',
+        //       type: 'primary',
+        //       text: true,
+        //       size: 'small',
+        //       onClick: () => {
+        //         model.value.name = row.name
+        //         model.value.bid = row.bid
+        //         showModalJf.value = true
+        //       },
+        //     },
+        //     () => '退积分'
+        //   ),
+        //   [[vPerms, ['/admin/store/set/integral']]]
+        // ),
         withDirectives(
           h(
             NButton,
diff --git a/src/views/finance/api.js b/src/views/finance/api.js
index 4eda119..0240945 100644
--- a/src/views/finance/api.js
+++ b/src/views/finance/api.js
@@ -4,4 +4,7 @@ export default {
   getData: (data) => request.post('/store/withdraw', data),
   //   审核提现
   passAudit: (data) => request.post('/store/withdraw/edit', data),
+
+  getYdata: (data) => request.post('/store/amount/withdraw', data),
+  ydataEdit: (data) => request.post('/store/amount/withdraw/edit', data),
 }
diff --git a/src/views/finance/index.vue b/src/views/finance/index.vue
index 7c60957..b3d1865 100644
--- a/src/views/finance/index.vue
+++ b/src/views/finance/index.vue
@@ -9,6 +9,17 @@
                 ref="numberAnimationInstRef"
                 :from="0"
                 :to="cardData.total / 100"
+                :precision="2"
+              />
+            </n-statistic>
+          </n-card>
+          <n-card ml-10 w-400>
+            <n-statistic label="服务费" tabular-nums>
+              <n-number-animation
+                ref="numberAnimationInstRef"
+                :from="0"
+                :to="cardData.commission || 0 / 100"
+                :precision="2"
               />
             </n-statistic>
           </n-card>
@@ -18,6 +29,7 @@
                 ref="numberAnimationInstRef"
                 :from="0"
                 :to="cardData.service / 100"
+                :precision="2"
               />
             </n-statistic>
           </n-card>
@@ -126,6 +138,7 @@ const cardData = ref({
   total: 0,
   service: 0,
   count: 0,
+  commission: 0,
 })
 
 const songs = ref([
@@ -353,6 +366,7 @@ const getList = async () => {
   pagination.value.itemCount = res.data.total
   cardData.value.total = res.data.all
   cardData.value.service = res.data.audit_integral
+  cardData.value.commission = res.data.audit_commission
   cardData.value.count = res.data.success_integral
   loading.value = false
 }
diff --git a/src/views/finance/yIndex.vue b/src/views/finance/yIndex.vue
new file mode 100644
index 0000000..d7d654b
--- /dev/null
+++ b/src/views/finance/yIndex.vue
@@ -0,0 +1,414 @@
+<template>
+  <CommonPage show-footer :title="$route.title">
+    <n-row gutter="12">
+      <n-col :span="24">
+        <div flex>
+          <n-card w-400>
+            <n-statistic label="总提现金额(含已驳回)" tabular-nums>
+              <n-number-animation
+                ref="numberAnimationInstRef"
+                :from="0"
+                :to="cardData.total / 100"
+                :precision="2"
+              />
+            </n-statistic>
+          </n-card>
+          <n-card ml-10 w-400>
+            <n-statistic label="待处理金额" tabular-nums>
+              <n-number-animation
+                ref="numberAnimationInstRef"
+                :from="0"
+                :to="cardData.service || 0 / 100"
+                :precision="2"
+              />
+            </n-statistic>
+          </n-card>
+          <n-card ml-10 w-400>
+            <n-statistic label="服务费" tabular-nums>
+              <n-number-animation
+                ref="numberAnimationInstRef"
+                :from="0"
+                :to="cardData.commission || 0 / 100"
+                :precision="2"
+              />
+            </n-statistic>
+          </n-card>
+          <n-card ml-10 w-400>
+            <n-statistic label="已审核金额" tabular-nums>
+              <n-number-animation
+                ref="numberAnimationInstRef"
+                :from="0"
+                :to="cardData.count || 0 / 100"
+              />
+            </n-statistic>
+          </n-card>
+        </div>
+      </n-col>
+      <n-col :span="24">
+        <div mt-10>
+          <span w-80>提现状态:</span>
+          <n-radio-group v-model:value="queryData.status" class="ml-10">
+            <n-radio-button
+              v-for="song in songs"
+              :key="song.value"
+              :value="song.value"
+              :label="song.label"
+            />
+          </n-radio-group>
+        </div>
+      </n-col>
+      <n-col :span="24">
+        <div mt-10 flex items-center>
+          <span w-80>号码搜索:</span>
+          <n-input v-model:value="queryData.word" style="width: 25%" placeholder="请输入手机号码" />
+        </div>
+      </n-col>
+      <n-col :span="10">
+        <div mt-10 flex items-center>
+          <span w-80>申请时间:</span>
+          <n-date-picker
+            v-model:formatted-value="queryData.time"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            clearable
+          />
+        </div>
+      </n-col>
+      <n-col :span="24">
+        <div mt-10>
+          <n-button type="primary" @click="getList">搜索</n-button>
+          <n-button ml-10 @click="clearQueryData">重置</n-button>
+        </div>
+      </n-col>
+    </n-row>
+    <n-data-table
+      class="mt-10"
+      :loading="loading"
+      :columns="columns"
+      :data="data"
+      :pagination="pagination"
+      :bordered="false"
+      remote
+    />
+    <!-- 打款记录 -->
+    <n-modal v-model:show="showModal">
+      <n-card
+        style="width: 500px"
+        title="打款记录"
+        :bordered="false"
+        size="huge"
+        role="dialog"
+        aria-modal="true"
+      >
+        <n-form ref="formRef" :model="model" :rules="rules" label-placement="left">
+          <n-grid :cols="1" :x-gap="24">
+            <n-form-item-gi :span="12" label="打款截图" path="img">
+              <Upload v-model:list="model.img" />
+            </n-form-item-gi>
+            <n-form-item-gi>
+              <div w-full flex justify-center>
+                <n-button type="primary" @click="ok">确定</n-button>
+                <n-button class="ml-10" @click="clear">关闭</n-button>
+              </div>
+            </n-form-item-gi>
+          </n-grid>
+        </n-form>
+      </n-card>
+    </n-modal>
+  </CommonPage>
+</template>
+
+<script setup>
+import api from './api'
+import { NButton, NImage, NTag } from 'naive-ui'
+import Upload from '@/components/Upload.vue'
+import { h, withDirectives, resolveDirective } from 'vue'
+const vPerms = resolveDirective('perms')
+const vRole = [[vPerms, ['/admin/store/amount/withdraw/edit']]]
+
+const showModal = ref(false)
+
+const queryData = ref({
+  status: '',
+  word: '',
+  time: '',
+})
+
+const cardData = ref({
+  total: 0,
+  service: 0,
+  count: 0,
+  commission: 0,
+})
+
+const songs = ref([
+  {
+    value: 1,
+    label: '已审核',
+  },
+  {
+    value: 2,
+    label: '已驳回',
+  },
+  {
+    value: 3,
+    label: '待审核',
+  },
+])
+
+const nowRow = ref({})
+
+const formRef = ref(null)
+
+const model = ref({
+  img: [],
+})
+
+const rules = {
+  img: { required: true, type: 'array', message: '请上传打款截图' },
+}
+
+const columns = ref([
+  {
+    title: '名字',
+    key: 'name',
+    align: 'center',
+  },
+  {
+    title: '电话',
+    key: 'phone',
+    align: 'center',
+  },
+  {
+    title: '银行名称',
+    key: 'bank',
+    align: 'center',
+  },
+  {
+    title: '银行卡号',
+    key: 'bank_card',
+    align: 'center',
+  },
+  {
+    title: '账户名称',
+    key: 'bank_name',
+    align: 'center',
+  },
+  {
+    title: '法人',
+    key: 'bank_user',
+    align: 'center',
+  },
+  {
+    title: '提现金额',
+    key: 'integral',
+    align: 'center',
+  },
+  {
+    title: '服务费',
+    key: 'commission',
+    align: 'center',
+  },
+  {
+    title: '实际到账',
+    key: 'number',
+    align: 'center',
+  },
+  {
+    title: '剩余余额',
+    key: 'residue',
+    align: 'center',
+  },
+  {
+    title: '手续费比例',
+    slot: 'commission_number',
+    align: 'center',
+    render: (row) => {
+      return h(
+        'span',
+        {},
+        {
+          default: () => `${row.commission_number}%`,
+        }
+      )
+    },
+  },
+  {
+    title: '手续费类型',
+    key: 'commission_type',
+    align: 'center',
+    render: (row) => {
+      return h(
+        NTag,
+        {
+          type: row.commission_type === 1 ? 'success' : 'warning',
+        },
+        {
+          default: () => (row.commission_type === 1 ? '百分比' : '固定值'),
+        }
+      )
+    },
+  },
+  {
+    title: '审核状态',
+    align: 'center',
+    slot: 'status',
+    render: (row) => {
+      return h(
+        NTag,
+        {
+          type: row.status === 1 ? 'success' : row.status === 2 ? 'error' : 'warning',
+        },
+        {
+          default: () => (row.status === 1 ? '已审核' : row.status === 2 ? '已驳回' : '待审核'),
+        }
+      )
+    },
+  },
+  {
+    title: '申请时间',
+    key: 'add_time',
+    align: 'center',
+  },
+  {
+    title: '打款截图',
+    slot: 'img',
+    render: (row) => {
+      return h(NImage, {
+        src: row.status_img,
+        width: '50',
+      })
+    },
+  },
+  {
+    title: '操作',
+    align: 'center',
+    slot: 'action',
+    render: (row) => {
+      if (row.status === 3) {
+        return [
+          withDirectives(
+            h(
+              NButton,
+              {
+                text: true,
+                type: 'primary',
+                onClick: () => {
+                  nowRow.value = row
+                  showModal.value = true
+                },
+              },
+              {
+                default: () => '审核',
+              }
+            ),
+            vRole
+          ),
+          withDirectives(
+            h(
+              NButton,
+              {
+                class: 'ml-10',
+                text: true,
+                type: 'error',
+                onClick: () => {
+                  nowRow.value = row
+                  refuse()
+                },
+              },
+              {
+                default: () => '拒绝',
+              }
+            ),
+            vRole
+          ),
+        ]
+      }
+    },
+  },
+])
+const loading = ref(false)
+const data = ref([])
+const pagination = ref({
+  page: 1,
+  pageSize: 10,
+  itemCount: 0,
+  onChange: (page) => {
+    pagination.value.page = page
+    getList()
+  },
+})
+
+onMounted(() => {
+  getList()
+})
+
+const getList = async () => {
+  loading.value = true
+  const query_data = {
+    Status: queryData.value.status || '',
+    Phone: queryData.value.word || '',
+    StartTime: queryData.value.time === null ? '' : queryData.value.time[0] || '',
+    EndTime: queryData.value.time === null ? '' : queryData.value.time[1] || '',
+  }
+  const res = await api.getYdata({
+    pageNum: pagination.value.page,
+    pageSize: pagination.value.pageSize,
+    ...query_data,
+  })
+
+  data.value = res.data.data || []
+  pagination.value.itemCount = res.data.total
+  cardData.value.total = res.data.all
+  cardData.value.service = res.data.audit_number
+  cardData.value.commission = res.data.audit_commission
+  cardData.value.count = res.data.success_amount
+  loading.value = false
+}
+
+const clear = async () => {
+  model.value = {
+    img: [],
+  }
+  showModal.value = false
+  formRef.value?.restoreValidation()
+  await getList()
+}
+
+const ok = () => {
+  formRef.value?.validate(async (errors) => {
+    if (!errors) {
+      const res = await api.passAudit({
+        bid: nowRow.value.bid,
+        wid: nowRow.value.wid,
+        img: model.value.img[0].url,
+        status: 1,
+      })
+      $message.success(res.msg)
+      clear()
+    }
+  })
+}
+
+const refuse = async () => {
+  const res = await api.passAudit({
+    bid: nowRow.value.bid,
+    wid: nowRow.value.wid,
+    img: model.value.img[0]?.url || '',
+    status: 2,
+  })
+  clear()
+  $message.success(res.msg)
+}
+
+const clearQueryData = () => {
+  queryData.value = {
+    status: '',
+    time: null,
+    word: '',
+  }
+  getList()
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/order/index/index.vue b/src/views/order/index/index.vue
index a7faeab..8d484a1 100644
--- a/src/views/order/index/index.vue
+++ b/src/views/order/index/index.vue
@@ -20,7 +20,7 @@
           </n-card>
           <n-card ml-10 w-500>
             <n-statistic label="赠送豆子" tabular-nums>
-              <n-number-animation :from="0" :to="cardData.count" />
+              <n-number-animation :from="0" :to="cardData.gift_pulse" />
             </n-statistic>
           </n-card>
         </div>
@@ -122,6 +122,7 @@ const cardData = ref({
   total: 0,
   service: 0,
   count: 0,
+  gift_pulse: 0,
 })
 
 const songs = ref([
@@ -352,6 +353,7 @@ const getList = async () => {
     cardData.value.total = res.data.number
     cardData.value.service = res.data.commission
     cardData.value.count = res.data.total
+    cardData.value.gift_pulse = res.data.gift_pulse
   } catch (error) {
     $message.error(error.msg)
   }