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/pages/knowledgeBase/knowledgeBase.vue | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/pages/knowledgeBase/knowledgeBase.vue b/src/pages/knowledgeBase/knowledgeBase.vue
index 2c40043..111bf5d 100644
--- a/src/pages/knowledgeBase/knowledgeBase.vue
+++ b/src/pages/knowledgeBase/knowledgeBase.vue
@@ -340,7 +340,7 @@
label: "鏃舵湡",
name: "dynasty",
value: ""
- },
+ }
// {
// type: "select",
// label: "鏈烘瀯",
@@ -397,7 +397,8 @@
tagId: "",
official: "",
genderType: ""
- }
+ },
+ aSearchData: ""
};
},
onLoad(options) {
@@ -643,6 +644,9 @@
},
// 楂樼骇鎼滅储
async onSubmit(val) {
+ this.keywords = "";
+ this.hotAciveIndex = "";
+ this.aSearchData = val;
this.profession.index = Number(val.tagId);
this.profession.id = Number(val.tagId);
const currentDynasty = this.dynasty.list.find(
@@ -681,6 +685,7 @@
// 鍩虹鎼滅储
async onSearch(val, index) {
this.keywords = val.text;
+ this.aSearchData = "";
if (index !== undefined) {
this.keywords = "";
this.hotAciveIndex = index;
@@ -744,7 +749,11 @@
CurrentChange(val) {
if (this.CurrentPage != val) {
this.CurrentPage = val;
- this.onSearch({ text: this.keywords });
+ if (this.isAdvancedSearch) {
+ this.onSubmit(this.aSearchData);
+ } else {
+ this.onSearch({ text: this.keywords });
+ }
}
},
// 涓婁竴椤�
--
Gitblit v1.9.1