diff --git a/config/prod.env.js b/config/prod.env.js
index d023f1a..c8b83e6 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,8 +1,8 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://111.198.10.15:11302/smartwell"',
-  // BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"',
+  // BASE_API: '"http://111.198.10.15:11302/smartwell"',
+  BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"',
   // BASE_API: '"http://111.198.10.15:8098/smartwell"',
   // BASE_API: '"http://106.74.146.218:2031"',
 }

diff --git a/config/prod.env.js b/config/prod.env.js
index d023f1a..c8b83e6 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,8 +1,8 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://111.198.10.15:11302/smartwell"',
-  // BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"',
+  // BASE_API: '"http://111.198.10.15:11302/smartwell"',
+  BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"',
   // BASE_API: '"http://111.198.10.15:8098/smartwell"',
   // BASE_API: '"http://106.74.146.218:2031"',
 }
diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue
index b79cae0..a952662 100644
--- a/src/page/layout/index.vue
+++ b/src/page/layout/index.vue
@@ -127,7 +127,6 @@
     created () {
       console.log("created")
       plusReady(this.plusReady)
-      debugger
       // 判断是不是要强制修改密码，如果需要的话跳转到修改密码页面
       const resetPwd = this.$store.getters.resetPwd
       if(resetPwd){

diff --git a/config/prod.env.js b/config/prod.env.js
index d023f1a..c8b83e6 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,8 +1,8 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://111.198.10.15:11302/smartwell"',
-  // BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"',
+  // BASE_API: '"http://111.198.10.15:11302/smartwell"',
+  BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"',
   // BASE_API: '"http://111.198.10.15:8098/smartwell"',
   // BASE_API: '"http://106.74.146.218:2031"',
 }
diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue
index b79cae0..a952662 100644
--- a/src/page/layout/index.vue
+++ b/src/page/layout/index.vue
@@ -127,7 +127,6 @@
     created () {
       console.log("created")
       plusReady(this.plusReady)
-      debugger
       // 判断是不是要强制修改密码，如果需要的话跳转到修改密码页面
       const resetPwd = this.$store.getters.resetPwd
       if(resetPwd){
diff --git a/src/page/login/login.vue b/src/page/login/login.vue
index 5d8d197..8966f49 100644
--- a/src/page/login/login.vue
+++ b/src/page/login/login.vue
@@ -65,6 +65,8 @@
             this.refreshCode()
           }
           this.loading = true
+          // 清空用户rolelist
+          this.$store.commit('SET_ROLELIST', [])
         }).catch((error)=>{
           // this.getConfig()
         })

diff --git a/config/prod.env.js b/config/prod.env.js
index d023f1a..c8b83e6 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,8 +1,8 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://111.198.10.15:11302/smartwell"',
-  // BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"',
+  // BASE_API: '"http://111.198.10.15:11302/smartwell"',
+  BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"',
   // BASE_API: '"http://111.198.10.15:8098/smartwell"',
   // BASE_API: '"http://106.74.146.218:2031"',
 }
diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue
index b79cae0..a952662 100644
--- a/src/page/layout/index.vue
+++ b/src/page/layout/index.vue
@@ -127,7 +127,6 @@
     created () {
       console.log("created")
       plusReady(this.plusReady)
-      debugger
       // 判断是不是要强制修改密码，如果需要的话跳转到修改密码页面
       const resetPwd = this.$store.getters.resetPwd
       if(resetPwd){
diff --git a/src/page/login/login.vue b/src/page/login/login.vue
index 5d8d197..8966f49 100644
--- a/src/page/login/login.vue
+++ b/src/page/login/login.vue
@@ -65,6 +65,8 @@
             this.refreshCode()
           }
           this.loading = true
+          // 清空用户rolelist
+          this.$store.commit('SET_ROLELIST', [])
         }).catch((error)=>{
           // this.getConfig()
         })
