loading和退团

1

src/App.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="app" v-cloak>
-    <router-view v-if="isRouterAlive" v-cloak/>
+    <router-view v-if="isRouterAlive" v-cloak />
   </div>
 </template>
 
@@ -40,7 +40,7 @@ export default {
   display: none !important;
 }
 html {
-  --color-primary: #00A79D;
+  --color-primary: #00a79d;
 }
 // 13817a
 body {
@@ -72,30 +72,64 @@ body {
 }
 </style>
 <style lang="scss">
-.el-loading-spinner .circular{
+.el-loading-spinner .circular {
   width: 42px;
   height: 42px;
   animation: loading-rotate 2s linear infinite;
   display: none;
 }
-.el-loading-spinner{
-    width: 180px!important;
-    height: 63px;
-    background: linear-gradient(to bottom, #fff 100%, #00f 100%);
-    // -webkit-mask-image: url('assets/img/loading.png');
-    // mask-image: url('assets/img/loading.png');
-    -webkit-mask-repeat: no-repeat;
-    mask-repeat: no-repeat;
-    -webkit-mask-position: center;
-    mask-position: center;
-    animation: raise 4s ease-in-out infinite;
-    top: 20%;
-    left: 50%;
-    margin-left: -90px;
-    position: relative;
-    border-radius: 10px;
-    padding-top: 10px;
-   box-shadow: rgba(0,0,0,.05) 0px 2px 3px 3px;
+.el-loading-spinner {
+  // width: 180px!important;
+  // height: 63px;
+  // background: linear-gradient(to bottom, #fff 100%, #00f 100%);
+  // ./icons/svg/loading.svg
+  // background: url('~@/assets/images/mycard.png');
+  // mask-image: url('assets/img/loading.png');
+  // -webkit-mask-repeat: no-repeat;
+  // mask-repeat: no-repeat;
+  // -webkit-mask-position: center;
+  // mask-position: center;
+  // animation: raise 4s ease-in-out infinite;
+  padding-top: 5px;
+  position: absolute;
+  left: 50%;
+  margin-left: -40px;
+  width: 80px !important;
+  height: 80px;
+  border-radius: 10px;
+  background-color: #fff;
+  -webkit-animation: rotateplane 1.5s infinite ease-in-out;
+  animation: rotateplane 1.5s infinite ease-in-out;
+  .iconfont {
+    font-size: 60px;
+  }
+}
+@-webkit-keyframes rotateplane {
+  0% {
+    -webkit-transform: perspective(120px);
+  }
+  50% {
+    -webkit-transform: perspective(120px) rotateY(180deg);
+  }
+  100% {
+    -webkit-transform: perspective(120px) rotateY(180deg);
+  }
+}
+
+@keyframes rotateplane {
+  0% {
+    transform: perspective(120px) rotateY(0deg);
+    -webkit-transform: perspective(120px) rotateY(0deg);
+  }
+
+  50% {
+    transform: perspective(120px) rotateY(-179.9deg);
+    -webkit-transform: perspective(120px) rotateY(-179.9deg);
+  }
+  100% {
+    transform: perspective(120px) rotateY(0deg);
+    -webkit-transform: perspective(120px) rotateY(0deg);
+  }
 }
 .el-table {
   width: 99% !important;
@@ -153,8 +187,8 @@ input[type="number"] {
   width: 180px !important;
 }
 
-.el-input__count{
-  background-color: transparent!important;
+.el-input__count {
+  background-color: transparent !important;
 }
 .multiple.el-select {
   width: 180px !important;
@@ -422,7 +456,7 @@ input[type="number"] {
     justify-content: space-between;
     align-items: center;
     .el-select__tags-text {
-        flex-wrap: nowrap;
+      flex-wrap: nowrap;
       max-width: 60px;
       overflow: hidden;
       text-overflow: ellipsis;

src/icons/svg/loading.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="33px" height="52px" viewBox="0 0 33 52" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>形状_2_备份</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M11.5216853,33.799691 C10.913674,35.4502333 11.1645993,37.3644718 12.3516691,38.7903841 C14.1177973,40.919486 17.2833168,41.1734156 19.435484,39.3470759 C21.5780003,37.5207361 21.8868314,34.3173167 20.1207032,32.1882148 C18.6151512,30.3716416 16.096247,29.9223815 14.0502405,30.9576329 C15.1118477,30.7427694 16.2410116,31.1041308 16.9744856,31.9831178 C18.0553947,33.2918318 17.8720262,35.2549029 16.5498428,36.3682865 C15.2373103,37.4816701 13.2974645,37.3351722 12.2165554,36.0264582 C11.6761009,35.3818677 11.4541285,34.5810128 11.5216853,33.799691 L11.5216853,33.799691 Z M16.2348555,44.6301565 C11.2321335,44.6301565 7.17614166,40.5335994 7.17614166,35.4893314 C7.17614166,30.4450634 11.2321335,26.3485064 16.2348555,26.3485064 C21.2375776,26.3485064 25.2935694,30.4450634 25.2935694,35.4893314 C25.2935694,40.5437899 21.2375776,44.6301565 16.2348555,44.6301565 Z M21.8545098,19.8009017 C27.9805287,22.1371362 32.3392358,28.1724088 32.3392358,35.2528389 C32.3392358,44.3518577 25.1309867,51.7396871 16.2348555,51.7396871 C7.33872441,51.7396871 0.130475303,44.3621043 0.130475303,35.2528389 C0.130475303,27.4141572 5.47212547,20.8563059 12.630731,19.1861031 L12.630731,2.93492779 C12.630731,1.83853702 13.4945294,0.957325747 14.566831,0.957325747 C20.4644893,0.957325747 25.26006,5.82448104 25.26006,11.8392603 C25.2501313,14.9849796 23.9395405,17.813053 21.8545098,19.8009017 L21.8545098,19.8009017 Z M16.2348555,47.6770982 C22.909183,47.6770982 28.3131407,41.9898865 28.3131407,34.9815078 C28.3131407,27.9731291 22.909183,22.2859175 16.2348555,22.2859175 C9.56052805,22.2859175 4.15657036,27.9731291 4.15657036,34.9815078 C4.15657036,41.9898865 9.56052805,47.6770982 16.2348555,47.6770982 Z M16.2348555,18.2233286 C19.1495386,17.3854973 21.2674744,14.7407767 21.2674744,11.6216216 C21.2674744,8.50246649 19.1495386,5.86784032 16.2348555,5.01991465 L16.2348555,18.2233286 Z" id="形状_2_备份" fill="#01C1B5"></path>
+    </g>
+</svg>

src/store/modules/app.js

@@ -48,7 +48,7 @@ const mutations = {
   },
   SET_LOAD_COUNT: (state, count) => {
     // 判断是否已经到0了
-    if(state.loadCount <= 0) {
+    if(state.loadCount < 0) {
       state.loadCount = 0
     } else {
       state.loadCount += count

src/styles/iconfont/iconfont.css

@@ -1,6 +1,6 @@
 @font-face {
   font-family: "iconfont"; /* Project id  */
-  src: url('iconfont.ttf?t=1642586418878') format('truetype');
+  src: url('iconfont.ttf?t=1642679515371') format('truetype');
 }
 
 .iconfont {
@@ -383,27 +383,31 @@
   content: "\e678";
 }
 
-.icon-koufeiguize:before {
+.icon-jigouruzhu:before {
   content: "\e679";
 }
 
-.icon-yunjiaoshibanben:before {
+.icon-koufeiguize:before {
   content: "\e67a";
 }
 
-.icon-yunjiaoshiyue:before {
+.icon-yunjiaoshibanben:before {
   content: "\e67b";
 }
 
-.icon-koufeibiaozhun:before {
+.icon-yunjiaoshiyue:before {
   content: "\e67c";
 }
 
-.icon-banbenhuiyuantubiao:before {
+.icon-koufeibiaozhun:before {
   content: "\e67d";
 }
 
-.icon-jigouruzhu:before {
+.icon-banbenhuiyuantubiao:before {
   content: "\e67e";
 }
 
+.icon-loading:before {
+  content: "\e67f";
+}
+

src/utils/loading.js

@@ -15,9 +15,9 @@ function startLoading () {    //使用Element loading-start 方法
   loading =  Vue.prototype.$loading({
     lock: true,
     fullscreen: true,
-    text: '加载中……',
-    background: 'rgba(0, 0, 0, 0)',
-    spinner: 'el-icon-loading',
+    text: '',
+    background: 'rgba(0, 0, 0, 0.3)',
+    spinner: 'iconfont icon-loading',
   })
 }
 function endLoading () {

src/utils/request-loading.js

@@ -2,17 +2,18 @@ import load from '@/utils/loading'
 // isLoading
 
 // let times = store.getters.loadCount;
-
+let timer = null
 export async function showFullScreenLoading(store) {
 
-  if (store.getters.loadCount === 0&&!store.getters.isLoading) {
+  if (store.getters.loadCount === 0 && !store.getters.isLoading) {
     await store.dispatch('app/setLoadCount', 1)
-    await store.dispatch('app/setLoadStatus',true)
-    // console.log(store.getters.isLoading,store.getters,'打开loding')
+    await store.dispatch('app/setLoadStatus', true)
     load.startLoading()
-
   } else {
     await store.dispatch('app/setLoadCount', 1)
+
+    clearTimeout(timer)
+    timer = null
   }
 
 
@@ -20,10 +21,15 @@ export async function showFullScreenLoading(store) {
 
 export async function tryHideFullScreenLoading(store) {
   await store.dispatch('app/setLoadCount', -1)
-  if (store.getters.loadCount <= 0&&store.getters.isLoading) {
-    load.endLoading();
-    await store.dispatch('app/resetLoadCount')
-    await  store.dispatch('app/setLoadStatus',false)
+  if (store.getters.loadCount <= 0 && store.getters.isLoading) {
+    timer = setTimeout(async () => {
+      await store.dispatch('app/resetLoadCount')
+      await store.dispatch('app/setLoadStatus', false)
+      load.endLoading();
+      clearTimeout(timer)
+      timer = null
+    }, 100)
+
   }
 
 }

src/views/categroyManager/productSystem/memberFeeSet.vue

@@ -678,7 +678,7 @@ export default {
         minYearFee: null,
         maxYearFee: null,
       },
-      context:'团练宝收费标准即为团练宝收费标准，可根据各分部的实际情况为分部制定不同的团练宝标准售价，设置完成后，各分部为学员创建团练宝缴费时默认以此处设置的价格向学员收费。',
+      context:'团练宝收费标准，可根据各分部的实际情况为分部制定不同的售价标准，设置完成后，各分部为学员创建团练宝缴费时默认以此处设置的价格向学员收费。',
       contextFlag:false
     };
   },

src/views/main/baseinfo/index.vue

@@ -66,7 +66,14 @@
           @resetDate="resetDate"
         />
       </el-col>
-      <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" v-if="$helpers.tenantId == 1">
+      <el-col
+        :xs="24"
+        :sm="24"
+        :md="24"
+        :lg="24"
+        :xl="24"
+        v-if="$helpers.tanentId == 1"
+      >
         <business
           ref="business"
           :data="dataInfo"
@@ -75,10 +82,20 @@
         />
       </el-col>
       <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-        <curriculum :data="dataInfo"   ref="curriculum" :search="search" @resetDate="resetDate" />
+        <curriculum
+          :data="dataInfo"
+          ref="curriculum"
+          :search="search"
+          @resetDate="resetDate"
+        />
       </el-col>
       <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-        <student :data="dataInfo" ref="student" :search="search" @resetDate="resetDate" />
+        <student
+          :data="dataInfo"
+          ref="student"
+          :search="search"
+          @resetDate="resetDate"
+        />
       </el-col>
 
       <!-- <el-col :xs="24" :sm="24" :md="12">
@@ -172,10 +189,9 @@ export default {
     },
   },
   created() {},
- async mounted() {
+  async mounted() {
     this.$set(this.search, "dates", this.getInitDate());
-  await  this.$store.dispatch("setBranchs");
-  // this.$set(this.search,'organId',this.selects.branchs[0].id)
+   await this.$store.dispatch("setBranchs");
     this.FetchDetail();
   },
   methods: {
@@ -198,6 +214,7 @@ export default {
     },
     async FetchDetail() {
       // 这里改变就通知子组件重置
+
       const data = {};
       try {
         const { dates, ...rest } = this.search;
@@ -215,7 +232,6 @@ export default {
         console.log(error);
       }
       this.dataInfo = data;
-
       if (this.$refs.business) {
         this.$refs["business"].init();
       }

src/views/main/index.vue

@@ -146,7 +146,6 @@ export default {
       });
     },
     reloadItem() {
-      console.log("调用");
       if (this.$refs.teamSchedule) {
         this.$refs.teamSchedule.getList();
       }

src/views/teamBuild/signupList.vue

@@ -800,7 +800,7 @@
               </auth>
               <auth
                 :auths="'musicGroupQuit/apply2'"
-                v-show="scope.row.paymentStatus == 2"
+                v-show="scope.row.paymentStatus == 2&&isManage"
               >
                 <el-button type="text" @click="quitTeam(scope.row)"
                   >退团</el-button
@@ -1307,16 +1307,17 @@ export default {
     // 通过乐团状态判断显示隐藏的东西
     let isSuperAdmin = this.$store.getters.isSuperAdmin;
     let roles = this.$store.getters.roles;
-    if (isSuperAdmin) {
+     if (isSuperAdmin) {
       this.isManage = "super";
     } else {
-      if (roles.indexOf(1) != -1) {
+      if (roles.indexOf("1") != -1) {
         this.isManage = "manage";
-      } else {
-        this.isManage = false;
+      }
+      if (roles.indexOf("2") != -1) {
+        this.isManage = "staff";
       }
     }
-    if (roles.indexOf(1) != -1 && roles.indexOf(2) != -1) {
+    if (roles.indexOf("1") != -1 && roles.indexOf("2") != -1) {
       this.isManage = "super";
     }
 
@@ -1911,7 +1912,7 @@ export default {
                 memberFee: params.memberFee,
                 musicalFee: params.musicalFee,
               };
-              if (this.isManage) {
+              if (this.isManage!='staff') {
                 params.status = "APPROVED";
               } else {
                 params.status = "PROCESSING";

src/views/teamDetail/components/studentList.vue

@@ -549,7 +549,7 @@
                 type="text"
                 v-if="
                   permission('musicGroupQuit/apply/3852') &&
-                  scope.row.studentStatus != 'QUIT'
+                  scope.row.studentStatus != 'QUIT'&&isManage
                 "
                 @click="quieTeamMask(scope.row)"
                 >退团</el-button
@@ -1227,13 +1227,14 @@ export default {
     if (isSuperAdmin) {
       this.isManage = "super";
     } else {
-      if (roles.indexOf(1) != -1) {
+      if (roles.indexOf("1") != -1) {
         this.isManage = "manage";
-      } else {
-        this.isManage = false;
+      }
+      if (roles.indexOf("2") != -1) {
+        this.isManage = "staff";
       }
     }
-    if (roles.indexOf(1) != -1 && roles.indexOf(2) != -1) {
+    if (roles.indexOf("1") != -1 && roles.indexOf("2") != -1) {
       this.isManage = "super";
     }
     try {
@@ -1526,7 +1527,7 @@ export default {
                 memberFee: params.memberFee,
                 musicalFee: params.musicalFee,
               };
-              if (this.isManage) {
+              if (this.isManage!='staff') {
                 params.status = "APPROVED";
               } else {
                 params.status = "PROCESSING";

src/views/withdrawal-application/index.vue

@@ -165,7 +165,7 @@
             <div>
               <el-button
                 type="text"
-                v-if="permission('musicGroupQuit/quitMusicGroup/quit')"
+                v-if="permission('musicGroupQuit/quitMusicGroup/quit')&&isManage"
                 :disabled="
                   scope.row.status != 'PROCESSING' ||
                   scope.row.status == 'DENIED' ||
@@ -174,7 +174,7 @@
                     isManage == 'manage' &&
                     scope.row.currentApproveRole == '2') ||
                   (scope.row.status == 'PROCESSING' &&
-                    !isManage &&
+                    isManage=='staff' &&
                     scope.row.currentApproveRole == '1')
                 "
                 @click="quieTeamMask(scope.row)"
@@ -182,7 +182,7 @@
               >
               <el-button
                 type="text"
-                v-if="permission('musicGroupQuit/quitMusicGroup/quit')"
+                v-if="permission('musicGroupQuit/quitMusicGroup/quit')&&isManage"
                 :disabled="
                   !(
                     scope.row.status != 'PROCESSING' ||
@@ -192,7 +192,7 @@
                       isManage == 'manage' &&
                       scope.row.currentApproveRole == '2') ||
                     (scope.row.status == 'PROCESSING' &&
-                      !isManage &&
+                      isManage=='staff' &&
                       scope.row.currentApproveRole == '1')
                   )
                 "
@@ -246,8 +246,10 @@
               <p>退还团练宝费用：报名缴费时缴费的团练宝费用</p>
               <p>退还课程费用：缴费总额-已结束课时单价之和</p>
               <p>退还乐器费用：报名缴费时缴纳的乐器费用（团购、租金）</p>
-              <p >退还教辅费用：报名缴费时缴费的教辅费用</p>
-              <p v-if="$helpers.tenantId ==1">退还乐保费用：报名缴费时缴费的乐保费用</p>
+              <p>退还教辅费用：报名缴费时缴费的教辅费用</p>
+              <p v-if="$helpers.tenantId == 1">
+                退还乐保费用：报名缴费时缴费的乐保费用
+              </p>
             </div>
             <el-button
               type="text"
@@ -262,12 +264,12 @@
           <el-button
             type="primary"
             v-permission="'musicGroupQuit/quitMusicGroup'"
-            v-if="!isManage"
+            v-if="isManage=='staff'"
             @click="submitInfo('PROCESSING')"
             >提交审核</el-button
           >
           <el-button
-            v-else
+            v-if="isManage=='super' || isManage=='manage'"
             type="primary"
             v-permission="'musicGroupQuit/quitMusicGroup'"
             @click="submitInfo('APPROVED')"
@@ -361,18 +363,18 @@ export default {
     that = this;
     let isSuperAdmin = this.$store.getters.isSuperAdmin;
     let roles = this.$store.getters.roles;
-
     await this.$store.dispatch("setBranchs");
     if (isSuperAdmin) {
       this.isManage = "super";
     } else {
-      if (roles.indexOf(1) != -1) {
+      if (roles.indexOf("1") != -1) {
         this.isManage = "manage";
-      } else {
-        this.isManage = false;
+      }
+      if (roles.indexOf("2") != -1) {
+        this.isManage = "staff";
       }
     }
-    if (roles.indexOf(1) != -1 && roles.indexOf(2) != -1) {
+    if (roles.indexOf("1") != -1 && roles.indexOf("2") != -1) {
       this.isManage = "super";
     }
     this.FetchList();

src/views/workBenchManager/journal/model/musicGroup.vue

@@ -189,7 +189,7 @@
         <el-button
           type="primary"
           v-permission="'musicGroupQuit/quitMusicGroup/conform'"
-          v-if="!isManage"
+          v-if="isManage=='staff'"
           :disabled="musicForm.currentApproveRole == '1'"
           @click="onSubmitGroup(musicForm, 'PROCESSING')"
           >提交审核</el-button
@@ -207,7 +207,7 @@
         <el-button
           :disabled="
             (isManage == 'manage' && musicForm.currentApproveRole == '2') ||
-            (!isManage && musicForm.currentApproveRole == '1')
+            (isManage=='staff' && musicForm.currentApproveRole == '1')
           "
           type="danger"
           v-permission="'musicGroupQuit/quitMusicGroup'"
@@ -339,18 +339,19 @@ export default {
       // 获取权限
       let isSuperAdmin = this.$store.getters.isSuperAdmin;
       let roles = this.$store.getters.roles;
-      if (isSuperAdmin) {
-        this.isManage = "super";
-      } else {
-        if (roles.indexOf(1) != -1) {
-          this.isManage = "manage";
-        } else {
-          this.isManage = false;
-        }
+    if (isSuperAdmin) {
+      this.isManage = "super";
+    } else {
+      if (roles.indexOf("1") != -1) {
+        this.isManage = "manage";
       }
-      if (roles.indexOf(1) != -1 && roles.indexOf(2) != -1) {
-        this.isManage = "super";
+      if (roles.indexOf("2") != -1) {
+        this.isManage = "staff";
       }
+    }
+    if (roles.indexOf("1") != -1 && roles.indexOf("2") != -1) {
+      this.isManage = "super";
+    }
       //   isSuperAdmin:state=>state.user.isSuperAdmin,
       // roles:state=>state.user.roles,