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

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

@@ -34,6 +34,12 @@
         </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>
 
@@ -48,6 +54,7 @@
       return {
         desc: "",
         name: "",
+        loading:false,
         checked: false,
         allPurview: [],
         rolePurview:null,
@@ -56,7 +63,6 @@
       };
     }, created() {
       setRem()
-
       this.GetAllPurview()
 
 
@@ -180,12 +186,20 @@
                 }
             }
 
+            this.loading = false
+
+
           } else {
+            this.loading = false
+
             this.$toast({
               message: response.data.msg
             });
           }
-        });
+        }) .catch(error => {
+          this.loading = false
+
+        });;
 
       },GetOtherPurview(){
         let params = {
@@ -211,8 +225,10 @@
           module: 3,
           id: 0,
         }
+        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) {
@@ -252,6 +268,8 @@
 
 
           } else {
+            this.loading = false
+
             this.$toast({
               message: response.data.msg
             });
@@ -388,6 +406,12 @@
 </style>
 
 <style lang="scss">
+  .wrapper {
+    position: fixed;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+  }
   .roleDescription {
 
   .input1 {

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

@@ -47,6 +47,11 @@
         </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>
 
@@ -58,11 +63,14 @@
   export default {
     data() {
       return {
+        loading:false,
         roles: [],
       };
     },
     methods: {
+
       GetInitRoles() {
+        this.loading = true
         GetAllRole().then(response => {
           if (response.data.state === 1) {
             console.log(response.data.data.roles.length)
@@ -71,12 +79,17 @@
                 this.roles.push(response.data.data.roles[i])
               }
             }
-          console.log( this.roles)
+            this.loading = false
+
           } else {
+            this.loading = false
+
             this.$toast({
               message: response.data.msg
             });
           }
+        }) .catch(error => {
+          this.loading = false
         });
       }, goToAddStaff(role) {
         this.$router.push({path: "/role/user?id="+role.id});
@@ -98,6 +111,12 @@
 
 
 <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

@@ -61,6 +61,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>
@@ -71,6 +76,7 @@ import { GetAllStaff } from "@/api/admin_user";
 export default {
   data() {
     return {
+      loading:false,
       active: 0,
       admin_user: [],
       del_admin_user: [],
@@ -79,8 +85,12 @@ export default {
   },
   methods: {
     GetAllStaff: function() {
-      GetAllStaff().then(response => {
-        if (response.data.state === 1) {
+      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){ //当前用户为子管理员，不展示管理员信息
@@ -136,7 +146,9 @@ export default {
             message: response.data.msg
           });
         }
-      });
+      }).catch(error => {
+          this.loading = false
+        });;
     },
     goEditStaff: function(id) {
       this.$router.push({ path: "/staff/editstaff?id=" + id });
@@ -223,6 +235,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

@@ -30,6 +30,12 @@
         </p>
       </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>
@@ -40,6 +46,7 @@ import { GetAllStaff } from "@/api/admin_user";
 export default {
   data() {
     return {
+      loading:false,
       active: 0,
       admin_user: [],
       org_creator:0,
@@ -47,6 +54,7 @@ export default {
   },
   methods: {
     GetAllStaff: function() {
+      this.loading = true
       GetAllStaff().then(response => {
         if (response.data.state === 1) {
           this.admin_user = response.data.data.admins;
@@ -61,7 +69,11 @@ export default {
               }
             }
           }
+          this.loading = false
+
         } else {
+          this.loading = false
+
           this.$toast({
             message: response.data.msg
           });
@@ -80,6 +92,7 @@ export default {
   created() {
     setRem();
     //获取没被禁用的用户
+
     this.org_creator  = this.$store.getters.user.org.creator
     console.log(this.org_creator)
     this.GetAllStaff();
@@ -159,4 +172,10 @@ export default {
     background: #5b98ff;
   }
 }
+.wrapper {
+  position: fixed;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+}
 </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

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

src/pages/org/index.vue

@@ -70,6 +70,12 @@
         <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>
 
@@ -85,6 +91,7 @@ import { Toast } from "vant";
         type_name: "",
         contact: false,
         show: false,
+        loading:false,
         area: {
           province_list: {
             110000: '北京市',
@@ -4307,8 +4314,10 @@ import { Toast } from "vant";
           return
         }
         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) {
             var status = response.data.data.status;
 
@@ -4337,6 +4346,9 @@ import { Toast } from "vant";
           }else{
             Toast.fail(response.data.msg)
           }
+        }) .catch(error => {
+          this.loading = false
+
         });
       }
     },
@@ -4345,6 +4357,12 @@ import { Toast } from "vant";
 </script>
 
 <style lang="scss" scoped>
+  .wrapper {
+    position: fixed;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+  }
 .page_createOrganization {
   height: 100%;
   overflow: hidden;