diff --git a/src/page/mine/modules/ResetPwd.vue b/src/page/mine/modules/ResetPwd.vue
index 8a7308b..fe8dfe6 100644
--- a/src/page/mine/modules/ResetPwd.vue
+++ b/src/page/mine/modules/ResetPwd.vue
@@ -40,7 +40,6 @@
       }
     },
     created(){
-      debugger
       if(this.$route.query && this.$route.query.force)
       this.force = this.$route.query.force
       Toast({
@@ -68,7 +67,7 @@
           this.newPasswordValidate = 'error'
           return false
         }else{
-          if(value.length<8||value.length>16){
+          if(value.length<12){
             this.newPasswordValidate = 'error'
             return false
           }else{
@@ -115,6 +114,12 @@
         const newPwd = RSAencrypt(this.newPassword)
         changePwd(oldPwd, newPwd).then(response => {
           if(response.code=200){
+            debugger
+            // if(this.force){
+            //   Toast('重置密码成功!')
+            //   this.$store.commit('SET_RESETPWD', false)
+            //   this.$router.replace({path:'/'})
+            // }else{
             Toast('重置密码成功，请重新登录')
             MyLocalStorage.Cache.remove(TOKEN)
             MyLocalStorage.Cache.remove(USER_ACCOUNT)
@@ -123,6 +128,7 @@
             MyLocalStorage.Cache.remove(LOGIN_FLAG)
             MyLocalStorage.Cache.remove(SLIDER_FLAG)
             this.$router.push({name: 'login'})
+            // }
           }
         })
       }

diff --git a/config/prod.env.js b/config/prod.env.js
index d023f1a..c8b83e6 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,8 +1,8 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://111.198.10.15:11302/smartwell"',
-  // BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"',
+  // BASE_API: '"http://111.198.10.15:11302/smartwell"',
+  BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"',
   // BASE_API: '"http://111.198.10.15:8098/smartwell"',
   // BASE_API: '"http://106.74.146.218:2031"',
 }
diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue
index b79cae0..a952662 100644
--- a/src/page/layout/index.vue
+++ b/src/page/layout/index.vue
@@ -127,7 +127,6 @@
     created () {
       console.log("created")
       plusReady(this.plusReady)
-      debugger
       // 判断是不是要强制修改密码，如果需要的话跳转到修改密码页面
       const resetPwd = this.$store.getters.resetPwd
       if(resetPwd){
diff --git a/src/page/login/login.vue b/src/page/login/login.vue
index 5d8d197..8966f49 100644
--- a/src/page/login/login.vue
+++ b/src/page/login/login.vue
@@ -65,6 +65,8 @@
             this.refreshCode()
           }
           this.loading = true
+          // 清空用户rolelist
+          this.$store.commit('SET_ROLELIST', [])
         }).catch((error)=>{
           // this.getConfig()
         })
diff --git a/src/page/mine/modules/ResetPwd.vue b/src/page/mine/modules/ResetPwd.vue
index 8a7308b..fe8dfe6 100644
--- a/src/page/mine/modules/ResetPwd.vue
+++ b/src/page/mine/modules/ResetPwd.vue
@@ -40,7 +40,6 @@
       }
     },
     created(){
-      debugger
       if(this.$route.query && this.$route.query.force)
       this.force = this.$route.query.force
       Toast({
@@ -68,7 +67,7 @@
           this.newPasswordValidate = 'error'
           return false
         }else{
-          if(value.length<8||value.length>16){
+          if(value.length<12){
             this.newPasswordValidate = 'error'
             return false
           }else{
@@ -115,6 +114,12 @@
         const newPwd = RSAencrypt(this.newPassword)
         changePwd(oldPwd, newPwd).then(response => {
           if(response.code=200){
+            debugger
+            // if(this.force){
+            //   Toast('重置密码成功!')
+            //   this.$store.commit('SET_RESETPWD', false)
+            //   this.$router.replace({path:'/'})
+            // }else{
             Toast('重置密码成功，请重新登录')
             MyLocalStorage.Cache.remove(TOKEN)
             MyLocalStorage.Cache.remove(USER_ACCOUNT)
@@ -123,6 +128,7 @@
             MyLocalStorage.Cache.remove(LOGIN_FLAG)
             MyLocalStorage.Cache.remove(SLIDER_FLAG)
             this.$router.push({name: 'login'})
+            // }
           }
         })
       }
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 23aa316..4e693b2 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -18,7 +18,8 @@
       state.device = device
     },
     SYS_CONFIG: (state, config) => {
-      state.kaptcha = config.appKaptcha
+      // state.kaptcha = config.appKaptcha
+      state.kaptcha = false
       state.sid = config.sid
       state.publicKey = config.publicKey
       setPublicKey(config.publicKey)