Merge branch 'feature/1.1.3版本开发' into develop

zhaojs

2023-06-28 9ea0383c303620cd019d0776ecbb47f52bcef805

 uniapp/components/indexPage.vue

@@ -626,11 +626,14 @@
            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;
               if(res.topBannerList&&res.topBannerList.length>0)
               {
                  this.topBannerList = res.topBannerList;
                  this.headerColor = this.topBannerList[0].colour;
               }
					
               this.singleLineList = res.singleLineList;
               this.doubleLineList = res.doubleLineList;
               this.bottomBannerList = res.bottomBannerList;
@@ -696,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) {