From 7f6f7b43bd85940eb5b75223f2ba72cffdb716ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com>
Date: Sat, 31 Aug 2024 10:45:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ss/mchApply/detail.vue     |  9 ++++++++-
 src/views/ss/recordBalance/index.vue | 13 +++++++++++--
 src/views/system/config/index.vue    |  7 ++++++-
 src/views/system/smUser/index.vue    |  5 ++++-
 src/views/system/withdraw/index.vue  | 15 +++++----------
 5 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/src/views/ss/mchApply/detail.vue b/src/views/ss/mchApply/detail.vue
index ccaa7ae..5d97128 100644
--- a/src/views/ss/mchApply/detail.vue
+++ b/src/views/ss/mchApply/detail.vue
@@ -3,7 +3,14 @@
     <el-card class="box-card">
       <el-descriptions title="申请详情" v-loading="loading">
         <template slot="extra">
-          <el-button type="warning" icon="el-icon-s-check" plain @click="handleVerify" v-if="isApproving">审核</el-button>
+          <el-button
+            type="warning"
+            icon="el-icon-s-check"
+            plain
+            @click="handleVerify"
+            v-has-permi="['ss:mchApply:verify']"
+            v-show="isApproving"
+          >审核</el-button>
         </template>
         <el-descriptions-item label="申请用户">{{detail.userName | defaultValue}}</el-descriptions-item>
         <el-descriptions-item label="申请时间">{{detail.createTime | defaultValue}}</el-descriptions-item>
diff --git a/src/views/ss/recordBalance/index.vue b/src/views/ss/recordBalance/index.vue
index 293d2aa..d7f543d 100644
--- a/src/views/ss/recordBalance/index.vue
+++ b/src/views/ss/recordBalance/index.vue
@@ -3,7 +3,7 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="用户名称" prop="userName" v-if="notHasView(views.user)">
         <el-input
-          v-model="queryParams.userId"
+          v-model="queryParams.userName"
           placeholder="请输入用户名称"
           clearable
           @keyup.enter.native="handleQuery"
@@ -93,7 +93,16 @@
       </el-table-column>
       <el-table-column label="变动时间" align="center" prop="createTime" sortable="custom" :sort-orders="orderSorts"  v-if="isShow('createTime')"/>
       <el-table-column label="变动金额" align="center" prop="beforeBalance" sortable="custom" :sort-orders="orderSorts"  v-if="isShow('amount')">
-        <template slot-scope="d">{{d.row.amount | money}} 元</template>
+        <template slot-scope="d">
+          <span v-if="d.row.amount >= 0" style="color: red;font-weight: bold;">
+            +{{d.row.amount | money}} 元
+            <svg-icon icon-class="up"/>
+          </span>
+          <span v-else style="color: green;font-weight: bold;">
+            {{d.row.amount | money}} 元
+            <svg-icon icon-class="down"/>
+          </span>
+        </template>
       </el-table-column>
       <el-table-column label="变动前余额" align="center" prop="beforeBalance" sortable="custom" :sort-orders="orderSorts"  v-if="isShow('beforeBalance')">
         <template slot-scope="d">{{d.row.beforeBalance | money}} 元</template>
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 3ab81fc..0e9207f 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -114,6 +114,7 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column label="权限" align="center" prop="permission"/>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -159,6 +160,9 @@
         <el-form-item label="参数键值" prop="configValue">
           <el-input v-model="form.configValue" placeholder="请输入参数键值" />
         </el-form-item>
+        <el-form-item label="修改权限" prop="permission">
+          <el-input v-model="form.permission" placeholder="请输入修改所需的权限" />
+        </el-form-item>
         <el-form-item label="系统内置" prop="configType">
           <el-radio-group v-model="form.configType">
             <el-radio
@@ -259,7 +263,8 @@ export default {
         configKey: undefined,
         configValue: undefined,
         configType: "Y",
-        remark: undefined
+        remark: undefined,
+        permission: null,
       };
       this.resetForm("form");
     },
diff --git a/src/views/system/smUser/index.vue b/src/views/system/smUser/index.vue
index 2c74fc9..4ace659 100644
--- a/src/views/system/smUser/index.vue
+++ b/src/views/system/smUser/index.vue
@@ -102,12 +102,15 @@
             </template>
             <template v-else-if="column.key === 'userName'">
               <user-link :id="d.row.userId" :name="d.row.userName"/>
+              <template v-if="d.row.isReal">({{d.row.realName}})</template>
             </template>
             <template v-else-if="column.key === 'referenceId'">
               <user-link :id="d.row.referenceId" :name="d.row.referenceName"/>
+              <template v-if="d.row.referenceIsReal">({{d.row.referenceRealName}})</template>
             </template>
             <template v-else-if="column.key === 'agentId'">
               <user-link :id="d.row.agentId" :name="d.row.agentName"/>
+              <template v-if="d.row.agentIsReal">({{d.row.agentRealName}})</template>
             </template>
             <template v-else-if="column.key === 'point'">
               {{d.row.point | money | defaultValue}} %
@@ -315,8 +318,8 @@ export default {
       span: 12,
       columns: [
         {key: 'userId', visible: false, label: '用户ID', align: 'center', minWidth: "80", sortable: true, width: null},
-        {key: 'phonenumber', visible: true, label: '手机号码', align: 'center', minWidth: null, sortable: true, width: "120"},
         {key: 'userName', visible: true, label: '用户名称', align: 'center', minWidth: null, sortable: false, width: "120"},
+        {key: 'phonenumber', visible: true, label: '手机号码', align: 'center', minWidth: null, sortable: true, width: "120"},
         {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},
diff --git a/src/views/system/withdraw/index.vue b/src/views/system/withdraw/index.vue
index 86dce8f..0b9ce28 100644
--- a/src/views/system/withdraw/index.vue
+++ b/src/views/system/withdraw/index.vue
@@ -22,6 +22,11 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="打款方式" prop="withdrawType">
+        <el-select v-model="queryParams.withdrawType" clearable placeholder="请选择打款方式" @change="handleQuery">
+          <el-option v-for="dict in dict.type.withdraw_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
       <el-form-item label="申请时间" prop="createDateRange">
         <el-date-picker
           v-model="queryParams.createDateRange"
@@ -44,16 +49,6 @@
           @change="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="提现方式" prop="channelId">
-        <el-select v-model="queryParams.channelId" clearable placeholder="请选择提现方式" @change="handleQuery">
-          <el-option v-for="dict in dict.type.withdraw_channel" :key="dict.value" :label="dict.label" :value="dict.value"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="打款方式" prop="withdrawType">
-        <el-select v-model="queryParams.withdrawType" clearable placeholder="请选择打款方式" @change="handleQuery">
-          <el-option v-for="dict in dict.type.withdraw_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
-        </el-select>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>