diff --git a/config/dev.env.js b/config/dev.env.js
index 6644302..b62643c 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -10,9 +10,10 @@
   // BASE_API: '"http://106.74.146.218:2031"'
   // BASE_API: '"http://192.168.0.123:14537"'
   // BASE_API: '"http://139.198.17.115:20004/smartwell"'
-  BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"'
+  // BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"'
+  // BASE_API: '"http://192.168.1.113:11302/smartwell"'
   // BASE_API: '"https://smartlog.work/smartwell"'
-  // BASE_API: '"http://111.198.10.15:11302/smartwell"'
+  BASE_API: '"http://111.198.10.15:11302/smartwell"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:14537"'
 })

diff --git a/config/dev.env.js b/config/dev.env.js
index 6644302..b62643c 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -10,9 +10,10 @@
   // BASE_API: '"http://106.74.146.218:2031"'
   // BASE_API: '"http://192.168.0.123:14537"'
   // BASE_API: '"http://139.198.17.115:20004/smartwell"'
-  BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"'
+  // BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"'
+  // BASE_API: '"http://192.168.1.113:11302/smartwell"'
   // BASE_API: '"https://smartlog.work/smartwell"'
-  // BASE_API: '"http://111.198.10.15:11302/smartwell"'
+  BASE_API: '"http://111.198.10.15:11302/smartwell"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:14537"'
 })
