diff --git a/src/api/http.js b/src/api/http.js index 6ce54b3..9fb61ae 100644 --- a/src/api/http.js +++ b/src/api/http.js @@ -6,6 +6,8 @@ import { Message } from 'element-ui'; import router from '@/router'; let path = '' export const baseURL = "http://127.0.0.1:8080" +// export const baseURL = "https://9miao.fun:6838/prod-api/api/" + const server = axios.create({ // 设置端口前缀 // baseURL: 'https://9miao.fun:6838/prod-api/api/', @@ -82,11 +84,16 @@ export function postData(url, method, data) { // 封装get export function getData(url, method, data) { return new Promise(resolve => { + console.log(localStorage.getItem('token')) // 调用自定义的axios server({ method, url, - params: data + params: data, + headers: { + "Content-Type": "application/json", + "saToken" : localStorage.getItem('token') + } }) .then(res => { resolve(res,"resHttps"); diff --git a/src/components/index/VueIndex.vue b/src/components/index/VueIndex.vue index 6dbdfae..4cc29b8 100644 --- a/src/components/index/VueIndex.vue +++ b/src/components/index/VueIndex.vue @@ -110,7 +110,7 @@ export default { this.$router.push({ path: "/desc", query: { id: id } }); }, searchUser() { - apiServe.Cllist(this.cdata).then((res) => { + apiServe.Cllist().then((res) => { console.log(res, "resVueIndex"); this.list = res.data.data; }); diff --git a/src/components/shop/shop.vue b/src/components/shop/shop.vue index dfa90aa..9350df9 100644 --- a/src/components/shop/shop.vue +++ b/src/components/shop/shop.vue @@ -33,7 +33,6 @@ export default { }, mounted() { - this.cdata.token = localStorage.getItem("token"); let token = localStorage.getItem("token"); console.log(token); if (!token) { @@ -61,7 +60,7 @@ export default { methods: { searchUser() { - apiServe.shoplist(this.cdata).then((res) => { + apiServe.shoplist().then((res) => { console.log(res); this.list = res.data.data; }); diff --git a/src/views/Login.vue b/src/views/Login.vue index 02d84b3..3da2033 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -73,21 +73,23 @@ export default { password: this.ruleForm.passWord, } let res = await apiServe.login(data); - console.log(res,"LoginRes") - if (res.data.code == 200) { + console.log(res.data) + if (res.data.token) { console.log(res,"res"); - localStorage.setItem('token', res?.data?.token?.data); + localStorage.setItem('token', res.data.token.data); this.$message({ message: '登陆成功', type: 'success' }) this.$router.push('/') - } - } else { - this.$message({ - message: res.msg, + }else{ + this.$message({ + message: res.data.msg, type: 'error' }) + } + } else { + console.log('表单验证失败'); } })