From 54d2fe5116b7bde9db00d45fc5642860b05838b2 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 30 Jul 2020 09:44:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A6=86=E5=B1=B1user=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=88=B0=E6=B3=B8=E5=B7=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/user/fail-authentication.vue      |  2 +-
 .../user/hasAuthenticationpartymembers.vue    |  2 +-
 .../user/party-wait-authentication.vue        |  4 +--
 .../modules/user/pass-authentication.vue      |  6 ++--
 src/views/modules/user/unauthorized.vue       | 29 +++++++++++--------
 .../modules/user/volunteerinfo-check.vue      |  2 +-
 src/views/modules/user/volunteerinfo.vue      | 10 +++++--
 .../modules/user/wait-authentication.vue      |  5 +++-
 8 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/src/views/modules/user/fail-authentication.vue b/src/views/modules/user/fail-authentication.vue
index 8dd3d02..1acd562 100644
--- a/src/views/modules/user/fail-authentication.vue
+++ b/src/views/modules/user/fail-authentication.vue
@@ -89,8 +89,8 @@
                          width="50px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
         <el-table-column prop="realName"
                          label="真实姓名"
-                         header-align="center"
                          width="80"
+                         header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="mobile"
                          label="手机号"
diff --git a/src/views/modules/user/hasAuthenticationpartymembers.vue b/src/views/modules/user/hasAuthenticationpartymembers.vue
index b7d6b46..9b4ee7c 100644
--- a/src/views/modules/user/hasAuthenticationpartymembers.vue
+++ b/src/views/modules/user/hasAuthenticationpartymembers.vue
@@ -72,8 +72,8 @@
                          width="50"></el-table-column>
         <el-table-column prop="realName"
                          label="姓名"
-                         header-align="center"
                          width="80"
+                         header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="mobile"
                          label="手机号"
diff --git a/src/views/modules/user/party-wait-authentication.vue b/src/views/modules/user/party-wait-authentication.vue
index 07fc218..8177469 100644
--- a/src/views/modules/user/party-wait-authentication.vue
+++ b/src/views/modules/user/party-wait-authentication.vue
@@ -102,13 +102,13 @@
                          min-width="200"
                          show-overflow-tooltip
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="left"></el-table-column>
         <el-table-column prop="address"
                          label="居住地址"
                          min-width="180"
                          show-overflow-tooltip
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="left"></el-table-column>
         <el-table-column prop="updatedTime"
                          label="提交时间"
                          width="160"
diff --git a/src/views/modules/user/pass-authentication.vue b/src/views/modules/user/pass-authentication.vue
index 7e74c21..87e419e 100644
--- a/src/views/modules/user/pass-authentication.vue
+++ b/src/views/modules/user/pass-authentication.vue
@@ -86,7 +86,7 @@
                          align="center"
                          width="50"></el-table-column>
         <el-table-column label="序号"
-                         width="50px"><template slot-scope="scope"> {{scope.$index+1}} </template></el-table-column>
+                         width="70px"><template slot-scope="scope"> {{scope.$index+1}} </template></el-table-column>
         <el-table-column prop="realName"
                          label="真实姓名"
                          width="80"
@@ -110,9 +110,7 @@
         <el-table-column prop="address"
                          label="居住地址"
                          header-align="center"
-                         min-width="400"
-                         show-overflow-tooltip
-                         align="left"></el-table-column>
+                         align="center"></el-table-column>
         <el-table-column :label="$t('handle')"
                          fixed="right"
                          header-align="center"
diff --git a/src/views/modules/user/unauthorized.vue b/src/views/modules/user/unauthorized.vue
index e3f7a46..a762a84 100644
--- a/src/views/modules/user/unauthorized.vue
+++ b/src/views/modules/user/unauthorized.vue
@@ -52,11 +52,11 @@
                     placeholder="请输入"
                     clearable></el-input>
         </el-form-item>
-        <el-form-item label="手机号">
-          <el-input v-model="dataForm.mobile"
-                    placeholder="请输入"
-                    clearable></el-input>
-        </el-form-item>
+<!--        <el-form-item label="手机号">-->
+<!--          <el-input v-model="dataForm.mobile"-->
+<!--                    placeholder="请输入"-->
+<!--                    clearable></el-input>-->
+<!--        </el-form-item>-->
         <!-- <div class="block"> -->
         <span class="demonstration">注册时间</span>&nbsp;&nbsp;
         <el-date-picker @change='setRegistTime'
