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
commit 943c20c7f7
12 changed files with 214 additions and 94 deletions

View File

@ -8,6 +8,33 @@ body{
.fade-leave-active {
opacity: 0;
}
.ts-no-data{
text-align: center;
margin:3rem 0;
}
.ts-mask{
width:100%;
height:100%;
position: fixed;
top:0;
left:0;
display:flex;
flex-direction: column;
justify-content: center;
align-items: center;
z-index:99;
.ts-mask-bg{
background-color:#000;
opacity:.6;
width:100%;
height:100%;
z-index:0;
position:absolute;
left:0;
top:0;
}
}
.userloding {
background: url(../image/onloading.png) center center no-repeat;
width: 3.12rem;
@ -260,6 +287,7 @@ img, picture {
flex-direction: column;
align-items: center;
justify-content: center;
cursor: pointer;
}
}
@ -473,6 +501,7 @@ img, picture {
li{
margin-top: .5rem;
height:4.125rem;
cursor: pointer;
img{
width:22px;
height:auto;

View File

@ -10,12 +10,12 @@
<li @click="switchTab(1)">{{ returnValueArr[1]?returnValueArr[1].name:'请选择' }}</li>
<li @click="switchTab(2)">{{ returnValueArr[2]?returnValueArr[2].name:'请选择' }}</li>
</ul>
<div class="close" @click="hideAddress"></div>
<div class="close" @click="pcHideAddress"></div>
</div>
<div class="ts-area-picker-values">
<ul>
<li v-for="(item, index) in curDisplayingCol" :key="item.id" @click="pickValue(item.id,item.name)" v-bind:class="{ active:(returnValueArr[curDisplayingColIndex]?returnValueArr[curDisplayingColIndex].id==item.id:false) }">
{{ item.name }}
<span>{{ item.name }}</span>
</li>
</ul>
</div>
@ -37,6 +37,9 @@
</div>
</template>
<script>
import {
areaData
} from "~/config/area.js";
export default {
props:["defaultValues"],
data(){
@ -46,20 +49,7 @@ export default {
returnValue:"",
returnValueArr:[],
show:false,
columns:[
{
values:[{id:"001",name:"省份1"},{id:"002",name:"省份2"}],
className:'col1'
},
{
values:[{id:"001-001",name:"省份1-城市1"},{id:"001-002",name:"省份1-城市2"},{id:"002-001",name:"省份2-城市1"},{id:"002-002",name:"省份2-城市2"}],
className:'col2'
},
{
values:[{id:"001-001-001",name:"省份1-城市1-区1"},{id:"001-002-002",name:"省份1-城市2-区2"},{id:"002-001-001",name:"省份2-城市1-区1"},{id:"002-002-002",name:"省份2-城市2-区2"}],
className:'col3'
}
],
columns:areaData,
curDisplayingColIndex:0,
curDisplayingCol:[]
}
@ -84,6 +74,7 @@ export default {
//mobile end
//PC
this.curDisplayingColIndex=0;
this.switchTab(this.curDisplayingColIndex);
//PC end
//Initilizing end
@ -132,20 +123,48 @@ export default {
//Handling City
let matchedCity=_self.fitlerValuesInArray(curSelection.province,_self.columns[index].values);
picker.setColumnValues(index,matchedCity);
if(_self.inArray(ele,matchedCity))
{
curSelection.city=ele.id;
}
else
{
console.log('502 : Invalid City Options');
curSelection.city=matchedCity[0].id;
}
//Handling City end
break;
default:
//Handling Area
let matchedArea=_self.fitlerValuesInArray(curSelection.city,_self.columns[index].values);
picker.setColumnValues(index,matchedArea);
if(_self.inArray(ele,matchedArea))
{
curSelection.area=ele.id;
}
else if(matchedArea.length)
{
console.log('503 : Invalid Area Options');
curSelection.area=matchedArea[0].id;
}
//Handling Area end
break;
}
});
},
inArray(needle,haystack){
if(!needle || !needle.id)
return false;
if(!haystack || haystack.length<haystack)
return false;
for(var i in haystack){
if(haystack[i].id==needle.id){
return true;
}
}
return false;
},
validatePickedValues(){
let _self=this;
let provinceId='';
@ -197,18 +216,24 @@ export default {
let tmpArr = [];
this.displayValue='';
values.forEach(function(ele,index){
if(!ele || !ele.name)
{
ele={id:'',name:''};
}
_self.displayValue = _self.displayValue + ele.name + " ";
tmpArr.push(ele.id);
returnVal.push(ele);
});
this.returnValueArr=returnVal;
this.returnValue=tmpArr.join("|");
this.$emit('getmenu',this.returnValueArr);
this.hideAddress();
},
onCancel() {
},
fitlerValuesInArray(stringStartWith,dataColArea){
stringStartWith=stringStartWith+"-";
let result=[];
dataColArea.forEach(function(ele){
if(ele.id.indexOf(stringStartWith)===0)
@ -221,6 +246,9 @@ export default {
popAddress() {
this.show=true;
},
pcHideAddress() {
this.onConfirm(this.returnValueArr);
},
hideAddress() {
this.show=false;
},
@ -229,10 +257,10 @@ export default {
if(tabIndex==0){
this.curDisplayingCol = this.columns[tabIndex].values;
}
//Check can switch to next tab
let lastValidatedTabIndex=this.validatePickedValues();
if(lastValidatedTabIndex<(tabIndex-1))
{
//TODO show warning here
let errorEle=document.querySelector(".ts-area-picker-values");
errorEle.classList.add("error");
let _self = this;
@ -246,6 +274,9 @@ export default {
}
tabIndex=lastValidatedTabIndex+1;
}
//Check can switch to next tab end
//Building column values for current
this.curDisplayingColIndex=tabIndex;
let filteredData=this.columns[tabIndex].values;
if(tabIndex>0 && this.returnValueArr[tabIndex-1]) //pass
@ -254,7 +285,13 @@ export default {
filteredData=this.fitlerValuesInArray(pickedId,this.columns[tabIndex].values);
}
this.curDisplayingCol=filteredData;
if(this.curDisplayingCol && this.curDisplayingCol.length<=0)
{
this.onConfirm(this.returnValueArr);
}
//Building column values for current end
//Filling style
areaTabLi.forEach(function(ele,index){
if(tabIndex==index){
ele.classList.add('active');
@ -262,7 +299,7 @@ export default {
else
ele.classList.remove('active');
})
//Filling style end
}
},
mounted(){
@ -277,9 +314,7 @@ export default {
<style lang="less" scoped>
.ts-area-picker-container{display:inline-block;}
.ts-area-picker-value-displayer{
width:42.5rem;
height: 2.81rem;
padding-left: 1rem;
}
.ts-area-picker-tmp-value{
border-bottom:1px solid #D7D7D7;
@ -293,9 +328,9 @@ export default {
li{
display:inline-block;
color:#333333;
width:3.125rem;
width:8rem;
padding: 1.25rem 0;
margin-right:4rem;
margin-right:.75rem;
cursor: pointer;
&.active{
color:#E2001A;
@ -316,7 +351,8 @@ export default {
}
.ts-area-picker-values{
width:100%;
height:100%;
height:78%;
overflow:auto;
&.error{
position:relative;
width:100%;
@ -335,21 +371,25 @@ export default {
}
}
ul{
padding:1rem 2.5rem 2rem 2.5rem;
padding:1rem .5rem 2rem 2.5rem;
margin:0;
}
li{
display:inline-block;
margin-top:1rem;
margin-right:3.875rem;
margin-right:.875rem;
color:#333;
width:8rem;
cursor:pointer;
&.nth-child(6n){
&:nth-child(4n){
margin-right:0;
}
&.active{
color:#E2001A;
border-bottom:4px solid #E2001A;
span{
display:inline-block;
border-bottom: 4px solid #E2001A;
}
}
}
}
@ -423,6 +463,9 @@ export default {
.ts-area-picker-mobile{
display:none;
}
.ts-area-picker-container,.ts-area-picker-value-displayer{
width:40rem;
}
.ts-area-picker-desktop{
display:block;
width:100%;
@ -430,9 +473,6 @@ export default {
border:1px solid #808285;
overflow:hidden;
}
.ts-area-picker-values{
}
}
@keyframes flash-error
{

View File

@ -76,7 +76,7 @@
<a href="https://royalcanin.com.cn/dogs" class="rc-list__header" data-ref="nav-link" role="menuitem" title="犬"></a>
</li>
<li class="rc-list__item">
<a href="#/tailored-nutrition" class="rc-list__header" data-ref="nav-link" role="menuitem" title="定制营养方案">定制营养方案</a>
<a href="/productdetails/productlist/" class="rc-list__header" data-ref="nav-link" role="menuitem" title="定制营养方案">定制营养方案</a>
</li>
<li class="rc-list__item">
<a href="https://royalcanin.com.cn/about" class="rc-list__header" data-ref="nav-link" role="menuitem" title="关于我们">关于我们</a>
@ -92,7 +92,7 @@
<a href="https://royalcanin.com.cn/cats" class="rc-list__header rc-margin--none" role="menuitem"></a>
<ul class="rc-list rc-list--blank rc-list--align test" role="menu">
<li class="rc-list__item">
<a href="#/cats/products" class="rc-list__link" role="menuitem">产品</a>
<a href="/productdetails/productlist/?stype=0" class="rc-list__link" role="menuitem">产品</a>
</li>
<li class="rc-list__item">
<a href="https://royalcanin.com.cn/cats/breeds" class="rc-list__link" role="menuitem">品种</a>
@ -113,7 +113,7 @@
<a href="https://royalcanin.com.cn/dogs" class="rc-list__header rc-margin--none" role="menuitem"></a>
<ul class="rc-list rc-list--blank rc-list--align test" role="menu">
<li class="rc-list__item">
<a href="#dogs/products" class="rc-list__link" role="menuitem">产品</a>
<a href="/productdetails/productlist/?stype=1" class="rc-list__link" role="menuitem">产品</a>
</li>
<li class="rc-list__item">
<a href="https://royalcanin.com.cn/dogs/breeds" class="rc-list__link" role="menuitem">品种</a>
@ -131,13 +131,13 @@
</li>
<li class="rc-list__item rc-list__item--group">
<img src="../assets/showimage/sub-nav-3.jpg" class="ts-head-img rc-margin-bottom--xs">
<a href="/" class="rc-list__header rc-margin--none" role="menuitem">定制营养方案</a>
<a href="/productdetails/productlist/" class="rc-list__header rc-margin--none" role="menuitem">定制营养方案</a>
<ul class="rc-list rc-list--blank rc-list--align test" role="menu">
<li class="rc-list__item">
<a href="#cats/products" class="rc-list__link" role="menuitem">猫系列</a>
<a href="/productdetails/productlist/?stype=0" class="rc-list__link" role="menuitem">猫系列</a>
</li>
<li class="rc-list__item">
<a href="#dogs/products" class="rc-list__link" role="menuitem">狗系列</a>
<a href="/productdetails/productlist/?stype=1" class="rc-list__link" role="menuitem">狗系列</a>
</li>
</ul>
</li>
@ -207,7 +207,7 @@
<a href="https://royalcanin.com.cn/cats" class="rc-list__header" title="Cat" role="menuitem"></a>
</li>
<li class="rc-list__item">
<a href="#cats/products" class="rc-list__link ca" role="menuitem" title="Products">产品</a>
<a href="/productdetails/productlist/?stype=0" class="rc-list__link ca" role="menuitem" title="Products">产品</a>
</li>
<li class="rc-list__item">
<a href="https://royalcanin.com.cn/cats/breeds" class="rc-list__link ca" role="menuitem" title="Breeds">品种</a>
@ -234,7 +234,7 @@
<a href="https://royalcanin.com.cn/dogs" class="rc-list__header" title="Dog" role="menuitem"></a>
</li>
<li class="rc-list__item">
<a href="#dogs/products" class="rc-list__link ca" role="menuitem" title="Products">产品</a>
<a href="/productdetails/productlist/?stype=1" class="rc-list__link ca" role="menuitem" title="Products">产品</a>
</li>
<li class="rc-list__item">
<a href="https://royalcanin.com.cn/dogs/breeds" class="rc-list__link ca" role="menuitem" title="Breeds">品种</a>
@ -252,19 +252,19 @@
</li>
<li class="rc-list__item rc-list__item--group">
<a href="https://royalcanin.com.cn/tailored-nutrition" class="rc-list__header" role="menuitem" id="mega-nav-header-3" data-toggle="nav-list-3">定制营养方案</a>
<a href="/productdetails/productlist/" class="rc-list__header" role="menuitem" id="mega-nav-header-3" data-toggle="nav-list-3">定制营养方案</a>
<ul class="rc-list rc-list--blank rc-list--align" id="nav-list-3" aria-labelledby="mega-nav-menu-3" role="menu">
<li class="rc-list__item rc-md-down">
<button class="rc-list__link rc-icon rc-left--xs rc-iconography" data-toggle="nav-list-3" role="button">返回</button>
</li>
<li class="rc-list__item rc-md-down">
<a href="https://royalcanin.com.cn/tailored-nutrition" class="rc-list__header" title="Nutrition" role="menuitem">定制营养方案</a>
<a href="/productdetails/productlist/" class="rc-list__header" title="Nutrition" role="menuitem">定制营养方案</a>
</li>
<li class="rc-list__item">
<a href="#cats/products" class="rc-list__link ca" role="menuitem">猫系列</a>
<a href="/productdetails/productlist/?stype=0" class="rc-list__link ca" role="menuitem">猫系列</a>
</li>
<li class="rc-list__item">
<a href="#dogs/products" class="rc-list__link ca" role="menuitem">狗系列</a>
<a href="/productdetails/productlist/?stype=1" class="rc-list__link ca" role="menuitem">狗系列</a>
</li>
</ul>
</li>

View File

@ -48,15 +48,15 @@
</ul>
</li>
<li class="rc-list__item rc-list__item--group" role="none">
<a href="#tailored-nutrition" class="rc-list__header" role="menuitem" id="nav-footer-top-3" data-toggle="nav-footer-3"
<a href="/productdetails/productlist/" class="rc-list__header" role="menuitem" id="nav-footer-top-3" data-toggle="nav-footer-3"
>定制营养方案
</a>
<ul class="rc-list rc-list--blank rc-list--align" id="nav-footer-3" aria-labelledby="nav-footer-top-3" role="menu">
<li class="rc-list__item">
<a href="#cats/products" class="rc-list__link" data-ref="nav-link" role="menuitem">猫系列</a>
<a href="/productdetails/productlist/?stype=0" class="rc-list__link" data-ref="nav-link" role="menuitem">猫系列</a>
</li>
<li class="rc-list__item">
<a href="#dogs/products" class="rc-list__link" data-ref="nav-link" role="menuitem">狗系列</a>
<a href="/productdetails/productlist/?style=1" class="rc-list__link" data-ref="nav-link" role="menuitem">狗系列</a>
</li>
</ul>
</li>

16
rc-busness/config/area.js Normal file

File diff suppressed because one or more lines are too long

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>
@ -740,19 +774,16 @@
doggan:[],
dogtype:[
{
title: "幼犬",
title: "离乳期",
},
{
title: "成犬",
title: "幼年",
},
{
title: "老年犬",
title: "成年",
},
{
title: "品种犬",
},
{
title: "亚健康",
title: "老年",
}
],
anchor:'',
@ -823,22 +854,17 @@
],
discoun: [
{
title: "幼猫",
title: "<4月龄",
},
{
title: "成猫",
title: "4-12月龄",
},
{
title: "老年猫",
title: "1-7岁",
},
{
title: "品种猫",
},
{
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

@ -51,6 +51,7 @@
<script>
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";

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 170 KiB

After

Width:  |  Height:  |  Size: 90 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 MiB

After

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 286 KiB

After

Width:  |  Height:  |  Size: 66 KiB