From d8f5a1fcb8632a9fb51cac9d72fb3bacaa41cbc2 Mon Sep 17 00:00:00 2001
From: long <515897141@qq.com>
Date: 星期四, 08 四月 2021 15:57:49 +0800
Subject: [PATCH] 1.添加mode提示、2.mock模式侧边栏不限制权限全显示
---
src/layout/components/Sidebar/Logo.vue | 7 ++++++-
src/pages/demo/index.vue | 5 ++++-
src/layout/components/Sidebar/index.vue | 5 +++++
src/config/baseConfig.js | 14 +++++++++-----
src/pages/demo/form.vue | 15 ++-------------
5 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/src/config/baseConfig.js b/src/config/baseConfig.js
index 4668a9b..92069cb 100644
--- a/src/config/baseConfig.js
+++ b/src/config/baseConfig.js
@@ -1,8 +1,5 @@
-var baseUrl = '//绾夸笂璇锋眰璺緞/' // 鍩虹璺緞
-var testBaseUrl = 'http://192.168.31.22:8080/' // 寮�鍙戞祴璇曡矾寰�
-// var testBaseUrl = 'http://192.168.1.163:8080/'; // 寮�鍙戞祴璇曡矾寰�
-// var testBaseUrl = 'http://192.168.31.143:8080/' // 寮�鍙戞祴璇曡矾寰� - 鍜�
-// var testBaseUrl = 'http://192.168.31.143:8888/'; // 寮�鍙戞祴璇曡矾寰� - 鍜�
+var baseUrl = '//绾夸笂璇锋眰璺緞/' // 鍩虹璺緞(鏈湴闈炶法鍩熻矾寰�)
+var testBaseUrl = 'http://192.168.31.22:8080/' // 寮�鍙戞祴璇曡矾寰�(鏈湴闈炶法鍩熻矾寰�)
var isCrossDomain = 1 // 鏄惁璺ㄥ煙
var isTest = 0 // 鏄惁娴嬭瘯
var isMock = 1 // 鏄惁浣跨敤mock
@@ -48,6 +45,13 @@
console.log('鏈杩愯鐨勬湇鍔″櫒鍩熷悕: ', baseUrl)
}
+var style_tx = 'font-weight:bold;font-size: 40px'
+if (isMock) {
+ console.log('%cNow is in mock mode', style_tx)
+} else if (isTest) {
+ console.log('%cNow is in test mode', style_tx)
+}
+
export { baseUrl, isCrossDomain, isMock }
// modules.export={
// baseUrl
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 4982961..272b4f1 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -2,7 +2,7 @@
<div class="sidebar-logo-container" :class="{'collapse':collapse}">
<transition name="sidebarLogoFade">
<router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
- <img v-if="logo" :src="logo" class="sidebar-logo">
+ <img v-if="logo" :src="logo" class="sidebar-logo logo-center">
<h1 v-else class="sidebar-title">{{ title }} </h1>
</router-link>
<router-link v-else key="expand" class="sidebar-logo-link" to="/">
@@ -61,6 +61,11 @@
margin-right: 12px;
}
+ & .logo-center {
+ margin-top: 50%;
+ transform: translateY(-50%);
+ }
+
& .sidebar-title {
display: inline-block;
margin: 0;
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 2e67afb..603476b 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -23,6 +23,7 @@
import Logo from './Logo'
import SidebarItem from './SidebarItem'
import variables from '@/styles/variables.scss'
+var isMock = require('@/config/baseConfig').isMock // 鍏ㄥ眬閰嶇疆鏂囦欢
export default {
components: { SidebarItem, Logo },
@@ -63,6 +64,8 @@
return menuData.filter((menu) => {
// 浠呮湁涓�绾ц彍鍗�
if (!menu.children) {
+ // isMock=1 鍏ㄦ樉绀�
+ if (isMock) return true
// 涓嶅瓨鍦ㄦ潈闄愮殑璇濓紝榛樿鏄剧ず
// console.log(menu.auth, menu.auth ? !!authData[menu.auth] : true)
// 蹇借hidden=true
@@ -72,6 +75,8 @@
if (menu.children.length) {
// 閫掑綊
menu.children = this.jun_filterAuth(menu.children, authData)
+ // isMock=1 鍏ㄦ樉绀�
+ if (isMock) return true
return menu.children.length
}
})
diff --git a/src/pages/demo/form.vue b/src/pages/demo/form.vue
index 002987a..fd4d748 100644
--- a/src/pages/demo/form.vue
+++ b/src/pages/demo/form.vue
@@ -64,7 +64,7 @@
<img style="max-width:100%" :src="uploadPreviewUrl" alt="">
</el-dialog>
- <back-to-top :custom-style="myBackToTopStyle" :visibility-height="300" :back-position="50" transition-name="fade" />
+ <back-to-top :visibility-height="300" :back-position="50" transition-name="fade" />
</div>
</template>
@@ -99,18 +99,7 @@
},
// 鍒濆鍖栧湴鍖�
- areaOpts: Area.getAreaOpts(Area.data), // 鐪佸競鍖烘暟鎹�
-
- // 鍥炲埌椤堕儴
- myBackToTopStyle: {
- right: '50px',
- bottom: '50px',
- width: '40px',
- height: '40px',
- 'border-radius': '4px',
- 'line-height': '45px', // 璇蜂繚鎸佷笌楂樺害涓�鑷翠互鍨傜洿灞呬腑
- background: '#e7eaf1'// 鎸夐挳鐨勮儗鏅鑹�
- },
+ areaOpts: Area.getAreaOpts(Area.data), // 鐪佸競鍖烘暟鎹畇
// 琛ㄥ崟鏍￠獙
rules: {
diff --git a/src/pages/demo/index.vue b/src/pages/demo/index.vue
index 4491e16..c7ff98f 100644
--- a/src/pages/demo/index.vue
+++ b/src/pages/demo/index.vue
@@ -93,13 +93,16 @@
:limit.sync="pageSize"
@pagination="getList"
/>
+
+ <back-to-top :visibility-height="300" :back-position="50" transition-name="fade" />
</div>
</template>
<script>
-
+import BackToTop from '@/components/BackToTop'
export default {
name: 'Demo',
+ components: { BackToTop },
data() {
return {
showSearch: true, // 鏄惁鏄剧ず鎼滅储鍖�
--
Gitblit v1.8.0