diff --git a/package-lock.json b/package-lock.json
index 3e1ad2c..a4fc876 100755
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,6 +17,7 @@
         "vue-clickaway": "^2.2.2",
         "vue-qr": "^4.0.9",
         "vue-router": "^3.5.1",
+        "vue-wxlogin": "^1.0.5",
         "vuex": "^3.6.2"
       },
       "devDependencies": {
@@ -11415,6 +11416,19 @@
       "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
       "dev": true
     },
+    "node_modules/vue-wxlogin": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/vue-wxlogin/-/vue-wxlogin-1.0.5.tgz",
+      "integrity": "sha512-JJTL9qwROH7c/OWU8mube6Yd6kwUTItCg4tyjZQVby1MKWNuNz/f0eeRd0bhOdFyPSFmVazTF3nw+Jhfo4FzVA==",
+      "license": "MIT",
+      "dependencies": {
+        "vue": "^2.4.2"
+      },
+      "engines": {
+        "node": ">= 4.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
     "node_modules/vuex": {
       "version": "3.6.2",
       "resolved": "https://registry.npmmirror.com/vuex/-/vuex-3.6.2.tgz",
diff --git a/package.json b/package.json
index 1e13c71..63da9b7 100755
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
     "vue-clickaway": "^2.2.2",
     "vue-qr": "^4.0.9",
     "vue-router": "^3.5.1",
+    "vue-wxlogin": "^1.0.5",
     "vuex": "^3.6.2"
   },
   "devDependencies": {
diff --git a/src/components/Header.vue b/src/components/Header.vue
index 9950fda..eb5b281 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -4,10 +4,10 @@
             <img src="../assets/header-logo.png" alt="">
         </div>
         <div class="header-right flex" v-if="headerShow">
-            <div 
-                :class="['right-item', currentPath == item.path ? 'right-item-active' :'']" 
-                v-for="(item,index) in routerNavList" 
-                :key="index" 
+            <div
+                :class="['right-item', currentPath == item.path ? 'right-item-active' :'']"
+                v-for="(item,index) in routerNavList"
+                :key="index"
                 @click="goToPage(item.path)"
             >
                 {{ item.name }}
@@ -33,27 +33,36 @@ export default {
             user: '',
             headerShow:false,
             doctor_id:'',
+            authtoken:false,
             currentPath:'',
             routerNavList:[
-                {
-                    name:'个人信息',
-                    path:'/doctorInformation'
-                },
-                {
-                    name:'医院管理',
-                    path:'/hospitalManage'
-                },
-                {
-                    name:'收款管理',
-                    path:'/paymentMethod'
-                },
+                // {
+                //     name:'个人信息',
+                //     path:'/doctorInformation'
+                // },
+                // {
+                //     name:'医院管理',
+                //     path:'/hospitalManage'
+                // },
+                // {
+                //     name:'收款管理',
+                //     path:'/paymentMethod'
+                // },
             ]
         }
     },
     mounted(){
-        this.user = localStorage.getItem('nick')
+        this.user = localStorage.getItem('user_name')
+        var user_type = localStorage.getItem('user_type')
+        if(!user_type || user_type == 'undefined') {
+            this.user = '超级管理员'
+        }else{
+            if(user_type && user_type != 'undefined') this.user = (user_type == 1?'医生':'助手') + this.user
+        }
         this.doctor_id = localStorage.getItem('doctor_id')
-        if(this.user){
+        this.authtoken = localStorage.getItem('authtoken')
+
+        if(this.authtoken){
             this.headerShow = true
             // 初始化时设置当前路由高亮
             this.updateCurrentPath()
@@ -76,26 +85,17 @@ export default {
             })
         },
         loginOut(){
-            // 退出登录
-            this.$http('POST', '/login_out', {}).then(response => {
-                if(response.status){
-                    // 移除信息待定 ---需要修改喔
-                    localStorage.removeItem('token');
-                    localStorage.removeItem('nick');
-                    localStorage.removeItem('doctor_id');
-                    // 退出后跳转到登录页或首页
-                    this.$router.push('/login');
-                }else{
-                    this.$message.error(response.data.info)
-                }
-            }).catch(error => {
-                console.error(error, 'error')
-            })
+            localStorage.removeItem('token');
+            localStorage.removeItem('user_name');
+            localStorage.removeItem('authtoken');
+            localStorage.removeItem('user_type');
+            localStorage.removeItem('doctor_id');
+            this.$router.push('/login');
         },
         // 更新当前路径高亮状态
         updateCurrentPath() {
             const currentRoute = this.$route.path;
-            const matchedItem = this.routerNavList.find(item => 
+            const matchedItem = this.routerNavList.find(item =>
                 currentRoute.startsWith(item.path)
             );
             if (matchedItem) {
@@ -113,7 +113,7 @@ export default {
         }
     },
     beforeDestroy() {
-        
+
     }
 }
 </script>
diff --git a/src/main.js b/src/main.js
index 6c9ef60..7d8a44f 100755
--- a/src/main.js
+++ b/src/main.js
@@ -25,6 +25,13 @@ Vue.directive('clickaway', clickaway);
 Vue.mixin(HeaderIcon)
 Vue.use(PositionMessage)
 
+
+window.issuper = true;
+var user_type = localStorage.getItem('user_type')
+if(user_type && user_type != 'undefined') window.issuper = false;
+
+window.doctor_id = localStorage.getItem('doctor_id');
+
 new Vue({
   router,
   store,
diff --git a/src/router/index.js b/src/router/index.js
index 2c7b55b..b06ab54 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,7 +11,7 @@ const routes = [
   {
     path: '/login',
     name: '登录',
-    component: () => import('../views/login.vue'),
+    component: () => import('../views/adminLogin.vue'),
     meta: {
       hideBreadcrumb: true, // 首页不显示面包屑
       requiresAuth:false
diff --git a/src/utils/request.js b/src/utils/request.js
index 91a00d6..e0c7365 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,18 +17,19 @@ service.interceptors.request.use(
     // 在发送请求之前做一些处理，例如添加 token
     // const token = localStorage.getItem("token");
     const token = localStorage.getItem("authtoken");
-    
+    const doctor_id = localStorage.getItem("doctor_id");
+
     // 检查是否存在 token，如果不存在则跳转到登录页
-    if (!token) {
+    if (!token && location.pathname != '/login' && location.href.indexOf('/login') == -1) {
       // 可以根据需要决定是否提示用户
       console.warn("未检测到登录信息，请重新登录");
       window.location.href = "/login";
       return Promise.reject(new Error("未登录"));
     }
-    
-    if (token) {
-      config.headers["Auth"] = `${token}`;
-    }
+
+    if (token) config.headers["Auth"] = `${token}`;
+    if (doctor_id) config.headers["DID"] = `${doctor_id}`;
+
     return config;
   },
   (error) => {
@@ -68,10 +69,19 @@ service.interceptors.response.use(
           console.error("请求失败", error.message);
       }
     }
+
     return Promise.reject(error);
   }
 );
 
+function logout() {
+  localStorage.removeItem('authtoken')
+  localStorage.removeItem('doctor_id')
+  localStorage.removeItem('user_name')
+  localStorage.removeItem('user_type')
+  location.href = '/login'
+}
+
 /**
  * 封装请求方法
  * @param {string} method 请求方法 (GET, POST, PUT, DELETE 等)
@@ -91,9 +101,13 @@ const request = (method, url, data = {}, config = {}) => {
       ...config,
     });
     res.then(response => {
-      if(response && response.msg && response.msg.indexOf('非法操作') > -1) {
-        localStorage.removeItem('authtoken')
-        location.href = '/ErrorAccess'
+      if(response && response.msg && response.msg.indexOf('您没有访问权限~~~') > -1) {
+        location.href = '/'
+        return;
+      }
+
+      if(response && response.msg && (response.msg.indexOf('非法操作') > -1 || response.code == 40002)) {
+        logout()
         return;
       }
     }).catch(error => {
@@ -111,9 +125,13 @@ const request = (method, url, data = {}, config = {}) => {
     });
 
     respost.then(response => {
-      if(response && response.msg && response.msg.indexOf('非法操作') > -1) {
-        localStorage.removeItem('authtoken')
-        location.href = '/ErrorAccess'
+      if(response && response.msg && response.msg.indexOf('您没有访问权限~~~') > -1) {
+        location.href = '/'
+        return;
+      }
+
+      if(response && response.msg && (response.msg.indexOf('非法操作') > -1 || response.code == 40002)) {
+        logout()
         return;
       }
     }).catch(error => {
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 90dc1c3..dce5ff4 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="min-width pagePadding " style="background: #F5F7FA;" v-if="pageShow">
         <div class="doctor-list-wrap ">
-            <p class="pageTitle">{{onlyHosFlag ? '医院管理' :'医生列表'}}</p>
+            <p class="pageTitle">{{issuper ? '医院管理' :'医生列表'}}</p>
             <el-form>
                 <div class="selectAllTable-wrap flex-between  mt32">
                     <div class="left flex">
@@ -16,8 +16,8 @@
                             @click="batchOperate('1')">
                             批量启用</GuipButton>
                     </div>
-                    <div class="right" v-if="onlyHosFlag">
-                        <GuipButton type="system" size="form" @click="addHospitalUser">添加医院</GuipButton>
+                    <div class="right" v-if="!issuper">
+                        <GuipButton type="system" size="form" @click="addHospital(false)">添加医院</GuipButton>
                     </div>
                     <div class="right flex" v-else>
                         <span>搜索医生</span>
@@ -29,7 +29,7 @@
                 </div>
                 <div class="tableList mt32" v-for="(item, index) in doctorList" :key="index">
 
-                    <div class="top flex-between mb24" v-if="!onlyHosFlag">
+                    <div class="top flex-between mb24" v-if="issuper">
                         <div class="left left1 flex">
                             <el-checkbox @change="handleCheckAllChange(index)" v-model="item.checked"></el-checkbox>
                             <el-avatar :src="item.avator" v-if="item.avator"></el-avatar>
@@ -147,7 +147,8 @@ export default {
             allChecked: false,
             pageShow:false,
             doctorIds:[],
-            payList:false
+            payList:false,
+            issuper:false
         }
     },
     components: {
@@ -162,16 +163,20 @@ export default {
         // CustomDropdown
     },
     created() {
-        console.log(this.onlyHosFlag,'onlyHosFlag===');
-        const { authtoken } = this.$route.query;
+        const { authtoken, did, type, name} = this.$route.query;
         if(authtoken) {
-            localStorage.setItem('authtoken', authtoken);
+            localStorage.setItem('authtoken', decodeURIComponent(authtoken));
+            localStorage.setItem('doctor_id', did);
+            localStorage.setItem('user_type', type);
+            localStorage.setItem('user_name', name);
             location.href = '/'
             return;
         }
         store.commit('SET_PAGENAME', '医生管理'); // 登录页面不显示侧边栏
     },
     mounted() {
+        this.issuper = window.issuper
+
         store.commit('SET_CUSTOMIZE', false);
         store.commit('SET_SLIDER_MENU', 'menuData');
         this.getInitData()
@@ -397,9 +402,13 @@ export default {
             })
         },
         addHospital(item) {
+            var docotr_id = window.doctor_id
+            if(item) {
+                docotr_id = item.id
+            }
             this.$router.push({
                 name: '医院信息',
-                query: { doctor_id: item.id }
+                query: { doctor_id: docotr_id }
             })
         },
         addHospitalUser(){
diff --git a/src/views/HosInformation.vue b/src/views/HosInformation.vue
index dfb4c44..46c19a9 100644
--- a/src/views/HosInformation.vue
+++ b/src/views/HosInformation.vue
@@ -712,7 +712,6 @@ export default {
             this.depart_id = depart_id;
             this.doctor_id = doctor_id;
             await this.fetchDoctorData()
-            console.log(this.doctor_id)
             await this.getAreaData()
             this.fetchPackData()
             this.fetchProjectData()
@@ -730,10 +729,12 @@ export default {
                 this.doctor_id = newVal.doctor_id;
                 this.depart_id = newVal.depart_id;
                 this.getAreaData();
-                this.fetchDoctorData();
-                this.fetchPackData();
-                this.fetchProjectData();
-                this.geHosAdress();
+                if(this.depart_id) {
+                    this.fetchDoctorData();
+                    this.fetchPackData();
+                    this.fetchProjectData();
+                    this.geHosAdress();
+                }
             }
         }
     },
@@ -1027,6 +1028,12 @@ export default {
                 depart_id: this.depart_id,
                 doctor_id: this.doctor_id
             }).then(response => {
+                if(response.code != 0) {
+                    this.$Message.error(response.msg);
+                    // location.href = '/'
+                    return;
+                }
+
                 this.form = {
                     ...this.form, ...response.data,
                     'morning_worktime': response.data.morning_worktime ? response.data.morning_worktime.split('-') : '',
diff --git a/src/views/adminLogin.vue b/src/views/adminLogin.vue
index 5a7a364..afb38b1 100644
--- a/src/views/adminLogin.vue
+++ b/src/views/adminLogin.vue
@@ -4,15 +4,22 @@
             <div class="index_rootContainer">
                 <b class="title">扫码登录</b>
                 <p class="sub_title mt32">打开 <b>微信</b> 扫码登录</p>
-                <div class=" mb32" v-if="status == 'waiting'">
-                    <vue-qr :text="qrCodeUrl" :size="192" :dot-scale="1"></vue-qr>
+                <div class="wxlogin-qrcode-box mb32" v-if="status == 'waiting'">
+                    <Wxlogin
+                    v-if="appid && redirect_uri"
+                    :appid="appid"
+                    :redirect_uri="redirect_uri"
+                    scope="snsapi_login"
+                    :state="state"
+                    height="186px"
+                    href="data:text/css;base64,LmltcG93ZXJCb3ggLnFyY29kZSB7d2lkdGg6IDE4OHB4O2JvcmRlcjpub25lO21hcmdpbi10b3A6MHB4O30KLmltcG93ZXJCb3ggLnRpdGxlIHtkaXNwbGF5OiBub25lO30KLmltcG93ZXJCb3ggLmluZm8ge3dpZHRoOiAxODhweDtkaXNwbGF5Om5vbmU7fQouc3RhdHVzX2ljb24ge2Rpc3BsYXk6IG5vbmV9Ci5pbXBvd2VyQm94IC5zdGF0dXMge3RleHQtYWxpZ246IGNlbnRlcjt9Ci53ZWJfcXJjb2RlX3R5cGVfaWZyYW1le2hlaWdodDoxODZweDt9Ci53ZWJfcXJjb2RlX3N3aXRjaF93cnAuanNfc3dpdGNoVG9GYXN0X3dycHttYXJnaW4tdG9wOjBweCAhaW1wb3J0YW50O2NvbG9yOiAjOEE5MDk5ICFpbXBvcnRhbnQ7fQoud2ViX3FyY29kZV9zd2l0Y2hfd3JwLmpzX3N3aXRjaFRvRmFzdF93cnAgYnV0dG9ue2NvbG9yOiAjOEE5MDk5ICFpbXBvcnRhbnQ7Y3Vyc29yOnBvaW50ZXI7fQoud2ViX3FyY29kZV9zd2l0Y2hfd3JwLmpzX3N3aXRjaFRvTm9ybWFsX3dycCBidXR0b257Y29sb3I6ICM4QTkwOTkgIWltcG9ydGFudDtjdXJzb3I6cG9pbnRlcjt9"
+                    ></Wxlogin>
                 </div>
                 <div class="refreshCode" v-if="status == 'expired'" @click="refreshCode">
                     <i class="el-icon-refresh"></i>
                     刷新二维码
                 </div>
-                <!-- :logo-src="logoUrl"
-                :logo-scale="0.2" -->
+
                 <div class="attention gap10">
                     <el-checkbox v-model="checked"></el-checkbox>
                     <b>登录即代表同意 <a @click="jumpDoc">《用户协议》</a>和 <a @click="jumpDoc">《隐私条款》</a></b>
@@ -40,123 +47,44 @@
     </div>
 </template>
 <script>
-import VueQr from 'vue-qr'
+import Wxlogin  from 'vue-wxlogin';
 export default {
     components: {
-        VueQr
+        Wxlogin
     },
     data() {
         return {
             checked: true,
             qrCodeUrl: 'https://example.com',
             token: '',
-            status: 'expired', // waiting, scanned, confirmed, expired, error
+            status: 'expired',
             loginTime:'',
+            appid:false,
+            redirectUri:false,
+            state:'zjadmin'
         }
     },
     created(){
-        // this.generateQRCode()
-    },
-    beforeDestroy() {
-        this.clearTimers();
+        this.getLoginConfig()
     },
     methods: {
-        jumpDoc() {
-
-        },
-        // 刷新二维码
-        refreshCode() {
-
-        },
-        async generateQRCode() {
+        async getLoginConfig() {
             this.status = 'waiting';
-            this.qrCodeUrl = '';
-            return
-            // try {
-            //     await this.$http('POST', '/api/admin/generate_qrcode', {
-            //         device_type: 'web',
-            //         timestamp: Date.now()
-            //     }).then(response => {
-            //         this.token = response.data.token;
-            //         this.qrCodeUrl = response.data.qr_code_url;
-
-            //         // 开始轮询检查状态
-            //         this.startPolling();
-
-            //         // 设置二维码过期时间（5分钟）
-            //         this.setExpireTimer();
-            //     }).catch(error => {
-            //         console.error('生成二维码失败:', error);
-            //         this.status = 'error';
-            //     });
-            // } catch (error) {
-            //     console.error('生成二维码失败:', error);
-            //     this.status = 'error';
-            // }
-        },
-
-        // 开始轮询检查扫码状态
-        startPolling() {
-            this.clearTimers();
-
-            // this.pollInterval = setInterval(async () => {
-            //     if (this.status === 'confirmed' || this.status === 'expired' || this.status === 'error') {
-            //         this.clearTimers();
-            //         return;
-            //     }
-
-            //     try {
-            //         await this.$http('POST', '/api/admin/check_scan_status', {
-            //             token: this.token
-            //         }).then(response => {
-            //             this.status = response.data.status;
-
-            //             if (response.data.status === 'scanned') {
-            //                 // 扫码后等待确认
-            //                 setTimeout(() => {
-            //                     this.handleLoginConfirm();
-            //                 }, 2000);
-            //             } else if (response.data.status === 'confirmed') {
-            //                 this.handleLoginSuccess(response.data);
-            //             } else if (response.data.status === 'expired') {
-            //                 this.status = 'expired';
-            //                 this.clearTimers();
-            //             }
-            //         }).catch(error => {
-            //             console.error('检查扫码状态失败:', error);
-            //             this.status = 'error';
-            //             this.clearTimers();
-            //         });
-            //     } catch (error) {
-            //         console.error('检查扫码状态失败:', error);
-            //         this.status = 'error';
-            //         this.clearTimers();
-            //     }
-            // }, 2000);
-        },
-
-        // 处理登录确认
-        async handleLoginConfirm() {
-            // try {
-            //     await this.$http('POST', '/api/admin/confirm_login', {
-            //         token: this.token
-            //     }).then(response => {
-            //         if (response.data.success) {
-            //             this.handleLoginSuccess(response.data);
-            //         } else {
-            //             this.status = 'expired';
-            //         }
-            //     }).catch(error => {
-            //         console.error('登录确认失败:', error);
-            //         this.status = 'error';
-            //     });
-            // } catch (error) {
-            //     console.error('登录确认失败:', error);
-            //     this.status = 'error';
-            // }
+            this.redirect_uri = '';
+            this.appid = '';
+            try {
+                await this.$http('POST', '/api/callback/get_admin_login_config').then(response => {
+                    this.appid = response.data.appid
+                    this.redirect_uri = response.data.redirect_uri
+                }).catch(error => {
+                    console.error('生成二维码失败:', error);
+                    this.status = 'error';
+                });
+            } catch (error) {
+                console.error('生成二维码失败:', error);
+                this.status = 'error';
+            }
         },
-
-        // 处理登录成功
         handleLoginSuccess(data) {
             this.status = 'confirmed';
             this.userInfo = data.user_info;
@@ -172,30 +100,6 @@ export default {
                 this.$emit('login-success', data);
             }, 1000);
         },
-
-        // 设置过期定时器
-        setExpireTimer() {
-            this.expireTimer = setTimeout(() => {
-                if (this.status !== 'confirmed') {
-                    this.status = 'expired';
-                    this.clearTimers();
-                }
-            }, 5 * 60 * 1000); // 5分钟过期
-        },
-
-        // 清除所有定时器
-        clearTimers() {
-            if (this.pollInterval) {
-                clearInterval(this.pollInterval);
-                this.pollInterval = null;
-            }
-            if (this.expireTimer) {
-                clearTimeout(this.expireTimer);
-                this.expireTimer = null;
-            }
-        },
-
-
     }
 }
 </script>
@@ -246,6 +150,10 @@ export default {
         color: #626573;
         margin-top: 32px;
         margin-bottom: 12px;
+        b{
+            font-weight: bold;
+            color: #1E2226;
+        }
     }
 
     .img {
@@ -379,4 +287,10 @@ export default {
 #ecomLoginForm {
     height: 280px;
 }
+
+.wxlogin-qrcode-box{
+    div:first-of-type{
+        height: 214px;
+    }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/paymentMethod.vue b/src/views/paymentMethod.vue
index 25feb8b..41cc2a2 100644
--- a/src/views/paymentMethod.vue
+++ b/src/views/paymentMethod.vue
@@ -21,7 +21,13 @@
                     </el-table-column>
                     <el-table-column prop="company_short_name" label="公司简称" min-width="160px"></el-table-column>
                     <el-table-column prop="appid" label="账号" min-width="288px"></el-table-column>
-                    <el-table-column prop="expires_time_desc" label="有效期" min-width="260px"></el-table-column>
+                    <el-table-column prop="expires_time_desc" label="有效期" min-width="260px">
+                        <template slot-scope="scope">
+                            <div :class="scope.row.expires_time_desc=='已过期' || scope.row.expires_time_desc=='未授权'?' error':''">
+                                {{scope.row.expires_time_desc}}
+                            </div>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="status" label="上传证书" min-width="258px">
                         <template slot-scope="scope">
                             <div :class="'flex'+(scope.row.have_cert?'':' error')" v-if="scope.row.type == 2">
@@ -104,7 +110,6 @@ export default {
 
     },
     watch:{
-
         list: {
             deep: true,
             handler(newVal) {
@@ -126,23 +131,7 @@ export default {
             this.doctorId =doctor_id;
         }
     },
-    mounted() {
-        if(this.doctor_id){
-            this.getBindpayList()
-        }
-    },
     methods: {
-        async getBindpayList() {
-            await this.$http('POST', '/api/admin/get_pay_list', {
-                doctor_id: this.doctor_id,
-                depart_id: this.depart_id,
-                index:1
-            }).then(response => {
-               this.payList = response.data;
-            }).catch(error => {
-                console.error(error, 'error')
-            })
-        },
         handleEvent(data) {
             this.isShowAddPay = data;
         },