Commit 899989f6 authored by 高铭波's avatar 高铭波

Merge branch 'dev-1.4.6' into test

parents f0018ebd 1a4dda82
......@@ -115,10 +115,10 @@ export default {
return process.uniEnv.qn_base_url + "SearchEmpty.png";
},
showAssociation() {
return this.focused && !this.$u.test.isEmpty(this.associationList);
return this.focused && this.search.keyword && !this.$u.test.isEmpty(this.associationList);
},
showOrderCell() {
return !this.focused && this.$u.test.isEmpty(this.associationList);
return !this.focused;
},
},
methods: {
......@@ -128,6 +128,7 @@ export default {
if (this.search.keyword) {
getApp().track("search_order", { keyword: this.search.keyword });
this.getOrderList();
this.focused = false;
}
},
// 高亮文本
......@@ -169,7 +170,7 @@ export default {
},
/** 失去焦点 */
loseFocus() {
this.focused = false;
},
// 页面数据
getOrderList(event) {
......@@ -243,6 +244,9 @@ export default {
<style lang="scss">
.search-wrap {
display: flex;
flex-direction: column;
height: 100vh;
.top-item {
position: sticky;
padding: 20rpx 0;
......@@ -283,6 +287,9 @@ export default {
}
.association-wrap {
height: 100%;
padding-bottom: 44rpx;
overflow: auto;
.association-cell {
display: flex;
padding: 26rpx 32rpx;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment