zs 1 年間 前
コミット
8117be10bf

+ 0 - 3
src/router/guard.js

@@ -1,5 +1,4 @@
 import { AxiosWrapper } from '@/utils/axios-wrapper'
-import { checkResult } from '@/utils/checkResult'
 import { UserStore } from '@/store/user'
 import { cloneDeep, isArray, omit } from 'lodash-es'
 import NProgress from 'nprogress'
@@ -165,8 +164,6 @@ export const registerBeforeRouter = async (router) => {
       }
       // 检查目的地路由是否注册
       const hasRoute = hasNecessaryRoute(to, router)
-      console.log(to, router)
-      console.log(hasRoute);
       NProgress.inc()
       if (hasRoute || to.meta.hidden) {
         // 注册了直接进入

+ 0 - 5
src/router/index.js

@@ -38,11 +38,6 @@ export const constantRoutes = [
         },
         component: () => import('@/views/home/index.vue')
       },
-      // {
-      //   path: '/match/sign',
-      //   component: () => import('@/views/match/sign/index.vue'),
-      //   meta: { hidden: true }
-      // },
       {
         path: '401',
         component: () => import('@/views/error-page/401.vue'),

+ 2 - 2
src/views/match/info/index.vue

@@ -72,9 +72,9 @@ const fields = [
 ]
 const opera = [
   { label: t('common.sign'), method: 'sign' },
-  { label: t('common.update'), method: 'edit', display: (i) => i.is_use === '1' },
+  { label: t('common.update'), method: 'edit', display: (i) => i.is_use === '1' && i.match_status === '0' },
   { label: t('common.exam'), method: 'exam', type: 'warning', display: (i) => i.status === '0' },
-  { label: t('common.delete'), method: 'delete', confirm: true, type: 'danger', display: (i) => i.is_use === '1' }
+  { label: t('common.delete'), method: 'delete', confirm: true, type: 'danger', display: (i) => i.is_use === '1' && i.match_status === '0' }
 ]
 const buttonFields = [{ label: t('common.add'), method: 'add' }]
 let skip = 0

+ 8 - 1
src/views/match/sign/index.vue

@@ -2,7 +2,10 @@
   <div id="index">
     <el-row>
       <el-col :span="24" class="main animate__animated animate__backInRight" v-loading="loading">
-        <el-col :span="24" class="one"> 报名管理 </el-col>
+        <el-col :span="24" class="one">
+          <el-button type="primary" @click="toBack()">返回</el-button>
+        </el-col>
+        <el-col :span="24" class="two"> 报名管理 </el-col>
       </el-col>
     </el-row>
   </div>
@@ -16,5 +19,9 @@ onMounted(async () => {
   loading.value = true
   loading.value = false
 })
+// 返回上一页
+const toBack = () => {
+  window.history.go(-1)
+}
 </script>
 <style scoped lang="scss"></style>