Browse Source

移除 版本检测

wangzhihui 4 năm trước cách đây
mục cha
commit
72fa334eb8
3 tập tin đã thay đổi với 16 bổ sung25 xóa
  1. 1 1
      src/components/Aside.vue
  2. 13 23
      src/main.js
  3. 2 1
      src/views/voyage/voyageList.vue

+ 1 - 1
src/components/Aside.vue

@@ -7,7 +7,7 @@
     active-text-color="#ffd04b"
     :router="true"
   >
-    <el-sub-menu v-for="(item, index) in menu" :key="item" :index="index">
+    <el-sub-menu v-for="(item, index) in menu" :key="item" :index="index + ''">
       <template v-slot:title>
         <i :class="item.icon"></i>
         <span>{{ item.title }}</span>

+ 13 - 23
src/main.js

@@ -12,27 +12,15 @@ const cloudConfig = db.collection("huihenduo_manage_config");
 const app = createApp(App);
 
 router.beforeEach(async (to, from, next) => {
-  let res = await cloudConfig.doc("18ed09686196068205eeb77612d641c6").get();
-  let currentVersion = localStorage.version;
-  let { version } = res.data[0];
-  if (currentVersion == version) {
-    let id = localStorage.id;
-    if (id) {
-      store.commit("changeLogin", true);
-      if (0 === to.matched.length) {
-        next("/cargoOwnerManage/cargoOwnerList");
-      } else if (to.path == "/login" || to.path == "/") {
-        next("/cargoOwnerManage/cargoOwnerList");
-      } else {
-        next();
-      }
+  let id = localStorage.id;
+  if (id) {
+    store.commit("changeLogin", true);
+    if (0 === to.matched.length) {
+      next("/cargoOwnerManage/cargoOwnerList");
+    } else if (to.path == "/login" || to.path == "/") {
+      next("/cargoOwnerManage/cargoOwnerList");
     } else {
-      store.commit("changeLogin", false);
-      if (to.path == "/login") {
-        next();
-      } else {
-        next("/login");
-      }
+      next();
     }
   } else {
     localStorage.removeItem("staffPhone");
@@ -40,10 +28,12 @@ router.beforeEach(async (to, from, next) => {
     localStorage.removeItem("status");
     localStorage.removeItem("userType");
     localStorage.removeItem("staffName");
-    localStorage.setItem("version", version);
-    location.reload();
     store.commit("changeLogin", false);
-    next("/login");
+    if (to.path == "/login") {
+      next();
+    } else {
+      next("/login");
+    }
   }
 });
 router.afterEach((to, from) => {

+ 2 - 1
src/views/voyage/voyageList.vue

@@ -158,7 +158,7 @@
       <el-table-column
         prop="voyageName"
         label="航次名称"
-        min-width="120"
+        min-width="140"
         align="center"
       ></el-table-column>
       <el-table-column
@@ -258,6 +258,7 @@ export default {
       term.value = "";
       if (res.data.status == 0) {
         tableData.value = res.data.result;
+        total.value = res.data.total;
       } else {
         ElNotification({
           type: "error",