From 9ea0383c303620cd019d0776ecbb47f52bcef805 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期三, 28 六月 2023 14:17:25 +0800
Subject: [PATCH] Merge branch 'feature/1.1.3版本开发' into develop
---
uniapp/components/indexPage.vue | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/uniapp/components/indexPage.vue b/uniapp/components/indexPage.vue
index 92cca2e..02c7e68 100644
--- a/uniapp/components/indexPage.vue
+++ b/uniapp/components/indexPage.vue
@@ -595,7 +595,7 @@
},
onRestore() {
this.swpidx = 0
- //console.log('涓嬫媺琚粓姝�');
+ console.log('涓嬫媺琚粓姝�');
},
pagescroll(e) {
this.$emit('scrollNum', e.detail.scrollTop)
@@ -630,19 +630,20 @@
var res = e.data.info;
if(res.topBannerList&&res.topBannerList.length>0)
{
- that.topBannerList = res.topBannerList;
- that.headerColor = that.topBannerList[0].colour;
+ this.topBannerList = res.topBannerList;
+ this.headerColor = this.topBannerList[0].colour;
}
- that.singleLineList = res.singleLineList;
- that.doubleLineList = res.doubleLineList;
- that.bottomBannerList = res.bottomBannerList;
- that.fastenter=res.indexbanner;
- that.popBannerSList=res.popBannerSList;
- that.enterTop=res.enterTop;
- that.enterDown=res.enterDown;
+
+ this.singleLineList = res.singleLineList;
+ this.doubleLineList = res.doubleLineList;
+ this.bottomBannerList = res.bottomBannerList;
+ this.fastenter=res.indexbanner;
+ this.popBannerSList=res.popBannerSList;
+ this.enterTop=res.enterTop;
+ this.enterDown=res.enterDown;
setTimeout(() => {
- that.triggeredstate = false;
- that._freshing = false;
+ this.triggeredstate = false;
+ this._freshing = false;
}, 300)
}).catch(function(err) {
console.log(err)
@@ -698,7 +699,6 @@
pageSize: 10,
type: type
}).then(e => {
- // console.log(e)
if (e.code != 0) return that.$alert(e.msg)
var res = e.data.list;
if (res.length < 10) {
--
Gitblit v1.9.3