From dbc61c1b1eda6318dbe76a4a73ac9b3d08c2b15b Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期二, 23 七月 2024 17:41:19 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/components/advancedSearch/advancedSearch.vue | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/components/advancedSearch/advancedSearch.vue b/src/components/advancedSearch/advancedSearch.vue
index 666ae59..4f93d7f 100644
--- a/src/components/advancedSearch/advancedSearch.vue
+++ b/src/components/advancedSearch/advancedSearch.vue
@@ -19,7 +19,7 @@
margin-left: 0.31rem;
cursor: pointer;
"
- >楂樼骇鎼滅储 锕�</view
+ >楂樼骇鎼滅储 鈭�</view
>
</view>
<!-- 楂樼骇鎼滅储 -->
@@ -28,7 +28,7 @@
v-if="isAdvancedSearch"
style="padding: 0 1.24rem; margin-bottom: 0.18rem"
>
- <view style="background-color: #fff; padding: 0.29rem" class="">
+ <view style="background-color: #fff; padding: 0.29rem" >
<h3>楂樼骇鎼滅储</h3>
<MyForm @submit="onSubmit" :from="from" />
</view>
@@ -45,6 +45,9 @@
default() {
return true;
}
+ },
+ advancedSearchBack: {
+ type: Function
},
isSearchTrue: {
type: Boolean,
@@ -141,13 +144,16 @@
},
methods: {
isAvancedClick() {
- this.isAdvancedSearch = !this.isAdvancedSearch;
+ if (this.advancedSearchBack) {
+ this.advancedSearchBack();
+ } else {
+ this.isAdvancedSearch = !this.isAdvancedSearch;
+ }
// this.$nextTick(() => {
// var box1Height = document.querySelector('.fbox').offsetHeight;
// // let box2Height= document.querySelector('.fbox1').style.height = box1Height + 'px';
// let box2Height = document.querySelector('.fbox1').offsetHeight
- // console.log(box1Height, box2Height);
// if (box1Height <= box2Height) {
// document.querySelector('.fbox1').style.height = box1Height + 'px';
// }
@@ -158,7 +164,6 @@
},
onSubmit(val) {
this.$emit("onSubmit", val);
- // console.log(val);
}
}
};
--
Gitblit v1.9.1