From ba3d748f9eb65a66fca9bd74fc7796b90a0a70ae Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期五, 30 六月 2023 09:06:15 +0800
Subject: [PATCH] Merge branch 'release/v1.1.3发布'
---
uniapp/components/indexPage.vue | 78 ++++++++++++++++++++++++++++-----------
1 files changed, 56 insertions(+), 22 deletions(-)
diff --git a/uniapp/components/indexPage.vue b/uniapp/components/indexPage.vue
index f72093c..02c7e68 100644
--- a/uniapp/components/indexPage.vue
+++ b/uniapp/components/indexPage.vue
@@ -58,11 +58,17 @@
</swiper-item>
</swiper>
</view> -->
+ <!--蹇嵎鍏ュ彛鍥炬爣-->
+ <view class="c-loading-img rowCenCen">
+ <view class="imgbox defIcon" v-for="(eitem,index) in fastenter" :key="index" @click="goUrl(eitem)">
+ <image :src="eitem.image"></image>
+ </view>
+ </view>
<!--宸﹁疆鎾紝鍙充袱琛�-->
<view class="centerflex f_contant">
<view class="f_centerSwiper-container swiper-box swiper-item f_left">
- <swiper class="swiper-box" :autoplay="true" :interval="5000" :duration="300" circular>
- <swiper-item v-for="(items,index) in singleLineList" :key='index'>
+ <swiper class="swiper-box" :autoplay="true" :interval="3000" :duration="300" :indicator-active-color="'#fff'" :indicator-dots="true" circular>
+ <swiper-item v-for="(items,index) in popBannerSList" :key='index'>
<view class="swiper-item defIcon" @click="goUrl(items)">
<image :src="items.image" mode="aspectFit"></image>
</view>
@@ -70,11 +76,11 @@
</swiper>
</view>
<view class="f_right">
- <view class="f_imgcon">
- <image src="https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/%E6%9C%80%E9%AB%9823888%E5%85%83-1054%20330.jpg"></image>
+ <view class="f_imgcon" v-if='enterTop.length>0' >
+ <image :src="enterTop[0].image" @click="goUrl(enterTop[0])"></image>
</view>
- <view class="f_imgcon">
- <image src="https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/%E6%9C%80%E9%AB%9823888%E5%85%83-1054%20330.jpg"></image>
+ <view class="f_imgcon" v-if='enterDown.length>0'>
+ <image :src="enterDown[0].image" @click="goUrl(enterDown[0])"></image>
</view>
</view>
</view>
@@ -103,7 +109,7 @@
</swiper>
</view>
<!--鍏ㄧ綉鐑攢-->
- <view class="van-row">
+ <!-- <view class="van-row">
<view class="van-col van-col--12" style="padding-right: 10rpx;">
<view class="home-row" @click="gorxb()">
<view class="title"><text class="name">鍏ㄧ綉鐑攢姒�</text>
@@ -151,7 +157,7 @@
</view>
</view>
</view>
- </view>
+ </view> -->
<!-- 澶у閮藉湪涔� -->
<!-- <view class="everysBuying-container colCen" v-if="zdmList.length>0">
<view class="box-bar-content rowCen">
@@ -440,16 +446,12 @@
navbarShowList: [],
navbarList: [],
sliderH: '',
-
scrollTop: 0,
scrollindex: 0,
-
-
zdmList: [],
phbList: [],
dyList: [],
rqList: [],
-
typedataList: [
{
mainTitle: '浜笢',
@@ -488,9 +490,14 @@
triggeredstate: true,
swpidx: 0,
canrefresh: true,
+ fastenter:[],
+ popBannerSList:[],
+ enterTop:[],
+ enterDown:[]
}
},
watch: {
+
recomendType(nval, oval){
if(nval != oval)this.changeRecommend()
},
@@ -612,21 +619,28 @@
onAbort() {
console.log('refushstop');
},
-
+
getBannerInfo() {
// banner鏁版嵁
var that = this;
this.$u.api.getBanner({
- type: '1,3,4,5'
+ 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;
+ this.fastenter=res.indexbanner;
+ this.popBannerSList=res.popBannerSList;
+ this.enterTop=res.enterTop;
+ this.enterDown=res.enterDown;
setTimeout(() => {
this.triggeredstate = false;
this._freshing = false;
@@ -642,7 +656,6 @@
})
},
-
godydetails(itm) {
const info = {}
info.nowInfo = itm
@@ -686,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) {
@@ -758,7 +770,12 @@
goUrl(info) {
utils.goUrl(info, this)
},
-
+ goFUrl(info)
+ {
+ uni.navigateTo({
+ url: info.url
+ });
+ },
gojgqUrl(info) {
if (info.urlType == '0') {
uni.navigateTo({
@@ -831,7 +848,7 @@
display: flex;
justify-content: space-between;
width: 96%;
- height: 550rpx;
+ height: 500rpx;
flex-direction: row;
padding: 20rpx 0;
margin: auto;
@@ -870,6 +887,23 @@
}
}
}
+ }
+
+ .c-loading-img {
+ width: 96%;
+ height: 132rpx;
+ background: #fff;
+ margin: auto;
+ margin-top: 20rpx;
+ border-radius: 12rpx;
+ justify-content:space-between;
+ padding:5rpx;
+
+ .imgbox {
+ width: 158rpx;
+ height: 105rpx;
+ // max-height: 72rpx;
+ }
}
.juan {
height: 28rpx;
@@ -935,7 +969,7 @@
.pageBody-container {
width: 100%;
//background-color: #FFFFFF;
- margin-bottom: 16rpx;
+ //margin-bottom: 16rpx;
.column-container {
width: 100%;
--
Gitblit v1.9.3