@@ -96,10 +96,10 @@
                          label="昵称"
                          header-align="center"
                          align="center"></el-table-column>
-        <el-table-column prop="mobile"
-                         label="手机号"
-                         header-align="center"
-                         align="center"></el-table-column>
+<!--        <el-table-column prop="mobile"-->
+<!--                         label="手机号"-->
+<!--                         header-align="center"-->
+<!--                         align="center"></el-table-column>-->
         <el-table-column prop="realName"
                          label="真实姓名"
                          header-align="center"
@@ -169,6 +169,7 @@ export default {
         streetId: '',
         communityId: '',
         gridId: '',
+        deptId:'',
         realName: '',
         mobile: '',
         identityNo: '',
@@ -208,21 +209,25 @@ export default {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
         this.dataForm.gridId = ''
-      }
+        this.dataForm.deptId = ''
+      }else
       if (val.length === 1) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = ''
         this.dataForm.gridId = ''
-      }
+        this.dataForm.deptId = this.deptIdList[0]
+      }else
       if (val.length === 2) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = this.deptIdList[1]
         this.dataForm.gridId = ''
-      }
+        this.dataForm.deptId = this.deptIdList[1]
+      }else
       if (val.length === 3) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = this.deptIdList[1]
         this.dataForm.gridId = this.deptIdList[2]
+        this.dataForm.deptId = this.deptIdList[2]
       }
     }
   },
diff --git a/src/views/modules/user/volunteerinfo-check.vue b/src/views/modules/user/volunteerinfo-check.vue
index fea42c7..ef1e234 100644
--- a/src/views/modules/user/volunteerinfo-check.vue
+++ b/src/views/modules/user/volunteerinfo-check.vue
@@ -8,7 +8,7 @@
              ref="dataForm"
              v-if="clickStatus === 1"
              @keyup.enter.native="dataFormSubmitHandle()"
-             :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+             :label-width="$i18n.locale === 'en-US' ? '140px' : '120px'">
       <el-form-item label="审核 :"
                     prop="auditStatus">
         <template>
diff --git a/src/views/modules/user/volunteerinfo.vue b/src/views/modules/user/volunteerinfo.vue
index eae94e3..612f6ca 100644
--- a/src/views/modules/user/volunteerinfo.vue
+++ b/src/views/modules/user/volunteerinfo.vue
@@ -66,9 +66,9 @@
                          align="center"></el-table-column>
         <el-table-column prop="auditStatus"
                          label="状态"
+                         width="110"
                          :formatter="auditStatusState"
                          header-align="center"
-                         width="110"
                          align="center"></el-table-column>
         <el-table-column prop="kindnessTime"
                          label="爱心时长"
@@ -80,6 +80,10 @@
                          header-align="center"
                          width="55"
                          align="center"></el-table-column>
+        <el-table-column prop="points"
+                         label="积分"
+                         header-align="center"
+                         align="center"></el-table-column>
         <el-table-column :label="$t('handle')"
                          fixed="right"
                          header-align="center"
@@ -244,10 +248,10 @@ export default {
       })
     },
     // 积分记录
-    pointsLogs (id) {
+    pointsLogs (userId) {
       this.volunteerPointsLogVisible = true
       this.$nextTick(() => {
-        this.$refs.volunteerPointsLog.dataForm.volunteerId = id
+        this.$refs.volunteerPointsLog.dataForm.userId = userId
         this.$refs.volunteerPointsLog.init()
       })
     },
diff --git a/src/views/modules/user/wait-authentication.vue b/src/views/modules/user/wait-authentication.vue
index 608ce11..a36c327 100644
--- a/src/views/modules/user/wait-authentication.vue
+++ b/src/views/modules/user/wait-authentication.vue
@@ -89,7 +89,6 @@
                          width="70px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
         <el-table-column prop="realName"
                          label="真实姓名"
-                         width="80"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="mobile"
@@ -97,6 +96,10 @@
                          width="110"
                          header-align="center"
                          align="center"></el-table-column>
+        <!--<el-table-column prop="identityNo"-->
+                         <!--label="身份证号"-->
+                         <!--header-align="center"-->
+                         <!--align="center"></el-table-column>-->
         <el-table-column prop="createdTime"
                          label="注册时间"
                          width="180"