解决冲突

package-lock.json

@@ -2332,7 +2332,6 @@
       "resolved": "http://registry.npm.taobao.org/boom/download/boom-2.10.1.tgz",
       "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
       "dev": true,
-      "optional": true,
       "requires": {
         "hoek": "2.x.x"
       }
@@ -5801,8 +5800,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5823,14 +5821,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5845,20 +5841,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5975,8 +5968,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5988,7 +5980,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -6003,7 +5994,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -6011,14 +6001,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -6037,7 +6025,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -6118,8 +6105,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -6131,7 +6117,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -6217,8 +6202,7 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -6254,7 +6238,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -6274,7 +6257,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -6318,14 +6300,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -6783,8 +6763,7 @@
       "version": "2.16.3",
       "resolved": "http://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
       "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "home-or-tmp": {
       "version": "2.0.0",

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

@@ -58,243 +58,252 @@
         </div>
       </div>
     </div>
+
+    <van-overlay :show="loading" type="spinner" size="30px">
+      <div class="wrapper">
+        <van-loading size="24px" vertical>正在加载中...</van-loading>
+      </div>
+    </van-overlay>
   </div>
 </template>
 
+
 <script>
-import { setRem } from "@/libs/functionRem";
-import {
-  GetAllPurview,
-  GetRoleInfo,
-  EditRoleInfo,
-  DeleteRoleInfo,
-  EditPurview,
-  GetAllRole
-} from "@/api/admin_user";
-import { Dialog } from "vant";
-
-export default {
-  data() {
-    return {
-      desc: "",
-      name: "",
-      checked: false,
-      allPurview: [],
-      rolePurview: null,
-      is_system: 0,
-      ids: []
-    };
-  },
-  created() {
-    setRem();
-
-    this.GetAllPurview();
-  },
-  methods: {
-    changePurviewStatus(value) {
-      let purview_ids = "";
-      let type = 0;
-      if (value.pid == 0) {
-        //当前页面只存在pid为0的数据，而且会出现开关按钮的情况只会是拥有一个子节点
-
-        if (value.sub_purview.length > 0) {
-          purview_ids = value.id + "," + value.sub_purview[0].id;
-        } else {
-          purview_ids = value.id;
-        }
-      }
-      if (value.isCheck) {
-        type = 1; //打开
-      } else {
-        type = 2; //关闭
-      }
+  import {setRem} from "@/libs/functionRem";
+  import {GetAllPurview,GetRoleInfo,EditRoleInfo,DeleteRoleInfo,EditPurview,GetAllRole} from "@/api/admin_user";
+  import {Dialog} from "vant";
 
-      let params = {
-        id: this.$route.query.id,
-        purview_id: purview_ids,
-        type: type
+  export default {
+    data() {
+      return {
+        desc: "",
+        name: "",
+        loading:false,
+        checked: false,
+        allPurview: [],
+        rolePurview:null,
+        is_system:0,
+        ids:[],
       };
+    }, created() {
+      setRem()
+      this.GetAllPurview()
 
-      EditPurview(params).then(response => {
-        if (response.data.state === 1) {
-          if (type == 1) {
-            value.isCheck = true;
-          } else {
-            value.isCheck = false;
+
+    }, methods: {
+      changePurviewStatus(value){
+        let purview_ids  = ""
+        let type = 0
+        if (value.pid == 0){ //当前页面只存在pid为0的数据，而且会出现开关按钮的情况只会是拥有一个子节点
+
+          if(value.sub_purview.length > 0) {
+
+            purview_ids = value.id + "," + value.sub_purview[0].id
+          }else{
+            purview_ids = value.id
           }
-        } else {
-          if (type == 1) {
-            value.isCheck = false;
+        }
+        if (value.isCheck){
+          type = 1 //打开
+        }else{
+          type = 2 //关闭
+        }
+
+
+        let params = {
+          id : this.$route.query.id,
+          purview_id:purview_ids,
+          type : type,
+        }
+
+        EditPurview(params).then(response => {
+          if (response.data.state === 1) {
+            if(type == 1){
+              value.isCheck = true
+            }else{
+              value.isCheck = false
+            }
           } else {
-            value.isCheck = true;
+            if(type == 1){
+              value.isCheck = false
+            }else{
+              value.isCheck = true
+            }
+            this.$toast({
+              message: response.data.msg
+            });
           }
-          this.$toast({
-            message: response.data.msg
-          });
-        }
-      });
-    },
-    toSubPurview(purview) {
-      if (purview.module == 3) {
-        this.$router.push({
-          path:
-            "/role/subpurview?id=" +
-            this.$route.query.id +
-            "&pid=" +
-            purview.id +
-            "&module=" +
-            purview.module +
-            "&title=" +
-            purview.name
         });
-      } else if (purview.module == 4 || purview.module == 6) {
-        this.$router.push({
-          path:
-            "/role/otherpurview?id=" +
-            this.$route.query.id +
-            "&pid=" +
-            purview.id +
-            "&module=" +
-            purview.module +
-            "&title=" +
-            purview.name
+
+
+
+      },
+      toSubPurview(purview){
+        if(purview.module == 3) {
+          this.$router.push({path: "/role/subpurview?id=" + this.$route.query.id + "&pid=" + purview.id + "&module=" + purview.module + "&title=" + purview.name})
+        }else if(purview.module == 4 || purview.module == 6){
+          this.$router.push({path: "/role/otherpurview?id=" + this.$route.query.id + "&pid=" + purview.id + "&module=" + purview.module + "&title=" + purview.name})
+
+        }
+
+      },
+      del(){
+        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
+              });
+            }
+          });
+
         });
-      }
-    },
-    del() {
-      Dialog.confirm({
-        message: "是否删除该角色？"
-      }).then(() => {
+      },
+      editRole(){
         let params = {
-          role_id: this.$route.query.id,
-          enable: false
-        };
-        DeleteRoleInfo(params).then(response => {
+          id: this.$route.query.id,
+          desc:this.desc,
+        }
+        EditRoleInfo(params).then(response => {
           if (response.data.state === 1) {
             this.$toast({
-              message: "删除成功"
+              message: "修改成功"
             });
-            this.$router.go(-1);
           } else {
             this.$toast({
               message: response.data.msg
             });
           }
         });
-      });
-    },
-    editRole() {
-      let params = {
-        id: this.$route.query.id,
-        desc: this.desc
-      };
-      EditRoleInfo(params).then(response => {
-        if (response.data.state === 1) {
-          this.$toast({
-            message: "修改成功"
-          });
-        } else {
-          this.$toast({
-            message: response.data.msg
-          });
+
+
+      },
+      GetRoleInfo(role_id) {
+        let params = {
+          id: role_id,
         }
-      });
-    },
-    GetRoleInfo(role_id) {
-      let params = {
-        id: role_id
-      };
-      GetRoleInfo(params).then(response => {
-        if (response.data.state === 1) {
-          this.rolePurview = response.data.data.role_purview;
-          this.name = response.data.data.role.name;
-          this.desc = response.data.data.role.intro;
-          this.is_system = response.data.data.role.is_system;
-
-          this.ids = this.rolePurview.PurviewIds.split(",");
-
-          for (let a = 0; a < this.ids.length; a++) {
-            for (let i = 0; i < this.allPurview.length; i++) {
-              if (parseInt(this.ids[a]) == this.allPurview[i].id) {
-                this.allPurview[i].isCheck = true;
-              }
+        GetRoleInfo(params).then(response => {
+          if (response.data.state === 1) {
+            this.rolePurview = response.data.data.role_purview
+            this.name =  response.data.data.role.name
+            this.desc = response.data.data.role.intro
+            this.is_system = response.data.data.role.is_system
+
+            this.ids = this.rolePurview.PurviewIds.split(',')
+
+            for(let a = 0; a < this.ids.length; a++ ){
+                for (let i = 0; i < this.allPurview.length; i++){
+                  if (parseInt(this.ids[a]) == this.allPurview[i].id){
+                      this.allPurview[i].isCheck = true
+                    }
+                }
             }
+
+            this.loading = false
+
+
+          } else {
+            this.loading = false
+
+            this.$toast({
+              message: response.data.msg
+            });
           }
-        } else {
-          this.$toast({
-            message: response.data.msg
-          });
+        }) .catch(error => {
+          this.loading = false
+
+        });;
+
+      },GetOtherPurview(){
+        let params = {
+          module: 7,
+          id: 0,
         }
-      });
-    },
-    GetOtherPurview() {
-      let params = {
-        module: 7,
-        id: 0
-      };
-      GetAllPurview(params).then(response => {
-        if (response.data.state === 1) {
-          for (let i = 0; i < response.data.data.purviews.length; i++) {
-            response.data.data.purviews[i]["no_sub"] = true;
-            this.allPurview.push(response.data.data.purviews[i]);
+        GetAllPurview(params).then(response => {
+          if (response.data.state === 1) {
+            for (let i = 0; i < response.data.data.purviews.length; i++) {
+              response.data.data.purviews[i]["no_sub"] = true
+              this.allPurview.push(response.data.data.purviews[i])
+            }
+
+          } else {
+            this.$toast({
+              message: response.data.msg
+            });
           }
-        } else {
-          this.$toast({
-            message: response.data.msg
-          });
+        });
+
+      } ,GetAllPurview() {
+        let params = {
+          module: 3,
+          id: 0,
         }
-      });
-    },
-    GetAllPurview() {
-      let params = {
-        module: 3,
-        id: 0
-      };
-      GetAllPurview(params).then(response => {
-        if (response.data.state === 1) {
-          for (let i = 0; i < response.data.data.purviews.length; i++) {
-            var purview = response.data.data.purviews[i].sub_purview;
-            if (purview.length > 1) {
-              response.data.data.purviews[i]["no_sub"] = false;
-            } else {
-              response.data.data.purviews[i]["no_sub"] = true;
+        this.loading = true
+        GetAllPurview(params).then(response => {
+          if (response.data.state === 1) {
+
+            for (let i = 0; i < response.data.data.purviews.length; i++) {
+              var purview = response.data.data.purviews[i].sub_purview
+              if (purview.length > 1) {
+                response.data.data.purviews[i]['no_sub'] = false
+              } else {
+                response.data.data.purviews[i]['no_sub'] = true
+              }
+              response.data.data.purviews[i]['isCheck'] = false
+              this.allPurview.push(response.data.data.purviews[i])
             }
-            response.data.data.purviews[i]["isCheck"] = false;
-            this.allPurview.push(response.data.data.purviews[i]);
+            this.allPurview.push({
+              module: 4,
+              name: "慢病管理",
+              id: 0,
+              icon_url: "https://kuyi.shengws.com/S8.png",
+              desc: "患者院外监测，患者随访",
+              no_sub: false
+            })
+            this.allPurview.push({
+              module: 6,
+              name: "SCRM",
+              id: 0,
+              icon_url: "https://kuyi.shengws.com/S9.png",
+              desc: "品牌建设，营销工具",
+              no_sub: false
+            })
+            // this.allPurview.push({
+            //   module: 7,
+            //   name: "分销商城",
+            //   id: 0,
+            //   icon_url: "https://kuyi.shengws.com/S10.png",
+            //   desc: "一键开店，分销商品",
+            //   no_sub: true
+            // })
+            this.GetOtherPurview()
+            this.GetRoleInfo(this.$route.query.id)
+
+
+          } else {
+            this.loading = false
+
+            this.$toast({
+              message: response.data.msg
+            });
           }
-          this.allPurview.push({
-            module: 4,
-            name: "慢病管理",
-            id: 0,
-            icon_url: "https://kuyi.shengws.com/S8.png",
-            desc: "患者院外监测，患者随访",
-            no_sub: false
-          });
-          this.allPurview.push({
-            module: 6,
-            name: "SCRM",
-            id: 0,
-            icon_url: "https://kuyi.shengws.com/S9.png",
-            desc: "品牌建设，营销工具",
-            no_sub: false
-          });
-          // this.allPurview.push({
-          //   module: 7,
-          //   name: "分销商城",
-          //   id: 0,
-          //   icon_url: "https://kuyi.shengws.com/S10.png",
-          //   desc: "一键开店，分销商品",
-          //   no_sub: true
-          // })
-          this.GetOtherPurview();
-          this.GetRoleInfo(this.$route.query.id);
-        } else {
-          this.$toast({
-            message: response.data.msg
-          });
-        }
-      });
-    }
+        });
+
+      },
+
+
+
   }
 };
 </script>
@@ -460,6 +469,13 @@ export default {
 
 <style lang="scss">
 .roleDescription {
+  .wrapper {
+    position: fixed;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+  }
+
   .input1 {
     font-size: 1rem;
     .van-cell__title{

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

@@ -3,7 +3,7 @@
     <van-sticky>
       <div class="privilegeManagementTitle">
         <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
-        <span class="titleName">权限管理</span>
+        <span class="titleName" >权限管理</span>
         <div class="iconBox" @click="goToAddRole()">
           <van-icon class="iconOne add" name="plus" />
         </div>
@@ -14,64 +14,30 @@
         <div>
           <div class="peopleTop">
             <div class="peopleImg">
-              <img
-                v-if="item.name == '医生'"
-                src="../../../../../assets/images/people1.jpg"
-                alt=""
-              />
-              <img
-                v-else-if="item.name == '护士'"
-                src="../../../../../assets/images/people2.jpg"
-                alt=""
-              />
-              <img
-                v-else-if="item.name == '子管理员'"
-                src="../../../../../assets/images/people5.jpg"
-                alt=""
-              />
-              <img
-                v-else-if="item.name == '库存'"
-                src="../../../../../assets/images/people3.jpg"
-                alt=""
-              />
-              <img
-                v-else-if="item.name == '院长'"
-                src="../../../../../assets/images/people4.jpg"
-                alt=""
-              />
-              <img
-                v-else-if="item.name == '运营'"
-                src="../../../../../assets/images/yy.jpg"
-                alt=""
-              />
-              <img
-                v-else-if="item.name == '技师'"
-                src="../../../../../assets/images/js.jpg"
-                alt=""
-              />
-              <img
-                v-else
-                src="../../../../../assets/images/default_avatar.jpg"
-                alt=""
-              />
+              <img v-if="item.name == '医生'" src="../../../../../assets/images/people1.jpg" alt=""/>
+              <img v-else-if="item.name == '护士'" src="../../../../../assets/images/people2.jpg" alt=""/>
+              <img v-else-if="item.name == '子管理员'" src="../../../../../assets/images/people5.jpg" alt=""/>
+              <img v-else-if="item.name == '库存'" src="../../../../../assets/images/people3.jpg" alt=""/>
+              <img v-else-if="item.name == '院长'" src="../../../../../assets/images/people4.jpg" alt=""/>
+              <img v-else-if="item.name == '运营'"  src="../../../../../assets/images/yy.jpg" alt=""/>
+              <img v-else-if="item.name == '技师'"  src="../../../../../assets/images/js.jpg" alt=""/>
+              <img v-else  src="../../../../../assets/images/default_avatar.jpg" alt=""/>
+
             </div>
             <div class="peopleTitle">
-              <p>{{ item.name }}</p>
+              <p>{{item.name}}</p>
               <div class="setting" @click="goToPermission(item)">
-                <van-icon class="setting-o" name="setting-o" />
-                <span>权限配置</span>
+                <van-icon class="setting-o" name="setting-o"/>
+                <span >权限配置</span>
               </div>
             </div>
           </div>
           <div class="peopleContent">
             <p>
-              {{ item.intro }}
+              {{item.intro}}
             </p>
             <p class="hasUser">
-              该角色目前已配置<span style="color:#338AFB">{{
-                item.staff_number
-              }}</span
-              >个员工
+              该角色目前已配置<span style="color:#338AFB">{{item.staff_number}}</span>个员工
             </p>
           </div>
         </div>
@@ -81,59 +47,76 @@
         </div>
       </div>
     </div>
+    <van-overlay :show="loading" type="spinner" size="30px">
+      <div class="wrapper">
+        <van-loading size="24px" vertical>正在加载中...</van-loading>
+      </div>
+    </van-overlay>
   </div>
 </template>
 
 <script>
-// import "../libs/rem.js";
-import { GetAllRole } from "@/api/admin_user";
-import { setRem } from "@/libs/functionRem";
+  // import "../libs/rem.js";
+  import {GetAllRole} from "@/api/admin_user";
+  import {setRem} from "@/libs/functionRem";
+
+  export default {
+    data() {
+      return {
+        loading:false,
+        roles: [],
+      };
+    },
+    methods: {
 
-export default {
-  data() {
-    return {
-      roles: []
-    };
-  },
-  methods: {
-    GetInitRoles() {
-      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++) {
-            if (!response.data.data.roles[i].is_super_admin) {
-              this.roles.push(response.data.data.roles[i]);
+      GetInitRoles() {
+        this.loading = true
+        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++) {
+              if (!response.data.data.roles[i].is_super_admin) {
+                this.roles.push(response.data.data.roles[i])
+              }
             }
+            this.loading = false
+
+          } else {
+            this.loading = false
+
+            this.$toast({
+              message: response.data.msg
+            });
           }
-          console.log(this.roles);
-        } else {
-          this.$toast({
-            message: response.data.msg
-          });
-        }
-      });
-    },
-    goToAddStaff(role) {
-      this.$router.push({ path: "/role/user?id=" + role.id });
-    },
-    goToStaffManage(role) {
-      this.$router.push({ path: "/role/usermanage?id=" + role.id + "&name=" + role.name });
-    },
-    goToPermission(role) {
-      this.$router.push({ path: "/role/editrole?id=" + role.id });
-    },
-    goToAddRole() {
-      this.$router.push({ path: "/role/addrole" });
+        }) .catch(error => {
+          this.loading = false
+        });
+      }, goToAddStaff(role) {
+        this.$router.push({path: "/role/user?id="+role.id});
+      }, goToStaffManage(role) {
+        this.$router.push({ path: "/role/usermanage?id=" + role.id + "&name=" + role.name });
+
+      }, goToPermission(role) {
+        this.$router.push({path:"/role/editrole?id="+role.id})
+      },goToAddRole(){
+        this.$router.push({path: "/role/addrole"});
+      },
+    }, created() {
+      setRem()
+      this.GetInitRoles()
+
+
     }
-  },
-  created() {
-    setRem();
-    this.GetInitRoles();
-  }
-};
+  };
 </script>
 
 <style lang="scss" scoped>
+  .wrapper {
+    position: fixed;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+  }
 .page_privilegeManagement {
   height: 100%;
   overflow-y: auto;

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

@@ -14,7 +14,7 @@
         <div class="staffBox" v-if="admin_user.length > 0">
           <div
             class="staffOne"
-            v-for="(item, index) in admin_user"
+            v-for="(item,index) in admin_user"
             :key="index"
             v-if="admin_user.length > 0"
           >
@@ -25,11 +25,8 @@
               alt
             />
             <p>
-              <span>{{ item.user_name }}</span>
-              <i
-                @click="goEditStaff(item.user_id)"
-                class="iconfont icon-bianji bianji"
-              ></i>
+              <span>{{item.user_name}}</span>
+              <i @click="goEditStaff(item.user_id)" class="iconfont icon-bianji bianji"></i>
             </p>
           </div>
         </div>
@@ -42,7 +39,7 @@
         <div class="staffBox" v-if="del_admin_user.length > 0">
           <div
             class="staffOne"
-            v-for="(item, index) in del_admin_user"
+            v-for="(item,index) in del_admin_user"
             :key="index"
             v-if="del_admin_user.length > 0"
           >
@@ -53,11 +50,8 @@
               alt
             />
             <p>
-              <span>{{ item.user_name }}</span>
-              <i
-                @click="goEditStaff(item.user_id)"
-                class="iconfont icon-bianji bianji"
-              ></i>
+              <span>{{item.user_name}}</span>
+              <i @click="goEditStaff(item.user_id)" class="iconfont icon-bianji bianji"></i>
             </p>
           </div>
         </div>
@@ -66,6 +60,11 @@
         </div>
       </van-tab>
     </van-tabs>
+    <van-overlay :show="loading" type="spinner" size="30px">
+      <div class="wrapper">
+        <van-loading size="24px" vertical>正在加载中...</van-loading>
+      </div>
+    </van-overlay>
   </div>
 </template>
 <script>
@@ -76,6 +75,7 @@ import { GetAllStaff } from "@/api/admin_user";
 export default {
   data() {
     return {
+      loading:false,
       active: 0,
       admin_user: [],
       del_admin_user: []
@@ -83,70 +83,70 @@ export default {
   },
   methods: {
     GetAllStaff: function() {
-      GetAllStaff().then(response => {
-        if (response.data.state === 1) {
-          for (let i = 0; i < response.data.data.admins.length; i++) {
-            if (response.data.data.admins[i].status == 1) {
-              if (response.data.data.isSubSuperAdmin) {
-                //当前用户为子管理员，不展示管理员信息
-                if (
-                  response.data.data.admins[i].user_id !=
-                  response.data.data.org_creator
-                ) {
-                  this.admin_user.push(response.data.data.admins[i]);
-                }
-              } else {
-                this.admin_user.push(response.data.data.admins[i]);
+      this.loading =true
+        GetAllStaff().then(response => {
+          this.loading =false
+
+          if (response.data.state === 1) {
+
+          for(let i = 0; i < response.data.data.admins.length; i++){
+            if(response.data.data.admins[i].status == 1){
+              if(response.data.data.isSubSuperAdmin){ //当前用户为子管理员，不展示管理员信息
+                  if(response.data.data.admins[i].user_id != response.data.data.org_creator){
+                    this.admin_user.push(response.data.data.admins[i])
+                  }
+              }else{
+                this.admin_user.push(response.data.data.admins[i])
+
               }
-            } else {
-              if (response.data.data.isSubSuperAdmin) {
-                //当前用户为子管理员，不展示管理员信息
-                if (
-                  response.data.data.admins[i].user_id !=
-                  response.data.data.org_creator
-                ) {
+            }else{
+              if(response.data.data.isSubSuperAdmin){ //当前用户为子管理员，不展示管理员信息
+                if(response.data.data.admins[i].user_id != response.data.data.org_creator){
                   // this.admin_user.push(response.data.data.admins[i])
-                  this.del_admin_user.push(response.data.data.admins[i]);
+                  this.del_admin_user.push(response.data.data.admins[i])
+
                 }
-              } else {
+              }else{
                 // this.admin_user.push(response.data.data.admins[i])
-                this.del_admin_user.push(response.data.data.admins[i]);
+                this.del_admin_user.push(response.data.data.admins[i])
+
+
               }
+
+
             }
           }
 
-          for (let i = 0; i < this.admin_user.length; i++) {
-            if (response.data.data.isSubSuperAdmin) {
-              //当前用户为子管理员，不展示管理员和其他子管理信息
-              if (
-                this.admin_user[i].is_sub_admin &&
-                this.admin_user[i].user_id != this.$store.getters.user.admin.id
-              ) {
-                this.admin_user.splice(i, 1);
+
+          for(let i = 0; i < this.admin_user.length; i++) {
+            if(response.data.data.isSubSuperAdmin){ //当前用户为子管理员，不展示管理员和其他子管理信息
+              if(this.admin_user[i].is_sub_admin && this.admin_user[i].user_id != this.$store.getters.user.admin.id){
+                this.admin_user.splice(i,1)
                 i = i - 1;
               }
             }
           }
 
-          for (let i = 0; i < this.del_admin_user.length; i++) {
-            if (response.data.data.isSubSuperAdmin) {
-              //当前用户为子管理员，不展示管理员和其他子管理信息
-              if (
-                this.del_admin_user[i].is_sub_admin &&
-                this.del_admin_user[i].user_id !=
-                  this.$store.getters.user.admin.id
-              ) {
-                this.del_admin_user.splice(i, 1);
+
+          for(let i = 0; i < this.del_admin_user.length; i++) {
+            if(response.data.data.isSubSuperAdmin){ //当前用户为子管理员，不展示管理员和其他子管理信息
+              if(this.del_admin_user[i].is_sub_admin && this.del_admin_user[i].user_id != this.$store.getters.user.admin.id){
+                this.del_admin_user.splice(i,1)
                 i = i - 1;
               }
             }
           }
-        } else {
+
+
+
+          } else {
           this.$toast({
             message: response.data.msg
           });
         }
-      });
+      }).catch(error => {
+          this.loading = false
+        });;
     },
     goEditStaff: function(id) {
       this.$router.push({ path: "/staff/editstaff?id=" + id });
@@ -233,6 +233,12 @@ export default {
 </style>
 
 <style lang="scss">
+  .wrapper {
+    position: fixed;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+  }
 .page_staffManagement {
   .van-tabs__line {
     background: #5b98ff;

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

@@ -12,7 +12,8 @@
         v-for="(item, index) in admin_user"
         :key="index"
         
-        @click="goEditStaff(item.user_id, item.is_sub_admin)"
+        @click="goEditStaff(item.user_id,item.is_sub_admin)"
+
       >
         <img v-if="item.avatar.length > 0" :src="item.avatar" alt />
         <img
@@ -20,10 +21,10 @@
           src="../../../../../assets/images/default_avatar.jpg"
           alt
         />
-        <p>
+        <p >
           <span>{{ item.user_name }}</span>
           <i
-            v-if="!item.is_sub_admin && org_creator != item.user_id"
+            v-if="org_creator != item.user_id"
             class="iconfont icon-bianji bianji"
           ></i>
         </p>
@@ -32,6 +33,11 @@
     <div class="noDataBox" v-else>
         <img src="../../../../../assets/images/none.png" alt />
       </div>
+    <van-overlay :show="loading" type="spinner" size="30px">
+      <div class="wrapper">
+        <van-loading size="24px" vertical>正在加载中...</van-loading>
+      </div>
+    </van-overlay>
   </div>
 </template>
 <script>
@@ -42,6 +48,7 @@ import { GetAllStaff } from "@/api/admin_user";
 export default {
   data() {
     return {
+      loading:false,
       active: 0,
       admin_user: [],
       org_creator: 0,
@@ -50,6 +57,7 @@ export default {
   },
   methods: {
     GetAllStaff: function() {
+      this.loading = true
       GetAllStaff().then(response => {
         if (response.data.state === 1) {
           this.admin_user = response.data.data.admins;
@@ -64,15 +72,19 @@ export default {
               }
             }
           }
+          this.loading = false
+
         } else {
+          this.loading = false
+
           this.$toast({
             message: response.data.msg
           });
         }
       });
     },
-    goEditStaff: function(id, is_sub_admin) {
-      if (!is_sub_admin && org_creator != id) {
+    goEditStaff: function(id,is_sub_admin) {
+      if (this.org_creator != id){
         this.$router.push({ path: "/staff/editstaff?id=" + id });
       }
     },
@@ -84,8 +96,9 @@ export default {
     this.name = this.$route.query.name
     setRem();
     //获取没被禁用的用户
-    this.org_creator = this.$store.getters.user.org.creator;
-    console.log(this.org_creator);
+
+    this.org_creator  = this.$store.getters.user.org.creator
+    console.log(this.org_creator)
     this.GetAllStaff();
   }
 };
@@ -165,6 +178,12 @@ export default {
        display: block;
     }
   }
+  .wrapper {
+    position: fixed;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+  }
 }
 ::-webkit-scrollbar {
   width: 0;
@@ -177,4 +196,5 @@ export default {
     background: #5b98ff;
   }
 }
+
 </style>

src/pages/home/createOrg/index.vue

@@ -71,6 +71,11 @@
         <span type="primary" @click="callPhone()">拨打</span>
       </span>
     </el-dialog>
+    <van-overlay :show="loading" type="spinner" size="30px">
+      <div class="wrapper">
+        <van-loading size="24px" vertical>正在加载中...</van-loading>
+      </div>
+    </van-overlay>
   </div>
 </template>
 
@@ -82,6 +87,7 @@
     components: {},
     data() {
       return {
+        loading:false,
         org_area: "",
         type_name: "",
         contact: false,
@@ -4308,7 +4314,10 @@
 
         this.orgForm.org_type = this.type_name.split("-")[1];
         Toast.loading({forbidClick: true, duration: 0});
+        this.loading = true
+
         createOrg(this.orgForm).then(response => {
+          this.loading = false
           if (response.data.state === 1) {
             //清除之前的数据
             this.$store.dispatch("SET_SCHEDUALS", "");
@@ -4335,6 +4344,8 @@
           } else {
             Toast.fail(response.data.msg);
           }
+        }) .catch(error => {
+            this.loading = false
         });
       }
     }
@@ -4435,6 +4446,12 @@
   }
 </style>
 <style lang="scss">
+  .wrapper {
+    position: fixed;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+  }
   .myDialog {
     line-height: 50%;
     height: 100%;

src/pages/homeIndex/index.vue

@@ -166,6 +166,7 @@ export default {
       org_arr: [],
       banners: [],
       apps: [],
+      isSubSuperAdmin:false,
       option1: [
         { text: "新款商品", value: 0 },
         { text: "全部商品全部商品全部商品全部商品全部商品全部商品", value: 1 },