1.0求BUG

src/static/js/axiosCfg.js

@@ -1,7 +1,7 @@
 //Http配置
 import Axios from 'axios'
 import {
-	Message
+    Message
 } from 'element-ui'
 import router from "../../router"
 import TokenManager from "./TokenManager"
@@ -14,14 +14,14 @@ Axios.defaults.headers['Content-Type'] = `application/x-www-form-urlencoded`;
  * 拦截http请求
  */
 Axios.interceptors.request.use(config => {
-	// 判断是否存在token，如果存在的话，则每个http header都加上token
-	try {
-		const obj = JSON.parse(TokenManager.getToken());
-		config.headers['token'] = obj.token;
-	} catch {
-		return config;
-	}
-	return config;
+    // 判断是否存在token，如果存在的话，则每个http header都加上token
+    try {
+        const obj = JSON.parse(TokenManager.getToken());
+        config.headers['token'] = obj.token;
+    } catch {
+        return config;
+    }
+    return config;
 });
 
 
@@ -29,31 +29,30 @@ Axios.interceptors.request.use(config => {
  * 拦截http响应
  */
 Axios.interceptors.response.use(res => {
-	const status = res.data.status; //状态码
-	switch (status) {
-		case 300: //警告
-			Message.warning({
-				message: res.data.msg
-			});
-			return reject(res);
-		case 401: //权限不足
-			Message.warning({
-				message: "验证信息过期,请重新登录",
-				duration: 5000
-			});
-			router.replace("/login");
-			return reject(res);
-			//服务器错误
-		case 500:
-			Message.error({
-				message: "服务器开小差了"
-			});
-			return reject(res);
-		default:
-			return res.data;
-	}
+    const status = res.data.status; //状态码
+    switch (status) {
+        case 300: //警告
+            Message.warning({
+                message: res.data.msg
+            });
+            return Promise.reject(300);
+        case 401: //权限不足
+            Message.warning({
+                message: "验证信息过期,请重新登录",
+                duration: 5000
+            });
+            router.replace("/login");
+            return Promise.reject(401);
+        case 500://服务器错误
+            Message.error({
+                message: "服务器开小差了"
+            });
+            return Promise.reject(500);
+        default:
+            return res.data;
+    }
 }, error => {
-	Message.error("接口异常");
+    Message.error("接口异常");
 });
 
 export default Axios

src/static/js/global.js

@@ -1,4 +1,5 @@
-const server = "http://localhost:8081/bms/api/pc/";
+// const server = "http://localhost:8081/bms/api/pc/";
+const server = "https://www.mang406.top/bms/api/pc/";
 
 const URL = {
     //登录
@@ -29,7 +30,7 @@ const URL = {
     setSos: server + "set/sos.do",
 
     //webSocket 地址
-    webSocket: "ws://localhost:8081/webSocket/",
+    webSocket: "wss://www.mang406.top/webSocket/",
 };
 
 export default {URL};

src/static/js/http.js

@@ -2,7 +2,7 @@ import Vue from "vue";
 import Axios from "./axiosCfg";
 import Qs from "qs";
 import {
-	Loading
+    Loading
 } from "element-ui";
 
 let loading; //加载框
@@ -11,86 +11,80 @@ let loading; //加载框
  * 打开加载框
  */
 function openLoad() {
-	//关闭加载框
-	if (loading != null) loading.close();
-	//打开加载框
-	loading = Loading.service({
-		text: "正在加载",
-		target: document.querySelector("#loading-area")
-	});
+    //关闭加载框
+    if (loading != null) loading.close();
+    //打开加载框
+    loading = Loading.service({
+        text: "正在加载",
+        target: document.querySelector("#loading-area")
+    });
 }
 
 /**
  * 关闭加载框
  */
 function closeLoad() {
-	if (loading != null) {
-		loading.close();
-	}
+    if (loading != null) {
+        loading.close();
+    }
 }
 
 /**
  * Post请求
  */
-Vue.prototype.Post = function(url, data) {
-	//打开加载框
-	openLoad();
-	//发送请求
-	return new Promise((resolve, reject) => {
-		Axios.post(url, Qs.stringify(data))
-			.then(res => {
-				resolve(res);
-			})
-			.catch(res => {
-				if (reject != null) {
-					reject(res);
-				}
-			})
-			.finally(() => {
-				closeLoad();
-			})
-	});
+Vue.prototype.Post = function (url, data) {
+    //打开加载框
+    openLoad();
+    //发送请求
+    return new Promise((resolve, reject) => {
+        Axios.post(url, Qs.stringify(data))
+            .then(res => {
+                resolve(res);
+            })
+            .catch(res => {
+                console.log(res);
+            })
+            .finally(() => {
+                closeLoad();
+            })
+    });
 };
 /**
  * Get请求
  */
-Vue.prototype.Get = function(url, data) {
-	//打开加载框
-	openLoad();
-	//请求数据
-	return new Promise((resolve, reject) => {
-		Axios.get(url, {
-				params: data
-			})
-			.then(function(res) {
-				resolve(res);
-			})
-			.catch((res) => {
-				if (reject != null) {
-					reject(res);
-				}
-			})
-			.finally(() => {
-				//关闭加载框
-				closeLoad();
-			})
-	});
+Vue.prototype.Get = function (url, data) {
+    //打开加载框
+    openLoad();
+    //请求数据
+    return new Promise((resolve, reject) => {
+        Axios.get(url, {params: data})
+            .then(function (res) {
+                resolve(res);
+            })
+            .catch((res) => {
+                console.log(res);
+            })
+            .finally(() => {
+                //关闭加载框
+                closeLoad();
+            })
+    });
 };
 
 /**
  * 下载
  */
-Vue.prototype.Download = function(url, data, fileName) {
-	Axios.post(url, Qs.stringify(data), {
-		responseType: "blob"
-	}).then(res => {
-		let link = document.createElement("a");
-		link.style.display = "none";
-		link.href = window.URL.createObjectURL(new Blob([res]));
-		link.setAttribute("download", fileName); // 自定义下载文件名（如exemple.txt）
-		document.body.appendChild(link);
-		link.click();
-		URL.revokeObjectURL(link.href); // 释放URL 对象
-		document.body.removeChild(link);
-	});
+Vue.prototype.Download = function (url, data, fileName) {
+    Axios.post(url, Qs.stringify(data), {
+        responseType: "blob"
+    }).then(res => {
+        let link = document.createElement("a");
+        link.style.display = "none";
+        link.href = window.URL.createObjectURL(new Blob([res]));
+        link.setAttribute("download", fileName); // 自定义下载文件名（如exemple.txt）
+        document.body.appendChild(link);
+        link.click();
+        URL.revokeObjectURL(link.href); // 释放URL 对象
+        document.body.removeChild(link);
+    });
 };

src/views/users/users.vue

@@ -1,131 +1,136 @@
 <template>
-	<div class="zy-template">
-		<div class="zy-module zy-template_search">
-			<el-form ref="form" :model="condition" label-width="60px">
-				<el-form-item label="用户名:" class="form-item">
-					<el-input v-model="condition.username" size="small"></el-input>
-				</el-form-item>
-				<el-form-item label="昵称:" class="form-item">
-					<el-input v-model="condition.nickname" size="small"></el-input>
-				</el-form-item>
-				<el-form-item label="性别:" class="form-item">
-					  <el-select v-model="condition.gender" placeholder="请选择"  size="small">
-					    <el-option value="1" label="男"/>
-					    <el-option value="2" label="女"/>
-					  </el-select>
-				</el-form-item>
-				<el-form-item class="form-item">
-					<el-button type="primary" size="small" @click="submit">查询</el-button>
-				</el-form-item>
-			</el-form>
-		</div>
+    <div class="zy-template">
+        <div class="zy-module zy-template_search">
+            <el-form ref="form" :model="condition" label-width="60px">
+                <el-form-item label="关键字:" class="form-item">
+                    <el-input v-model="condition.key" size="small" placeholder="用户名/昵称"></el-input>
+                </el-form-item>
+                <el-form-item label="性别:" class="form-item">
+                    <el-select v-model="condition.gender" size="small" value="">
+                        <el-option value="1" label="男"/>
+                        <el-option value="2" label="女"/>
+                    </el-select>
+                </el-form-item>
+                <el-form-item class="form-item">
+                    <el-button type="primary" size="small" @click="submit">查询</el-button>
+                </el-form-item>
+            </el-form>
+        </div>
 
-		<div class="zy-template_table">
-			<el-table :data="page.records" max-height="800" stripe size="small" header-cell-class-name="header-cell"
-				style="width: 100%;">
-				<el-table-column prop="avatar" label="头像" width="80" min-width="5%">
-					<template #default="scope">
-						<img :src="scope.row.avatar" width="50" height="50" style="border-radius: 100px;" />
-					</template>
-				</el-table-column>
-				<el-table-column prop="nickname" label="昵称" width="120" min-width="10%" />
-				<el-table-column prop="gender" label="性别" width="80" min-width="5%" />
-				<el-table-column prop="area" label="地区" width="250" min-width="20%" />
-				<el-table-column prop="openId" label="open-id" width="250" min-width="10%" />
-				<el-table-column prop="username" label="用户名" width="150" min-width="10%" />
-				<el-table-column prop="phone" label="手机号" width="150" min-width="10%" />
-				<el-table-column prop="createTime" label="注册时间" width="150" min-width="10%" />
-				<el-table-column label="操作" min-width="10%" />
-			</el-table>
-			<el-pagination class="pagination" background layout="prev, pager, next" :current-page="page.current"
-				:total="page.total" :page-size="page.size" @current-change="pagination" />
-		</div>
+        <div class="zy-template_table">
+            <el-table :data="page.records" max-height="800" stripe size="small" header-cell-class-name="header-cell"
+                      style="width: 100%;">
+                <el-table-column prop="avatar" label="头像" width="80" min-width="5%">
+                    <template #default="scope">
+                        <img :src="scope.row.avatar" width="50" height="50" style="border-radius: 100px;" alt="avatar"/>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="nickname" label="昵称" width="120" min-width="10%"/>
+                <el-table-column label="性别" width="80" min-width="5%">
+                    <template #default="scope">
+                        {{scope.row.gender===1?'男':'女'}}
+                    </template>
+                </el-table-column>
+                <el-table-column label="地区" width="250" min-width="20%">
+                    <template #default="scope">
+                        {{scope.row.country}}{{scope.row.province}}{{scope.row.city}}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="openId" label="微信open-id" width="250" min-width="10%"/>
+                <el-table-column prop="username" label="用户名" width="150" min-width="10%"/>
+                <el-table-column prop="phone" label="手机号" width="150" min-width="10%"/>
+                <el-table-column prop="createTime" label="注册时间" width="150" min-width="10%"/>
+                <el-table-column label="操作" min-width="10%"/>
+            </el-table>
+            <el-pagination class="pagination" background layout="prev, pager, next" :current-page="page.current"
+                           :total="page.total" :page-size="page.size" @current-change="pagination"/>
+        </div>
 
-	</div>
+    </div>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				condition: {
-					username: '',
-					nickname: ''
-				},
-				page: {
-					current: 1,
-					size: 20,
-				},
-			};
-		},
-		mounted: function() {
-			this.getUserList();
-		},
-		methods: {
+    export default {
+        data() {
+            return {
+                condition: {
+                    key: '',
+                    gender: ''
+                },
+                page: {
+                    current: 1,
+                    size: 20,
+                },
+            };
+        },
+        mounted: function () {
+            this.getUserList(this.page);
+        },
+        methods: {
 
-			/**
-			 * 提交查询条件
-			 */
-			submit: function() {
-				const param = {
-					username: this.condition.username,
-					nickname: this.condition.nickname
-				};
-				this.getUserList(param);
-			},
-			/**
-			 * 分页点击事件
-			 */
-			pagination: function(current) {
-				const param = {
-					username: this.condition.username,
-					nickname: this.condition.nickname,
-					current: current,
-					size: this.page.size,
-				};
-				this.getUserList(param);
-			},
-			/**
-			 * 获取用户列表
-			 */
-			getUserList: function(params) {
-				const that = this;
-				this.Post(this.Global.getUserList, params).then(res => {
-					that.page = res.data;
-				})
-			}
-		}
-	};
+            /**
+             * 提交查询条件
+             */
+            submit: function () {
+                const param = {
+                    key: this.condition.key,
+                    gender: this.condition.gender
+                };
+                this.getUserList(param);
+            },
+            /**
+             * 分页点击事件
+             */
+            pagination: function (current) {
+                const param = {
+                    key: this.condition.key,
+                    gender: this.condition.gender,
+                    current: current,
+                    size: this.page.size,
+                };
+                this.getUserList(param);
+            },
+            /**
+             * 获取用户列表
+             */
+            getUserList: function (params) {
+                const that = this;
+                this.Post(this.Global.getUserList, params).then(res => {
+                    that.page = res.data;
+                })
+            }
+        }
+    };
 </script>
 
 <style lang="scss">
-	.header-cell {
-		background: #f3f5f9 !important;
-	}
+    .header-cell {
+        background: #f3f5f9 !important;
+    }
 
-	.zy-template {
-		width: 100%;
+    .zy-template {
+        width: 100%;
 
-		&_search {
-			overflow: hidden;
+        &_search {
+            overflow: hidden;
 
-			& .form-item {
-				margin-bottom: 0;
-				float: left;
-				width: 230px;
-			}
-		}
+            & .form-item {
+                margin-bottom: 0;
+                float: left;
+                width: 230px;
+            }
+        }
 
-		&_table {
-			border-radius: 5px;
-			width: 100%;
-			background: white;
-			box-sizing: border-box;
-			padding: 20px;
-		}
+        &_table {
+            border-radius: 5px;
+            width: 100%;
+            background: white;
+            box-sizing: border-box;
+            padding: 20px;
+        }
 
-		& .pagination {
-			margin-top: 20px;
-		}
-	}
+        & .pagination {
+            margin-top: 20px;
+        }
+    }
 </style>