修改bug

修改bug

src/api/userMember.js

@@ -64,4 +64,14 @@ export function updateUser(data) {
     data
   })
 }
+
+//1.8 重置用户密码
+export function resetPassword(data) {
+  return request({
+    url: '/user/resetPassword',
+    method: 'post',
+    data
+  })
+}
+
 //用户管理 end ------------------------------------->

src/store/modules/userMember.js

@@ -1,5 +1,5 @@
 import {getUserList,getUserInfo,createUser,verifyUserInfo,getUser,
-  upUserStatus,updateUser
+  upUserStatus,updateUser,resetPassword
 } from '@/api/userMember'
 
 const state = {
@@ -81,6 +81,16 @@ const actions = {
         reject(error)
       })
     })
+  },
+  //修改用户密码
+  resetPassword({commit},data) {
+    return new Promise((resolve, reject) => {
+      resetPassword(data).then(response => {
+        resolve(response)
+      }).catch(error => {
+        reject(error)
+      })
+    })
   }
   //用户管理管理 end ---------------------------------------->
 }

src/utils/baseUrl.js

@@ -1,16 +1,16 @@
 const URL = {
   //baseUrl: 'http://183.131.25.186:9501',//测试环境
-  baseUrl: 'http://116.131.8.26:9501',//pre环境
+  //baseUrl: 'http://116.131.8.26:9501',//pre环境
   //baseUrl: 'http://103.105.201.2:9501',//正式环境-ip
-  //baseUrl: 'http://flzxw.bjzxtw.org.cn:9501',//正式环境-域名
+  baseUrl: 'https://flzxw.bjzxtw.org.cn:9501',//正式环境-域名
   //baseUrl: 'http://192.168.1.201:9501',//刘佳伟本地环境
   //baseUrl:'http://192.168.1.115:9501',//冯蕊的本地环境
   //baseUrl: 'http://192.168.1.127:9501',//刘剑的本地环境
   //WebsocketUrl: 'ws://192.168.1.201:9506',//刘佳伟websocket地址
   //WebsocketUrl: 'ws://192.168.1.127:9506'//刘剑websocket地址
   //WebsocketUrl: 'ws://183.131.25.186:9506',//测试环境websocket地址
-  WebsocketUrl: 'ws://116.131.8.26:9506'//pre环境websocket地址
-  //WebsocketUrl: 'ws://flzxw.bjzxtw.org.cn:9506'//正式环境websocket地址
+  //WebsocketUrl: 'ws://116.131.8.26:9506'//pre环境websocket地址
+  WebsocketUrl: 'ws://flzxw.bjzxtw.org.cn:9506'//正式环境websocket地址
 }
 
 export default URL;

src/views/chat/hall.vue

@@ -1178,6 +1178,8 @@ import URL from '@/utils/baseUrl';
 import hallTitle from './components/hallTitle.vue';
 import RingChart from '../dashboard/admin/components/RingChart.vue';
 import { TimeSelect } from 'element-ui';
+//引入socket地址 注意 后续版本将会删除这个请求方式
+import baseUrl from '@/utils/baseUrl';
 
 export default {
   components: {
@@ -2392,7 +2394,7 @@ export default {
     //console.log("Admin-Token:", adminToken);
 
     //2.连接websocket 
-    let websocketNewUrl = process.env.VUE_APP_BASE_WEBSOCKET +"?token=" + adminToken;
+    let websocketNewUrl = baseUrl.WebsocketUrl +"?token=" + adminToken;
     //let websocketNewUrl = URL.WebsocketUrl +"?token=" + adminToken;
     this.ws = new WebSocket(websocketNewUrl);
     this.ws.addEventListener('message', this.handleIncomingMessage);