diff --git a/src/permission.js b/src/permission.js
index 46ba4de..6594725 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -1,6 +1,6 @@
 import router from './router'
 import store from './store'
-import { Message } from 'element-ui'
+import { Message, MessageBox } from 'element-ui'
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css' // progress bar style
 import {getToken, setToken} from '@/utils/auth' // get token from cookie
@@ -17,28 +17,61 @@ router.beforeEach(async(to, from, next) => {
 
   // set page title
   document.title = getPageTitle(to.meta.title)
-
+  console.log(to.path)
   //osslogin
-  if (/^\/oss_login.*/.test(to.path)) {
+  if (/\/oss_login.*/g.test(to.path)) {
     if (to.query.token) {
-      const ossRes= await ossLogin({
+      const ossRes = await ossLogin({
         oss_token: to.query.token
       })
-      setToken(ossRes.user.bianma,"difficult_employee_token_h5")
-      next({
-        path: "/h5",
-        replace: true
-      })
+      if (ossRes.admin?.token && ossRes.user?.user?.bianma) {
+        try {
+          await MessageBox.confirm('选择入口方式','提示',{
+            confirmButtonText: '进入前台',
+            cancelButtonText: '进入后台',
+            type: "warning",
+            showClose: false,
+            closeOnClickModal: false
+          })
+          setToken(ossRes.user.user.bianma,"difficult_employee_token_h5")
+          next({
+            path: "/h5",
+            replace: true
+          })
+        } catch (err) {
+          store.commit('user/SET_TOKEN', ossRes.admin.token)
+          setToken(ossRes.admin.token,"difficult_employee_token")
+          next({
+            path: "/",
+            replace: true
+          })
+        }
+      } else if (ossRes.user?.user?.bianma) {
+        setToken(ossRes.user.user.bianma,"difficult_employee_token_h5")
+        next({
+          path: "/h5",
+          replace: true
+        })
+      } else if (ossRes.admin?.token) {
+        store.commit('user/SET_TOKEN', ossRes.admin.token)
+        setToken(ossRes.admin.token,"difficult_employee_token")
+        next({
+          path: "/",
+          replace: true
+        })
+      } else {
+
+      }
     }
     return
   }
 
   // determine whether the user has logged in
-  let hasToken = getToken()
-  if (/^\/h5.*/.test(to.path)) {
+  let hasToken;
+  if (/\/h5.*/g.test(to.path)) {
     hasToken = getToken("difficult_employee_token_h5")
   } else {
-    hasToken = getToken()
+    hasToken = getToken("difficult_employee_token")
   }
   console.log(hasToken)
 
diff --git a/src/utils/request.js b/src/utils/request.js
index ab840ea..f46b294 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -8,6 +8,7 @@ import store from '@/store'
 import {
   getToken
 } from '@/utils/auth'
+import router from "@/router";
 
 let loading ;
 // create an axios instance
@@ -36,7 +37,7 @@ service.interceptors.request.use(
       // please modify it according to the actual situation
       //config.headers['X-Token'] = getToken();
 
-      config.headers['Authorization'] = "Bearer " + getToken()
+      config.headers['Authorization'] = "Bearer " + getToken(/\/h5.*/g.test(router.currentRoute.fullPath) ? "difficult_employee_token_h5" : "difficult_employee_token")
     }
     return config
   },
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index dd59bdf..36815c9 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -23,6 +23,8 @@
           </el-table-column>
           <el-table-column prop="username" label="用户名">
           </el-table-column>
+          <el-table-column prop="idcard" label="身份证号">
+          </el-table-column>
           <el-table-column prop="address" label="角色">
             <template slot-scope="scope">
               <el-tag size="medium" v-for="(item,index) in scope.row.roles" style="margin-right: 10px;">{{ item.name }}
@@ -58,6 +60,10 @@
             <el-input v-model="form.username" :readonly="userNameStatus ? false : 'readonly'" autocomplete="off">
             </el-input>
           </el-form-item>
+          <el-form-item label="身份证号" prop="idcard">
+            <el-input v-model="form.idcard" autocomplete="off">
+            </el-input>
+          </el-form-item>
           <el-form-item label="密码" prop="password">
             <el-input v-model="form.password" type="password" autocomplete="off"></el-input>
           </el-form-item>
@@ -116,6 +122,7 @@
           username: "",
           password: "",
           department_id: "",
+          idcard: ""
         },
         rules: {
           name: [{
@@ -134,7 +141,24 @@
             required: true,
             message: '请输入密码',
             trigger: 'blur',
-          }]
+          },
+          ],
+          idcard: [
+            {
+              required: true,
+              message: '请输入身份证号',
+              trigger: 'blur',
+            },
+            {
+              validator: (rule, value, callback) => {
+                if (/^[1-9][0-9]{5}(19|20)[0-9]{2}((01|03|05|07|08|10|12)(0[1-9]|[1-2][0-9]|3[0-1])|(04|06|09|11)(0[1-9]|[1-2][0-9]|30)|02(0[1-9]|[1-2][0-9]))[0-9]{3}([0-9]|x|X)$/.test(value)) {
+                  callback()
+                } else {
+                  callback(new Error("身份证格式错误"))
+                }
+              }
+            }
+          ]
         },
         tableHeight: 0,
         //查询条件字段