Merge branch '03/12permission' into 04/13classAddSound

src/components/Pagination/index.vue

@@ -126,6 +126,7 @@ export default {
       }
     },
     handleSizeChange (val) {
+      this.currentPage = 1
       this.$emit('pagination', { page: this.currentPage, limit: val })
       if (this.autoScroll) {
         scrollTo(0, 800)

src/layout/components/Navbar.vue

@@ -47,7 +47,7 @@
               >{{ item }}</el-tag
             >
           </div>
-          <span slot="reference" style="display: flex;align-items: center;justify-content: center;">
+          <span slot="reference" style="display: flex;align-items: center;justify-content: center;height: 59px;">
             <!-- {{ organName.length > 10 ? organName.substr(0, 10) + "..." : organName }} -->
             <!-- <i class="el-icon-s-home" style="font-size: 23px; color: #1A1A1A;"></i> -->
             <img src="@/assets/images/base/base-home.svg" style="width: 23px;">

src/store/modules/app.js

@@ -51,14 +51,17 @@ const mutations = {
 const toggleDot = status => {
   const { indexErrData, remindMatterData } = status
   const dotStatus =  indexErrData || remindMatterData
-  const el = document.querySelector('.el-menu a[href="#/main/main"] span')
-  if (el) {
-    if (dotStatus) {
-      el.classList.add('main-dot')
-    } else {
-      el.classList.remove('main-dot')
+  setTimeout(() => {
+    // const el = document.querySelector('.menu-wrapper a[href="#/main/main"] span')
+    const el = document.querySelector('.el-scrollbar__view a.indexlayout-top-menu-li[href="#/main"] span')
+    if (el) {
+      if (dotStatus) {
+        el.classList.add('main-dot')
+      } else {
+        el.classList.remove('main-dot')
+      }
     }
-  }
+  }, 500);
 }
 
 const actions = {

src/views/businessManager/orderManager/financeManager-taoqi.vue

@@ -358,6 +358,7 @@
         :title="isAdd ? '添加订单' : '查看'"
         destroy-on-close
         :visible.sync="routeOrderStatus"
+        v-if="routeOrderStatus"
         @close="onFormClose('ruleForm')"
         width="600px"
       >
@@ -1237,6 +1238,7 @@ export default {
           ],
           applyType: null,
           userId: "",
+          calenderId: null
         };
       }
     },

src/views/businessManager/orderManager/financeManager.vue

@@ -1254,6 +1254,7 @@ export default {
           ],
           applyType: null,
           userId: "",
+          calenderId: null
         };
       }
     },

src/views/businessManager/orderManager/payRecord.vue

@@ -241,7 +241,7 @@
                 >
                 <el-popconfirm
                   title="确定删除该条数据吗？"
-                  @onConfirm="() => removeRecord(scope.row.id)"
+                  @confirm="() => removeRecord(scope.row.id)"
                   v-permission="'financialExpenditure/batchDel/4042'"
                 >
                   <el-button type="text" slot="reference">删除</el-button>
@@ -383,7 +383,12 @@ export default {
     removeRecord(id) {
       removeFinancialExpenditure({
         ids: id,
-      }).then(() => this.getList());
+      }).then(() => {
+        this.getList()
+        this.$message.success("删除成功");
+      }).catch((res) => {
+        this.$message.error(res.msg)
+      });
     },
     beforeUpload(file) {
       load.startLoading();

src/views/businessManager/orderManager/salesList.vue

@@ -276,7 +276,7 @@
               >
               <el-popconfirm
                 title="退货后该销售金额将退还到学员账户余额"
-                @onConfirm="() => refund({ id: scope.row.id })"
+                @confirm="() => refund({ id: scope.row.id })"
                 v-if="scope.row.status === 0"
                 v-permission="'sellOrder/refund'"
               >
@@ -557,6 +557,8 @@ export default {
                 reTry: true,
               });
             });
+          } else {
+            this.$message.error(res.msg)
           }
         });
     },

src/views/main/reminders/index.vue

@@ -64,8 +64,7 @@ export default {
     permission,
     handle(item) {
       // 添加判断权限
-      console.log(item)
-      if(errorType[item[0]?.errorType] && !this.permission(errorType[item[0]?.errorType]?.permission)) {
+      if(errorType[item.errorType] && !this.permission(errorType[item.errorType]?.permission)) {
         return
       }
       new Searchs().removeByKey('/teamList')