diff --git a/config/index.js b/config/index.js
index 1fecefb..cef61d9 100644
--- a/config/index.js
+++ b/config/index.js
@@ -61,7 +61,8 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/yizhuang_inner/', // ori:/
+    // assetsPublicPath: '/yizhuang_inner/', // ori:/
+    assetsPublicPath: '/yizhuang/', // ori:/
 
     /**
      * Source Maps

diff --git a/config/dev.env.js b/config/dev.env.js
index 6644302..b62643c 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -10,9 +10,10 @@
   // BASE_API: '"http://106.74.146.218:2031"'
   // BASE_API: '"http://192.168.0.123:14537"'
   // BASE_API: '"http://139.198.17.115:20004/smartwell"'
-  BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"'
+  // BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"'
+  // BASE_API: '"http://192.168.1.113:11302/smartwell"'
   // BASE_API: '"https://smartlog.work/smartwell"'
-  // BASE_API: '"http://111.198.10.15:11302/smartwell"'
+  BASE_API: '"http://111.198.10.15:11302/smartwell"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:14537"'
 })
diff --git a/config/index.js b/config/index.js
index 1fecefb..cef61d9 100644
--- a/config/index.js
+++ b/config/index.js
@@ -61,7 +61,8 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/yizhuang_inner/', // ori:/
+    // assetsPublicPath: '/yizhuang_inner/', // ori:/
+    assetsPublicPath: '/yizhuang/', // ori:/
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 413ac2e..2f6cac8 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,4 +3,5 @@
   NODE_ENV: '"production"',
   // BASE_API: '"http://111.198.10.15:11302/smartwell"'
   BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"',
+  // BASE_API: '"http://192.168.1.113:11302/smartwell"',
 }

diff --git a/config/dev.env.js b/config/dev.env.js
index 6644302..b62643c 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -10,9 +10,10 @@
   // BASE_API: '"http://106.74.146.218:2031"'
   // BASE_API: '"http://192.168.0.123:14537"'
   // BASE_API: '"http://139.198.17.115:20004/smartwell"'
-  BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"'
+  // BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"'
+  // BASE_API: '"http://192.168.1.113:11302/smartwell"'
   // BASE_API: '"https://smartlog.work/smartwell"'
-  // BASE_API: '"http://111.198.10.15:11302/smartwell"'
+  BASE_API: '"http://111.198.10.15:11302/smartwell"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:14537"'
 })
diff --git a/config/index.js b/config/index.js
index 1fecefb..cef61d9 100644
--- a/config/index.js
+++ b/config/index.js
@@ -61,7 +61,8 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/yizhuang_inner/', // ori:/
+    // assetsPublicPath: '/yizhuang_inner/', // ori:/
+    assetsPublicPath: '/yizhuang/', // ori:/
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 413ac2e..2f6cac8 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,4 +3,5 @@
   NODE_ENV: '"production"',
   // BASE_API: '"http://111.198.10.15:11302/smartwell"'
   BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"',
+  // BASE_API: '"http://192.168.1.113:11302/smartwell"',
 }
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index cb35221..326cbec 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -116,7 +116,7 @@
           commit('SET_ACCOUNT', data.account)
           commit('SET_NAME', data.name)
           commit('SET_DATASCOPE', data.dataScope)
-          commit('SET_RESETPWD', data.sysData.resetPwd)
+          commit('SET_RESETPWD', data.sysData.resetPwd || data.chPwdDays>30)
           resolve(response)
         }).catch(error => {
           reject(error)

diff --git a/config/dev.env.js b/config/dev.env.js
index 6644302..b62643c 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -10,9 +10,10 @@
   // BASE_API: '"http://106.74.146.218:2031"'
   // BASE_API: '"http://192.168.0.123:14537"'
   // BASE_API: '"http://139.198.17.115:20004/smartwell"'
-  BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"'
+  // BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"'
+  // BASE_API: '"http://192.168.1.113:11302/smartwell"'
   // BASE_API: '"https://smartlog.work/smartwell"'
-  // BASE_API: '"http://111.198.10.15:11302/smartwell"'
+  BASE_API: '"http://111.198.10.15:11302/smartwell"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:14537"'
 })
diff --git a/config/index.js b/config/index.js
index 1fecefb..cef61d9 100644
--- a/config/index.js
+++ b/config/index.js
@@ -61,7 +61,8 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/yizhuang_inner/', // ori:/
+    // assetsPublicPath: '/yizhuang_inner/', // ori:/
+    assetsPublicPath: '/yizhuang/', // ori:/
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 413ac2e..2f6cac8 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,4 +3,5 @@
   NODE_ENV: '"production"',
   // BASE_API: '"http://111.198.10.15:11302/smartwell"'
   BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"',
+  // BASE_API: '"http://192.168.1.113:11302/smartwell"',
 }
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index cb35221..326cbec 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -116,7 +116,7 @@
           commit('SET_ACCOUNT', data.account)
           commit('SET_NAME', data.name)
           commit('SET_DATASCOPE', data.dataScope)
-          commit('SET_RESETPWD', data.sysData.resetPwd)
+          commit('SET_RESETPWD', data.sysData.resetPwd || data.chPwdDays>30)
           resolve(response)
         }).catch(error => {
           reject(error)
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 260bdca..24d6bce 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -22,7 +22,7 @@
         </el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
-    <reset-pwd v-show="showSetPwd|resetPwd" ref="retPwd" :close="!resetPwd"/>
+    <reset-pwd ref="retPwd" :close="!resetPwd"/>
   </div>
 </template>
 
@@ -44,9 +44,22 @@
     ...mapGetters([
       'sidebar',
       'avatar',
-      'resetPwd'
+      'resetPwd',
+      'chPwdDays'
     ])
   },
+  watch: {
+    resetPwd: {
+      handler(val) {
+        if (val) {
+          this.$nextTick(() => {
+            this.$refs.retPwd.initDialog(true)
+          })
+        }
+      },
+      immediate: true
+    }
+  },
   mounted() {
     if (this.resetPwd) {
       this.$refs.retPwd.initDialog(true)
@@ -62,7 +75,7 @@
       })
     },
     resetPassword() {
-      this.showSetPwd = true
+      // this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     }
   }

diff --git a/config/dev.env.js b/config/dev.env.js
index 6644302..b62643c 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -10,9 +10,10 @@
   // BASE_API: '"http://106.74.146.218:2031"'
   // BASE_API: '"http://192.168.0.123:14537"'
   // BASE_API: '"http://139.198.17.115:20004/smartwell"'
-  BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"'
+  // BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"'
+  // BASE_API: '"http://192.168.1.113:11302/smartwell"'
   // BASE_API: '"https://smartlog.work/smartwell"'
-  // BASE_API: '"http://111.198.10.15:11302/smartwell"'
+  BASE_API: '"http://111.198.10.15:11302/smartwell"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:14537"'
 })
diff --git a/config/index.js b/config/index.js
index 1fecefb..cef61d9 100644
--- a/config/index.js
+++ b/config/index.js
@@ -61,7 +61,8 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/yizhuang_inner/', // ori:/
+    // assetsPublicPath: '/yizhuang_inner/', // ori:/
+    assetsPublicPath: '/yizhuang/', // ori:/
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 413ac2e..2f6cac8 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,4 +3,5 @@
   NODE_ENV: '"production"',
   // BASE_API: '"http://111.198.10.15:11302/smartwell"'
   BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"',
+  // BASE_API: '"http://192.168.1.113:11302/smartwell"',
 }
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index cb35221..326cbec 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -116,7 +116,7 @@
           commit('SET_ACCOUNT', data.account)
           commit('SET_NAME', data.name)
           commit('SET_DATASCOPE', data.dataScope)
-          commit('SET_RESETPWD', data.sysData.resetPwd)
+          commit('SET_RESETPWD', data.sysData.resetPwd || data.chPwdDays>30)
           resolve(response)
         }).catch(error => {
           reject(error)
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 260bdca..24d6bce 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -22,7 +22,7 @@
         </el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
-    <reset-pwd v-show="showSetPwd|resetPwd" ref="retPwd" :close="!resetPwd"/>
+    <reset-pwd ref="retPwd" :close="!resetPwd"/>
   </div>
 </template>
 
@@ -44,9 +44,22 @@
     ...mapGetters([
       'sidebar',
       'avatar',
-      'resetPwd'
+      'resetPwd',
+      'chPwdDays'
     ])
   },
+  watch: {
+    resetPwd: {
+      handler(val) {
+        if (val) {
+          this.$nextTick(() => {
+            this.$refs.retPwd.initDialog(true)
+          })
+        }
+      },
+      immediate: true
+    }
+  },
   mounted() {
     if (this.resetPwd) {
       this.$refs.retPwd.initDialog(true)
@@ -62,7 +75,7 @@
       })
     },
     resetPassword() {
-      this.showSetPwd = true
+      // this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     }
   }
diff --git a/src/views/system/user/resetPwd.vue b/src/views/system/user/resetPwd.vue
index 4e11158..b62b3bb 100644
--- a/src/views/system/user/resetPwd.vue
+++ b/src/views/system/user/resetPwd.vue
@@ -88,8 +88,8 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible) {
-      this.dialogFormVisible = dialogFormVisible
+    initDialog: function() {
+      this.dialogFormVisible = true
       this.resetForm()
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()