回退 'Pull Request !43 : 2022-1-19 Leung'

This commit is contained in:
Admin
2022-01-20 02:45:55 +00:00
committed by Gitee
parent 704232e442
commit b6787145e4
17 changed files with 225 additions and 551 deletions

View File

@@ -5,43 +5,9 @@
<!-- Suppose in header end -->
<div class="ts-banner-swiper-container">
<swiper :options="headerSwiperOption">
<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>
<swiper-slide v-for="(banner, index) in showingBanners" :key="index">
<a :href="banner.link" target="_blank">
<img :src="banner.src" class="useraimg"/>
</a>
</swiper-slide>
</swiper>
@@ -83,7 +49,7 @@
<swiper-slide v-for="(item, index) in catlistvideo" :key="index">
<div class="rc-video">
<div class="uservideo">
<video controls="" :poster=item.catimage preload="none">
<video controls="" :poster=item.catimage>
<source :src=item.video type="video/mp4">
</video>
</div>
@@ -99,7 +65,7 @@
<div class="sw-center" >
<div class="rc-click" @click="selectproduce(item,index)">
<div class="uservideo">
<video controls="controls" :poster=item.catimage preload="none">
<video controls="controls" :poster=item.catimage>
<source :src= item.video type="video/ogg">
</video>
</div>
@@ -129,7 +95,6 @@
<van-tabs @click='catclickShi' class="van-tabs" v-if="onemao" v-model="maoshiCurIndex">
<van-tab v-for="(item,index) in discoun" :key="index" :title="item.title">
<div class="rc-contair">
<div class="ts-no-data" v-if="!catshi.length">暂未发现相关记录</div>
<ul class="ts-product-list rc-margin-bottom--lg">
<li v-for="(item,index) in catshi" :key="index" class="rc-margin-top--md">
<div class="rc-click rc-margin-bottom--md" @click="selectproduce(item,index)">
@@ -140,7 +105,7 @@
<div class="rc-column">
<div class="rc-click" @click="selectproduce(item,index)">
<span>{{item.name}}</span>
<i>{{item.ecprice}}</i>
<i>0.001{{item.price}}</i>
</div>
<strong class="ts-standard-btn ts-standard-btn--two rc-margin-y--md center" @click="selectproduce(item,index)">立即购买</strong>
</div>
@@ -184,7 +149,6 @@
</ul>
</div>
<div class="">
<div class="ts-no-data" v-if="!catshi.length">暂未发现相关记录</div>
<ul class="ts-product-list rc-margin-bottom--lg">
<li v-for="(item,index) in rccontair" :key="index" class="rc-margin-top--md">
<div class="rc-click rc-margin-bottom--md" @click="selectproduce(item,index)">
@@ -215,7 +179,6 @@
<van-tabs @click='catclickGan' class="van-tabs" v-if="twomao" v-model="maoganCurIndex">
<van-tab v-for="(item,index) in discoun" :key="index" :title="item.title">
<div class="rc-contair">
<div class="ts-no-data" v-if="!catgan.length">暂未发现相关记录</div>
<ul class="ts-product-list rc-margin-bottom--lg">
<li v-for="(item,index) in catgan" :key="index" class="rc-margin-top--md">
<div class="rc-click rc-margin-bottom--md" @click="selectproduce(item,index)">
@@ -273,7 +236,6 @@
</ul>
</div>
<div class="rc-contair">
<div class="ts-no-data" v-if="!rccontair.length">暂未发现相关记录</div>
<ul class="ts-product-list rc-margin-bottom--lg">
<li v-for="(item,index) in rccontair" :key="index" class="rc-margin-top--md">
<div class="rc-click rc-margin-bottom--md" @click="selectproduce(item,index)">
@@ -284,7 +246,7 @@
<div class="rc-column">
<div class="rc-click" @click="selectproduce(item,index)">
<span>{{item.title}}</span>
<i>{{item.ecprice}}</i>
<i>0.001{{item.price}}</i>
</div>
<strong class="ts-standard-btn ts-standard-btn--two rc-margin-y--md center" @click="selectproduce(item,index)">立即购买</strong>
</div>
@@ -317,7 +279,7 @@
<swiper-slide v-for="(item, key) in doglistvideo" :key="key">
<div class="rc-video">
<div class="uservideo">
<video controls="" :poster=item.catimage preload="none">
<video controls="" :poster=item.catimage>
<source :src=item.video type="video/mp4">
</video>
</div>
@@ -333,7 +295,7 @@
<div class="sw-center" >
<div class="rc-click" @click="selectproduce(item,index)">
<div class="uservideo">
<video controls="controls" preload="none" :poster="item.catimage">
<video controls="controls">
<source :src= item.video type="video/ogg">
</video>
</div>
@@ -381,8 +343,6 @@
</div>
<div class="rc-contair">
<div class="ts-no-data" v-if="!dogshi.length">暂未发现相关记录</div>
<ul class="ts-product-list rc-margin-bottom--lg">
<li v-for="(item,index) in dogshi" :key="index" class="rc-margin-top--md">
<div class="rc-click rc-margin-bottom--md" @click="selectproduce(item,index)">
@@ -393,7 +353,7 @@
<div class="rc-column">
<div class="rc-click" @click="selectproduce(item,index)">
<span>{{item.name}}</span>
<i>{{item.ecprice}}</i>
<i>0.001{{item.price}}</i>
</div>
<strong class="ts-standard-btn ts-standard-btn--two rc-margin-y--md center" @click="selectproduce(item,index)">立即购买</strong>
</div>
@@ -428,6 +388,8 @@
</ol>
<div class="rc-maa">
<ul>
<li
v-for="(item, index) in doglist"
:key="index"
@@ -451,7 +413,7 @@
<div class="rc-column">
<div class="rc-click" @click="selectproduce(item,index)">
<span>{{item.title}}</span>
<i>{{item.ecprice}}</i>
<i>0.001{{item.price}}</i>
</div>
<strong class="ts-standard-btn ts-standard-btn--two rc-margin-y--md center" @click="selectproduce(item,index)">立即购买</strong>
</div>
@@ -495,7 +457,6 @@
</ul>
</div>
<div class="rc-contair">
<div class="ts-no-data" v-if="!doggan.length">暂未发现相关记录</div>
<ul class="ts-product-list rc-margin-bottom--lg">
<li v-for="(item,index) in doggan" :key="index" class="rc-margin-top--md">
<div class="rc-click rc-margin-bottom--md" @click="selectproduce(item,index)">
@@ -506,7 +467,7 @@
<div class="rc-column">
<div class="rc-click" @click="selectproduce(item,index)">
<span>{{item.name}}</span>
<i>{{item.ecprice}}</i>
<i>0.001{{item.price}}</i>
</div>
<strong class="ts-standard-btn ts-standard-btn--two rc-margin-y--md center" @click="selectproduce(item,index)">立即购买</strong>
</div>
@@ -565,7 +526,7 @@
<div class="rc-column">
<div class="rc-click" @click="selectproduce(item,index)">
<span>{{item.title}}</span>
<i>{{item.ecprice}}</i>
<i>0.001{{item.price}}</i>
</div>
<strong class="ts-standard-btn ts-standard-btn--two rc-margin-y--md center" @click="selectproduce(item,index)">立即购买</strong>
</div>
@@ -592,7 +553,6 @@
<van-tabs @click='userclick' class="van-tabs" v-if="fivemao">
<van-tab v-for="(item,index) in discounchufang" :key="index" :title="item.title">
<div class="rc-contair">
<div class="ts-no-data" v-if="!processinformation.length">暂未发现相关记录</div>
<ul class="ts-product-list rc-margin-bottom--lg">
<li v-for="(item,index) in processinformation" :key="index" class="rc-margin-top--md rc-padding-bottom--lg">
<div class="rc-click rc-margin-bottom--md" @click="selectproduce(item,index)">
@@ -780,16 +740,19 @@
doggan:[],
dogtype:[
{
title: "离乳期",
title: "幼犬",
},
{
title: "幼年",
title: "成犬",
},
{
title: "成年",
title: "老年犬",
},
{
title: "老年",
title: "品种犬",
},
{
title: "亚健康",
}
],
anchor:'',
@@ -860,17 +823,22 @@
],
discoun: [
{
title: "<4月龄",
title: "幼猫",
},
{
title: "4-12月龄",
title: "成猫",
},
{
title: "1-7岁",
title: "老年猫",
},
{
title: "品种猫",
},
{
title: ">7岁"
}
title: "亚健康猫"
},
],
discountlist: [
@@ -1097,12 +1065,9 @@
centeredSlides: true,
speed:1000,
spaceBetween: 0,
autoplay: {
delay: 3000,
},
autoplay: true,
pagination: {
el: '#homeBannerSwiperPagnation',
clickable: true
el: '#homeBannerSwiperPagnation'
},
paginationClickable: true,
loopAdditionalSlides: 100,
@@ -1129,7 +1094,6 @@
loopAdditionalSlides: 100,
pagination: {
el: '#catStarSwiperPagnation',
clickable: true
},
navigation: {
nextEl: '.swiper-button-next',
@@ -1153,7 +1117,6 @@
loopAdditionalSlides: 100,
pagination: {
el: '#dogStarSwiperPagnation',
clickable: true
},
navigation: {
nextEl: '.swiper-button-next',
@@ -1404,14 +1367,13 @@
userdogShi(){
this.activeIndex5=(this.activeIndex5?this.activeIndex5:0);
let apiDogSize=this.userdoglist[this.activeIndex5].title;
let apiDogAgeType=this.dogtype[this.quanshiCurIndex].title;
let apiDogFoodType=this.dogtype[this.quanshiCurIndex].title;
this.userstype=1;
let petType={
petType:1,
categoryName:"皇家犬湿粮",
tagUsedAge:apiDogAgeType,
name:apiDogSize
name:apiDogFoodType,
}
for(let i =0;i<this.userserachlist.length;i++){
if(!this.userserachlist.includes(petType)){
@@ -1424,13 +1386,12 @@
userdogGan(){
this.activeIndex6=(this.activeIndex6?this.activeIndex6:0);
let apiDogSize=this.userdoglist[this.activeIndex6].title;
let apiDogAgeType=this.dogtype[this.quanganCurIndex].title;
let apiDogFoodType=this.dogtype[this.quanganCurIndex].title;
this.userstype=1;
let petType={
petType:1,
tagUsedAge:apiDogAgeType,
name:apiDogSize
name:apiDogFoodType,
}
for(let i =0;i<this.userserachlist.length;i++){
if(!this.userserachlist.includes(petType)){
@@ -1541,7 +1502,6 @@
//userlist=data.slice(0,6);
if(dataType)
{
console.log(this.dogshi,this.dogshi.length);
if(dataType=='Shi')
this.dogshi=data;
else if(dataType=='Gan')
@@ -1602,10 +1562,10 @@
catclickGan(){
this.userstype=0;
this.maoganCurIndex=this.maoganCurIndex?this.maoganCurIndex:0;
let apiCatAgeType=this.discoun[this.maoganCurIndex].title;
let apiCatType=this.discoun[this.maoganCurIndex].title;
let petType={
petType:0,
tagUsedAge:apiCatAgeType
name:apiCatType,
}
for(let i =0;i<this.userserachlist.length;i++){
if(!this.userserachlist.includes(petType)){
@@ -1617,11 +1577,11 @@
catclickShi(){
this.userstype=0;
this.maoshiCurIndex=this.maoshiCurIndex?this.maoshiCurIndex:0;
let apiCatAgeType=this.discoun[this.maoshiCurIndex].title;
let apiCatType=this.discoun[this.maoshiCurIndex].title;
let petType={
petType:0,
categoryName:"皇家猫湿粮",
tagUsedAge:apiCatAgeType
name:apiCatType,
}
for(let i =0;i<this.userserachlist.length;i++){
if(!this.userserachlist.includes(petType)){

View File

@@ -75,7 +75,79 @@ export default {
userstates:0,
userimage: require("../../assets/image/unused.png"),
newlist: [
{
price: "30",
pricestype: "新客优惠券",
special: "全场每满299-30",
period: "有效期",
starttime: "2021.11.29-2022.01.28",
catimage: require("../../assets/image/unused.png"),
},
{
price: "30",
pricestype: "新客优惠券",
special: "全场每满299-30",
period: "有效期",
starttime: "2021.11.29-2022.01.28",
catimage: require("../../assets/image/unused.png"),
},
{
price: "30",
pricestype: "新客优惠券",
special: "全场每满299-30",
period: "有效期",
starttime: "2021.11.29-2022.01.28",
catimage: require("../../assets/image/unused.png"),
},
{
price: "30",
pricestype: "新客优惠券",
special: "全场每满299-30",
period: "有效期",
starttime: "2021.11.29-2022.01.28",
},
{
price: "30",
pricestype: "新客优惠券",
special: "全场每满299-30",
period: "有效期",
starttime: "2021.11.29-2022.01.28",
},
{
price: "30",
pricestype: "新客优惠券",
special: "全场每满299-30",
period: "有效期",
starttime: "2021.11.29-2022.01.28",
},
{
price: "30",
pricestype: "新客优惠券",
special: "全场每满299-30",
period: "有效期",
starttime: "2021.11.29-2022.01.28",
},
{
price: "30",
pricestype: "新客优惠券",
special: "全场每满299-30",
period: "有效期",
starttime: "2021.11.29-2022.01.28",
},
{
price: "30",
pricestype: "新客优惠券",
special: "全场每满299-30",
period: "有效期",
starttime: "2021.11.29-2022.01.28",
},
{
price: "30",
pricestype: "新客优惠券",
special: "全场每满299-30",
period: "有效期",
starttime: "2021.11.29-2022.01.28",
},
],
discountlist: [
{
@@ -90,7 +162,27 @@ export default {
],
preferential: [
{
price: "30",
pricestype: "新客优惠券",
special: "全场每满299-30",
period: "有效期",
starttime: "2021.11.29-2022.01.28",
},
{
price: "30",
pricestype: "新客优惠券",
special: "全场每满299-30",
period: "有效期",
starttime: "2021.11.29-2022.01.28",
},
{
price: "30",
pricestype: "新客优惠券",
special: "全场每满299-30",
period: "有效期",
starttime: "2021.11.29-2022.01.28",
},
],
userdiscount:[],
activeIndex: 0,
@@ -189,5 +281,6 @@ import Myheader from "~/components/header.vue";
<style lang="less" scoped>
// 手机端
@import url("../../assets/css/global.less");
@import url("../../assets/css/discount.less");
</style>

View File

@@ -1,7 +1,7 @@
<template>
<div>
<Myheader></Myheader>
<div class="rc-top"></div>
<div class="rc-usermain ">
<ul>
<li v-for="(item,index) in userrecord" :key="index">

View File

@@ -1,26 +1,22 @@
<template>
<div>
<van-address-edit
:area-list="areaList"
show-postal
show-delete
show-set-default
show-search-result
:search-result="searchResult"
:area-columns-placeholder="['请选择', '请选择', '请选择']"
@save="onSave"
@delete="onDelete"
@change-detail="onChangeDetail"
/>
<addressInput></addressInput>
</div>
<van-address-edit
:area-list="areaList"
show-postal
show-delete
show-set-default
show-search-result
:search-result="searchResult"
:area-columns-placeholder="['请选择', '请选择', '请选择']"
@save="onSave"
@delete="onDelete"
@change-detail="onChangeDetail"
/>
</template>
<script>
import { editaddress } from "../../ajax/getData";
import { Toast } from 'vant';
import { areaList } from '@vant/area-data';
import addressInput from '~/components/addressInput.vue' //引用头部公共组件
export default {
data(){
return{
@@ -73,7 +69,7 @@ export default {
},
components:{
addressInput
},

View File

@@ -64,7 +64,7 @@
</div>
<div class="rc-layout-container rc-two-column rc-button">
<div class="rc-column rc-text--left">
<a href="https://royalcanin.com.cn/privacy" target="_blank" class="rc-styled-link"><span>隐私政策</span></a>
<a href="#" class="rc-styled-link"><span>隐私政策</span></a>
</div>
<div class="rc-column rc-text--right">
<nuxt-link :to="`/userlogin/login/`" class="rc-styled-link">
@@ -84,7 +84,6 @@
@click="register()"
class="ts-standard-btn ts-standard-btn--max-width"
value="注册"
readonly=""
></input
>
<!-- <van-divider @click="toLogin">注册账户</van-divider> -->

View File

@@ -84,7 +84,7 @@
</div>
<div class="rc-layout-container rc-two-column rc-button">
<div class="rc-column rc-text--left">
<a href="https://royalcanin.com.cn/privacy" target="_blank" class="rc-styled-link"><span>隐私政策</span></a>
<a href="#" class="rc-styled-link"><span>隐私政策</span></a>
</div>
<div class="rc-column rc-text--right">
<nuxt-link :to="`/userlogin/edit/`" class="rc-styled-link">
@@ -104,7 +104,6 @@
@click="register()"
class="ts-standard-btn ts-standard-btn--max-width"
value="登录"
readonly=""
></input
>
<!-- <van-divider @click="toLogin">注册账户</van-divider> -->