From 14a39a4ff9afa86d3ab18f20c1d1a35ff870437d Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Tue, 10 Dec 2019 10:03:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=9C=AA=E8=AE=A4=E8=AF=81=E3=80=81=E5=BE=85=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/unauthorized.vue       | 3 ++-
 src/views/modules/user/user-add-or-update.vue | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/user/unauthorized.vue b/src/views/modules/user/unauthorized.vue
index 859c138b..a4f76e30 100644
--- a/src/views/modules/user/unauthorized.vue
+++ b/src/views/modules/user/unauthorized.vue
@@ -26,6 +26,7 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="昵称"><el-input v-model="dataForm.nickname" 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' v-model="time" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>&nbsp;
@@ -40,8 +41,8 @@
                 <el-table-column label="序号" width="70px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
                 <el-table-column prop="myGridName" label="所属网格（街道-社区-网格）" header-align="center" align="center" v-if="false"></el-table-column>
                 <el-table-column prop="nickname" 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" align="center" v-if="false"></el-table-column>
-                <el-table-column prop="mobile" label="手机号" header-align="center" align="center" v-if="false"></el-table-column>
                 <el-table-column prop="identityNo" label="身份证号" header-align="center" align="center" v-if="false"></el-table-column>
                 <el-table-column prop="registerTime" label="加入网格时间" header-align="center" align="center"></el-table-column>
                 <el-table-column prop="state" label="注册状态" :formatter="formatState" header-align="center" align="center"></el-table-column>
diff --git a/src/views/modules/user/user-add-or-update.vue b/src/views/modules/user/user-add-or-update.vue
index 9ee07c7b..622aafe9 100644
--- a/src/views/modules/user/user-add-or-update.vue
+++ b/src/views/modules/user/user-add-or-update.vue
@@ -27,7 +27,7 @@
                     v-if="true">
         <span>累计提交认证{{dataForm.totalSubmitNum}}次&nbsp;&nbsp;&nbsp;通过{{dataForm.totalPassSubmitNum}}次,&nbsp;不通过{{dataForm.totalFailNum}}次</span>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-        <el-button v-if="dataForm.totalSubmitNum>0" type="text" size="small" @click="userAuthenticateHistoryListHandle(dataForm.id)">查看详情</el-button>
+        <el-button  type="text" size="small" @click="userAuthenticateHistoryListHandle(dataForm.id)">查看详情</el-button>
       </el-form-item>
       <el-form-item label="居民住址"
                     prop="address">
@@ -236,6 +236,9 @@ export default {
     },
     // 查看详情
     userAuthenticateHistoryListHandle (userId) {
+      if (!this.dataForm.totalSubmitNum > 0) {
+        return this.$message.error('累计提交' + this.dataForm.totalSubmitNum + '次,没有认证历史记录')
+      }
       this.authenticateHistoryVisible = true
       this.$nextTick(() => {
         this.$refs.authenticateHistory.dataForm.userId = userId

From ea939329f2235024e700e60f47677630ad6fb943 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Tue, 10 Dec 2019 17:44:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=82=B9=E8=B5=9E?=
 =?UTF-8?q?=E7=82=B9=E8=B8=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/news/news.vue      | 4 ++--
 src/views/modules/news/newsdraft.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/news/news.vue b/src/views/modules/news/news.vue
index dfe2e3a2..584f8be5 100644
--- a/src/views/modules/news/news.vue
+++ b/src/views/modules/news/news.vue
@@ -110,11 +110,11 @@
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="likeNumber"
-                         label="点赞数"
+                         label="支持数"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="unLikeNumber"
-                         label="点踩数"
+                         label="反对数"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="createdTime"
diff --git a/src/views/modules/news/newsdraft.vue b/src/views/modules/news/newsdraft.vue
index ad4b0794..ae2f78b3 100644
--- a/src/views/modules/news/newsdraft.vue
+++ b/src/views/modules/news/newsdraft.vue
@@ -110,11 +110,11 @@
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="likeNumber"
-                         label="点赞数"
+                         label="支持数"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="unLikeNumber"
-                         label="点踩数"
+                         label="反对数"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="createdTime"