Selaa lähdekoodia

Merge branch 'groupJobFair' of https://git.citupro.com/zhengnaiwen_citu/menduner into groupJobFair

Xiao_123 1 kuukausi sitten
vanhempi
commit
a3e5c07aec
3 muutettua tiedostoa jossa 10 lisäystä ja 11 poistoa
  1. 0 3
      components.d.ts
  2. 5 3
      src/permission.js
  3. 5 5
      src/utils/payType.js

+ 0 - 3
components.d.ts

@@ -75,7 +75,4 @@ declare module 'vue' {
     VerifySlide: typeof import('./src/components/Verifition/Verify/VerifySlide.vue')['default']
     WangEditor: typeof import('./src/components/FormUI/wangEditor/index.vue')['default']
   }
-  export interface ComponentCustomProperties {
-    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
-  }
 }

+ 5 - 3
src/permission.js

@@ -141,9 +141,11 @@ router.beforeEach(async (to, from, next) => {
     else if (localStorage.getItem('necessaryInfoReady') === 'fddeaddc47868b' && tokenIndex === 2 && localStorage.getItem('chooseRole') !== 'showChooseRole') dialogExtend('necessaryInfoDialog')
     
     if (to.fullPath === '/login') {
-      window.location.reload()
-      // next('/recruitHome')
-      return
+      if (from.path !== '/login' && from.path !== '/') {
+        window.location.reload()
+      } else {
+        next({ path: '/recruitHome' })
+      }
     }
     next()
     return

+ 5 - 5
src/utils/payType.js

@@ -35,11 +35,11 @@ const channelsWechat = [
     // icon: svg_wx_pub,
     code: 'wx_pub'
   },
-  {
-    name: '微信小程序支付',
-    // icon: svg_wx_lite,
-    code: 'wx_lite'
-  },
+  // {
+  //   name: '微信小程序支付',
+  //   // icon: svg_wx_lite,
+  //   code: 'wx_lite'
+  // },
   {
     name: '微信 App 支付',
     // icon: svg_wx_app,