From 333b6a457df40b42df742ed5284f073f675c220b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com>
Date: Thu, 8 Aug 2024 10:34:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E4=B8=AD=E5=BF=83=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E6=94=B6=E6=AC=BE=E8=B4=A6=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/app/account.js                        |  11 ++
 src/api/app/user.js                           |   8 +
 src/api/mch/recharge.js                       |  10 ++
 src/assets/icons/svg/bank.svg                 |   1 +
 src/assets/icons/svg/qrcode.svg               |   1 +
 src/components/LineField/index.vue            |  62 ++++++++
 src/components/RangePicker/index.vue          |  12 +-
 src/views/index.vue                           |   1 +
 src/views/mch/index/components/MchAccount.vue | 137 ++++++++++++++++++
 .../components/MchRechargeCountReport.vue     |  86 +++++++++++
 .../mch/index/components/MchUserProfile.vue   |  75 ++++++++++
 src/views/mch/index/index.vue                 |  41 +++++-
 src/views/mch/receiveBill/index.vue           |   3 +-
 src/views/ss/receiveBill/index.vue            |   2 +-
 .../smUser/components/userRechargeReport.vue  |   1 -
 src/views/system/smUser/detail.vue            |   4 +-
 16 files changed, 445 insertions(+), 10 deletions(-)
 create mode 100644 src/api/app/account.js
 create mode 100644 src/api/app/user.js
 create mode 100644 src/api/mch/recharge.js
 create mode 100644 src/assets/icons/svg/bank.svg
 create mode 100644 src/assets/icons/svg/qrcode.svg
 create mode 100644 src/components/LineField/index.vue
 create mode 100644 src/views/mch/index/components/MchAccount.vue
 create mode 100644 src/views/mch/index/components/MchRechargeCountReport.vue
 create mode 100644 src/views/mch/index/components/MchUserProfile.vue

