diff --git a/src/api/api.js b/src/api/api.js index a260d80..114f703 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -47,7 +47,9 @@ let apiServe = { // 商城购买 shop:(id) => getIdddData("point/getGoodByPoint", "get", id), //注销 - LogOut:() => LayOut("logout","get") + LogOut:() => LayOut("logout","get"), + + banner:(data) => getData("home/banna","get",data) } export { apiServe }; \ No newline at end of file diff --git a/src/api/http.js b/src/api/http.js index 9aae331..6ce54b3 100644 --- a/src/api/http.js +++ b/src/api/http.js @@ -5,9 +5,12 @@ import { Message } from 'element-ui'; //引入路由实例 import router from '@/router'; let path = '' +export const baseURL = "http://127.0.0.1:8080" const server = axios.create({ // 设置端口前缀 - baseURL: 'https://9miao.fun:6838/prod-api/api/', + // baseURL: 'https://9miao.fun:6838/prod-api/api/', + baseURL: baseURL+ '/api/', + // 设置超时时间 timeout: 5000, // 设置请求头 全局 diff --git a/src/assets/jifenshangcheng.png b/src/assets/jifenshangcheng.png new file mode 100644 index 0000000..67bf8c9 Binary files /dev/null and b/src/assets/jifenshangcheng.png differ diff --git a/src/assets/li.png b/src/assets/li.png new file mode 100644 index 0000000..d9ab5f7 Binary files /dev/null and b/src/assets/li.png differ diff --git a/src/assets/liyan.png b/src/assets/liyan.png new file mode 100644 index 0000000..20b6af8 Binary files /dev/null and b/src/assets/liyan.png differ diff --git a/src/assets/zs 3.png b/src/assets/zs 3.png new file mode 100644 index 0000000..0ac189e Binary files /dev/null and b/src/assets/zs 3.png differ diff --git a/src/components/index/VueIndex.vue b/src/components/index/VueIndex.vue index 07ee474..6dbdfae 100644 --- a/src/components/index/VueIndex.vue +++ b/src/components/index/VueIndex.vue @@ -1,27 +1,33 @@ \ No newline at end of file + diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index 21a8741..d6524b2 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -32,7 +32,7 @@ export default { .el-card__body, .el-main { padding: 0; - background-color: #F5F6F3; + background-color: #dfe6e9; } } diff --git a/src/views/Login.vue b/src/views/Login.vue index 431fe42..02d84b3 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -74,7 +74,7 @@ export default { } let res = await apiServe.login(data); console.log(res,"LoginRes") - if (res.data.token.code == 200) { + if (res.data.code == 200) { console.log(res,"res"); localStorage.setItem('token', res?.data?.token?.data); this.$message({ @@ -84,6 +84,10 @@ export default { this.$router.push('/') } } else { + this.$message({ + message: res.msg, + type: 'error' + }) console.log('表单验证失败'); } }) diff --git a/src/views/commonHeader.vue b/src/views/commonHeader.vue index 3c14173..2cca274 100644 --- a/src/views/commonHeader.vue +++ b/src/views/commonHeader.vue @@ -1,7 +1,7 @@