From 902904a693ed867fe7f1514dd8eedc7cf01bdfc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com>
Date: Wed, 4 Sep 2024 10:56:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0gif?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ImageUpload/index.vue |  2 +-
 src/views/mch/recharge/detail.vue    |  5 ++++-
 src/views/mch/user/index.vue         | 19 ++++---------------
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index addaf90..e3a307d 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -67,7 +67,7 @@ export default {
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {
       type: Array,
-      default: () => ["png", "jpg", "jpeg"],
+      default: () => ["png", "jpg", "jpeg", "gif"],
     },
     // 是否显示提示
     isShowTip: {
diff --git a/src/views/mch/recharge/detail.vue b/src/views/mch/recharge/detail.vue
index 723795f..aa7e2e4 100644
--- a/src/views/mch/recharge/detail.vue
+++ b/src/views/mch/recharge/detail.vue
@@ -8,7 +8,10 @@
             <el-descriptions-item label="交易状态">
               <dict-tag :value="detail.status" :options="dict.type.sm_transaction_bill_status" size="small"/>
             </el-descriptions-item>
-            <el-descriptions-item label="订单金额">{{detail.money | money | defaultValue}} 元</el-descriptions-item>
+            <el-descriptions-item label="订单金额">
+              {{detail.money | money | defaultValue}} 元
+              <template v-if="detail.refundAmount > 0">（退款 {{detail.refundAmount | money | defaultValue}} 元）</template>
+            </el-descriptions-item>
             <el-descriptions-item label="设备编号">
               <device-link :id="detail.deviceId" :text="detail.deviceNo"/>
             </el-descriptions-item>
diff --git a/src/views/mch/user/index.vue b/src/views/mch/user/index.vue
index 1db6528..62c537f 100644
--- a/src/views/mch/user/index.vue
+++ b/src/views/mch/user/index.vue
@@ -83,9 +83,6 @@
             <template v-else-if="['billAmount', 'provideBonus'].includes(column.key)">
               {{d.row[column.key] | money | defaultValue}} 元
             </template>
-            <template v-else-if="column.key === 'status'">
-              <dict-tag :options="dict.type.sm_user_status" :value="d.row.status"/>
-            </template>
             <template v-else-if="column.key === 'deviceAdmin'">
               <el-tag :type="d.row.deviceAdmin ? 'danger' : 'info'">{{d.row.deviceAdmin ? '是' : '否'}}</el-tag>
             </template>
@@ -119,21 +116,13 @@
 </template>
 
 <script>
-import {
-  listSmUser,
-  getSmUser,
-  addSmUser,
-  updateSmUser,
-  delSmUser, listAgent, listBiz, listInvestor, listStoreUser
-} from '@/api/system/smUser'
 import { $serviceType, $showColumns, $withdrawServiceType } from '@/utils/mixins'
 import UserLink from '@/components/Business/SmUser/UserLink.vue'
 import UserInput from '@/components/Business/SmUser/UserInput.vue'
 import DeptTreeSelect from '@/components/Business/Dept/DeptTreeSelect.vue'
-import { FieldName, SmUserType, UserType } from '@/utils/constants'
+import { FieldName, SmUserType } from '@/utils/constants'
 import { mapGetters } from 'vuex'
 import { agentListAgent, agentListBiz, agentListInvestor } from '@/api/agent/user'
-import SmUser from '@/views/system/smUser/index.vue'
 import { bizListBiz, bizListInvestor } from '@/api/biz/user'
 
 const defaultSort = {
@@ -144,7 +133,7 @@ const defaultSort = {
 export default {
   name: "MchUser",
   mixins: [$showColumns, $serviceType, $withdrawServiceType],
-  dicts: ['sm_user_status', 'user_type', 'sys_user_sex', 'service_type', 'withdraw_service_type'],
+  dicts: ['user_type', 'sys_user_sex', 'service_type', 'withdraw_service_type'],
   components: { DeptTreeSelect, UserInput, UserLink },
   props: {
     query: {
@@ -199,8 +188,8 @@ export default {
         {key: 'type', visible: true, label: '角色', align: 'center', minWidth: null, sortable: true, width: null},
         {key: 'point', visible: true, label: '分成', align: 'center', minWidth: null, sortable: true, width: null},
         {key: 'referenceId', visible: true, label: '推广人', align: 'center', minWidth: null, sortable: true, width: null},
-        {key: 'status', visible: true, label: '状态', align: 'center', minWidth: null, sortable: true, width: null},
-        {key: 'createTime', visible: true, label: '注册时间', align: 'center', minWidth: null, sortable: true, width: "100"},
+        // {key: 'status', visible: true, label: '状态', align: 'center', minWidth: null, sortable: true, width: null},
+        // {key: 'createTime', visible: true, label: '注册时间', align: 'center', minWidth: null, sortable: true, width: "100"},
         {key: 'agentCount', visible: true, label: `${FieldName.AGENT}数`, align: 'center', minWidth: null, sortable: false, width: null},
         {key: 'bizManCount', visible: true, label: `${FieldName.BIZ}数`, align: 'center', minWidth: null, sortable: false, width: null},
         {key: 'investorCount', visible: true, label: `${FieldName.INVESTOR}数`, align: 'center', minWidth: null, sortable: false, width: null},