diff --git a/index.html b/index.html index abc0acc..68bf970 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,5 @@ - + diff --git a/package.json b/package.json index 1cdd914..e25d6b9 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "mockjs": "^1.1.0", "nprogress": "^0.2.0", "screenfull": "^6.0.1", + "sortablejs": "^1.15.3", "video.js": "^7.20.3", "vue": "^3.2.25", "vue-router": "^4.0.13", diff --git a/src/api/modules/config.js b/src/api/modules/config.js index a3e9906..2872d36 100644 --- a/src/api/modules/config.js +++ b/src/api/modules/config.js @@ -1,18 +1,3 @@ import service from "../request.js"; const API_BASE_URL = '/config'; - -// 客户列表 -export function getConfigList(query) { - return service({ - method: "get", - url: `${API_BASE_URL}/list`, - data: query, - }); -} -export function updateConfig(query) { - return service({ - method: "put", - url: `${API_BASE_URL}`, - data: query, - }); -} +// 原接口方法已转移至system.js 中 diff --git a/src/api/modules/system.js b/src/api/modules/system.js index 21546c7..4d4b198 100644 --- a/src/api/modules/system.js +++ b/src/api/modules/system.js @@ -1,15 +1,6 @@ import service from "../request.js"; const API_BASE_URL = '/config'; -// 配置列表 -export function getSystemList(query) { - return service({ - method: "get", - url: `${API_BASE_URL}/list`, - data: query, - }); -} - // 修改配置 export function updateSystem(params) { return service({ @@ -17,4 +8,22 @@ export function updateSystem(params) { url: `${API_BASE_URL}`, data: params, }); -} \ No newline at end of file +} + +// 获取配置信息列表(全部配置) +export function getConfigList(query) { + return service({ + method: "get", + url: `${API_BASE_URL}/list`, + data: query, + }); +} + +// 更新单个配置项内容（仅更新内容字段） +export function updateConfig(query) { + return service({ + method: "put", + url: `${API_BASE_URL}`, + data: query, + }); +} diff --git a/src/store/modules/users.js b/src/store/modules/users.js index 739c54c..4c0b912 100644 --- a/src/store/modules/users.js +++ b/src/store/modules/users.js @@ -63,8 +63,9 @@ export default { return new Promise((resolve, reject) => { LoginInfo(userInfo) .then((res) => { - console.log(res.data.data); + console.log(res.data.token, "token"); sessionStorage.setItem("token", res.data.token); + localStorage.setItem("token", res.data.token); sessionStorage.setItem("UserInfo", JSON.stringify(res.data)); commit("setToken", res.data.token); commit("setUserInfo", res.data); diff --git a/src/views/goods/index.vue b/src/views/goods/index.vue index 11ee616..4e00ceb 100644 --- a/src/views/goods/index.vue +++ b/src/views/goods/index.vue @@ -1,6 +1,10 @@ diff --git a/src/views/system/homeSite.vue b/src/views/system/homeSite.vue index 407626e..cf612b9 100644 --- a/src/views/system/homeSite.vue +++ b/src/views/system/homeSite.vue @@ -25,7 +25,7 @@ @@ -105,7 +105,7 @@ import { import {nextTick, onMounted, reactive, ref} from 'vue' import {options} from './options.js' -import {getUserList} from "../../api/modules/user"; +import {getConfigList} from "../../api/modules/system"; const tableData = ref([]) const dataList = ref([]) @@ -130,11 +130,11 @@ const initData = () => { tableData.value = columnData.value; - // orderLists(queryData.value).then((res) => { - // console.log(res.data.data) - // // total.value = res.data.data.total - // tableData.value = res.data.data - // }) + getConfigList(queryData.value).then((res) => { + console.log(res.data) + // total.value = res.data.data.total + tableData.value = res.data + }) } const itemEditHanld = (item) => { item.itemEdit = !item.itemEdit