Merge branch 'master' of http://git.shengws.com/csx/Pad_New

src/api/admin_user.js

@@ -173,6 +173,20 @@ export function GetFunctionRoleInfo(params){
 
 
 
+export function GetAllRole(){
+  return request({
+    url:'/m/api/role',
+    method:'get',
+  })
+}
+
+
+
+
+
+
+
+
 
 
 

src/pages/console/managementConsole/staff_role/editRole/index.vue

@@ -40,7 +40,8 @@
 
 <script>
   import {setRem} from "@/libs/functionRem";
-  import {GetAllPurview,GetRoleInfo,EditRoleInfo,DeleteRoleInfo,EditPurview} from "@/api/admin_user";
+  import {GetAllPurview,GetRoleInfo,EditRoleInfo,DeleteRoleInfo,EditPurview,GetAllRole} from "@/api/admin_user";
+  import {Dialog} from "vant";
 
   export default {
     data() {
@@ -64,7 +65,7 @@
         let purview_ids  = ""
         let type = 0
         if (value.pid == 0){ //当前页面只存在pid为0的数据，而且会出现开关按钮的情况只会是拥有一个子节点
-          console.log(value.sub_purview)
+
           if(value.sub_purview.length > 0) {
 
             purview_ids = value.id + "," + value.sub_purview[0].id
@@ -117,24 +118,27 @@
 
       },
       del(){
-        let params = {
-          role_id: this.$route.query.id,
-          enable:false,
-        }
-        DeleteRoleInfo(params).then(response => {
-          if (response.data.state === 1) {
-            this.$toast({
-              message: "删除成功"
-            });
-            this.$router.go(-1)
-          } else {
-            this.$toast({
-              message: response.data.msg
-            });
+        Dialog.confirm({
+          message: "是否删除该角色？"
+        }).then(() => {
+          let params = {
+            role_id: this.$route.query.id,
+            enable:false,
           }
-        });
-
+          DeleteRoleInfo(params).then(response => {
+            if (response.data.state === 1) {
+              this.$toast({
+                message: "删除成功"
+              });
+              this.$router.go(-1)
+            } else {
+              this.$toast({
+                message: response.data.msg
+              });
+            }
+          });
 
+        });
       },
       editRole(){
         let params = {

src/pages/console/managementConsole/staff_role/privilegeManagement/index.vue

@@ -52,7 +52,7 @@
 
 <script>
   // import "../libs/rem.js";
-  import {AdminInitData} from "@/api/admin_user";
+  import {GetAllRole} from "@/api/admin_user";
   import {setRem} from "@/libs/functionRem";
 
   export default {
@@ -63,7 +63,7 @@
     },
     methods: {
       GetInitRoles() {
-        AdminInitData().then(response => {
+        GetAllRole().then(response => {
           if (response.data.state === 1) {
             console.log(response.data.data.roles.length)
             for (let i = 0; i < response.data.data.roles.length; i++) {

src/pages/homeIndex/index.vue

@@ -46,7 +46,7 @@
     <div class="background1"></div>
 
 
-    <div class="management" v-if="this.$store.getters.user.admin.id ==  this.$store.getters.user.org.creator&&this.isCreateOrg">
+    <div class="management" v-if="(this.$store.getters.user.admin.id == this.$store.getters.user.org.creator&&this.isCreateOrg) || (this.isSubSuperAdmin)">
       <div class="managementTitle">
         <div class="managementName">
           管理控制台
@@ -127,6 +127,7 @@
       return {
         value1: 0,
         isCreateOrg: false,
+        isSubSuperAdmin:false,
         org_arr: [],
         banners: [],
         apps: [],
@@ -283,6 +284,8 @@
         GetHomeData().then(response => {
           if (response.data.state === 1) {
             this.isCreateOrg = response.data.data.isCreateOrg
+            this.isSubSuperAdmin = response.data.data.isSubSuperAdmin
+
             if(this.isCreateOrg){
               this.orgs = response.data.data.orgs
               this.apps = response.data.data.apps

src/pages/my/modifyPassword.vue

@@ -15,6 +15,7 @@
               v-model="forgetForm.phone"
               v-on:input="watchNum"
               maxlength="11"
+              readonly
               @input="change(forgetForm.phone)"
             ></el-input>
           </div>

src/permission.js

@@ -2,7 +2,7 @@ import router from "./router";
 import store from "./store";
 import  isLogin  from "@/api/login";
 
-const loginWhiteList = ["/", "/login", "/privacy", "/forgetPassword", "/userAgreement","/myIndex","/patients","/addPatints","/nopassword","/forget","/register","/setname",'/join','/createorg']; // 登录验证白名单
+const loginWhiteList = ["/", "/login", "/privacy", "/forgetPassword", "/userAgreement","/nopassword","/forget","/register","/setname",'/join','/createorg']; // 登录验证白名单
 
 router.beforeEach((to, from, next) => {
   // 线上注释