xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-03 02:36:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!46 revert-Leung

Browse Source 
Merge pull request !46 from Admin/revert-merge-43-sit-Carl
This commit is contained in:
Admin 2022-01-20 02:47:20 +00:00 committed by Gitee
commit e78a843e89
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
17 changed files with 225 additions and 551 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
rc-busness/assets/css/global.less
View File

@ -8,10 +8,7 @@ body{
.fade-leave-active { .fade-leave-active {
opacity: 0; opacity: 0;
} }
.ts-no-data{
text-align: center;
margin:3rem 0;
}
.ts-mask{ .ts-mask{
width:100%; width:100%;
height:100%; height:100%;
@ -69,6 +66,8 @@ body{
} }
//用户光点 //用户光点
.rc-screen-reader{ .rc-screen-reader{
width: 0.81rem;
height: 0.81rem;
border-radius: 50%; border-radius: 50%;
position: absolute; position: absolute;
background-color: red; background-color: red;
@ -78,13 +77,6 @@ body{
width: 0.37rem; width: 0.37rem;
height: 0.37rem; height: 0.37rem;
} }
.rc-menu--xs .rc-screen-reader{
left: 30%;
}
.rc-list__link.ts-login--xs .rc-screen-reader{
left:16%;
}
img, picture { img, picture {
display: block; display: block;
max-width: 100%; max-width: 100%;
@ -111,8 +103,7 @@ img, picture {
li{ li{
border: 1px solid #D7D7D7; border: 1px solid #D7D7D7;
display: inline-flex; display: inline-flex;
border-bottom-left-radius: 4px; border-radius: 4px;
border-bottom-right-radius: 4px;
flex-direction: column; flex-direction: column;
max-width:10rem; max-width:10rem;
.rc-column .rc-column
@ -144,7 +135,7 @@ img, picture {
} }
img{ img{
width:10rem; width:10rem;
min-height:10rem; height:10rem;
object-fit: contain; object-fit: contain;
display: flex; display: flex;
margin: 0 auto; margin: 0 auto;
@ -339,9 +330,6 @@ img, picture {
html { html {
//font-size:100px; //font-size:100px;
} }
.rc-list__link.ts-login--xs .rc-screen-reader{
left:7%;
}
.rc-md-up { .rc-md-up {
display: none!important; display: none!important;
} }

30
rc-busness/assets/css/index.less
View File

@ -27,9 +27,6 @@
img{ img{
border-radius: 50%; border-radius: 50%;
} }
&:first-child{
margin-left:0;
}
&.active { &.active {
img{ img{
border: 3px solid #E2001A; border: 3px solid #E2001A;
@ -49,8 +46,8 @@
.uservideo{ .uservideo{
overflow: hidden; overflow: hidden;
video{ video{
width:100%; height:100%;
height:auto; width:auto;
} }
} }
.ul-dog{ .ul-dog{
@ -184,31 +181,38 @@
#xxxFullScreen { #xxxFullScreen {
background-color: white; background-color: white;
margin-top: 0.40rem; margin-top: 0.40rem;
#swiper1 {
overflow: hidden;
}
.swiper-container{ .swiper-container{
height: 6.45rem; height: 6.45rem;
} }
.swiper-container { .swiper-container, .swiper-container2 {
width: 100%; width: 100%;
// overflow: visible !important;
height: 100%; height: 100%;
position: relative; position: relative;
} }
.swiper-container .swiper-wrapper .swiper-slide { #swiper1 .swiper-container .swiper-wrapper .swiper-slide {
width: 17.25rem; width: 17.25rem;
//height: 6.45rem !important; //Auto adaption //height: 6.45rem !important; //Auto adaption
} }
/* 上一张 */ /* 上一张 */
swiper-container .swiper-wrapper .swiper-slide-prev { #swiper1 .swiper-container .swiper-wrapper .swiper-slide-prev {
margin-top: 0.05rem; margin-top: 0.05rem;
height: 100%; height: 100%;
} }
/* 下一张 */ /* 下一张 */
.swiper-container .swiper-wrapper .swiper-slide-next { #swiper1 .swiper-container .swiper-wrapper .swiper-slide-next {
margin-top: 0.05rem; margin-top: 0.05rem;
height: 100%; height: 100%;
} }
.swiper-container .swiper-wrapper .swiper-slide-active { .swiper-container .swiper-wrapper .swiper-slide-active {
height: 100%; height: 100%;
} }
.uservideo{ .uservideo{
width: 100%; width: 100%;
@ -234,7 +238,6 @@
flex-direction: column; flex-direction: column;
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
vertical-align: top;
} }
img{ img{
width: 10rem; width: 10rem;
@ -273,7 +276,7 @@
/* 中间的图片 */ /* 中间的图片 */
.swiper-container .swiper-wrapper .swiper-slide-active { .swiper-container .swiper-wrapper .swiper-slide-active {
height: 165px !important;
} }
.swiperWrap{ .swiperWrap{
height: 469px; height: 469px;
@ -281,6 +284,8 @@
img{ img{
height: 469px; height: 469px;
width: 100%; width: 100%;
} }
/deep/.swiper-pagination-bullet-active{ /deep/.swiper-pagination-bullet-active{
background: red; background: red;
@ -374,9 +379,6 @@
} }
.ts-banner-swiper-container{ .ts-banner-swiper-container{
position:relative; position:relative;
img{
margin:0 auto;
}
.ts-carousel-indicator{ .ts-carousel-indicator{
position:absolute; position:absolute;
bottom:.4rem; bottom:.4rem;

2
rc-busness/assets/css/login.less
View File

@ -55,13 +55,11 @@
} }
.container { .container {
font-size: 0.1rem; font-size: 0.1rem;
background-color:#fff;
.van-field__body { .van-field__body {
border-bottom: 1px solid red; border-bottom: 1px solid red;
} }
.content { .content {
margin-top: 24px; margin-top: 24px;
box-shadow: unset;
} }
.userfoget { .userfoget {
font-size: 14px; font-size: 14px;

357
rc-busness/components/addressInput.vue
View File

@ -1,357 +0,0 @@
<template>
<div class="ts-area-picker-container">
<input class="ts-area-picker-value-displayer" placeholder="请选择收货地址" @focus="initAddress" v-model="displayValue"></input>
<input type="hidden" :value="returnValue">
<div class="ts-area-picker-desktop" v-if="show">
<div class="ts-area-picker-tmp-value">
<ul>
<li class="active" @click="switchTab(0)">{{ returnValueArr[0]?returnValueArr[0].name:'请选择' }}</li>
<li @click="switchTab(1)">{{ returnValueArr[1]?returnValueArr[1].name:'请选择' }}</li>
<li @click="switchTab(2)">{{ returnValueArr[2]?returnValueArr[2].name:'请选择' }}</li>
</ul>
</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:(returnValue[curDisplayingColIndex]?returnValue.id==item.id:false) }">
{{ item.name }}
</li>
</ul>
</div>
</div>
<div class="ts-area-picker-mobile ts-mask" v-if="show">
<div class="ts-mask-bg"></div>
<van-picker
show-toolbar
title="选择地区"
:columns="columns"
value-key="name"
@confirm="onConfirm"
@cancel="onCancel"
@change="onChange"
class="ts-area-picker-mobile-component"
/>
</div>
</div>
</template>
<script>
export default {
data(){
return{
displayValue:"",
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'
}
],
curDisplayingColIndex:0,
curDisplayingCol:[]
}
},
methods:{
initAddress(){
this.show=true;
//Initilizing
//mobile
let self=this;
// defaultValues : array[{id:"_ID_IN_columns_of_province",name:"_NAME_IN_columns"},{id:"_ID_IN_columns_of_city",name:"_NAME_IN_columns"},{id:"_ID_IN_columns_of_area",name:"_NAME_IN_columns"}]
let defaultValues = [{id:this.columns[0].values[0].id, name:this.columns[0].values[0].name},{id:this.columns[1].values[0].id, name:this.columns[1].values[0].name},{id:this.columns[2].values[0].id, name:this.columns[2].values[0].name}];
this.$children.forEach(function(vueComponent){
if(vueComponent._name=="<VanPicker>")
{
self.onChange(vueComponent,defaultValues); //Important
}
});
//mobile end
//PC
this.switchTab(this.curDisplayingColIndex);
//PC end
//Initilizing end
},
pickValue(pickId,pickName){
let areaObj={id:pickId,name:pickName};
this.returnValueArr[this.curDisplayingColIndex]=areaObj;
this.validatePickedValues();
//Submit to value displaying
let tmpDisplayValueEle = document.querySelectorAll(".ts-area-picker-tmp-value li");
tmpDisplayValueEle[this.curDisplayingColIndex].innerText=this.returnValueArr[this.curDisplayingColIndex].name;
//Submit to value displaying end
//Moving to next tab
this.curDisplayingColIndex++;
if(this.curDisplayingColIndex>2 || this.curDisplayingColIndex<0)
this.curDisplayingColIndex = 0;
if(this.returnValueArr.length>=3)
{
this.onConfirm(this.returnValueArr);
}
else
this.switchTab(this.curDisplayingColIndex);
//Moving to next tab end
},
// For van picker
onChange(picker,values) { //values = [{id:this.columns[0].id, name:this.columns[0].name},{id:this.columns[1].id, name:this.columns[1].name},{id:this.columns[3].id, name:this.columns[3].name}];
//Support single choice only , index = 0 province, index = 1 city, index = 2 area
let curSelection={'province':'','city':'','area':''};
if(!values)
return;
let _self=this;
values.forEach(function(ele,index){
switch(index){
case 0:
//Handling Province
curSelection.province=ele.id;
//Handling Province end
break;
case 1:
//Handling City
let matchedCity=_self.fitlerValuesInArray(curSelection.province,_self.columns[index].values);
picker.setColumnValues(index,matchedCity);
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);
curSelection.area=matchedArea[0].id;
//Handling Area end
break;
}
});
},
validatePickedValues(){
let _self=this;
let provinceId='';
let areaId=undefined;
this.returnValueArr.forEach(function(obj,index){
switch(index){
case 0:
//Skipping province checking
provinceId = obj.id;
break;
case 1:
//Checking City
if(obj.id.indexOf(provinceId)<0)
{
console.log('500 : error via checking validatePickedValues');
_self.returnValueArr[index]={};
}
else
{
areaId = _self.returnValueArr[index].id;
}
//Checking City end
break;
case 2:
//Checking Area
if(areaId && obj.id.indexOf(areaId)<0)
{
console.log('501 : error via checking validatePickedValues');
_self.returnValueArr[index]={};
}
//Checking Area end
break;
default:
break;
}
});
},
onConfirm(values) {
debugger;
//Get columns structure array here : values
let _self=this;
let returnVal=[];
let tmpArr = [];
this.displayValue='';
values.forEach(function(ele,index){
_self.displayValue = _self.displayValue + ele.name + " ";
tmpArr.push(ele.id);
returnVal.push(ele);
});
this.returnValueArr=returnVal;
this.returnValue=tmpArr.join("|");
this.hideAddress();
},
onCancel() {
},
fitlerValuesInArray(stringStartWith,dataColArea){
let result=[];
dataColArea.forEach(function(ele){
if(ele.id.indexOf(stringStartWith)===0)
{
result.push(ele);
}
});
return result;
},
popAddress() {
this.show=true;
},
hideAddress() {
this.show=false;
},
switchTab(tabIndex){
let _self=this;
let areaTabLi=document.querySelectorAll(".ts-area-picker-tmp-value li");
if(tabIndex==0){
this.curDisplayingCol = this.columns[tabIndex].values;
}
else{
if(this.returnValueArr[tabIndex-1]){}
else{
tabIndex=tabIndex-1;
}
}
this.curDisplayingColIndex=tabIndex;
areaTabLi.forEach(function(ele,index){
if(tabIndex==index)
{
ele.classList.add('active');
let filteredData=_self.columns[tabIndex].values;
if(_self.curDisplayingColIndex>0) //pass
{
let pickedId = _self.returnValueArr[_self.curDisplayingColIndex-1].id;
filteredData=_self.fitlerValuesInArray(pickedId,_self.columns[tabIndex].values);
}
_self.curDisplayingCol=filteredData;
}
else
ele.classList.remove('active');
})
}
},
mounted(){
},
components:{
},
}
</script>
<style lang="less" scoped>
.ts-area-picker-container{display:inline-block;}
.ts-area-picker-value-displayer{
width:40rem;
}
.ts-area-picker-tmp-value{
border-bottom:1px solid #D7D7D7;
padding:0 2.5rem;
box-sizing: border-box;
ul{
padding:0;
margin:0;
display: flex;
li{
display:inline-block;
color:#333333;
width:3.125rem;
padding: 1.25rem 0;
margin-right:4rem;
cursor: pointer;
&.active{
color:#E2001A;
border-bottom:4px solid #E2001A;
}
}
}
}
.ts-area-picker-values{
ul{
padding:1rem 2.5rem 2rem 2.5rem;
margin:0;
}
li{
display:inline-block;
margin-top:1rem;
margin-right:3.875rem;
color:#333;
cursor:pointer;
&.nth-child(6n){
margin-right:0;
}
}
}
@media screen and (max-width:768px)
{
/deep/.van-picker__cancel
{
display:none;
}
/deep/.van-picker__title{
font-size:1.375rem;
color:#E1001A;
}
/deep/.van-picker__toolbar{
padding:1.5rem 1.25rem;
box-sizing: border-box;
border-bottom:1px solid #D8D8D8;
}
/deep/.van-picker__confirm{
text-indent:-999rem;
position:relative;
&:after{
transform: rotate(45deg);
}
&:before{
transform: rotate(-45deg);
}
&:before,
&:after {
position: absolute;
content: ' ';
background-color: #E1001A;
left: 1.25rem;
bottom:-0.875rem;
width: 1px;
height: 1.375rem;
}
}
.ts-area-picker-mobile{
display:flex;
flex-direction: column;
justify-content: flex-end;
.ts-area-picker-mobile-component{
height:40vh;
width:100%;
}
}
.ts-area-picker-desktop{
display:none;
}
}
@media screen and (min-width:769px)
{
.ts-area-picker-mobile{
display:none;
}
.ts-area-picker-desktop{
display:block;
width:100%;
height:19.25rem;
border:1px solid #808285;
}
}
</style>

12
rc-busness/components/header.vue
View File

@ -6,7 +6,6 @@
<li class="rc-list__item rc-xl-down"> <li class="rc-list__item rc-xl-down">
<button class="rc-btn rc-btn--icon-label rc-icon rc-menu--xs rc-iconography rc-md-up" data-modal-trigger="main-nav-modal" aria-label="Menu" role="menuitem"> <button class="rc-btn rc-btn--icon-label rc-icon rc-menu--xs rc-iconography rc-md-up" data-modal-trigger="main-nav-modal" aria-label="Menu" role="menuitem">
菜单 菜单
<em class="rc-screen-reader" v-show="loginornot"></em>
</button> </button>
<button class="rc-btn rc-btn--icon rc-icon rc-menu--xs rc-iconography rc-md-down" data-js-trigger="mobile-push-nav" aria-label="Menu" role="menuitem"> <button class="rc-btn rc-btn--icon rc-icon rc-menu--xs rc-iconography rc-md-down" data-js-trigger="mobile-push-nav" aria-label="Menu" role="menuitem">
<span class="rc-screen-reader-text"> <span class="rc-screen-reader-text">
@ -46,7 +45,10 @@
<span class="rc-screen-reader-text"> <span class="rc-screen-reader-text">
登录 登录
</span> </span>
<em class="rc-screen-reader" v-show="loginornot"></em> <em class="rc-screen-reader" v-show="loginornot">
</em>
</a> </a>
<!-- <!--
@ -303,12 +305,6 @@
<div class="rc-column rc-padding-x--none"> <div class="rc-column rc-padding-x--none">
<ul class="rc-list rc-list--blank rc-list--align rc-btn-offset--top" role="menu"> <ul class="rc-list rc-list--blank rc-list--align rc-btn-offset--top" role="menu">
<li class="rc-list__item">
<a class="rc-list__link rc-icon ts-login--xs" role="menuitem" data-modal-trigger="main-nav-modal" @click="turnlogin">
个人中心
<em class="rc-screen-reader" v-show="loginornot"></em>
</a>
</li>
<li class="rc-list__item"> <li class="rc-list__item">
<a class="rc-list__link rc-icon rc-email--xs rc-iconography--xs" role="menuitem" href="https://royalcanin.com.cn/about/contact"> <a class="rc-list__link rc-icon rc-email--xs rc-iconography--xs" role="menuitem" href="https://royalcanin.com.cn/about/contact">
与我们联系 与我们联系

2
rc-busness/components/rc-footer.vue
View File

@ -203,7 +203,7 @@
<div class="rc-column rc-text--center rc-padding-y--none"> <div class="rc-column rc-text--center rc-padding-y--none">
<span class="">法律声明 ©2021 ROYAL CANIN, Inc.</span> <span class="">法律声明 ©2021 ROYAL CANIN, Inc.</span>
<br/> <br/>
<a target='_blank' href='https://royalcanin.com.cn/privacy'><span class="">隐私声明</span></a> <a target='_blank' href='https://royalcanin.com.cn/#privacy'><span class="">隐私声明</span></a>
&nbsp; | &nbsp; &nbsp; | &nbsp;
<a target='_blank' href='https://royalcanin.com.cn/declaration'><span class="">法律声明</span></a> <a target='_blank' href='https://royalcanin.com.cn/declaration'><span class="">法律声明</span></a>
</div> </div>

12
rc-busness/nuxt.config.js
View File

@ -4,18 +4,18 @@ export default {
// Global page headers: https://go.nuxtjs.dev/config-head // Global page headers: https://go.nuxtjs.dev/config-head
head: { head: {
title: '皇家官方商城', title: 'rc-busness',
htmlAttrs: { htmlAttrs: {
lang: 'zh-cn', lang: 'en',
}, },
script: [ script: [
//{ src: '/js/rem.js' }, //{ src: '/js/rem.js' },
// { src: '/js/flexible.js', type: 'text/javascript', charset: 'utf-8'}, // { src: '/js/flexible.js', type: 'text/javascript', charset: 'utf-8'},
{ src: 'https://ocstest.royalcanin.com.cn:8081/livechat/chatapp/customer/branch/RoyalCanin/14053/index.js' },//SOL { src: 'https://ocstest.royalcanin.com.cn:8081/livechat/chatapp/customer/branch/RoyalCanin/14053/index.js' },
{ src: 'https://ocstest.royalcanin.com.cn:8081/livechat/chatapp/customer/branch/RoyalCanin/14054/index.js' },//订单 //{ src: 'https://ocstest.royalcanin.com.cn:8081/livechat/chatapp/customer/branch/RoyalCanin/14054/index.js' },
{ innerHTML: trackingScript, type: 'text/javascript', charset: 'utf-8'}, { innerHTML: trackingScript, type: 'text/javascript', charset: 'utf-8' },
{ innerHTML: assetsUrl, type: 'text/javascript', charset: 'utf-8'}, { innerHTML: assetsUrl, type: 'text/javascript', charset: 'utf-8' },
{ src: '/royalcanin-cdn-assets-new/css_js/royal-canin.min.bundle.js' }, { src: '/royalcanin-cdn-assets-new/css_js/royal-canin.min.bundle.js' },
], ],

124
rc-busness/pages/index.vue
View File

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

97
rc-busness/pages/personal/discount.vue
View File

@ -75,7 +75,79 @@ export default {
userstates:0, userstates:0,
userimage: require("../../assets/image/unused.png"), userimage: require("../../assets/image/unused.png"),
newlist: [ 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: [ discountlist: [
{ {
@ -90,7 +162,27 @@ export default {
], ],
preferential: [ 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:[], userdiscount:[],
activeIndex: 0, activeIndex: 0,
@ -189,5 +281,6 @@ import Myheader from "~/components/header.vue";
<style lang="less" scoped> <style lang="less" scoped>
// 手机端 // 手机端
@import url("../../assets/css/global.less");
@import url("../../assets/css/discount.less"); @import url("../../assets/css/discount.less");
</style> </style>

2
rc-busness/pages/personal/integral.vue
View File

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

8
rc-busness/pages/useraddress/addaddress.vue
View File

@ -1,5 +1,4 @@
<template> <template>
<div>
<van-address-edit <van-address-edit
:area-list="areaList" :area-list="areaList"
show-postal show-postal
@ -11,16 +10,13 @@
@save="onSave" @save="onSave"
@delete="onDelete" @delete="onDelete"
@change-detail="onChangeDetail" @change-detail="onChangeDetail"
/> />
<addressInput></addressInput>
</div>
</template> </template>
<script> <script>
import { editaddress } from "../../ajax/getData"; import { editaddress } from "../../ajax/getData";
import { Toast } from 'vant'; import { Toast } from 'vant';
import { areaList } from '@vant/area-data'; import { areaList } from '@vant/area-data';
import addressInput from '~/components/addressInput.vue' //引用头部公共组件
export default { export default {
data(){ data(){
return{ return{
@ -73,7 +69,7 @@ export default {
}, },
components:{ components:{
addressInput
}, },

3
rc-busness/pages/userlogin/edit.vue
View File

@ -64,7 +64,7 @@
</div> </div>
<div class="rc-layout-container rc-two-column rc-button"> <div class="rc-layout-container rc-two-column rc-button">
<div class="rc-column rc-text--left"> <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>
<div class="rc-column rc-text--right"> <div class="rc-column rc-text--right">
<nuxt-link :to="`/userlogin/login/`" class="rc-styled-link"> <nuxt-link :to="`/userlogin/login/`" class="rc-styled-link">
@ -84,7 +84,6 @@
@click="register()" @click="register()"
class="ts-standard-btn ts-standard-btn--max-width" class="ts-standard-btn ts-standard-btn--max-width"
value="注册" value="注册"
readonly=""
></input ></input
> >
<!-- <van-divider @click="toLogin">注册账户</van-divider> --> <!-- <van-divider @click="toLogin">注册账户</van-divider> -->

3
rc-busness/pages/userlogin/login.vue
View File

@ -84,7 +84,7 @@
</div> </div>
<div class="rc-layout-container rc-two-column rc-button"> <div class="rc-layout-container rc-two-column rc-button">
<div class="rc-column rc-text--left"> <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>
<div class="rc-column rc-text--right"> <div class="rc-column rc-text--right">
<nuxt-link :to="`/userlogin/edit/`" class="rc-styled-link"> <nuxt-link :to="`/userlogin/edit/`" class="rc-styled-link">
@ -104,7 +104,6 @@
@click="register()" @click="register()"
class="ts-standard-btn ts-standard-btn--max-width" class="ts-standard-btn ts-standard-btn--max-width"
value="登录" value="登录"
readonly=""
></input ></input
> >
<!-- <van-divider @click="toLogin">注册账户</van-divider> --> <!-- <van-divider @click="toLogin">注册账户</van-divider> -->

BIN
rc-busness/static/images/banner/four.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 85 KiB

BIN
rc-busness/static/images/banner/one.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 90 KiB

After

Width:  |  Height:  |  Size: 170 KiB

BIN
rc-busness/static/images/banner/three.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 1.0 MiB

BIN
rc-busness/static/images/banner/two.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 286 KiB