From bb5945958bfa27c9d1668c71b8397ada1bcefb23 Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Sat, 21 Oct 2023 15:33:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=92=B1=E5=8C=85=20-=20=E4=BC=98=E5=8C=96=20?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=BA=94=E7=94=A8=20-=20=E8=AF=81=E4=B9=A6?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=A2=9E=E5=8A=A0=E5=BA=94=E7=94=A8=E7=A7=81?=
 =?UTF-8?q?=E9=92=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/pay/wallet/balance/index.ts           |  1 -
 .../member/user/detail/UserAccountInfo.vue    |  2 +-
 .../components/channel/AlipayChannelForm.vue  | 10 ++++++
 src/views/pay/wallet/balance/index.vue        | 35 ++++++-------------
 4 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/src/api/pay/wallet/balance/index.ts b/src/api/pay/wallet/balance/index.ts
index e5f4a1cd..3e5ab369 100644
--- a/src/api/pay/wallet/balance/index.ts
+++ b/src/api/pay/wallet/balance/index.ts
@@ -3,7 +3,6 @@ import request from '@/config/axios'
 /** 用户钱包查询参数 */
 export interface PayWalletUserReqVO {
   userId: number
-  userType: number
 }
 /** 钱包 VO */
 export interface WalletVO {
diff --git a/src/views/member/user/detail/UserAccountInfo.vue b/src/views/member/user/detail/UserAccountInfo.vue
index bb2a06b8..56a6ab63 100644
--- a/src/views/member/user/detail/UserAccountInfo.vue
+++ b/src/views/member/user/detail/UserAccountInfo.vue
@@ -65,7 +65,7 @@ const getUserWallet = async () => {
     wallet.value = WALLET_INIT_DATA
     return
   }
-  const params = { userId: props.user.id, userType: UserTypeEnum.MEMBER }
+  const params = { userId: props.user.id }
   wallet.value = (await WalletApi.getWallet(params)) || WALLET_INIT_DATA
 }
 
diff --git a/src/views/pay/app/components/channel/AlipayChannelForm.vue b/src/views/pay/app/components/channel/AlipayChannelForm.vue
index 46dc4312..169ef8ea 100644
--- a/src/views/pay/app/components/channel/AlipayChannelForm.vue
+++ b/src/views/pay/app/components/channel/AlipayChannelForm.vue
@@ -69,6 +69,16 @@
           </el-form-item>
         </div>
         <div v-if="formData.config.mode === 2">
+          <el-form-item label-width="180px" label="应用私钥" prop="config.privateKey">
+            <el-input
+              type="textarea"
+              :autosize="{ minRows: 8, maxRows: 8 }"
+              v-model="formData.config.privateKey"
+              placeholder="请输入应用私钥"
+              clearable
+              :style="{ width: '100%' }"
+            />
+          </el-form-item>
           <el-form-item label-width="180px" label="商户公钥应用证书" prop="config.appCertContent">
             <el-input
               v-model="formData.config.appCertContent"
diff --git a/src/views/pay/wallet/balance/index.vue b/src/views/pay/wallet/balance/index.vue
index e4c19c6e..296b567b 100644
--- a/src/views/pay/wallet/balance/index.vue
+++ b/src/views/pay/wallet/balance/index.vue
@@ -8,30 +8,15 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="用户编号" prop="userId">
+      <el-form-item label="用户昵称" prop="nickname">
         <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入用户编号"
+          v-model="queryParams.nickname"
+          placeholder="请输入用户昵称"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="用户类型" prop="userType">
-        <el-select
-          v-model="queryParams.userType"
-          placeholder="请选择用户类型"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.USER_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
       <el-form-item label="创建时间" prop="createTime">
         <el-date-picker
           v-model="queryParams.createTime"
@@ -54,7 +39,12 @@
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="用户编号" align="center" prop="userId" />
+      <el-table-column label="用户昵称" align="center" prop="nickname" />
+      <el-table-column label="头像" align="center" prop="avatar" width="80px">
+        <template #default="scope">
+          <img :src="scope.row.avatar" style="width: 40px" />
+        </template>
+      </el-table-column>
       <el-table-column label="用户类型" align="center" prop="userType">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.USER_TYPE" :value="scope.row.userType" />
@@ -116,12 +106,7 @@ const list = ref([]) // 列表的数据
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  userId: null,
-  userType: null,
-  balance: null,
-  totalExpense: null,
-  totalRecharge: null,
-  freezePrice: null,
+  nickname: null,
   createTime: []
 })
 const queryFormRef = ref() // 搜索的表单