!18 2022-1-17Leung roll back

Merge pull request !18 from Admin/revert-merge-16-sit-Carl
This commit is contained in:
Admin 2022-01-17 03:18:52 +00:00 committed by Gitee
commit bac785b5e4
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 435 additions and 315 deletions

View File

@ -282,6 +282,11 @@ img, picture {
.rc-top{ .rc-top{
margin-top: 74px; margin-top: 74px;
} }
.rc-list__header {
background: none;
padding: .5rem 0;
border-bottom: none;
}
.ts-right-arr { .ts-right-arr {
border-bottom:1px solid #E1001A; border-bottom:1px solid #E1001A;
padding-bottom:2px; padding-bottom:2px;

View File

@ -313,6 +313,8 @@ object-fit: cover;
color: #fff; color: #fff;
height: 100%; height: 100%;
width: 100%; width: 100%;
font-size: 1.25rem;
line-height: 9.375rem;
text-align: center; text-align: center;

View File

@ -39,54 +39,56 @@
</ul> </ul>
</div> </div>
</div> </div>
<div class="online bold rc-md-up" v-show="catproduct"></div> </div>
<div class="online bold rc-md-up" v-show="catproduct"></div>
<div class="rc-full-width"> <div class="rc-full-width">
<div class="rc-lunbo rc-full-width"> <div class="rc-lunbo rc-full-width">
<!-- <h2>明星猫粮</h2> --> <!-- <h2>明星猫粮</h2> -->
<div class="pageFullScreen" id="xxxFullScreen" v-show="catproduct" ref="mingxing"> <div class="pageFullScreen" id="xxxFullScreen" v-show="catproduct" ref="mingxing">
<!-- 内容 --> <!-- 内容 -->
<div class="swiper-container rc-full-width rc-padding-y--md" id="swiper1"> <div class="swiper-container rc-full-width rc-padding-y--md" id="swiper1">
<h2 class="rc-beta rc-text--center">{{usertitle}}</h2> <h2 class="rc-beta rc-text--center">{{usertitle}}</h2>
<!-- 轮播图 --> <!-- 轮播图 -->
<van-swipe class="rc-padding-bottom--md"> <swiper :options="swiperOption">
<van-swipe-item v-for="(item, index) in catlistvideo" :key="index"> <swiper-slide class="swiper-slide" v-for="(item, key) in catlistvideo" :key="key" >
<div class="rc-video"> <div class="rc-video">
<div class="uservideo"> <div class="uservideo">
</div> </div>
<div class="rc-right"> <div class="rc-right">
<img :src=item.catimage alt=""> <img :src=item.catimage alt="">
<span>{{item.title}}</span> <span>{{item.title}}</span>
<p>{{item.detail}}</p> <p>{{item.detail}}</p>
<em>{{item.price}}</em> <em>{{item.price}}</em>
<strong class="ts-standard-btn ts-standard-btn--two center" @click="userbuy(item,index)">立即购买</strong> <strong class="ts-standard-btn ts-standard-btn--two center" @click="userbuy(item,index)">立即购买</strong>
</div> </div>
</div> </div>
<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 width="300px" height="251" controls="controls"> <video width="300px" height="251" controls="controls">
<source :src= item.video type="video/ogg" autoplay> <source :src= item.video type="video/ogg" autoplay>
</video> </video>
</div>
<img :src=item.catimage alt="">
<span>{{item.title}}</span>
<p>{{item.detail}}</p>
<em>{{item.price}}</em>
</div> </div>
<div class="rc-full-width rc-margin-y--md">
<i @click="userbuy(item,index)" class="ts-standard-btn ts-standard-btn--two center">立即购买</i>
</div>
</div>
<img :src=item.catimage alt=""> </swiper-slide>
<span>{{item.title}}</span> </swiper>
<p>{{item.detail}}</p> </div>
<em>{{item.price}}</em>
</div>
<div class="rc-full-width rc-margin-y--md">
<i @click="userbuy(item,index)" class="ts-standard-btn ts-standard-btn--two center">立即购买</i>
</div>
</div>
</van-swipe-item>
</van-swipe>
</div>
</div> </div>
@ -94,14 +96,102 @@
<div class="online bold" v-show="onemao"></div> <div class="online bold" v-show="onemao"></div>
<div class="selectionswitch rc-full-width rc-max-width--xl rc-padding-y--md" ref="usercontent" v-show="onemao"> <div class="selectionswitch rc-full-width rc-max-width--xl rc-padding-y--md" ref="usercontent" v-show="onemao">
<h2 class="rc-beta rc-text--center" >全价猫湿粮</h2> <h2 class="rc-beta rc-text--center" >全价猫湿粮</h2>
<van-tabs @change='catclick' class="van-tabs"> <van-tabs @change='catclick' class="van-tabs">
<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">
<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-rccontair">
<img :src=item.picture alt="">
</div>
</div>
<div class="rc-column">
<div class="rc-click" @click="selectproduce(item,index)">
<span>{{item.name}}</span>
<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>
</li>
</ul>
<nuxt-link :to="`/productdetails/productlist/`">
<div class="userserlect">
<span class="ts-standard-btn center">查看更多</span>
</div>
</nuxt-link>
</div>
</van-tab>
</van-tabs>
<div class="rc-selection">
<ol>
<li
v-for="(item, index) in selection"
:key="index"
@click="selectGo(item, index)"
:class="activeInde2 == index ? 'userselection' : 'unselection'"
>
<span>{{ item.title }}</span>
</li>
</ol>
<div class="rc-maa">
<ul>
<li
v-for="(item, index) in doglist"
:key="index"
@click="selectGoo(item, index)"
:class="activeInde3 == index ? 'active' : 'unactive'"
>
<img :src="item.catimage" alt="">
<span>{{ item.title }}</span>
</li>
</ul>
</div>
<div class="">
<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)">
<div class="rc-rccontair">
<img :src=item.catimage alt="">
</div>
</div>
<div class="rc-column">
<div class="rc-click" @click="selectproduce(item,index)">
<span>{{item.title}}</span>
<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>
</li>
</ul>
<nuxt-link :to="`/productdetails/productlist/`">
<div class="userserlect">
<span class="ts-standard-btn center">查看更多</span>
</div>
</nuxt-link>
</div>
</div>
</div>
<div class="online bold" v-show="twomao"></div>
<div class="selectionswitch rc-full-width rc-max-width--xl rc-padding-y--md" v-show="twomao" ref="catgan">
<h2 class="rc-beta rc-text--center">全价猫干粮</h2>
<van-tabs @change='catclick' class="van-tabs">
<van-tab v-for="(item,index) in discoun" :key="index" :title="item.title">
<div class="rc-contair">
<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)"> <div class="rc-click rc-margin-bottom--md" @click="selectproduce(item,index)">
<div class="rc-rccontair"> <div class="rc-rccontair">
<img :src=item.picture alt=""> <img :src=item.picture alt="">
@ -625,10 +715,11 @@
import { userquery,postCourseId,biaomessage,userque,searchchanpin } from "../ajax/getData"; import { userquery,postCourseId,biaomessage,userque,searchchanpin } from "../ajax/getData";
const settings = require("@/config"); const settings = require("@/config");
export default { export default {
middleware: 'metaTitle', middleware: 'metaTitle',
meta: {title: '首页'}, // middleware: 'metaTitle',
data(){ meta: {title: '首页'},
return{ data(){
return{
useraindex:0, useraindex:0,
usertitle:'明星猫粮', usertitle:'明星猫粮',
dogtitle:'明星狗粮', dogtitle:'明星狗粮',
@ -797,7 +888,7 @@ activeInde3:0,
}, },
], ],
discounchufang: [ discounchufang: [
{ {
title: "消化道", title: "消化道",
catimage: require("../assets/cat.png"), catimage: require("../assets/cat.png"),
@ -990,216 +1081,228 @@ activeInde3:0,
} }
}, },
} }
}, },
components:{ components:{
Myheader, Myheader,
Myfooter, Myfooter,
unlogin, unlogin,
// userswiper // userswiper
}, },
created(){ created(){
vm=this; vm=this;
}, },
watch:{ watch:{
},
mounted(){
const that = this
this.ifAdoid()
// window.onresize = () => {
// setTimeout(() => {
// this.ifAdoid()
// }, 500);
}, // }
mounted(){ this.usermessage= JSON.parse(localStorage.getItem("userInfo"));
const that = this
this.ifAdoid();
this.usermessage= JSON.parse(localStorage.getItem("userInfo"));
if(this.usermessage==null ||this.usermessage==undefined){
this.userunlogin=true
}
window.addEventListener("scroll", this.handleScroll, true);
this.userchufang();//
this.catmessage();//
this.dogmessage();//
},
destroyed () {
window.removeEventListener('scroll', this.scrollToTop);
},
methods:{
ifAdoid(item,index){
//console.log(index);
this.userindex=index;
var sUserAgent = navigator.userAgent.toLowerCase();
var bIsIpad = sUserAgent.match(/ipad/i) == "ipad";
var bIsIphoneOs = sUserAgent.match(/iphone os/i) == "iphone os";
var bIsMidp = sUserAgent.match(/midp/i) == "midp";
var bIsUc7 = sUserAgent.match(/rv:1.2.3.4/i) == "rv:1.2.3.4";
var bIsUc = sUserAgent.match(/ucweb/i) == "ucweb";
var bIsAndroid = sUserAgent.match(/android/i) == "android";
var bIsCE = sUserAgent.match(/windows ce/i) == "windows ce";
var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile";
if (!(bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM)) {
console.log("当前是电脑打开")
this.stypechange=false;
//console.log(this.usertitle)
this.catproduct=true; if(this.usermessage==null ||this.usermessage==undefined){
this.onemao=false; this.userunlogin=true
this.twomao=false; }
this.threemao=false; window.addEventListener("scroll", this.handleScroll, true);
this.fourmao=false; this.userchufang();//
this.fivemao=false; this.catmessage();//
this.sixmao=false; this.dogmessage();//
this.dogshow=false // this.usershi();//
this.showingBanners=this.banners.pc; // this.userhot();
}
else
{
console.log("当前是手机打开")
this.showingBanners=this.banners.mobile;
this.stypechange=true;
this.onemao=true;
this.twomao=true;
this.threemao=true;
this.fourmao=true;
this.fivemao=true;
this.dogshow=true;
this.catproduct=true
this.sixmao=true;
} },
}, destroyed () {
window.removeEventListener('scroll', this.scrollToTop);
ifadroind(item,index,order){ },
//console.log(item,index,order); methods:{
var sUserAgent = navigator.userAgent.toLowerCase();
var bIsIpad = sUserAgent.match(/ipad/i) == "ipad";
var bIsIphoneOs = sUserAgent.match(/iphone os/i) == "iphone os";
var bIsMidp = sUserAgent.match(/midp/i) == "midp";
var bIsUc7 = sUserAgent.match(/rv:1.2.3.4/i) == "rv:1.2.3.4";
var bIsUc = sUserAgent.match(/ucweb/i) == "ucweb";
var bIsAndroid = sUserAgent.match(/android/i) == "android";
var bIsCE = sUserAgent.match(/windows ce/i) == "windows ce";
var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile";
if (!(bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM)) {
//console.log("")
if(item.title=='明星猫粮'){
this.catproduct=true;
this.twomao=false;
this.threemao=false;
this.fourmao=false;
this.fivemao=false;
this.dogshow=false;
this.sixmao=false;
this.onemao=false;
}
if(item.title=='猫湿粮'){
this.onemao=true;
this.dogshow=false;
//console.log(this.onemao);
this.twomao=false;
this.threemao=false;
this.fourmao=false;
this.fivemao=false;
this.catproduct=false;
}if(item.title=='猫干粮'){ ifAdoid(item,index){
this.onemao=false; console.log(index);
this.twomao=true; this.userindex=index;
this.dogshow=false; var sUserAgent = navigator.userAgent.toLowerCase();
this.threemao=false; var bIsIpad = sUserAgent.match(/ipad/i) == "ipad";
this.fourmao=false; var bIsIphoneOs = sUserAgent.match(/iphone os/i) == "iphone os";
this.chufang=false; var bIsMidp = sUserAgent.match(/midp/i) == "midp";
this.catproduct=false; var bIsUc7 = sUserAgent.match(/rv:1.2.3.4/i) == "rv:1.2.3.4";
} var bIsUc = sUserAgent.match(/ucweb/i) == "ucweb";
var bIsAndroid = sUserAgent.match(/android/i) == "android";
var bIsCE = sUserAgent.match(/windows ce/i) == "windows ce";
var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile";
if(item.title=='犬干粮'){ if (!(bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM)) {
this.onemao=false; console.log("当前是电脑打开")
this.twomao=false; this.stypechange=false;
this.threemao=false; console.log(this.usertitle)
this.fourmao=true;
this.chufang=false;
this.dogshow=false;
this.catproduct=false;
}
if(item.title=='犬湿粮'){ // let catshiid=document.querySelectorAll('.selectionswitch');
this.onemao=false; // catshiid[this.userindex].style.display='none';
this.twomao=false; // catshiid[this.userindex].style.display='none';
this.threemao=true; this.catproduct=true;
this.fourmao=false; this.onemao=false;
this.chufang=false; this.twomao=false;
this.catproduct=false; this.threemao=false;
this.dogshow=false; this.fourmao=false;
} this.fivemao=false;
if(item.title=='处方用粮'){ this.sixmao=false;
this.onemao=false; this.dogshow=false
this.twomao=false; // console.log(catshiid);
this.threemao=false; }else{
this.fourmao=false; console.log("当前是手机打开")
this.fivemao=true; this.stypechange=true;
this.dogshow=false; this.onemao=true;
this.catproduct=false; this.twomao=true;
} this.threemao=true;
if(item.title=='明星狗粮'){ this.fourmao=true;
this.onemao=false; this.fivemao=true;
this.twomao=false; this.dogshow=true;
this.threemao=false; this.catproduct=true
this.fourmao=false; this.sixmao=true;
this.fivemao=false;
this.dogshow=true;
this.catproduct=false;
}
// this.usertitle=item.title
// this.catlistvideo[order]=item;
// this.catproduct=true;
}else{ }
this.catfood=true; },
// this.catproduct=false;
let userindex=index
//console.log(item,index);
let mingxin=document.querySelector('.pageFullScreen');
let dogtop=document.querySelector('.oc-top');
//console.log(dogtop);
//console.log(mingxin.offsetTop);
if(item.title=='犬湿粮'||item.title=='犬干粮'||item.title=='处方用粮'){
userindex=userindex-2
}else{
userindex=userindex-1
}
if(item.title=='明星猫粮'){
mingxin.scrollIntoView(true);
}else{
let catshiid=document.querySelectorAll('.selectionswitch');
catshiid[userindex].scrollIntoView(true);
}
if(item.title=='明星狗粮')
dogtop.scrollIntoView(true);
// if(item.title=="湿"){
// this.catproduct=false;
// this.catfood=true;
// }else if(item.title==""){
// this.catproduct=true;
// this.catfood=false;
// } ifadroind(item,index,order){
//console.log("") console.log(item,index,order);
}
},
userdog(item,index){ var sUserAgent = navigator.userAgent.toLowerCase();
this.userstype=1; var bIsIpad = sUserAgent.match(/ipad/i) == "ipad";
let petType={ var bIsIphoneOs = sUserAgent.match(/iphone os/i) == "iphone os";
petType:1, var bIsMidp = sUserAgent.match(/midp/i) == "midp";
name:index, var bIsUc7 = sUserAgent.match(/rv:1.2.3.4/i) == "rv:1.2.3.4";
} var bIsUc = sUserAgent.match(/ucweb/i) == "ucweb";
for(let i =0;i<this.userserachlist.length;i++){ var bIsAndroid = sUserAgent.match(/android/i) == "android";
if(!this.userserachlist.includes(petType)){ var bIsCE = sUserAgent.match(/windows ce/i) == "windows ce";
this.userserachlist.push(petType) var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile";
}W
} if (!(bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM)) {
this.dogmessage(this.userserachlist) console.log("当前是电脑打开啊啊啊")
}, if(item.title=='明星猫粮'){
this.catproduct=true;
this.twomao=false;
this.threemao=false;
this.fourmao=false;
this.fivemao=false;
this.dogshow=false;
this.sixmao=false;
this.onemao=false;
}
if(item.title=='猫湿粮'){
this.onemao=true;
this.dogshow=false;
console.log(this.onemao);
this.twomao=false;
this.threemao=false;
this.fourmao=false;
this.fivemao=false;
this.catproduct=false;
}if(item.title=='猫干粮'){
this.onemao=false;
this.twomao=true;
this.dogshow=false;
this.threemao=false;
this.fourmao=false;
this.chufang=false;
this.catproduct=false;
}
if(item.title=='犬干粮'){
this.onemao=false;
this.twomao=false;
this.threemao=false;
this.fourmao=true;
this.chufang=false;
this.dogshow=false;
this.catproduct=false;
}
if(item.title=='犬湿粮'){
this.onemao=false;
this.twomao=false;
this.threemao=true;
this.fourmao=false;
this.chufang=false;
this.catproduct=false;
this.dogshow=false;
}
if(item.title=='处方用粮'){
this.onemao=false;
this.twomao=false;
this.threemao=false;
this.fourmao=false;
this.fivemao=true;
this.dogshow=false;
this.catproduct=false;
}
if(item.title=='明星狗粮'){
this.onemao=false;
this.twomao=false;
this.threemao=false;
this.fourmao=false;
this.fivemao=false;
this.dogshow=true;
this.catproduct=false;
}
// this.usertitle=item.title
// this.catlistvideo[order]=item;
// this.catproduct=true;
}else{
this.catfood=true;
// this.catproduct=false;
let userindex=index
console.log(item,index);
let mingxin=document.querySelector('.pageFullScreen');
let dogtop=document.querySelector('.oc-top');
console.log(dogtop);
console.log(mingxin.offsetTop);
if(item.title=='犬湿粮'||item.title=='犬干粮'||item.title=='处方用粮'){
userindex=userindex-2
}else{
userindex=userindex-1
}
if(item.title=='明星猫粮'){
mingxin.scrollIntoView(true);
}else{
let catshiid=document.querySelectorAll('.selectionswitch');
catshiid[userindex].scrollIntoView(true);
}
if(item.title=='明星狗粮')
dogtop.scrollIntoView(true);
// if(item.title=="湿"){
// this.catproduct=false;
// this.catfood=true;
// }else if(item.title==""){
// this.catproduct=true;
// this.catfood=false;
// }
console.log("当前是手机打开")
}
},
userdog(item,index){
this.userstype=1;
let petType={
petType:1,
name:index,
}
for(let i =0;i<this.userserachlist.length;i++){
if(!this.userserachlist.includes(petType)){
this.userserachlist.push(petType)
}
}
this.dogmessage(this.userserachlist)
},
userlook(order){ userlook(order){
@ -1242,6 +1345,10 @@ activeInde3:0,
this.gotop = false; this.gotop = false;
this.searchBar=true this.searchBar=true
} }
}
}, },
toTop() { toTop() {
let top = document.documentElement.scrollTop || document.body.scrollTop; let top = document.documentElement.scrollTop || document.body.scrollTop;
@ -1355,59 +1462,65 @@ activeInde3:0,
lianxi(item,index){ lianxi(item,index){
if(item.title=='在线客服'){ if(item.title=='在线客服'){
var option = { var option = {
customer: {id: '', name: '', email: '', mobile: '', memberId: '999999'} customer: {id: '', name: '', email: '', mobile: '', memberId: '999999'}
} }
dis_livchat(option); dis_livchat(option);
} }
if(item.title=='购物车'){ if(item.title=='购物车'){
this.$router.push({ this.$router.push({
path: "/myorder/userrecord", path: "/myorder/userrecord",
});
}
if(item.title=='营养专家'){
var option = {
customer: {id: '', name: '', email: '', mobile: '', memberId: '999999'}
}
dis_livchat(option);
}
}, });
userbuy(item){ }
let user= localStorage.getItem("userInfo"); if(item.title=='营养专家'){
this.courseId(item) var option = {
this.$router.push({ customer: {id: '', name: '', email: '', mobile: '', memberId: '999999'}
path: "/myorder/userrecord", }
}); dis_livchat(option);
}, }
selectGoods(item,index){ },
//console.log(item,index); userbuy(item){
this.activeIndex=index; let user= localStorage.getItem("userInfo");
//console.log(item.title); this.courseId(item)
this.ifadroind(item,index,this.useraindex) this.$router.push({
// this.ifAdoid(item,index); path: "/myorder/userrecord",
}, });
quanshi(item,index){ },
//console.log(item,index);
this.activeIndex5=index
//console.log(this.activeIndex5);
},
userdoghot(item,index){
this.activeIndex6=index
}, selectGoods(item,index){
selectGo(item,index){ console.log(item,index);
this.activeInde2=index; this.activeIndex=index;
}, console.log(item.title);
selectGoo(item,index){ this.ifadroind(item,index,this.useraindex)
this.activeInde3=index; // this.ifAdoid(item,index);
}
} },
quanshi(item,index){
console.log(item,index);
this.activeIndex5=index
console.log(this.activeIndex5);
},
userdoghot(item,index){
this.activeIndex6=index
},
selectGo(item,index){
this.activeInde2=index;
},
selectGoo(item,index){
this.activeInde3=index;
} }
},
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@media screen and(min-width: 320px) and(max-width:768px){ @media screen and(min-width: 320px) and(max-width:768px){