From f177e9729088121310772a71cd91423fa67587b9 Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Fri, 20 Oct 2023 15:54:44 +0800
Subject: [PATCH] 1

---
 src/components/merchantManagement/memberInfo.vue   |  5 +-
 .../usercenter/components/dataStatistics.vue       | 62 ++++++++++------------
 2 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/src/components/merchantManagement/memberInfo.vue b/src/components/merchantManagement/memberInfo.vue
index 5c880a2..1bea7aa 100644
--- a/src/components/merchantManagement/memberInfo.vue
+++ b/src/components/merchantManagement/memberInfo.vue
@@ -86,7 +86,6 @@
           <a-col :span="4">角色：</a-col>
           <a-col :span="18">{{ currentMember.role }}</a-col>
         </a-row>
-
         <a-row style="margin-bottom:24px">
           <a-col :span="4">权限：</a-col>
           <a-col :span="18">{{ currentMember.permission }}</a-col>
@@ -490,8 +489,8 @@ export default {
             agencyRole: this.currentMember.agencyRole + '',
             aliasName: this.currentMember.aliasName,
             tel: this.currentMember.tel,
-            permission: this.currentMember.permission,
             group: this.currentMember.group,
+            agencyTeamId: this.currentMember.agencyTeamName,
           })
         }, 200)
       } else if (type == 'detail') {
@@ -553,7 +552,7 @@ export default {
               if (data.status == 200) {
                 this.$message.success('修改成功')
                 this.visible = false
-                this.permission = getAgencyPermissionsByRole(1)
+                this.permission = getAgencyPermissionsByRole()
                 this.permissionName = getAgencyPermissionNameById(this.permission)
                 this.getMemberList()
               } else {
diff --git a/src/components/userinfo/usercenter/components/dataStatistics.vue b/src/components/userinfo/usercenter/components/dataStatistics.vue
index 858c231..f1b9ced 100644
--- a/src/components/userinfo/usercenter/components/dataStatistics.vue
+++ b/src/components/userinfo/usercenter/components/dataStatistics.vue
@@ -379,25 +379,25 @@ export default {
           // scopedSlots: { customRender: 'userName' },
           customRender: (text, row, index) => {
             let sex
-			if(row.sex == '1'){
-				sex ='男'
-			}else if(row.sex == '2'){
-				sex = '女'
-			}else{
-				sex = "未知"
-			}
+            if (row.sex == '1') {
+              sex = '男'
+            } else if (row.sex == '2') {
+              sex = '女'
+            } else {
+              sex = '未知'
+            }
             // switch (row.sex) {
-            //   case 0:
+            //   case '0':
             //     sex = '男女不限'
-            //   case 1:
+            //   case '1':
             //     sex = '男'
-            //   case 2:
+            //   case '2':
             //     sex = '女'
 
             //   default:
             //     break
             // }
-            return text.trim() + '/' + (sex ? sex + '/' : '') + (row.age ? row.age + '/' : '') + (row.nation ? row.nation : '')
+            return text.trim() + (sex ? '/' + sex : '') + (row.age ? '/' + row.age : '') + (row.nation ? '/' + row.nation : '')
           },
         },
         // {
@@ -816,10 +816,10 @@ export default {
 </script>
 
 <style scoped lang="less">
-	table {
-	    font-size: 14px;
-	}
-	
+table {
+  font-size: 14px;
+}
+
 .dataStatisticsContainer {
   height: 100%;
 
@@ -866,22 +866,21 @@ export default {
   }
 }
 
-/deep/ .ant-table-thead > tr > th, /deep/ .ant-table-tbody > tr > td {
-   padding: 12px 8px !important;
-	}
-
+/deep/ .ant-table-thead > tr > th,
+/deep/ .ant-table-tbody > tr > td {
+  padding: 12px 8px !important;
+}
 
-/deep/ .ant-table.ant-table-fixed-header .ant-table-scroll .ant-table-header{
-		overflow: auto !important;
-		margin-bottom: -20px !important;
-		    padding-bottom: 20px !important;
-	}
+/deep/ .ant-table.ant-table-fixed-header .ant-table-scroll .ant-table-header {
+  overflow: auto !important;
+  margin-bottom: -20px !important;
+  padding-bottom: 20px !important;
+}
 
 /deep/ .ant-table {
-	table{
-		font-size: 14px;
-		
-	}
+  table {
+    font-size: 14px;
+  }
   .ant-table-pagination.ant-pagination {
     float: unset;
     text-align: center;
@@ -968,14 +967,14 @@ export default {
   /deep/.ant-table-body {
     .ant-table-thead {
       .ant-table-row-cell-break-word {
-        padding:12px 8px;
+        padding: 12px 8px;
         // text-align: center;
       }
     }
     .ant-table-tbody {
       > tr > td {
         font-size: 14px;
-        padding:12px 8px;
+        padding: 12px 8px;
         // height: 20px;
         // display: inline-block;
         // padding: 0px 16px;
@@ -992,10 +991,7 @@ export default {
   }
 }
 
-
 .dataTable {
-
-	
   /deep/.ant-table-tbody {
     > tr > td {
       font-size: 14px;