From 2885d7e31c4a78a5048124d8f67068b6ade12d1d Mon Sep 17 00:00:00 2001
From: LiuHao <liuhaoai545@gmail>
Date: 星期五, 05 五月 2023 10:25:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ts' into ts
---
src/components/ImageUpload/index.vue | 2 +-
src/views/system/role/index.vue | 2 +-
src/views/system/user/index.vue | 2 +-
src/assets/styles/sidebar.scss | 2 +-
src/plugins/download.ts | 2 +-
src/views/system/role/authUser.vue | 2 +-
src/layout/index.vue | 12 ++++++------
src/components/FileUpload/index.vue | 2 +-
src/components/Editor/index.vue | 2 +-
9 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index 4c2f3f1..1db15fa 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -1,6 +1,6 @@
#app {
.main-container {
- min-height: 100%;
+ height: 100%;
transition: margin-left 0.28s;
margin-left: $base-sidebar-width;
position: relative;
diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue
index e250050..a0728eb 100644
--- a/src/components/Editor/index.vue
+++ b/src/components/Editor/index.vue
@@ -68,7 +68,7 @@
const upload = reactive<UploadOption>({
headers: { Authorization: "Bearer " + getToken() },
- url: import.meta.env.VITE_APP_BASE_API + '/system/oss/upload'
+ url: import.meta.env.VITE_APP_BASE_API + '/resource/oss/upload'
})
const myQuillEditor = ref();
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 9d8f742..a46d5ee 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -78,7 +78,7 @@
const uploadList = ref<any[]>([]);
const baseUrl = import.meta.env.VITE_APP_BASE_API;
-const uploadFileUrl = ref(baseUrl + "/system/oss/upload"); // 涓婁紶鏂囦欢鏈嶅姟鍣ㄥ湴鍧�
+const uploadFileUrl = ref(baseUrl + "/resource/oss/upload"); // 涓婁紶鏂囦欢鏈嶅姟鍣ㄥ湴鍧�
const headers = ref({ Authorization: "Bearer " + getToken() });
const fileList = ref<any[]>([]);
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index 57697fa..0791f3e 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -76,7 +76,7 @@
const dialogVisible = ref(false);
const baseUrl = import.meta.env.VITE_APP_BASE_API;
-const uploadImgUrl = ref(baseUrl + "/system/oss/upload"); // 涓婁紶鐨勫浘鐗囨湇鍔″櫒鍦板潃
+const uploadImgUrl = ref(baseUrl + "/resource/oss/upload"); // 涓婁紶鐨勫浘鐗囨湇鍔″櫒鍦板潃
const headers = ref({ Authorization: "Bearer " + getToken() });
const fileList = ref<any[]>([]);
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 4c6ab94..d49de04 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,17 +1,17 @@
<template>
<div :class="classObj" class="app-wrapper" :style="{ '--current-color': theme }">
- <el-scrollbar>
- <div v-if="device === 'mobile' && sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
- <side-bar v-if="!sidebar.hide" class="sidebar-container" />
- <div :class="{ hasTagsView: needTagsView, sidebarHide: sidebar.hide }" class="main-container">
+ <div v-if="device === 'mobile' && sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
+ <side-bar v-if="!sidebar.hide" class="sidebar-container" />
+ <div :class="{ hasTagsView: needTagsView, sidebarHide: sidebar.hide }" class="main-container">
+ <el-scrollbar>
<div :class="{ 'fixed-header': fixedHeader }">
<navbar ref="navbarRef" @setLayout="setLayout" />
<tags-view v-if="needTagsView" />
</div>
<app-main />
<settings ref="settingRef" />
- </div>
- </el-scrollbar>
+ </el-scrollbar>
+ </div>
</div>
</template>
diff --git a/src/plugins/download.ts b/src/plugins/download.ts
index 2640763..e1c4414 100644
--- a/src/plugins/download.ts
+++ b/src/plugins/download.ts
@@ -9,7 +9,7 @@
let downloadLoadingInstance: LoadingInstance;
export default {
async oss(ossId: string | number) {
- const url = baseURL + '/system/oss/download/' + ossId;
+ const url = baseURL + '/resource/oss/download/' + ossId;
downloadLoadingInstance = ElLoading.service({ text: '姝ｅ湪涓嬭浇鏁版嵁锛岃绋嶅��', background: 'rgba(0, 0, 0, 0.7)' });
try {
const res = await axios({
diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue
index 4b2bec8..ae4f73f 100644
--- a/src/views/system/role/authUser.vue
+++ b/src/views/system/role/authUser.vue
@@ -63,7 +63,7 @@
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
- @pagination="handleQuery"
+ @pagination="getList"
/>
<select-user ref="selectRef" :roleId="queryParams.roleId" @ok="handleQuery" />
</el-card>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 48ed9c9..56c14c5 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -93,7 +93,7 @@
v-model:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
- @pagination="handleQuery"
+ @pagination="getList"
/>
</el-card>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 33ca77a..63c2adf 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -138,7 +138,7 @@
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
- @pagination="handleQuery"
+ @pagination="getList"
/>
</el-card>
</el-col>
--
Gitblit v1.9.3