Merge branch 'dev-liveSix-20200817' of...

Merge branch 'dev-liveSix-20200817' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-liveSix-20200817

src/components/yqrange/mebman.vue

@@ -7,7 +7,7 @@
         <span class="text inlin" @click="goBalck">黑名单</span>
       </el-col>
       <el-col :span="4" class="mm-r">
-        <span class="text" @click="goManger" v-if="role">设置管理员</span>
+        <span class="text" @click="goManger" v-if="role == 1">设置管理员</span>
       </el-col>
     </el-row>
     <div class="member-main">
@@ -93,7 +93,15 @@ export default {
       this.$router.push(`/blacklist-manage?circleId=${this.circleId}&circleName=${this.circleName}`)
     },
     getRole() {
-      this.role = localStorage.getItem("highMainManager") || localStorage.getItem("mainManager") || (localStorage.getItem("storageIdType") == 1 ? 1 : 0)
+      if (localStorage.getItem("highMainManager") == 1 || localStorage.getItem("mainManager") == 1 || localStorage.getItem("storageIdType") == 1) {
+        this.role = 1
+        console.log('===================显示=================');
+        console.log(this.role);
+      } else {
+        this.role = 0
+        console.log('===================不显示=================');
+        console.log(this.role);
+      }
     },
     refreshRenYuan() {
       this.$refs.renyaun.initRange()

src/components/yqrange/member-management/renyuan.vue

@@ -270,6 +270,7 @@ export default {
             message: '删除成功!'
           });
           this.deleteVisible = false
+          this.formOrganization.pageNum = 1;
           this.getList()
         }).catch(() => {
           this.$message.error('删除失败，请稍后重试');

src/utils/filter.js

@@ -492,9 +492,9 @@ const vueFilter = {
         }else if (value == 20) {
             return ''
         }else if (value == 30) {
-          return '上线'
+          return '已上线'
         } else if (value == 40) {
-          return '下线'
+          return '已下线'
         }else if (value == 50) {
           return '已解散'
         }else {

src/views/yqrange/admin-manage.vue

@@ -244,7 +244,7 @@ export default {
       });
       }
       if (row.roleId == 1) {
-            this.$confirm(`确定要将管理员员“${row.name}”降为普通成员？`, '提示', {
+            this.$confirm(`确定要将管理员“${row.name}”降为普通成员？`, '提示', {
         confirmButtonText: '确 定',
         cancelButtonText: '取消',
         type: 'warning',