diff --git a/src/config/index.js b/src/config/index.js index c9e4e90..12ee932 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -12,7 +12,7 @@ const DEFAULT_CONFIG = { CORE_VER: "1.6.9", //接口地址 - API_URL: 'https://x--mo.com:8888/admin', + API_URL: 'https://app.gter.net/adminApi', //请求超时 TIMEOUT: 10000, @@ -24,7 +24,7 @@ const DEFAULT_CONFIG = { THEMEHEADER: true, //TokenName - TOKEN_NAME: "token", + TOKEN_NAME: "authorization", // Cookie Name SESSIONNAME: "MIUCMSSESSION", diff --git a/src/style/app.scss b/src/style/app.scss index 24d8443..e2b13f7 100644 --- a/src/style/app.scss +++ b/src/style/app.scss @@ -27,9 +27,10 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo .adminui-header {height: 58px;background: #222b45;color: #fff;display: flex;justify-content:space-between;} .adminui-header-left {display: flex;align-items: center;padding-left:20px;} .adminui-header-right {display: flex;align-items: center;} -.adminui-header .logo-bar {font-size: 20px;font-weight: bold;display: flex;align-items: center;} +.adminui-header .logo-bar {font-size: 20px;font-weight: bold;display: flex;align-items: center;width: 137px;} .adminui-header .logo-bar .logo {margin-right: 10px;width: 35px;height: 35px;} -.adminui-header .nav {display: flex;height: 100%;margin-left: 40px;} +.adminui-header .logo-bar span {overflow: hidden;} +.adminui-header .nav {display: flex;height: 100%;margin-left: 10px;} .adminui-header .nav li {padding:0 10px;margin: 0 10px 0 0;font-size: 14px;color: rgba(255, 255, 255, 0.6);list-style: none;height: 100%;display: flex;align-items: center;cursor: pointer;} .adminui-header .nav li i {margin-right: 5px;} .adminui-header .nav li:hover {color: #fff;} diff --git a/src/style/fix.scss b/src/style/fix.scss index 112b318..13814e7 100644 --- a/src/style/fix.scss +++ b/src/style/fix.scss @@ -20,9 +20,9 @@ --el-color-primary-dark-7: #132f4c; --el-color-primary-dark-8: #0c1f32; --el-color-primary-dark-9: #060f19; - --el-menu-base-level-padding: 15px; + --el-menu-base-level-padding: 12px; --el-menu-icon-width: 20px; - --el-menu-item-height: 50px; + --el-menu-item-height: 52px; --el-upload-picture-card-size: 100%; } diff --git a/src/views/app/apartment/api.js b/src/views/app/apartment/api.js index 5863285..fc6f427 100644 --- a/src/views/app/apartment/api.js +++ b/src/views/app/apartment/api.js @@ -1,5 +1,5 @@ import http from "@/utils/request" -export const urlPrefix = '/app/apartment/' +export const urlPrefix = '/tenement/apartment/' export default { get: async function(url, params) { return await http.get(urlPrefix + url, params); diff --git a/src/views/system/crontab/index.vue b/src/views/system/crontab/index.vue index bf9bca7..45c8beb 100644 --- a/src/views/system/crontab/index.vue +++ b/src/views/system/crontab/index.vue @@ -87,7 +87,7 @@ }, methods: { loaddata(){ - this.$http.get('app/crontab/lists').then((res) => { + this.$http.get('crontab/admin/lists').then((res) => { if (res.code == 200) { this.list = res.data; return ; @@ -116,7 +116,7 @@ }).then(() => { - this.$http.get('app/crontab/delete').then((res) => { + this.$http.get('crontab/admin/delete').then((res) => { if (res.code == 200) { this.list.splice(this.list.findIndex(item => item.id === task.id), 1) return ; @@ -135,7 +135,7 @@ this.loginfo = o; this.dialog.logsVisible = true this.$nextTick(() => { - this.$refs.logs.setApi('app/crontab/logs?id='+o.id) + this.$refs.logs.setApi('crontab/admin/logs?id='+o.id) }) }, run(task){ @@ -144,7 +144,7 @@ //本地更新数据 handleSuccess(data, mode){ - this.$http.post('app/crontab/submit', {type:mode, info:data}).then((res) => { + this.$http.post('crontab/admin/submit', {type:mode, info:data}).then((res) => { this.$refs.saveDialog.isSaveing = false; diff --git a/src/views/system/tablegen/column.vue b/src/views/system/tablegen/column.vue index 37fb360..24db52f 100644 --- a/src/views/system/tablegen/column.vue +++ b/src/views/system/tablegen/column.vue @@ -491,7 +491,7 @@ this.$refs.dialogForm.validate(async (valid) => { if (valid) { this.isSaveing = true; - var res = await this.$http.post('system/table/submit',{info:this.form, token:this.token}); + var res = await this.$http.post('table/submit',{info:this.form, token:this.token}); this.isSaveing = false; if(res.code == 200){ this.visible = false; @@ -514,7 +514,7 @@ this.form.title = data.title; this.form.uniqid = data.uniqid; setTimeout(async ()=>{ - var res = await this.$http.get('system/table/info',params) + var res = await this.$http.get('table/info',params) this.loading = false this.form = res.data.data; this.token = res.data.token; diff --git a/src/views/system/tablegen/index.vue b/src/views/system/tablegen/index.vue index 0cec87c..51031c5 100644 --- a/src/views/system/tablegen/index.vue +++ b/src/views/system/tablegen/index.vue @@ -63,7 +63,7 @@ - +