Ver código fonte

更新扫码登录到测试环境

Xiao_123 1 mês atrás
pai
commit
a93e2c558b

+ 53 - 53
src/router/modules/components/recruit/enterprise.js

@@ -392,68 +392,68 @@ const enterprise = [
       }
     ]
   },
-  {
-    path: '/recruit/enterprise/newlyAppointed',
-    component: Layout,
-    name: 'Newly Appointed',
-    meta: {
-      title: '门墩儿新任命',
-      enName: 'Newly Appointed',
-      icon: 'mdi-new-box'
-    },
-    children: [
-      {
-        path: '/recruit/enterprise/newlyAppointed',
-        show: true,
-        component: () => import('@/views/recruit/enterprise/newlyAppointed/index.vue')
-      }
-    ]
-  },
   // {
+  //   path: '/recruit/enterprise/newlyAppointed',
   //   component: Layout,
-  //   path: '/recruit/enterprise/talentMap',
-  //   redirect: '/recruit/enterprise/talentMap/newlyAppointed',
-  //   name: 'TalentMap',
+  //   name: 'Newly Appointed',
   //   meta: {
-  //     title: '人才地图',
-  //     enName: 'Talent Map',
-  //     icon: 'mdi-map-marker-account-outline',
+  //     title: '门墩儿新任命',
+  //     enName: 'Newly Appointed',
+  //     icon: 'mdi-new-box'
   //   },
   //   children: [
   //     {
-  //       path: '/recruit/enterprise/talentMap/newlyAppointed',
-  //       meta: {
-  //         title:'门墩儿新任命',
-  //         enName: 'Newly Appointed'
-  //       },
-  //       component: () => import('@/views/recruit/enterprise/newTalentMap/newlyAppointed/index.vue')
-  //     },
-  //     {
-  //       path: '/recruit/enterprise/talentMap/search',
-  //       meta: {
-  //         title: '人才搜索',
-  //         enName: 'Talent Search'
-  //       },
-  //       component: () => import('@/views/recruit/enterprise/newTalentMap/search/index.vue')
-  //     },
-  //     {
-  //       path: '/recruit/enterprise/talentMap/labeling',
-  //       meta: {
-  //         title: '人才标注',
-  //         enName: 'Talent labeling '
-  //       },
-  //       component: () => import('@/views/recruit/enterprise/newTalentMap/labeling/index.vue')
-  //     },
-  //     {
-  //       path: '/recruit/enterprise/talentMap/tagManagement',
-  //       meta: {
-  //         title: '标签管理',
-  //         enName: 'Tag Management '
-  //       },
-  //       component: () => import('@/views/recruit/enterprise/newTalentMap/tag/index.vue')
+  //       path: '/recruit/enterprise/newlyAppointed',
+  //       show: true,
+  //       component: () => import('@/views/recruit/enterprise/newlyAppointed/index.vue')
   //     }
   //   ]
   // },
+  {
+    component: Layout,
+    path: '/recruit/enterprise/talentMap',
+    redirect: '/recruit/enterprise/talentMap/newlyAppointed',
+    name: 'TalentMap',
+    meta: {
+      title: '人才地图',
+      enName: 'Talent Map',
+      icon: 'mdi-map-marker-account-outline',
+    },
+    children: [
+      {
+        path: '/recruit/enterprise/talentMap/newlyAppointed',
+        meta: {
+          title:'门墩儿新任命',
+          enName: 'Newly Appointed'
+        },
+        component: () => import('@/views/recruit/enterprise/newTalentMap/newlyAppointed/index.vue')
+      },
+      {
+        path: '/recruit/enterprise/talentMap/search',
+        meta: {
+          title: '人才搜索',
+          enName: 'Talent Search'
+        },
+        component: () => import('@/views/recruit/enterprise/newTalentMap/search/index.vue')
+      },
+      {
+        path: '/recruit/enterprise/talentMap/labeling',
+        meta: {
+          title: '人才标注',
+          enName: 'Talent labeling '
+        },
+        component: () => import('@/views/recruit/enterprise/newTalentMap/labeling/index.vue')
+      },
+      {
+        path: '/recruit/enterprise/talentMap/tagManagement',
+        meta: {
+          title: '标签管理',
+          enName: 'Tag Management '
+        },
+        component: () => import('@/views/recruit/enterprise/newTalentMap/tag/index.vue')
+      }
+    ]
+  },
   {
     path: '/recruit/enterprise/contactUs',
     component: Layout,

+ 11 - 11
src/views/login/index.vue

@@ -31,7 +31,7 @@
             <v-tabs v-model="tab" align-tabs="center" color="primary" :class="`mb-${tab === 3 ? 6 : 9}`" @update:modelValue="tabChange">
               <v-tab :value="2">账号</v-tab>
               <v-tab :value="1">验证码</v-tab>
-              <!-- <v-tab :value="3">微信扫码</v-tab> -->
+              <v-tab :value="3">微信扫码</v-tab>
             </v-tabs>
             <v-window v-model="tab">
                 <!-- 验证码登录 -->
@@ -42,7 +42,7 @@
               <v-window-item :value="2">
                 <passwordFrom ref="passRef" @handleEnter="handleLogin"></passwordFrom>
               </v-window-item>
-              <!-- <v-window-item :value="3">
+              <v-window-item :value="3">
                 <div v-if="showQrCode" class="d-flex align-center flex-column position-relative">
                   <v-img :src="qrCodeUrl" width="200" height="200"></v-img>
                   <span class="color-666 font-size-13 mt-3">请使用微信扫描二维码登录“门墩儿”</span>
@@ -58,7 +58,7 @@
                 <div v-else style="height: 150px; line-height: 150px; text-align: center;">
                   加载中 . . .
                 </div>
-              </v-window-item> -->
+              </v-window-item>
             </v-window>
           </div>
           <div class="font-size-14">
@@ -325,14 +325,14 @@ const disabledClick = () => {
 }
 
 const tabChange = (val) => {
-  // if (val === 3) {
-  //   if (abortController.value) {
-  //     abortController.value.abort()
-  //     abortController.value = null
-  //   }
-  //   query.value.clientId = generateUUID()
-  //   getSocialAuthRedirect()
-  // }
+  if (val === 3) {
+    if (abortController.value) {
+      abortController.value.abort()
+      abortController.value = null
+    }
+    query.value.clientId = generateUUID()
+    getSocialAuthRedirect()
+  }
 }
 
 // 获取验证码