From 2b06902e25978254f39bef49ed3cf6b1cab1c033 Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期五, 26 七月 2024 11:53:09 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/components/headNav/headNav.vue | 96 +++++++++++++++++++++++++++++++----------------
1 files changed, 63 insertions(+), 33 deletions(-)
diff --git a/src/components/headNav/headNav.vue b/src/components/headNav/headNav.vue
index 4d99911..180027a 100644
--- a/src/components/headNav/headNav.vue
+++ b/src/components/headNav/headNav.vue
@@ -33,6 +33,7 @@
width: 2.33rem;
margin-right: 0.3rem;
justify-content: flex-end;
+ position: relative;
"
>
<input
@@ -43,6 +44,8 @@
flex: 1;
background-color: #fff;
font-size: 0.13rem;
+ padding-right: 30px;
+ box-sizing: border-box;
"
@blur="InputBlur"
@confirm="toggleSearch"
@@ -50,18 +53,38 @@
v-model="searchInput"
placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�"
/>
+ <span
+ class="cleanupBtn"
+ v-if="searchInput"
+ @click="searchInput = ''"
+ style="
+ position: absolute;
+ top: 50%;
+ margin-top: -10px;
+ right: 42px;
+ color: #fff;
+ z-index: 2;
+ display: inline-block;
+ width: 20px;
+ height: 20px;
+ text-align: center;
+ line-height: 20px;
+ background-color: #a5a5a5;
+ font-weight: bold;
+ border-radius: 50%;
+ font-size: 12px;
+ cursor: pointer;
+ "
+ >鉁�</span
+ >
<view
title="鎼滅储"
class="search-logo"
@click="toggleSearch"
:style="{
- backgroundColor: searchBg == true ? '#244A7B' : '#DA7A2B'
+ backgroundColor: searchBg == true ? '#244A7B' : '#DA7A2B',
}"
- style="
- background-color: #000;
- border-radius: 50%;
- margin-top: -4rpx;
- "
+ style="background-color: #000; border-radius: 50%"
></view>
</view>
<el-dropdown trigger="click" @command="handleCommand">
@@ -115,20 +138,23 @@
<span slot="title">棣栭〉</span>
</el-menu-item>
<el-menu-item index="1">
- <span slot="title">涓尰浜虹墿鏁版嵁搴�</span>
+ <span slot="title">鍘嗕唬浜虹墿</span>
</el-menu-item>
<el-menu-item index="2" class="oActive">
- <span slot="title">涓栧尰鍖诲鏁版嵁搴�</span>
+ <span slot="title">瀹跺浼犳壙</span>
+ </el-menu-item>
+ <el-menu-item index="6">
+ <span slot="title">瀛︽湳鍥捐氨</span>
</el-menu-item>
<el-menu-item index="3">
- <span slot="title">涓尰瀛︽湳娴佹淳</span>
+ <span slot="title">瀛︽湳娴佹淳</span>
</el-menu-item>
<el-menu-item index="4">
- <span slot="title">涓尰鍦板煙鍥捐氨</span>
+ <span slot="title">鍦板煙鍥捐氨</span>
</el-menu-item>
- <el-menu-item index="5">
+ <!-- <el-menu-item index="5">
<span slot="title">涓尰鍖讳簨鍒跺害</span>
- </el-menu-item>
+ </el-menu-item> -->
</el-menu>
</view>
</el-dialog>
@@ -149,32 +175,32 @@
type: String,
default() {
return "鏍囬";
- }
+ },
},
searchBg: {
type: Boolean,
default() {
return true;
- }
+ },
},
bg: {
type: String,
default() {
return "/static/image/topBg.png";
- }
+ },
},
bg1: {
type: String,
default() {
return "/static/image/line.png";
- }
+ },
},
idIndex: {
type: String,
default() {
return "1";
- }
- }
+ },
+ },
},
data() {
return {
@@ -182,7 +208,7 @@
searchInput: "", // 鎼滅储妗嗚緭鍏ョ殑鍐呭
menuNav: false,
dialogVisible: false,
- isCommand: true
+ isCommand: true,
};
},
methods: {
@@ -207,13 +233,13 @@
if (res.confirm) {
setTimeout(() => {
uni.reLaunch({
- url: "/pages/Login/Login"
+ url: "/pages/Login/Login",
});
}, 1500);
} else if (res.cancel) {
// console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
}
- }
+ },
});
}
// uni.navigateTo({
@@ -227,7 +253,7 @@
handleCommand(int) {
if (int == 1) {
uni.navigateTo({
- url: "/pages/changePassword/changePassword"
+ url: "/pages/changePassword/changePassword",
});
} else if (int == 2) {
uni.showModal({
@@ -244,40 +270,44 @@
//閫�鍑烘垚鍔燂紒骞惰烦杞埌鍏朵粬椤甸潰
this.$message.success("閫�鍑烘垚鍔�");
uni.reLaunch({
- url: "/pages/Login/Login"
+ url: "/pages/Login/Login",
});
});
} else if (res.cancel) {
// console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
}
- }
+ },
});
}
},
handleSelect(index) {
if (index === "0") {
uni.navigateTo({
- url: "/pages/index/index?id=" + 0
+ url: "/pages/index/index?id=" + 0,
});
} else if (index === "1") {
uni.navigateTo({
- url: "/pages/character/index?id=" + 1
+ url: "/pages/character/index?id=" + 1,
});
} else if (index === "2") {
uni.navigateTo({
- url: "/pages/inherit/index?id=" + 2
+ url: "/pages/inherit/index?id=" + 2,
});
} else if (index === "3") {
uni.navigateTo({
- url: "/pages/academicGenres/index?id=" + 3
+ url: "/pages/academicGenres/index?id=" + 3,
});
} else if (index === "4") {
uni.navigateTo({
- url: "/pages/territory/territory?id=" + 4
+ url: "/pages/territory/territory?id=" + 4,
});
} else if (index === "5") {
uni.navigateTo({
- url: "/pages/TcmSystem/TcmSystem?id=" + 5
+ url: "/pages/TcmSystem/TcmSystem?id=" + 5,
+ });
+ } else if (index === "6") {
+ uni.navigateTo({
+ url: "/pages/academicSchools/index",
});
}
},
@@ -293,13 +323,13 @@
if (this.searchInput.trim() !== "") {
uni.navigateTo({
url:
- "/pages/knowledgeBase/knowledgeBase?keyword=" + this.searchInput
+ "/pages/knowledgeBase/knowledgeBase?keyword=" + this.searchInput,
});
}
this.searchInput = "";
});
- }
- }
+ },
+ },
};
</script>
--
Gitblit v1.9.1