diff --git a/config/dev.env.js b/config/dev.env.js
index 251ba26..a1dfd8a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -10,7 +10,8 @@
   // BASE_API: '"http://106.74.146.218:2031"'
   // BASE_API: '"http://192.168.0.212:8083"'
   // BASE_API: '"http://192.168.8.201:8083/smartwell"'
-  BASE_API: '"http://111.198.10.15:11707/smartwell"'
+  // BASE_API: '"http://111.198.10.15:11707/smartwell"'
+  BASE_API: '"http://111.198.10.15:21403"'
   // BASE_API: '"http://139.198.16.38:8095/smartcity"'
   // BASE_API: '"http://10.9.39.8:8083"'
   // BASE_API: '"http://192.168.0.244:8083"'

diff --git a/config/dev.env.js b/config/dev.env.js
index 251ba26..a1dfd8a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -10,7 +10,8 @@
   // BASE_API: '"http://106.74.146.218:2031"'
   // BASE_API: '"http://192.168.0.212:8083"'
   // BASE_API: '"http://192.168.8.201:8083/smartwell"'
-  BASE_API: '"http://111.198.10.15:11707/smartwell"'
+  // BASE_API: '"http://111.198.10.15:11707/smartwell"'
+  BASE_API: '"http://111.198.10.15:21403"'
   // BASE_API: '"http://139.198.16.38:8095/smartcity"'
   // BASE_API: '"http://10.9.39.8:8083"'
   // BASE_API: '"http://192.168.0.244:8083"'
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 37ee964..f3cb650 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -43,7 +43,7 @@
         @current-change="handleCurrentChange"/>
     </div>
     <info-well v-show="wellShow" ref="wellInfo"/>
-    <<handle-prompt ref="handlePrompt" @watchChild="fetchData"/>
+    <handle-prompt ref="handlePrompt" @watchChild="fetchData"/>
   </div>
 </template>
 

diff --git a/config/dev.env.js b/config/dev.env.js
index 251ba26..a1dfd8a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -10,7 +10,8 @@
   // BASE_API: '"http://106.74.146.218:2031"'
   // BASE_API: '"http://192.168.0.212:8083"'
   // BASE_API: '"http://192.168.8.201:8083/smartwell"'
-  BASE_API: '"http://111.198.10.15:11707/smartwell"'
+  // BASE_API: '"http://111.198.10.15:11707/smartwell"'
+  BASE_API: '"http://111.198.10.15:21403"'
   // BASE_API: '"http://139.198.16.38:8095/smartcity"'
   // BASE_API: '"http://10.9.39.8:8083"'
   // BASE_API: '"http://192.168.0.244:8083"'
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 37ee964..f3cb650 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -43,7 +43,7 @@
         @current-change="handleCurrentChange"/>
     </div>
     <info-well v-show="wellShow" ref="wellInfo"/>
-    <<handle-prompt ref="handlePrompt" @watchChild="fetchData"/>
+    <handle-prompt ref="handlePrompt" @watchChild="fetchData"/>
   </div>
 </template>
 
diff --git a/src/views/system/user/resetPwd.vue b/src/views/system/user/resetPwd.vue
index e03e18c..c6e5104 100644
--- a/src/views/system/user/resetPwd.vue
+++ b/src/views/system/user/resetPwd.vue
@@ -31,6 +31,8 @@
       console.log('验证旧密码')
       if (value === '') {
         callback(new Error('旧密码不能为空'))
+      }else{
+        callback()
       }
     }
     const validatePass = (rule, value, callback) => {
@@ -38,7 +40,7 @@
       if (value === '') {
         callback(new Error('密码不能为空'))
       } else {
-        var reg = /^(?![a-zA-z]+$)(?!\d+$)(?![!@#$%^&*]+$)[a-zA-Z\d!@#$%^&*]+$/
+        var reg = /^(?![a-zA-z]+$)(?!\d+$)(?![!@#$%^&_*]+$)[a-zA-Z\d!@#$%^&_*]+$/
         if (value.match(reg)) { // 样式匹配
           if (value.length < 8 || value.length > 16) {
             callback(new Error('密码长度必须在8到16位之间'))