Przeglądaj źródła

修改线上问题

lex-xin 4 lat temu
rodzic
commit
2dc9da3d67

+ 2 - 2
src/layout/components/TagsView.vue

@@ -117,7 +117,6 @@ export default {
       const allSearch = searchs.getSearchs();
 
       const sks = Object.keys(allSearch);
-      console.log(sks)
       let route = this.$route;
       for (const item of sks) {
        if (!(keys.includes(item) || keys.includes(allSearch[item].bind))) {
@@ -174,7 +173,8 @@ export default {
             if (latestView) {
               this.$router.push(latestView.fullPath);
             } else {
-              this.$router.push("/");
+              let firstMenuUrl = localStorage.getItem('firstMenuUrl')
+              this.$router.push(firstMenuUrl || '/');
             }
           }
         });

+ 1 - 0
src/permission.js

@@ -88,6 +88,7 @@ router.beforeEach(async (to, from, next) => {
           // 确保addroutes完整的hack方法
           // 设置replace:true,这样导航就不会留下历史记录。
           let firstMenu = getFirstMenu(accessRoutes)
+          localStorage.setItem('firstMenuUrl', firstMenu)
           if(to.path == '/main/main') {
             next({ path: firstMenu, replace: true })
           } else {

+ 3 - 2
src/store/modules/tagsView.js

@@ -30,11 +30,12 @@ const tagsView = {
       // }
     },
     DEL_VISITED_VIEWS: (state, view) => {
+      let firstMenuUrl = localStorage.getItem('firstMenuUrl')
+      let compareUrl = firstMenuUrl || '/main/main'
       for (const [i, v] of state.visitedViews.entries()) {
 
         if (v.path === view.path) {
-
-          if (state.visitedViews.length == 1 && state.visitedViews[0].path == '/main/main') {
+          if (state.visitedViews.length == 1 && state.visitedViews[0].path == compareUrl) {
             break
           } else {
 

+ 23 - 16
src/views/teamBuild/signupList.vue

@@ -2,15 +2,25 @@
   <div class="sigup-container">
     <div class="topWrap">
       <div>
-        <h2>
-          <el-page-header @back="onCancel" :content="teamName + '报名详情'">
-          </el-page-header>
-        </h2>
-        <p style="margin-bottom: 15px; font-size: 18px; font-weight: 400">
-          报名截止时间:{{ applyExpireDate | formatTimer }} 缴费截止时间:{{
-            paymentExpireDate | formatTimer
-          }}
-        </p>
+        <div style="display: flex;justify-content: space-between;">
+          <div>
+            <h2>
+              <el-page-header @back="onCancel" :content="teamName + '报名详情'">
+              </el-page-header>
+            </h2>
+            <p style="margin-bottom: 15px; font-size: 18px; font-weight: 400">
+              报名截止时间:{{ applyExpireDate | formatTimer }} 缴费截止时间:{{
+                paymentExpireDate | formatTimer
+              }}
+            </p>
+          </div>
+          <p class="msg" :class="status == 'PAY' ? 'pay' : ''">
+            <img :src="status == 'APPLY' ? stepImgs.APPLY : stepImgs.PAY" alt="" />
+            {{ status == "APPLY" ? "报名中" : "缴费中" }}
+          </p>
+        </div>
+
+
         <div class="btnList">
           <!-- <div class='newBand close'
                v-permission="'musicGroup/cancelMusicGroup'"
@@ -103,10 +113,7 @@
         APPLY: require('@/assets/images/base/clock.png'),
         PAY: require('@/assets/images/base/pay.png')
       }, -->
-      <p class="msg" :class="status == 'PAY' ? 'pay' : ''">
-        <img :src="status == 'APPLY' ? stepImgs.APPLY : stepImgs.PAY" alt="" />
-        {{ status == "APPLY" ? "报名中" : "缴费中" }}
-      </p>
+      
     </div>
     <div class="searchList">
       <save-form
@@ -1513,9 +1520,9 @@ export default {
     padding: 18px 58px;
     // height: 136px;
     background-color: #fff;
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
+    // display: flex;
+    // flex-direction: row;
+    // justify-content: space-between;
     .msg.pay {
       color: #f85043;
     }