diff --git a/src/api/app/account.js b/src/api/app/account.js
new file mode 100644
index 0000000..5e394cb
--- /dev/null
+++ b/src/api/app/account.js
@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+/**
+ * 获取用户的收款账户列表
+ */
+export function appGroupAccount() {
+  return request({
+    url: '/app/account',
+    method: 'get'
+  })
+}
diff --git a/src/api/app/user.js b/src/api/app/user.js
new file mode 100644
index 0000000..85393d4
--- /dev/null
+++ b/src/api/app/user.js
@@ -0,0 +1,8 @@
+import request from '@/utils/request'
+
+export function appGetUserInfo() {
+  return request({
+    url: '/app/user/userInfo',
+    method: 'get'
+  })
+}
diff --git a/src/api/mch/recharge.js b/src/api/mch/recharge.js
new file mode 100644
index 0000000..5821b47
--- /dev/null
+++ b/src/api/mch/recharge.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 商户统计信息
+export function mchRechargeCount(params) {
+  return request({
+    url: '/app/bill/landlordCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/assets/icons/svg/bank.svg b/src/assets/icons/svg/bank.svg
new file mode 100644
index 0000000..151ffa8
--- /dev/null
+++ b/src/assets/icons/svg/bank.svg
@@ -0,0 +1 @@
+<svg t="1723084001519" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5334" width="64" height="64"><path d="M601.879542 615.183034l40.164768 0 0 39.908942-40.164768 0 0-39.908942Z" p-id="5335"></path><path d="M701.140243 615.183034l40.164768 0 0 39.908942-40.164768 0 0-39.908942Z" p-id="5336"></path><path d="M511.999488 63.645552c-246.99951 0-447.230857 200.231347-447.230857 447.230857 0 246.998487 200.23237 447.231881 447.230857 447.231881 246.99951 0 447.229834-200.233394 447.229834-447.231881C959.229323 263.876899 758.998999 63.645552 511.999488 63.645552zM789.144576 682.721243c0 0-1.87572 36.32737-37.862329 41.443901L276.297278 724.165144c0 0-28.481681-1.705851-34.109866-38.544875l-1.056052-218.816634 548.013215 0L789.144576 682.721243zM789.144576 329.424778l0 67.026556-548.013215-0.271176 1.056052-68.801992c5.884011-29.420053 34.280758-30.187533 34.280758-30.187533l473.279117 0C789.656229 301.283858 789.144576 329.424778 789.144576 329.424778z" p-id="5337"></path><path d="M651.254066 615.183034l40.164768 0 0 39.908942-40.164768 0 0-39.908942Z" p-id="5338"></path></svg>
diff --git a/src/assets/icons/svg/qrcode.svg b/src/assets/icons/svg/qrcode.svg
new file mode 100644
index 0000000..31855ec
--- /dev/null
+++ b/src/assets/icons/svg/qrcode.svg
@@ -0,0 +1 @@
+<svg t="1723082130577" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="21193" width="64" height="64"><path d="M688.72 461.288a28.4 28.4 0 0 1-28.4 28.4H381.104a28.4 28.4 0 0 1 0-56.8H660.32a28.4 28.4 0 0 1 28.4 28.4zM688.72 591.64a28.4 28.4 0 0 1-28.4 28.408H381.104a28.4 28.4 0 1 1 0-56.8H660.32a28.392 28.392 0 0 1 28.4 28.392z" p-id="21194"></path><path d="M520.72 437.64a28.4 28.4 0 0 1 28.408 28.4v239.216a28.408 28.408 0 0 1-56.816 0V466.032a28.4 28.4 0 0 1 28.408-28.392z" p-id="21195"></path><path d="M385.176 334.944a28.4 28.4 0 0 1 40.168-0.008l101.264 101.264a28.408 28.408 0 0 1-0.016 40.168 28.4 28.4 0 0 1-40.168 0.008L385.168 375.112a28.408 28.408 0 0 1 0.008-40.168z" p-id="21196"></path><path d="M662.608 334.944a28.4 28.4 0 0 1 0.008 40.168l-42.832 42.84-58.432 58.424a28.416 28.416 0 0 1-40.184-40.184l101.28-101.264a28.4 28.4 0 0 1 40.16 0.016z" p-id="21197"></path><path d="M122.2 397.072a28.4 28.4 0 0 1-28.4-28.4V211.336c0-59.776 48.624-108.4 108.4-108.4h163.384a28.4 28.4 0 0 1 0 56.8H202.2a51.656 51.656 0 0 0-51.6 51.6v157.336a28.4 28.4 0 0 1-28.4 28.4z" p-id="21198"></path><path d="M359.552 920.136H202.2c-59.776 0-108.4-48.624-108.4-108.4V648.344a28.4 28.4 0 1 1 56.8 0v163.392a51.656 51.656 0 0 0 51.6 51.6h157.352a28.4 28.4 0 0 1 0 56.8z" p-id="21199"></path><path d="M829.576 920.136H666.184a28.4 28.4 0 1 1 0-56.8h163.392a51.656 51.656 0 0 0 51.6-51.6V654.4a28.4 28.4 0 1 1 56.8 0v157.336c0 59.768-48.624 108.4-108.4 108.4z" p-id="21200"></path><path d="M909.576 403.128a28.4 28.4 0 0 1-28.4-28.4V211.336a51.656 51.656 0 0 0-51.6-51.6h-157.36a28.4 28.4 0 1 1 0-56.8h157.36c59.776 0 108.4 48.624 108.4 108.4v163.392a28.4 28.4 0 0 1-28.4 28.4z" p-id="21201"></path></svg>
diff --git a/src/components/LineField/index.vue b/src/components/LineField/index.vue
new file mode 100644
index 0000000..b637d64
--- /dev/null
+++ b/src/components/LineField/index.vue
@@ -0,0 +1,62 @@
+<template>
+
+  <div class="line-field">
+    <div class="label">
+      {{label}}
+    </div>
+    <div class="right-box" >
+      <slot>
+        {{value}}
+      </slot>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "LineField",
+  props: {
+    label: {
+      type: String,
+      default: null
+    },
+    value: {
+      type: [String, Number],
+      default: null,
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.line-field {
+  width: 100%;
+  padding: 0.5em 1em;
+  font-size: 14px;
+  display: flex;
+  height: fit-content;
+  line-height: 1.5em;
+  justify-content: space-between;
+  .label {
+    width: fit-content;
+  }
+  .right-box {
+    flex: 1;
+    text-align: right;
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-end;
+    vertical-align: center;
+  }
+  i {
+    line-height: 1.5em;
+    margin: 0 0.5em;
+  }
+}
+.line-field:nth-child(n +2) {
+  border-top: 1px solid #ededed;
+}
+.line-field:hover {
+  background-color: rgba(136, 131, 240, 0.08);
+}
+</style>
diff --git a/src/components/RangePicker/index.vue b/src/components/RangePicker/index.vue
index 0dc4946..5aba0e6 100644
--- a/src/components/RangePicker/index.vue
+++ b/src/components/RangePicker/index.vue
@@ -1,5 +1,11 @@
 <template>
-  <el-select v-model="showValue" :placeholder="placeholder" @change="onChange" :style="{width: width}">
+  <el-select
+    v-model="showValue"
+    :placeholder="placeholder"
+    @change="onChange"
+    :style="{width: width}"
+    :clearable="clearable"
+  >
     <el-option v-for="num of (end - start + 1)" :value="end - num + 1" :key="num" :label="(end - num + 1).toString() + suffix"></el-option>
   </el-select>
 </template>
@@ -9,6 +15,10 @@
 export default {
   name: 'rangePicker',
   props: {
+    clearable: {
+      type: Boolean,
+      default: false,
+    },
     // 双向绑定值
     value: {
       type: Number,
diff --git a/src/views/index.vue b/src/views/index.vue
index 9f149b8..9ebd8a8 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -31,6 +31,7 @@ export default {
   padding: 32px;
   background-color: rgb(240, 242, 245);
   position: relative;
+  min-height: calc(100vh - 84px);
 
   .chart-wrapper {
     background: #fff;
diff --git a/src/views/mch/index/components/MchAccount.vue b/src/views/mch/index/components/MchAccount.vue
new file mode 100644
index 0000000..26db194
--- /dev/null
+++ b/src/views/mch/index/components/MchAccount.vue
@@ -0,0 +1,137 @@
+<template>
+  <div>
+    <div class="account-item" style="background-color:#00BA88;" @click="onClickItem(data.WECHAT)">
+      <div class="name">
+        <svg-icon icon-class="wechat"/> 微信支付
+      </div>
+      <div class="account-no">
+        <template v-if="data.WECHAT && data.WECHAT[0] && data.WECHAT[0].accountNo">
+          已绑定
+        </template>
+        <template v-else>
+          去绑定
+        </template>
+      </div>
+    </div>
+    <div class="account-item" style="background-color:#8EA9E4;" @click="onClickItem(data.BANK_CARD)">
+      <div class="name" >
+        <template v-if="data.BANK_CARD && data.BANK_CARD[0] && data.BANK_CARD[0].accountNo">
+          <div class="bank-logo" :style="{backgroundImage: `url(https://bkaear.market.alicloudapi.com/banklogo/${data.BANK_CARD[0].cardInfo.Icon})` }"/>
+          {{data.BANK_CARD[0].cardInfo.bankName}}
+        </template>
+        <template v-else>
+          <svg-icon icon-class="bank"/>
+          银行卡
+        </template>
+      </div>
+      <div class="account-no">
+        <template v-if="data.BANK_CARD && data.BANK_CARD[0] && data.BANK_CARD[0].accountNo">
+          {{data.BANK_CARD[0].accountNo}}
+        </template>
+        <template v-else>
+          去绑定
+        </template>
+      </div>
+    </div>
+    <div class="account-item" style="background-color:#8883F0;" @click="onClickItem(data.OFFLINE_IMAGE)">
+      <div class="name">
+        <svg-icon icon-class="qrcode"/> 线下收款码
+      </div>
+      <div class="account-no">
+        <template v-if="data.OFFLINE_IMAGE && data.OFFLINE_IMAGE[0] && data.OFFLINE_IMAGE[0].accountNo">
+          已绑定
+        </template>
+        <template v-else>
+          去绑定
+        </template>
+      </div>
+    </div>
+
+    <el-dialog :visible.sync="showBind" title="请使用微信扫码" width="250px" :show-close="false" center>
+      <qr-code text="https://kg.chuangtewl.com/a" height="200px" width="200px" style="display: block;margin:auto;"/>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { appGroupAccount } from '@/api/app/account'
+import { AccountType } from '@/utils/constants'
+import QrCode from '@/components/QrCode/index.vue'
+
+export default {
+  name: "MchAccount",
+  components: { QrCode },
+  data() {
+    return {
+      data: {},
+      showBind: false,  // 展示绑定二维码
+      showQrCode: false,   // 展示线下收款二维码
+    }
+  },
+  created() {
+    this.getData();
+  },
+  methods: {
+    // 点击事件
+    onClickItem(item) {
+      if (item == null || item.length === 0 || item[0] == null) {
+        this.showBind = true;
+        return;
+      }
+      let account = item[0];
+      if (account.accountType === AccountType.OFFLINE_IMAGE) {
+        this.showQrCode = true;
+      }
+    },
+    getData() {
+      appGroupAccount().then(res => {
+        this.data = res.data;
+      })
+    }
+  }
+}
+</script>
+
+<style>
+.account-item {
+  position: relative;
+  width: 100%;
+  height: fit-content;
+  color: #fff;
+  padding: 1em 1.5em;
+  border-radius: 10px;
+  cursor: pointer;
+  transition: .25s;
+  .name {
+    font-size: 18px;
+    display: flex;
+    line-height: 24px;
+    svg {
+      height: 24px;
+      font-size: 24px;
+    }
+    svg,
+    .bank-logo {
+      margin-right: 8px;
+    }
+    .bank-logo {
+      width: 24px;
+      height: 24px;
+      border-radius: 12px;
+      background-repeat: no-repeat;
+      background-size: cover;
+      background-position: center;
+    }
+  }
+  .account-no {
+    text-align: right;
+  }
+}
+.account-item:nth-child(n + 2) {
+  margin-top: 0.5em;
+}
+.account-item:hover {
+  transform: scale(1.05);
+}
+</style>
diff --git a/src/views/mch/index/components/MchRechargeCountReport.vue b/src/views/mch/index/components/MchRechargeCountReport.vue
new file mode 100644
index 0000000..008669e
--- /dev/null
+++ b/src/views/mch/index/components/MchRechargeCountReport.vue
@@ -0,0 +1,86 @@
+<template>
+  <div v-loading="loading">
+    <el-row type="flex" style="justify-content: space-between">
+      <el-date-picker
+        v-model="computedMonth"
+        type="month"
+        placeholder="选择月"
+        @change="getData"
+      />
+      <div>
+        {{queryParams.year}}年{{queryParams.month}}月收入
+        <span style="font-size: 26px">{{totalIncome | money}}</span>
+        元
+      </div>
+    </el-row>
+    <single-line-chart name="收入（元）" :chart-data="chartData" :labels="labels" height="250px"/>
+  </div>
+</template>
+
+<script>
+import { mchRechargeCount } from '@/api/mch/recharge'
+import SingleLineChart from '@/components/SingleLineChart/index.vue'
+import RangePicker from '@/components/RangePicker/index.vue'
+
+export default {
+  name: 'MchRechargeCountReport',
+  components: { RangePicker, SingleLineChart },
+  data() {
+    return {
+      queryParams: {
+        year: new Date().getFullYear(),
+        month: new Date().getMonth() + 1,
+        groupBy: "create_date"
+      },
+      data: [],
+      loading: false,
+    }
+  },
+  computed: {
+    // 数据列表
+    chartData() {
+      return this.data.map(item => item.recharge);
+    },
+    labels() {
+      return this.data.map(item => item.createDate);
+    },
+    computedMonth: {
+      get() {
+        let date = new Date();
+        date.setFullYear(this.queryParams.year);
+        date.setMonth(this.queryParams.month - 1);
+        console.log('get', date)
+        return date;
+      },
+      set(val) {
+        console.log('set', val)
+        this.queryParams.year = val.getFullYear();
+        this.queryParams.month = val.getMonth() + 1;
+      }
+    },
+    totalIncome() {
+      if (this.data == null) {
+        return 0;
+      }
+      return this.data.reduce((pre, cur) => pre + cur.recharge, 0);
+    }
+  },
+  created() {
+    this.getData();
+  },
+  methods: {
+    getData() {
+      this.loading = true;
+      mchRechargeCount(this.queryParams).then(res => {
+        this.data = res.data;
+      }).finally(() => {
+        this.loading = false;
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/src/views/mch/index/components/MchUserProfile.vue b/src/views/mch/index/components/MchUserProfile.vue
new file mode 100644
index 0000000..b6f60b1
--- /dev/null
+++ b/src/views/mch/index/components/MchUserProfile.vue
@@ -0,0 +1,75 @@
+<template>
+  <div class="profile" v-loading="loading">
+    <el-avatar :src="avatar" :size="64" style="margin:2em auto;"/>
+    <el-row type="flex" style="margin-bottom: 1em">
+      <el-statistic title="设备数" :value="user.deviceCount" suffix="台"/>
+      <el-statistic title="店铺数" :value="user.storeCount" suffix="家"/>
+    </el-row>
+    <el-row type="flex" style="margin-bottom: 1em">
+      <el-statistic title="总收入" :value="user.totalIncome" :precision="2" suffix="元"/>
+      <el-statistic title="总提现" :value="user.withDrawlAmount" :precision="2" suffix="元"/>
+      <el-statistic title="账户余额" :value="user.balance" suffix="元" :precision="2"/>
+    </el-row>
+    <el-row>
+      <line-field label="绑定手机" :value="user.phonenumber"/>
+      <line-field label="设备服务费">
+        <template v-if="user.serviceRate == null || user.serviceType == null">跟随渠道</template>
+        <template v-else>
+          <dict-tag :options="dict.type.service_type" :value="user.serviceType" size="mini"/>
+          {{user.serviceRate}} {{serviceUnit(user.serviceType)}}
+        </template>
+      </line-field>
+      <line-field label="提现服务费">
+        <template v-if="user.withdrawServiceRate == null || user.withdrawServiceType == null">跟随渠道</template>
+        <template v-else>
+          <dict-tag :options="dict.type.withdraw_service_type" :value="user.withdrawServiceType" size="mini"/>
+          {{user.withdrawServiceRate}} {{serviceUnit(user.withdrawServiceType)}}
+        </template>
+      </line-field>
+    </el-row>
+  </div>
+</template>
+
+
+<script>
+import { mapGetters } from 'vuex'
+import { appGetUserInfo } from '@/api/app/user'
+import { $serviceType, $withdrawServiceType } from '@/utils/mixins'
+import LineField from '@/components/LineField/index.vue'
+
+export default {
+  name: "MchUserProfile",
+  mixins: [$serviceType, $withdrawServiceType],
+  dicts: ['withdraw_service_type', 'service_type'],
+  components: { LineField },
+  data() {
+    return {
+      loading: false,
+      user: {}
+    }
+  },
+  computed: {
+    ...mapGetters(['avatar'])
+  },
+  created() {
+    this.getUserInfo();
+  },
+  methods: {
+    getUserInfo() {
+      this.loading = true;
+      appGetUserInfo().then(res => {
+        this.user = res.data;
+      }).finally(() => {
+        this.loading = false;
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.profile {
+  display: flex;
+  flex-direction: column;
+}
+</style>
diff --git a/src/views/mch/index/index.vue b/src/views/mch/index/index.vue
index 472fe09..06d2803 100644
--- a/src/views/mch/index/index.vue
+++ b/src/views/mch/index/index.vue
@@ -1,13 +1,48 @@
 <template>
-
+  <el-row :gutter="12">
+    <el-col :xl="6" :lg="8" :md="10" :sm="12" :xs="24">
+      <el-card class="card-box">
+        <div class="hello">欢迎！{{name}}！</div>
+        <mch-user-profile/>
+      </el-card>
+      <el-card  class="card-box" header="收款账户">
+        <mch-account/>
+      </el-card>
+    </el-col>
+    <el-col :xl="18" :lg="16" :md="14" :sm="12" :xs="24">
+      <el-scrollbar>
+        <el-card class="card-box" header="收入统计">
+          <mch-recharge-count-report/>
+        </el-card>
+<!--        <el-card class="card-box">-->
+<!--          <el-tabs>-->
+<!--            <el-tab-pane label="近期订单"/>-->
+<!--          </el-tabs>-->
+<!--        </el-card>-->
+      </el-scrollbar>
+    </el-col>
+  </el-row>
 </template>
 
 <script>
+import MchRechargeCountReport from '@/views/mch/index/components/MchRechargeCountReport.vue'
+import { mapGetters } from 'vuex'
+import MchUserProfile from '@/views/mch/index/components/MchUserProfile.vue'
+import LineField from '@/components/LineField/index.vue'
+import MchAccount from '@/views/mch/index/components/MchAccount.vue'
+
 export default {
-  name: 'MchIndex'
+  name: 'MchIndex',
+  components: { MchAccount, LineField, MchUserProfile, MchRechargeCountReport },
+  computed: {
+    ...mapGetters(['name'])
+  }
 }
 </script>
 
 <style scoped>
-
+.hello {
+  font-size: 20px;
+  margin: 0.5em 0;
+}
 </style>
diff --git a/src/views/mch/receiveBill/index.vue b/src/views/mch/receiveBill/index.vue
index 5e30dce..c608ac4 100644
--- a/src/views/mch/receiveBill/index.vue
+++ b/src/views/mch/receiveBill/index.vue
@@ -197,8 +197,7 @@ export default {
         {key: 'billId', visible: true, label: '编号', minWidth: "50", sortable: true, overflow: false, align: 'center'},
         {key: 'deviceId', visible: true, label: '设备', minWidth: null, sortable: true, overflow: false, align: 'center'},
         {key: 'type', visible: true, label: '账单类型', minWidth: null, sortable: true, overflow: false, align: 'center'},
-        {key: 'billTime', visible: true, label: '账单时间', minWidth: "100", sortable: false, overflow: false, align: 'center'},
-        {key: 'status', visible: true, label: '账单状态', minWidth: null, sortable: true, overflow: false, align: 'center'},
+        {key: 'billTime', visible: true, label: '账期', minWidth: "100", sortable: false, overflow: false, align: 'center'},
         {key: 'amount', visible: true, label: '账单金额', minWidth: null, sortable: true, overflow: false, align: 'center'},
         {key: 'receivedAmount', visible: true, label: '已付金额', minWidth: null, sortable: true, overflow: false, align: 'center'},
         {key: 'description', visible: true, label: '账单描述', minWidth: "300", sortable: true, overflow: false, align: 'center'},
diff --git a/src/views/ss/receiveBill/index.vue b/src/views/ss/receiveBill/index.vue
index dd00803..da0839d 100644
--- a/src/views/ss/receiveBill/index.vue
+++ b/src/views/ss/receiveBill/index.vue
@@ -206,7 +206,7 @@ export default {
         {key: 'userName', visible: true, label: '用户名称', minWidth: null, sortable: true, overflow: false, align: 'center'},
         {key: 'deviceId', visible: true, label: '设备', minWidth: null, sortable: true, overflow: false, align: 'center'},
         {key: 'type', visible: true, label: '账单类型', minWidth: null, sortable: true, overflow: false, align: 'center'},
-        {key: 'billTime', visible: true, label: '账单时间', minWidth: "100", sortable: false, overflow: false, align: 'center'},
+        {key: 'billTime', visible: true, label: '账期', minWidth: "100", sortable: false, overflow: false, align: 'center'},
         {key: 'status', visible: true, label: '账单状态', minWidth: null, sortable: true, overflow: false, align: 'center'},
         {key: 'amount', visible: true, label: '账单金额', minWidth: null, sortable: true, overflow: false, align: 'center'},
         {key: 'receivedAmount', visible: true, label: '已收金额', minWidth: null, sortable: true, overflow: false, align: 'center'},
diff --git a/src/views/system/smUser/components/userRechargeReport.vue b/src/views/system/smUser/components/userRechargeReport.vue
index 7478a8f..6948c16 100644
--- a/src/views/system/smUser/components/userRechargeReport.vue
+++ b/src/views/system/smUser/components/userRechargeReport.vue
@@ -48,7 +48,6 @@ export default {
   methods: {
     // 当年份发生变化
     onChangeYear(year) {
-      console.log(year);
       this.queryParams.year = year;
       this.getReportData(this.mchId);
     },
diff --git a/src/views/system/smUser/detail.vue b/src/views/system/smUser/detail.vue
index f41d577..dbdfc1e 100644
--- a/src/views/system/smUser/detail.vue
+++ b/src/views/system/smUser/detail.vue
@@ -29,7 +29,7 @@
                   <el-descriptions-item label="提现服务费">
                     <template v-if="userData.withdrawServiceRate == null || userData.withdrawServiceType == null">跟随渠道</template>
                     <template v-else>
-                      <dict-tag :options="dict.type.service_type" :value="userData.withdrawServiceType" size="mini"/>
+                      <dict-tag :options="dict.type.withdraw_service_type" :value="userData.withdrawServiceType" size="mini"/>
                       {{userData.withdrawServiceRate}} {{serviceUnit(userData.withdrawServiceType)}}
                     </template>
                   </el-descriptions-item>
@@ -96,7 +96,7 @@ export default {
   name: 'User/:userId',
   mixins: [$view, $serviceType],
   components: { Suit, Account, RecordBalance, Store, Access, UserRechargeReport, UserAccount, UserDevice, LineChart},
-  dicts: ['sm_user_type', 'service_type'],
+  dicts: ['sm_user_type', 'service_type', 'withdraw_service_type'],
   computed: {
     serviceUnit() {
       return (type) => {