From 4ac3c2382e0733685f7612f8e9ca4e85d15c1411 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期日, 25 六月 2023 08:55:00 +0800
Subject: [PATCH] Merge branch 'hotfix/苹果审核修改'
---
uniapp/components/indexPage.vue | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/uniapp/components/indexPage.vue b/uniapp/components/indexPage.vue
index c239708..92cca2e 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)
@@ -626,21 +626,23 @@
this.$u.api.getBanner({
type: '1,3,4,5,11,12,13,14'
}).then(e => {
- console.log(e)
if (e.code == 1) return that.$alert(e.msg);
var res = e.data.info;
- this.topBannerList = res.topBannerList;
- this.headerColor = this.topBannerList[0].colour;
- 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;
+ if(res.topBannerList&&res.topBannerList.length>0)
+ {
+ that.topBannerList = res.topBannerList;
+ that.headerColor = that.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;
setTimeout(() => {
- this.triggeredstate = false;
- this._freshing = false;
+ that.triggeredstate = false;
+ that._freshing = false;
}, 300)
}).catch(function(err) {
console.log(err)
@@ -696,7 +698,7 @@
pageSize: 10,
type: type
}).then(e => {
- console.log(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