Merge branch 'release/1.1.2发布'

zhaojs

2023-06-10 69ea24e8fdfb41fc48c3fdb8c444645c13b1bbc4

 uniapp/components/indexPage.vue

@@ -49,7 +49,7 @@
                  </view>
                  
                  <!--单列图片-->
                  <view class="centerSwiper-container colCenCen borderBox" v-if="singleLineList.length>0">
               <!--    <view class="centerSwiper-container colCenCen borderBox" v-if="singleLineList.length>0">
                     <swiper class="swiper-box" :autoplay="true" :interval="5000" :duration="300" circular>
                        <swiper-item v-for="(items,index) in singleLineList" :key='index'>
                           <view class="swiper-item defIcon" @click="goUrl(items)">
@@ -57,6 +57,32 @@
                           </view>
                        </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="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>
                           </swiper-item>
                        </swiper>
                     </view>
                     <view class="f_right">
                        <view class="f_imgcon" v-if='enterTop.length>0' >
                           <image :src="enterTop[0].image"  @click="goUrl(enterTop[0])"></image>
                        </view>
                        <view class="f_imgcon" v-if='enterDown.length>0'>
                           <image :src="enterDown[0].image"  @click="goUrl(enterDown[0])"></image>
                        </view>
                     </view>
                  </view>
                  
                  <!--双列图片-->
@@ -83,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>
@@ -131,7 +157,7 @@
                        </view>
                     </view>
                  </view>
               </view>
               </view> -->
               <!-- 大家都在买 -->
               <!-- <view class="everysBuying-container colCen" v-if="zdmList.length>0">
                  <view class="box-bar-content rowCen">
@@ -420,16 +446,12 @@
            navbarShowList: [],
            navbarList: [],
            sliderH: '',

            scrollTop: 0,
            scrollindex: 0,


            zdmList: [],
            phbList: [],
            dyList: [],
            rqList: [],

            typedataList: [
               {
                  mainTitle: '京东',
@@ -468,9 +490,14 @@
            triggeredstate: true,
            swpidx: 0,
            canrefresh: true,
            fastenter:[],
            popBannerSList:[],
            enterTop:[],
            enterDown:[]
         }
      },
      watch: {
			
         recomendType(nval, oval){
            if(nval != oval)this.changeRecommend()
         },
@@ -597,8 +624,9 @@
            // 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;
@@ -606,12 +634,16 @@
               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;
               }, 300)
            }).catch(function(err) {

               console.log(err)
            })
         },

@@ -620,7 +652,6 @@
               url: '../active/tiktoklist'
            })
         },
			

         godydetails(itm) {
            const info = {}
@@ -735,10 +766,14 @@
         },

         goUrl(info) {
            console.log(info)
            utils.goUrl(info, this)
         },

         goFUrl(info)
         {
            uni.navigateTo({
               url: info.url
            });
         },
         gojgqUrl(info) {
            if (info.urlType == '0') {
               uni.navigateTo({
@@ -806,6 +841,68 @@
</script>

<style lang="scss">
   .f_contant
   {
          display: flex;
          justify-content: space-between;
          width: 96%;
          height: 500rpx;
          flex-direction: row;
         padding: 20rpx 0;
         margin: auto;
         .f_left{
            width:49%;
            border-radius: 12rpx;
            background: #fff;
         }
         .f_right{
            width:49%;
            display: flex;
            flex-direction: column;
            justify-content: space-between;
         }
         .f_imgcon
         {
            height: 49%;
            border-radius: 12rpx;
            image
            {
               width:100%;
               border-radius: 12rpx;
               height: 100%;
            }
         }
         .f_centerSwiper-container {
				
			
            .swiper-box {
               width: 100%;
               height: 100%;
			
               .swiper-item {
                  width: 100%;
                  height: 100%;
               }
            }
         }
   }
	
   .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;
      background: linear-gradient(90deg, #ff8873 0, #ff4f4f 100%);
@@ -870,7 +967,7 @@
      .pageBody-container {
         width: 100%;
         //background-color: #FFFFFF;
         margin-bottom: 16rpx;
         //margin-bottom: 16rpx;

         .column-container {
            width: 100%;