From 213a7fb9ff901a4a60d9eaabdf1f4b3c1f863b43 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Thu, 13 Aug 2020 14:58:04 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=88=86=E4=B9=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pageB/search/out.vue | 1 +
pageB/search/searchGoods.vue | 1 +
2 files changed, 2 insertions(+)
diff --git a/pageB/search/out.vue b/pageB/search/out.vue
index e79b153..a679836 100644
--- a/pageB/search/out.vue
+++ b/pageB/search/out.vue
@@ -86,6 +86,7 @@ export default {
},
onNavigationBarSearchInputConfirmed(value) {
this.value = value.text
+ this.page = 1
// console.log(this.value)
this.ShopSearch()
},
diff --git a/pageB/search/searchGoods.vue b/pageB/search/searchGoods.vue
index 053a741..5ac5a4b 100644
--- a/pageB/search/searchGoods.vue
+++ b/pageB/search/searchGoods.vue
@@ -61,6 +61,7 @@ export default {
},
onNavigationBarSearchInputConfirmed(value) {
this.value = value.text
+ this.page = 1
this.ShopSearch()
},
methods: {
From 87e5515b988092dea2a1622b5a14993083e41e15 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Thu, 13 Aug 2020 15:02:00 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E9=AB=98=E5=BA=A6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pageB/search/out.vue | 7 ++++---
pageB/search/searchGoods.vue | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/pageB/search/out.vue b/pageB/search/out.vue
index a679836..1e5f13d 100644
--- a/pageB/search/out.vue
+++ b/pageB/search/out.vue
@@ -213,7 +213,7 @@ export default {
},
setViewHeight() {
const res = uni.getSystemInfoSync();
- this.scrollHeight = res.windowHeight - res.windowWidth / 750 * 90 + 'px';
+ this.scrollHeight = res.windowHeight - res.windowWidth / 750 * 92 + 'px';
},
toDetailsPage(id) {
this.$u.route('/pageC/merchant/index', {
@@ -235,10 +235,11 @@ export default {
box-sizing: border-box;
padding: 30rpx 40rpx;
display: flex;
- margin-bottom: 30rpx;
+ // margin-bottom: 30rpx;
+ height: 92rpx;
> view {
height: 30rpx;
- line-height: 30rpx;
+ line-height: 1;
flex: 1;
font-size: 32rpx;
color: rgba(51,51,51,1);
diff --git a/pageB/search/searchGoods.vue b/pageB/search/searchGoods.vue
index 5ac5a4b..8b118f2 100644
--- a/pageB/search/searchGoods.vue
+++ b/pageB/search/searchGoods.vue
@@ -139,7 +139,7 @@ export default {
},
setViewHeight() {
const res = uni.getSystemInfoSync();
- this.scrollHeight = res.windowHeight - res.windowWidth / 750 * 90 + 'px';
+ this.scrollHeight = res.windowHeight - res.windowWidth / 750 * 92 + 'px';
},
toDetailsPage(id) {
this.$u.route('/pageB/sdetails/index', {
@@ -155,10 +155,11 @@ export default {
box-sizing: border-box;
padding: 30rpx 40rpx;
display: flex;
- margin-bottom: 30rpx;
+ // margin-bottom: 30rpx;
+ height: 92rpx;
> view {
height: 30rpx;
- line-height: 30rpx;
+ line-height: 1;
flex: 1;
font-size: 32rpx;
color: rgba(51,51,51,1);
From 1a3b39f31e64aedac011bcc53b7c28f5fc0dafa9 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Thu, 13 Aug 2020 15:06:49 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=BB=91=E5=8A=A8=E5=88=B0=E9=A1=B6?=
=?UTF-8?q?=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pageB/search/searchGoods.vue | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/pageB/search/searchGoods.vue b/pageB/search/searchGoods.vue
index 8b118f2..b4c3efc 100644
--- a/pageB/search/searchGoods.vue
+++ b/pageB/search/searchGoods.vue
@@ -11,7 +11,7 @@
好评
-
+
@@ -39,7 +39,10 @@ export default {
loadStatus: 'loadmore',
timer: true, // 防止上拉加载短时间内多次调用,
value:"",
- top:0
+ scrollTop: 0,
+ old: {
+ scrollTop: 0
+ }
}
},
watch: {
@@ -65,6 +68,9 @@ export default {
this.ShopSearch()
},
methods: {
+ scroll: function(e) {
+ this.old.scrollTop = e.detail.scrollTop; // 必要
+ },
setNavSearchInput(keyword) {
console.log(keyword);
// #ifdef APP-PLUS
@@ -133,7 +139,10 @@ export default {
switchCurrent(current) {
this.page = 1
if(current == 1 && this.current == 1) this.priceOrderAsc = !this.priceOrderAsc;
- this.top=0
+ this.scrollTop = this.old.scrollTop
+ this.$nextTick(function() {
+ this.scrollTop = 0
+ });
this.ShopSearch()
this.current = current;
},
From d604351cf3a59c51586d09ddd52ca5eb46befaa5 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Thu, 13 Aug 2020 15:37:59 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=86=E4=B9=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pageB/search/out.vue | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/pageB/search/out.vue b/pageB/search/out.vue
index 1e5f13d..033fed4 100644
--- a/pageB/search/out.vue
+++ b/pageB/search/out.vue
@@ -7,7 +7,7 @@
社区
-
+
@@ -18,7 +18,7 @@
-
+
@@ -34,7 +34,7 @@
-
+
@@ -59,7 +59,11 @@ export default {
scrollHeight: '',
loadStatus: 'loadmore',
timer: true, // 防止上拉加载短时间内多次调用,
- value:""
+ value:"",
+ scrollTop: 0,
+ old: {
+ scrollTop: 0
+ }
}
},
components:{
@@ -91,6 +95,9 @@ export default {
this.ShopSearch()
},
methods: {
+ scroll: function(e) {
+ this.old.scrollTop = e.detail.scrollTop; // 必要
+ },
// 动态设置导航栏搜索框内容
setNavSearchInput(keyword) {
// #ifdef APP-PLUS