Merge remote-tracking branch 'origin/sit-Leung' into sit-jiamin-v2

This commit is contained in:
952108534@qq.com
2022-01-20 20:04:06 +08:00
12 changed files with 214 additions and 94 deletions

View File

@@ -5,9 +5,43 @@
<!-- Suppose in header end -->
<div class="ts-banner-swiper-container">
<swiper :options="headerSwiperOption">
<swiper-slide v-for="(banner, index) in showingBanners" :key="index">
<a :href="banner.link" target="_blank">
<img :src="banner.src" class="useraimg"/>
<swiper-slide>
<a href="#" target="_blank">
<picture>
<source media="(max-width: 768px)" srcset="/images/banner/one.jpg">
<source media="(min-width: 769px)" srcset="/images/banner/pc-banner1.png">
<img src="/images/banner/one.jpg">
</picture>
</a>
</swiper-slide>
<swiper-slide>
<a href="#" target="_blank">
<picture>
<source media="(max-width: 768px)" srcset="/images/banner/two.jpg">
<source media="(min-width: 769px)" srcset="/images/banner/pc-banner2.png">
<img src="/images/banner/two.jpg">
</picture>
</a>
</swiper-slide>
<swiper-slide>
<a href="#" target="_blank">
<picture>
<source media="(max-width: 768px)" srcset="/images/banner/three.jpg">
<source media="(min-width: 769px)" srcset="/images/banner/pc-banner3.png">
<img src="/images/banner/three.jpg">
</picture>
</a>
</swiper-slide>
<swiper-slide>
<a href="#" target="_blank">
<picture>
<source media="(max-width: 768px)" srcset="/images/banner/four.jpg">
<source media="(min-width: 769px)" srcset="/images/banner/pc-banner4.png">
<img src="/images/banner/four.jpg">
</picture>
</a>
</swiper-slide>
</swiper>
@@ -49,7 +83,7 @@
<swiper-slide v-for="(item, index) in catlistvideo" :key="index">
<div class="rc-video">
<div class="uservideo">
<video controls="" :poster=item.catimage>
<video controls="" :poster=item.catimage preload="none">
<source :src=item.video type="video/mp4">
</video>
</div>
@@ -65,7 +99,7 @@
<div class="sw-center" >
<div class="rc-click" @click="selectproduce(item,index)">
<div class="uservideo">
<video controls="controls" :poster=item.catimage>
<video controls="controls" :poster=item.catimage preload="none">
<source :src= item.video type="video/ogg">
</video>
</div>
@@ -279,7 +313,7 @@
<swiper-slide v-for="(item, key) in doglistvideo" :key="key">
<div class="rc-video">
<div class="uservideo">
<video controls="" :poster=item.catimage>
<video controls="" :poster=item.catimage preload="none">
<source :src=item.video type="video/mp4">
</video>
</div>
@@ -295,7 +329,7 @@
<div class="sw-center" >
<div class="rc-click" @click="selectproduce(item,index)">
<div class="uservideo">
<video controls="controls">
<video controls="controls" preload="none" :poster="item.catimage">
<source :src= item.video type="video/ogg">
</video>
</div>
@@ -739,22 +773,19 @@
userserachlist:[{}],
doggan:[],
dogtype:[
{
title: "幼犬",
},
{
title: "成犬",
},
{
title: "老年犬",
},
{
title: "品种犬",
},
{
title: "亚健康",
}
],
{
title: "离乳期",
},
{
title: "幼年",
},
{
title: "成年",
},
{
title: "老年",
}
],
anchor:'',
dogshi:[],
catlist:[],
@@ -823,22 +854,17 @@
],
discoun: [
{
title: "幼猫",
title: "<4月龄",
},
{
title: "成猫",
title: "4-12月龄",
},
{
title: "老年猫",
},
{
title: "品种猫",
title: "1-7岁",
},
{
title: "亚健康猫"
},
title: ">7岁"
}
],
discountlist: [
@@ -1065,7 +1091,11 @@
centeredSlides: true,
speed:1000,
spaceBetween: 0,
autoplay: true,
autoplay: {
delay: 3000,
stopOnLastSlide: false,
disableOnInteraction: false,
},
pagination: {
el: '#homeBannerSwiperPagnation',
clickable:true
@@ -1370,13 +1400,14 @@
userdogShi(){
this.activeIndex5=(this.activeIndex5?this.activeIndex5:0);
let apiDogSize=this.userdoglist[this.activeIndex5].title;
let apiDogFoodType=this.dogtype[this.quanshiCurIndex].title;
let apiDogAgeType=this.dogtype[this.quanshiCurIndex].title;
this.userstype=1;
let petType={
petType:1,
categoryName:"皇家犬湿粮",
name:apiDogFoodType,
tagStatus:2,
tagUsedAge:apiDogAgeType,
name:apiDogSize
}
for(let i =0;i<this.userserachlist.length;i++){
if(!this.userserachlist.includes(petType)){
@@ -1389,12 +1420,14 @@
userdogGan(){
this.activeIndex6=(this.activeIndex6?this.activeIndex6:0);
let apiDogSize=this.userdoglist[this.activeIndex6].title;
let apiDogFoodType=this.dogtype[this.quanganCurIndex].title;
let apiDogAgeType=this.dogtype[this.quanganCurIndex].title;
this.userstype=1;
let petType={
petType:1,
name:apiDogFoodType,
tagStatus:1,
tagUsedAge:apiDogAgeType,
name:apiDogSize
}
for(let i =0;i<this.userserachlist.length;i++){
if(!this.userserachlist.includes(petType)){
@@ -1565,10 +1598,11 @@
catclickGan(){
this.userstype=0;
this.maoganCurIndex=this.maoganCurIndex?this.maoganCurIndex:0;
let apiCatType=this.discoun[this.maoganCurIndex].title;
let apiCatAgeType=this.discoun[this.maoshiCurIndex].title;
let petType={
petType:0,
name:apiCatType,
tagStatus:1,//干
tagUsedAge:apiCatAgeType,
}
for(let i =0;i<this.userserachlist.length;i++){
if(!this.userserachlist.includes(petType)){
@@ -1580,11 +1614,11 @@
catclickShi(){
this.userstype=0;
this.maoshiCurIndex=this.maoshiCurIndex?this.maoshiCurIndex:0;
let apiCatType=this.discoun[this.maoshiCurIndex].title;
let apiCatAgeType=this.discoun[this.maoshiCurIndex].title;
let petType={
petType:0,
categoryName:"皇家猫湿粮",
name:apiCatType,
tagStatus:2,//湿
tagUsedAge:apiCatAgeType,
}
for(let i =0;i<this.userserachlist.length;i++){
if(!this.userserachlist.includes(petType)){

View File

@@ -50,7 +50,8 @@
<script>
import Myheader from '~/components/header.vue'
import Myheader from '~/components/header.vue'
import addressInput from '~/components/addressInput.vue'
import MyFooter from '~/components/rc-footer.vue'
import addressInput from '~/components/addressInput.vue'
import {editaddress} from "../../ajax/getData";