!14 2022-01-14

Merge pull request !14 from Admin/sit-Leung
This commit is contained in:
Admin 2022-01-14 14:47:56 +00:00 committed by Gitee
commit 05a17d897f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
62 changed files with 1854 additions and 30794 deletions

View File

@ -165,7 +165,6 @@ export const useredit = (mobile, pet,address) => {
storeCode:'', storeCode:'',
remark:'', remark:'',
memberMark:'', memberMark:'',
remark:'' remark:''
} }
return fetch('member?type=add', data, 'POST' ) return fetch('member?type=add', data, 'POST' )

View File

@ -1,4 +1,5 @@
/*Body*/ /*Body*/
html,body{height:100%;}
body{ body{
font-family: DINPro,'PingFang SC',miui,'Hiragino Sans GB','Microsoft Yahei',sans-serif; font-family: DINPro,'PingFang SC',miui,'Hiragino Sans GB','Microsoft Yahei',sans-serif;
line-height: 1.5; line-height: 1.5;
@ -155,6 +156,7 @@ img, picture {
} }
li{ li{
border-radius: 100px; border-radius: 100px;
flex-shrink: 0;
} }
} }
.active{ .active{
@ -234,6 +236,7 @@ img, picture {
max-width: 460px; max-width: 460px;
margin-left: auto!important; margin-left: auto!important;
margin-right: auto!important; margin-right: auto!important;
box-shadow:unset;
} }
.ts-standard-input{ .ts-standard-input{
@ -280,7 +283,7 @@ img, picture {
width:100%; width:100%;
} }
.rc-top{ .rc-top{
margin-top: 74px; margin-top: 90px;
} }
.rc-list__header { .rc-list__header {
background: none; background: none;
@ -361,7 +364,7 @@ img, picture {
font-size:16px; font-size:16px;
} }
.rc-top{ .rc-top{
margin-top: 124px; margin-top: 150px;
} }
.ts-product-list{ .ts-product-list{
text-align: left; text-align: left;

View File

@ -147,9 +147,10 @@
height:auto; height:auto;
max-height: 15.68rem; max-height: 15.68rem;
display: block; display: block;
overflow:hidden;
video{ video{
max-width:100%; width:100%;
max-height:100%; height:100%;
} }
} }
} }
@ -290,9 +291,11 @@
color: #444444; color: #444444;
border: 1px solid #D7D7D7; border: 1px solid #D7D7D7;
} }
// .usermain{ // .usermain{
// display: none; // display: none;
// } // }
} }
@ -483,7 +486,7 @@ img{
.rc-ma .rc-ma
{ {
.rc-margin-y--xl{ .rc-margin-y--xl{
margin-bottom: 1.88rem; //margin-bottom: 1.88rem;
} }
// padding:60px 0; // padding:60px 0;

View File

@ -1,3 +1,11 @@
.rc-usermain{
width:100%;
padding-bottom:2.8rem;
ol{
overflow-x:hidden;
overflow-y:auto;
}
}
@media screen and (max-width:768px){ @media screen and (max-width:768px){
.rc-button{ .rc-button{
width: 100%; width: 100%;
@ -27,12 +35,8 @@ span{
} }
} }
.rc-usermain{ .rc-usermain{
width: 92%;
margin: 0 auto;
ul{ ul{
height: 70px; height: 4.375rem;
display: block;
border-bottom: 1px solid #D8D8D8; border-bottom: 1px solid #D8D8D8;
display: flex; display: flex;
align-items: center; align-items: center;
@ -43,17 +47,15 @@ span{
li{ li{
float: left; float: left;
width: 30%; width: 30%;
position:relative;
padding-right:.625rem;
} }
li:after{ li:after{
// height: 2px;
// border: 1px solid red;
// display: block;
content:"|"; content:"|";
color: #707070; color: #707070;
margin-left: 5px; position:absolute;
top:0;
right:0;
} }
li:last-child:after{ li:last-child:after{
content:""; content:"";
@ -62,16 +64,14 @@ span{
} }
ol{ ol{
margin-top:1rem;
max-height:70vh;
li{ li{
font-style: normal; font-style: normal;
display: block; height: 2rem;
height: 32px;
margin-top: 16px;
display: flex; display: flex;
// justify-content: space-between;
align-items: center; align-items: center;
color: #666666; font-size: .875rem;
font-size: 14px;
text-align: center; text-align: center;
i{ i{
font-style: normal; font-style: normal;
@ -130,10 +130,7 @@ span{
} }
} }
.rc-usermain{ .rc-usermain{
width: 92%;
margin: 0 auto;
margin-top: 60px; margin-top: 60px;
ul{ ul{
height: 64px; height: 64px;
background: #F6F6F6; background: #F6F6F6;
@ -150,20 +147,19 @@ border-radius: 3px 3px 0px 0px;
li{ li{
float: left; float: left;
width: 42%; width: 42%;
} }
} }
ol{ ol{
max-height:37.5rem;
li{ li{
font-style: normal; font-style: normal;
display: block; display: block;
height: 48px; height: 48px;
margin-top: 16px;
display: flex; display: flex;
border: 1px solid #D7D7D7; border: 1px solid #D7D7D7;
border-top:0;
//justify-content: space-between; //justify-content: space-between;
align-items: center; align-items: center;
color: #666666; color: #666666;

View File

@ -1,7 +1,9 @@
.container{ .container{
min-height:80vh;
height:100%; height:100%;
background-color:#f6f6f6; display:flex;
flex-direction: column;
align-items: center;
//background-color:#f6f6f6;
} }
.ts-max-width--460{ .ts-max-width--460{
border-radius: 3px; border-radius: 3px;
@ -139,7 +141,7 @@
} }
} }
// /* 最小768px最大1920 *pc端/ // /* 最小768px最大1920 *pc端/
@media screen and (min-width: 768px) and (max-width: 1920px) { @media screen and (min-width: 769px) {
.usecheck{ .usecheck{
display: flex; display: flex;
text-align: left; text-align: left;

View File

@ -8,6 +8,9 @@ ul li ol li em strong i {
.rc-center{ .rc-center{
overflow:hidden; overflow:hidden;
} }
.r-block{
border-radius:.25rem;
}
//手机端 //手机端
@media screen and (max-width: 768px) { @media screen and (max-width: 768px) {
.ts-mypersonal{ .ts-mypersonal{
@ -140,6 +143,7 @@ ul li ol li em strong i {
} }
.rc-cordd{ .rc-cordd{
color:#666666; color:#666666;
position:relative;
span{ span{
display: inline-block; display: inline-block;
margin-top: 16px; margin-top: 16px;
@ -249,6 +253,15 @@ ul li ol li em strong i {
width: 440px; width: 440px;
height: 652px; height: 652px;
} }
.ts-mypersonal{
margin-left:0;
.rc-column{
padding-left:0;
padding-right:0;
}
}
.online{ .online{
margin:40px auto; margin:40px auto;
} }
@ -366,13 +379,25 @@ ul li ol li em strong i {
background: #D7D7D7; background: #D7D7D7;
margin-top: 16px; margin-top: 16px;
border-radius: 4px; border-radius: 4px;
position:relative;
margin-top:3.32rem;
.r-block{ .r-block{
width: 0%; width: 0%;
height: 100%; height: 100%;
background: #008900; background: #008900;
} }
.ts-point-tag{
background:url("../image/img-pointBg.png") no-repeat center top;
background-size:contain;
height:2.375rem;
width:3.625rem;
text-align:center;
position:absolute;
font-size:.875rem;
line-height:2rem;
left:0;
top:-2.6rem;
}
} }
.rc-value{ .rc-value{
display: flex; display: flex;

View File

@ -41,8 +41,7 @@ color: #333333;
} }
} }
.rc-main { .rc-main {
width: 92%;
margin: 0 auto;
.rc-userbottom{ .rc-userbottom{
display: none; display: none;
} }
@ -304,8 +303,6 @@ color: #333333;
@media screen and (min-width: 768px) and (max-width: 1920px) { @media screen and (min-width: 768px) and (max-width: 1920px) {
.rc-main { .rc-main {
width: 92%;
margin: 0 auto;
.rc-userbottomm{ .rc-userbottomm{
display: none; display: none;
} }

View File

@ -0,0 +1,351 @@
// 手机端
@media screen and(min-width: 320px) and(max-width:768px) {
.active {
font-size: 14px;
color: #e2001a;
cursor: pointer;
}
.unactive {
font-size: 14px;
color: #444444;
cursor: pointer;
}
.rc-layout-container {
width: 100%;
.rc-main {
.rc-usermaina{
width: 100%;
height: 100%;
}
.rc-headera {
display: flex;
justify-content: space-between;
height: 64px;
align-items: center;
}
.rc-userheader{
display: none;
}
.rc-center {
width: 100%;
height: 245px;
margin-top: 8px;
.rc-usermain {
.pc-bottom{
display: none;
}
display: flex;
.rc-image {
border: 1px solid #D8D8D8;
margin-top: 17px;
;
img {
width: 96px;
height: 96px;
display: block;
}
}
.rc-right {
.rc-userbottomm{
display: none;
}
display: flex;
flex-direction: column;
width: 100%;
margin-left: 16px;
justify-content: center;
em
{
font-style: normal;
display: block;
font-size: 16px;
margin-top: 18px;
font-weight: bold;
color: #E1001A;
}
}
.rc-userright {
display: flex;
flex-direction: column;
color: #666666;
font-size: 14px;
span{
display: block;
margin-top: 16px;
}
}
.rc-userbottom {
display: flex;
justify-content: space-between;
margin-top: 8px;
span{
color: #666666;
font-size: 14px;
}
i{
font-style: normal;
color: #E1001A;
font-size: 18px;
font-weight: bold;
}
}
}
.rc-bottom {
display: flex;
align-items: center;
justify-content: center;
margin-top: 24px;
span {
display: block;
width: 130px;
display: flex;
align-items: center;
line-height: 40px;
text-align: center;
color: #e2001a;
height: 40px;
border: 2px solid #e2001a;
justify-content: center;
border-radius: 30px;
font-weight: bold;
}
span:last-child{
margin-left: 15px;
}
}
}
.rc-title {
height: 52px;
display: flex;
align-items: center;
border-bottom: 1px solid #d8d8d8;
justify-content: space-between;
span{
font-size: 14px;
color: #999999;
margin-left: 8px;
}
em{
font-style: normal;
font-size: 14px;
color: #333333;
}
i{
font-style: normal;
font-size: 14px;
color: #333333;
}
.rc-usertitle strong{
display: none;
}
}
}
}
}
// /* 最小768px最大1920 *pc端/
@media screen and (min-width: 768px) and (max-width: 1920px) {
.active {
font-size: 18px;
color: #e2001a;
cursor: pointer;
// margin-left: 40px;
}
.unactive {
font-size: 18px;
color: #444444;
cursor: pointer;
// margin-left: 80px;
}
.rc-layout-container {
.rc-main {
.rc-headera {
display: flex;
height: 64px;
align-items: center;
border: 1px solid #D7D7D7;
border-radius: 3px 3px 0px 0px;
font-size: 18px;
span:first-child{
margin-left: 40px;
}
span{
margin-left: 80px;
}
}
.rc-userheader{
width: 100%;
height: 64px;
background: #F6F6F6;
border: 1px solid #D7D7D7;
display: flex;
align-items: center;
justify-content: space-between;
font-size: 18px;
span:first-child{
margin-left: 173px;
}
span:last-child{
margin-right: 87px;
}
}
.rc-center {
width: 100%;
height: 220px;
border: 1px solid #D7D7D7;
.rc-usermain {
display: flex;
justify-content: space-between;
align-items: center;
height: 164px;
.rc-usercenter{
width: 25%;
em{
font-size: 18px;
}
}
.rc-image {
border: 1px solid #D8D8D8;
margin-left: 40px;
img {
width: 96px;
height: 96px;
display: block;
}
}
.rc-right {
.rc-userbottom{
display: none;
}
display: flex;
width: 100%;
margin-left: 16px;
em
{
font-style: normal;
font-weight: bold;
font-size: 16px;
margin-top: 18px;
color: #E1001A;
}
}
.rc-userright {
display: flex;
flex-direction: column;
color: #666666;
font-size: 16px;
span{
display: block;
margin-top: 6px;
}
}
.rc-userbottomm {
display: flex;
justify-content: space-between;
align-items: center;
width: 58%;
font-size: 20px;
color: #E1001A;
font-weight: bold;
i{
font-style: normal;
}
}
.pc-bottom {
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
margin-right: 40px;
span {
display: block;
width: 130px;
cursor: pointer;
display: flex;
align-items: center;
line-height: 40px;
font-weight: bold;
text-align: center;
color: #e2001a;
height: 40px;
border: 2px solid #e2001a;
justify-content: center;
border-radius: 30px;
}
span:last-child{
margin-top: 15px;
}
}
}
.rc-bottom {
display: none;
}
}
.rc-title {
height: 55px;
display: flex;
align-items: center;
border-bottom: 1px solid #d8d8d8;
justify-content: space-between;
span{
font-size: 16px;
color: #999999;
margin-left: 8px;
}
strong{
font-style: normal;
font-size: 16px;
color: #444444;
}
em{
font-style: normal;
font-size: 16px;
color: #333333;
}
i{
font-style: normal;
font-size: 16px;
margin-left: 40px;
color: #333333;
}
.rc-usertitle{
margin-right: 73px;
display: flex;
align-items: center;
em{
display: block;
margin-left: 8px;
}
}
}
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@ -393,7 +393,7 @@ export default {
mounted() { mounted() {
// //
let usernot=JSON.parse(localStorage.getItem("userInfo")); let usernot=JSON.parse(localStorage.getItem("userInfo"));
console.log(usernot); //console.log(usernot);
if(usernot==null ||usernot==undefined){ if(usernot==null ||usernot==undefined){
console.log(usernot); console.log(usernot);
this.loginornot=true this.loginornot=true
@ -401,21 +401,19 @@ export default {
this.loginornot=false this.loginornot=false
this.usermessage=usernot; this.usermessage=usernot;
} }
console.log(this.loginornot); //console.log(this.loginornot);
}, },
methods: { methods: {
bindTracking: function(){ bindTracking: function(){
console.log('bindTracking'); //console.log('bindTracking');
}, },
// //
// //
searchturn(){ searchturn(){
this.$router.push({ name: "usersearch-search", this.$router.push({ name: "usersearch-search",})
})
}, },
// //
turnlogin(){ turnlogin(){

View File

@ -1,288 +0,0 @@
<template>
<div class="magnify">
<div class="left_contaner">
<div class="middle_img" @mouseover="boxMouseOver" @mouseleave="boxMouseLeave">
<img :src="middleImg" alt="" style="width:100%">
<div class="shade" @mouseover="shadeMouseOver" @mousemove="shadeMouseMove" ref="shade" v-show="isShade"></div>
</div>
<div class="carousel">
<div class="left_arrow arrow" @click="leftArrowClick">
<img src="../assets/image/userleft.jpg" alt="">
</div>
<div class="show_box">
<ul class="picture_container" ref="middlePicture">
<li class="picture_item" @click="tabPicture(item,index)" v-for="(item, index) in pictureList" :key="index">
<img :src="item.attachmentPath" class="small_img" alt="">
</li>
</ul>
</div>
<div class="right_arrow arrow" @click="rightArrowClick">
<img src="../assets/image/userright.png" alt="">
</div>
</div>
</div>
<div class="right_contanier" v-show="isBig">
<img :src="middleImg" ref="bigImg" class="big_img" alt="">
</div>
</div>
</template>
<script>
import $ from 'jquery'
export default {
props:['parentmsg'],
props: {
tableLabelTest:Array,
imgList: Array, //
zoom: {
default: 2, // ,
type: Number
}
},
data() {
return {
middleImgWidth:350,
middleImgHeight:350,
thumbnailHeight:100,
tableLabelTest1:this.tableLabelTest,
pictureList: [
{url: require("../assets/four.png")},
{url: require("../assets/cat.png")},
{url: require("../assets/one.png")},
{url: require("../assets/six.png")},
{url: require("../assets/six.png")},
{url: require("../assets/six.png")},
{url: require("../assets/four.png")},
{url: require("../assets/cat.png")},
{url: require("../assets/one.png")},
{url: require("../assets/six.png")},
{url: require("../assets/six.png")},
{url: require("../assets/six.png")},
],
menu:[],
middleImg: '', //
bigImg: '', //
isShade: false, //
isBig: false, //
initX: 0, // clientX
initY: 0, // clientY
leftX: 0, // left
topY: 0, // top
middleLeft: 0, // left,
itemWidth: 80, //
}
},
watch:{
data:'ifadroind',// methods
inputName: function(newValue) {
this.pictureList=newValue;
this.menu=newValue;
console.log(this.newValue);
}
},
created() {
},
mounted() {
let user= JSON.parse(localStorage.getItem("message"));
console.log(user);
if(user!==null){
this.pictureList=user;
}
if (user && user.length) {
this.pictureList = user
}
this.middleImg = this.pictureList[0].attachmentPath;
console.log(this.middleImg);
// ,4,50
// this.itemWidth = (this.middleImgWidth-30) / 2
this.ifadroind();
this.$nextTick(() => {
console.log(this.menu);
//
const imgWidth = this.middleImgHeight + this.thumbnailHeight + 20
//
// $('.magnify').css({
// width: this.middleImgWidth,
// height: imgWidth
// })
//
$('.middle_img .shade').css({
width: this.middleImgWidth/this.zoom,
height: this.middleImgHeight/this.zoom
})
//
$('.carousel').css({
height: this.thumbnailHeight
})
//
// $('.picture_item').css({
// width: this.itemWidth
// })
// ,left
$('.right_contanier').css({
left: this.middleImgWidth,
width: imgWidth,
height: imgWidth
})
// ()
$('.right_contanier .big_img').css({
width: imgWidth * this.zoom,
height: imgWidth * this.zoom
})
})
},
methods: {
//
ifadroind(){
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)) {
//Mob Screen
}else{
//PC screen size
this.middleImgWidth=560;
this.middleImgHeight=560;
}
$('.middle_img').css({
width: this.middleImgWidth,
height: this.middleImgHeight
})
},
// ,,
boxMouseOver (e) {
e.preventDefault();
e.stopPropagation();
this.isShade = true
this.isBig = true
//
let x = e.offsetX - $('.shade').width()/2
let y = e.offsetY - $('.shade').height()/2
let maxLeft = $('.middle_img').width() - $('.shade').width()
let maxTop = $('.middle_img').height() - $('.shade').height()
x = x <= 0 ? 0 : x
x = x >= maxLeft ? maxLeft : x
y = y <= 0 ? 0 : y
y = y >= maxTop ? maxTop : y
$('.shade').css({
left: x,
top: y
})
},
//
shadeMouseMove (e) {
e.preventDefault();
e.stopPropagation();
//x - offsetLeft -
var x = this.getEventPage(e).pageX - $('.middle_img')[0].offsetParent.offsetLeft - $('.middle_img')[0].offsetParent.clientLeft;
//y - offsetTop -
var y = this.getEventPage(e).pageY - $('.middle_img')[0].offsetParent.offsetTop - $('.middle_img')[0].offsetParent.clientTop;
//
x -= $('.shade').width() / 2;
y -= $('.shade').height() / 2;
//
let maxLeft = $('.middle_img').width() - $('.shade').width()
let maxTop = $('.middle_img').height() - $('.shade').height()
x = x <= 0 ? 0 : x
x = x >= maxLeft ? maxLeft : x
y = y <= 0 ? 0 : y
y = y >= maxTop ? maxTop : y
//
$('.shade').css({
left: x,
top: y
})
// ,
// x:/ y: /,
const xRate = $('.big_img').width() / $('.middle_img').width()
const yRate = $('.big_img').height() / $('.middle_img').height()
$('.big_img').css({
left: -x*xRate,
top: -y*yRate
})
// console.log(e, x, y, xRate, yRate, 66677)
},
// ,
shadeMouseOver (e) {
e.preventDefault();
e.stopPropagation();
// console.log(88888, e)
},
//
boxMouseLeave () {
this.isShade = false
this.isBig = false
},
//
tabPicture (item,index) {
this.middleImg = item.attachmentPath
this.$emit('changeName',item)
console.log(item,index)
},
//
leftArrowClick () {
if (this.middleLeft < 0) {
//
this.middleLeft += this.itemWidth
$('.picture_container').animate({
left: this.middleLeft
}, 500)
}
},
//
rightArrowClick () {
// ,(-1)*
if (this.middleLeft > -this.itemWidth*(this.pictureList.length-1)) {
this.middleLeft -= this.itemWidth
$('.picture_container').animate({
left: this.middleLeft
}, 500)
}
},
/**
* 获取网页滚出去的距离包括上面滚出去的部分和左边滚出去的部分
* @returns {{scrollTop: (Number|number), scrollLeft: (Number|number)}}
*/
getPageScroll() {
return {
scrollTop: window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0,
scrollLeft: window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft || 0
}
},
/**
* 获取事件对象点击的点相对于文档左上角的坐标
* @param e
* @returns {{pageX: *, pageY: *}}
*/
getEventPage(e) {
return {
pageX: e.clientX + this.getPageScroll().scrollLeft,
pageY: e.clientY + this.getPageScroll().scrollTop
}
}
}
}
</script>
<style lang="less" scoped>
@import url("../assets/css/magnifier.less");
</style>

View File

@ -101,11 +101,6 @@
<a href="javascript:;" data-modal-trigger="modal-whereToBuy" onclick='bindTracking(this)' evt-name='页内弹窗' evt-cat='footererBtnClick' evt-val='在哪购买' class="rc-btn rc-btn--inverse rc-btn--icon-label rc-icon rc-bag--xs rc-brand3" title="Where to buy" role="menuitem"> <a href="javascript:;" data-modal-trigger="modal-whereToBuy" onclick='bindTracking(this)' evt-name='页内弹窗' evt-cat='footererBtnClick' evt-val='在哪购买' class="rc-btn rc-btn--inverse rc-btn--icon-label rc-icon rc-bag--xs rc-brand3" title="Where to buy" role="menuitem">
在哪购买 在哪购买
</a> </a>
<!--
<a class="rc-btn rc-btn--inverse rc-btn--icon-label rc-icon rc-language--xs rc-brand3" role="menuitem" data-modal-trigger="country-lang-selector">
Language
</a>
-->
<a class="rc-btn rc-btn--inverse rc-btn--icon-label rc-icon rc-up--xs rc-brand3" role="menuitem" href="#"> <a class="rc-btn rc-btn--inverse rc-btn--icon-label rc-icon rc-up--xs rc-brand3" role="menuitem" href="#">
回到顶部 回到顶部
</a> </a>
@ -149,15 +144,15 @@
<div class="ts-row-body"> <div class="ts-row-body">
<p> <p>
<a href="https://weibo.com/chinaroyalcanin" target='_blank' class="rc-img--round rc-img--round--sm rc-margin-right--xs"> <a href="https://weibo.com/chinaroyalcanin" target='_blank' class="rc-img--round rc-img--round--sm rc-margin-right--xs">
<img src="../assets/showimage/ico-weibo.png"> <img src='/images/ico-weibo.png'>
</a> </a>
<a href="https://www.zhihu.com/org/huang-jia-chong-wu-shi-pin" target='_blank' class="rc-img--round rc-img--round--sm rc-margin-right--xs"> <a href="https://www.zhihu.com/org/huang-jia-chong-wu-shi-pin" target='_blank' class="rc-img--round rc-img--round--sm rc-margin-right--xs">
<img src="../assets/showimage/ico-zhihu.png"> <img src='/images/ico-zhihu.png'>
</a> </a>
<a href="https://space.bilibili.com/2136859062" target='_blank' class="rc-img--round rc-img--round--sm rc-margin-right--xs"> <a href="https://space.bilibili.com/2136859062" target='_blank' class="rc-img--round rc-img--round--sm rc-margin-right--xs">
<img src="../assets/showimage/ico-bilibili.png"> <img src='/images/ico-bilibili.png'>
</a> </a>
</p> </p>
</div> </div>
@ -176,7 +171,7 @@
<div class="rc-four-column rc-layout-container"> <div class="rc-four-column rc-layout-container">
<div class="rc-column ts-qr-container rc-text--center"> <div class="rc-column ts-qr-container rc-text--center">
<a href="weixin://dl/business/?t=xjjEG3b5Ycu" target='_blank' onclick='return bindTracking(this,2000)' evt-name='页脚跳转' evt-cat='footerLinkClick' evt-val='产品验证'> <a href="weixin://dl/business/?t=xjjEG3b5Ycu" target='_blank' onclick='return bindTracking(this,2000)' evt-name='页脚跳转' evt-cat='footerLinkClick' evt-val='产品验证'>
<img src="../assets/showimage/qrcode-chanpin.jpg"> <img src="/images/qrcode-chanpin.jpg">
<span> <span>
产品验证 产品验证
</span> </span>
@ -185,7 +180,7 @@
<div class="rc-column ts-qr-container rc-text--center"> <div class="rc-column ts-qr-container rc-text--center">
<a href="weixin://dl/business/?t=BE1OA2AngRs" target='_blank' onclick='return bindTracking(this,2000)' evt-name='页脚跳转' evt-cat='footerLinkClick' evt-val='皇家爱宠荟会员中心'> <a href="weixin://dl/business/?t=BE1OA2AngRs" target='_blank' onclick='return bindTracking(this,2000)' evt-name='页脚跳转' evt-cat='footerLinkClick' evt-val='皇家爱宠荟会员中心'>
<img src="../assets/showimage/qrcode-aichong.jpg"> <img src="/images/qrcode-aichong.jpg">
<span> <span>
皇家爱宠荟会员中心 皇家爱宠荟会员中心
</span> </span>
@ -193,7 +188,7 @@
</div> </div>
<div class="rc-column ts-qr-container rc-text--center"> <div class="rc-column ts-qr-container rc-text--center">
<img src="../assets/showimage/qrcode-royal-elite.jpg"> <img src="/images/qrcode-royal-elite.jpg">
<span class='rc-text-center'> <span class='rc-text-center'>
皇家兽医精英荟 皇家兽医精英荟
</span> </span>
@ -201,7 +196,7 @@
<div class="rc-column ts-qr-container rc-text--center"> <div class="rc-column ts-qr-container rc-text--center">
<a href="https://v.douyin.com/e12mtGA/" target='_blank'> <a href="https://v.douyin.com/e12mtGA/" target='_blank'>
<img src="../assets/showimage/qrcode-douyin.jpg"> <img src="/images/qrcode-douyin.jpg">
<span> <span>
皇家宠物食品抖音官方账号 皇家宠物食品抖音官方账号
</span> </span>

View File

@ -38,6 +38,7 @@ export default {
css: [ css: [
'vant/lib/index.css', 'vant/lib/index.css',
'element-ui/lib/theme-chalk/index.css', 'element-ui/lib/theme-chalk/index.css',
{src:'@/assets/css/global.less'},
{src:'@/assets/css/royalcanin-custom.css'}, {src:'@/assets/css/royalcanin-custom.css'},
{ src: "swiper/css/swiper.css" } { src: "swiper/css/swiper.css" }
@ -76,8 +77,10 @@ export default {
}, },
// Build Configuration: https://go.nuxtjs.dev/config-build // Build Configuration: https://go.nuxtjs.dev/config-build
build: { build: {
analyze: true, assetFilter: function(assetFilename) { return assetFilename.endsWith('.js'); } analyze: true,
assetFilter: function(assetFilename) {
return assetFilename.endsWith('.js');
}
}, },
// axios: { // axios: {
// proxy: true, // proxy: true,

File diff suppressed because it is too large Load Diff

View File

@ -16,20 +16,17 @@
}, },
"dependencies": { "dependencies": {
"@nuxtjs/axios": "^5.13.6", "@nuxtjs/axios": "^5.13.6",
"@vant/touch-emulator": "^1.3.2",
"amfe-flexible": "^2.2.1",
"core-js": "^3.15.1", "core-js": "^3.15.1",
"element-ui": "^2.15.6", "element-ui": "^2.15.6",
"ip": "^1.1.5",
"jquery": "^3.6.0",
"less": "^4.1.2", "less": "^4.1.2",
"less-loader": "^6.0.0", "less-loader": "^6.0.0",
"nuxt": "^2.15.7", "nuxt": "^2.15.7",
"nuxt-tailvue": "^1.0.95", "nuxt-tailvue": "^1.0.95",
"qrcodejs2": "^0.0.2", "qrcodejs2": "^0.0.2",
"swiper": "^5.4.5",
"vant": "^2.12.22", "vant": "^2.12.22",
"vue-awesome-swiper": "^4.1.1", "vuex-persistedstate": "^4.1.0",
"vuex-persistedstate": "^4.1.0" "vue-awesome-swiper": "^4.1.1"
}, },
"devDependencies": { "devDependencies": {
"@vant/area-data": "^1.1.5", "@vant/area-data": "^1.1.5",

View File

@ -3,30 +3,22 @@
<div> <div>
<Myheader></Myheader> <Myheader></Myheader>
<div class="rc-top"></div>
<unlogin></unlogin> <unlogin></unlogin>
<!-- Suppose in header end --> <!-- Suppose in header end -->
<van-swipe :autoplay="3000"> <van-swipe :autoplay="3000" class="rc-padding-bottom--md">
<van-swipe-item v-for="(banner, index) in banners" :key="index"> <van-swipe-item v-for="(banner, index) in showingBanners" :key="index">
<img :src="banner.src" class="useraimg"/> <img :src="banner.src" class="useraimg"/>
</van-swipe-item> </van-swipe-item>
</van-swipe> </van-swipe>
<div class="online bold rc-md-down" id="fixed-catbar-seperator"></div> <div class="online bold rc-md-down" id="fixed-catbar-seperator"></div>
<!-- <div v-swiper:mySwiper="swiperOption" class="swiperWrap">
<div class="swiper-wrapper">
<div class="swiper-slide" v-for="(banner,index ) in banners" :key="index">
<img :src="banner.src">
</div>
</div>
<div class="swiper-pagination swiper-pagination-bullets"></div>
</div> -->
<div class="rc-max-width--xl"> <div class="rc-max-width--xl">
<div class="usermain"> <div class="usermain">
<div :class="searchBar?'rc-ma':'rc-ma searchBara'"> <div :class="searchBar?'rc-ma':'rc-ma searchBara'">
<div v-if="!searchBar" class="online bold rc-md-down"></div> <div v-if="!searchBar" class="online bold rc-md-down"></div>
<ul class="ul-zhuan rc-margin-y--xl"> <ul class="ul-zhuan rc-margin-y--md">
<li <li
v-for="(item, index) in discountlist" v-for="(item, index) in discountlist"
:key="index" :key="index"
@ -69,7 +61,7 @@
<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">
</video> </video>
</div> </div>
@ -304,7 +296,7 @@
<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">
</video> </video>
</div> </div>
@ -323,10 +315,12 @@
</div> </div>
</div> </div>
<div class="online bold" v-show="threemao"></div> <div class="online bold" v-show="threemao"></div>
<div class="selectionswitch rc-full-width rc-max-width--xl rc-padding-y--md" v-show="threemao" ref="doggshi"> <div class="selectionswitch rc-full-width rc-max-width--xl rc-padding-y--md" v-show="threemao" ref="doggshi">
<h2 class="rc-beta rc-text--center">全价犬湿粮</h2> <h2 class="rc-beta rc-text--center">全价犬湿粮</h2>
<van-tabs @change='userdog' class="van-tabs"> <van-tabs @change='userdog' class="van-tabs">
@ -707,11 +701,9 @@
</template> </template>
<script> <script>
let vm=null; let vm=null;
import $ from 'jquery'
import Myheader from "~/components/header.vue"; import Myheader from "~/components/header.vue";
import Myfooter from "~/components/rc-footer.vue"; import Myfooter from "~/components/rc-footer.vue";
import unlogin from "~/components/unlogin.vue"; import unlogin from "~/components/unlogin.vue";
import '@vant/touch-emulator';
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 {
@ -773,7 +765,6 @@ activeInde3:0,
selection:[ selection:[
{ {
title: "幼猫", title: "幼猫",
}, },
{ {
title: "成猫", title: "成猫",
@ -783,21 +774,24 @@ activeInde3:0,
}, },
{ {
title: "品种猫", title: "品种猫",
}, },
{ {
title: "亚健康", title: "亚健康",
}, },
], ],
banners:{
banners:[ 'mobile':[
{src:require("../assets/image/one.jpg"),link:""}, {src:"/images/banner/one.jpg",link:""},
{src:require("../assets/image/two.jpg"),link:""}, {src:"/images/banner/two.jpg",link:""},
{src:require("../assets/image/three.jpg"),link:""}, {src:"/images/banner/three.jpg",link:""},
{src:require("../assets/image/four.jpg"),link:""}, {src:"/images/banner/four.jpg",link:""}
], ],
'pc':[
{src:"/images/banner/pc-banner1.png",link:""},
{src:"/images/banner/pc-banner2.png",link:""}
]
},
showingBanners:[],
userdoglist: [ userdoglist: [
{ {
title: "小型犬", title: "小型犬",
@ -916,29 +910,29 @@ activeInde3:0,
catlistvideo: [ catlistvideo: [
{ {
title: "明星猫粮", title: "明星猫粮",
video:require("../assets/cat/one.mp4"), video:"/images/cat/one.mp4",
catimage: require("../assets/cat/one.jpg"), catimage: "/images/cat/one.jpg",
detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养', detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养',
price:'¥123.45', price:'¥123.45',
}, },
{ {
title: "猫湿粮", title: "猫湿粮",
video:require("../assets/cat/two.mp4"), video:"/images/cat/two.mp4",
catimage: require("../assets/cat/two.jpg"), catimage: "/images/cat/two.jpg",
detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养', detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养',
price:'¥123.45', price:'¥123.45',
}, },
{ {
title: "猫干粮", title: "猫干粮",
video:require("../assets/cat/three.mp4"), video:"/images/cat/three.mp4",
catimage: require("../assets/cat/three.jpg"), catimage: "/images/cat/three.jpg",
detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养', detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养',
price:'¥123.45', price:'¥123.45',
}, },
{ {
title: "猫干粮", title: "猫干粮",
video:require("../assets/cat/four.mp4"), video:"/images/cat/four.mp4",
catimage: require("../assets/cat/four.jpg"), catimage: "/images/cat/four.jpg",
detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养', detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养',
price:'¥123.45', price:'¥123.45',
}, },
@ -948,29 +942,29 @@ activeInde3:0,
doglistvideo: [ doglistvideo: [
{ {
title: "明星狗粮", title: "明星狗粮",
video:require("../assets/dog/one.mp4"), video:"/images/dog/one.mp4",
catimage: require("../assets/dog/one.jpg"), catimage: "/images/dog/one.jpg",
detail:'为10月龄及以上成犬量身打造的精准营养', detail:'为10月龄及以上成犬量身打造的精准营养',
price:'¥123.45', price:'¥123.45',
}, },
{ {
title: "狗湿粮", title: "狗湿粮",
video:require("../assets/dog/two.mp4"), video:"/images/dog/two.mp4",
catimage: require("../assets/dog/two.jpg"), catimage: "/images/dog/two.jpg",
detail:'为10月龄及以上英国成犬量身打造的精准营养', detail:'为10月龄及以上英国成犬量身打造的精准营养',
price:'¥123.45', price:'¥123.45',
}, },
{ {
title: "狗干粮", title: "狗干粮",
video:require("../assets/dog/three.mp4"), video:"/images/dog/three.mp4",
catimage: require("../assets/dog/three.jpg"), catimage: "/images/dog/three.jpg",
detail:'为10月龄及以上英国犬成犬量身打造的精准营养', detail:'为10月龄及以上英国犬成犬量身打造的精准营养',
price:'¥123.45', price:'¥123.45',
}, },
{ {
title: "狗干粮", title: "狗干粮",
video:require("../assets/dog/four.mp4"), video:"/images/dog/four.mp4",
catimage: require("../assets/dog/four.jpg"), catimage: "/images/dog/four.jpg",
detail:'为10月龄及以上英国成犬量身打造的精准营养', detail:'为10月龄及以上英国成犬量身打造的精准营养',
price:'¥123.45', price:'¥123.45',
}, },
@ -999,7 +993,6 @@ activeInde3:0,
title: "皇家英国短毛猫全价湿粮", title: "皇家英国短毛猫全价湿粮",
price:'¥123.45', price:'¥123.45',
ordernum: 1, ordernum: 1,
catimage: require("../assets/image/rc-cat.png"), catimage: require("../assets/image/rc-cat.png"),
}, },
@ -1065,12 +1058,12 @@ activeInde3:0,
}, },
on: { on: {
slideChange(Swiper) { slideChange(Swiper) {
console.log('onSlideChangeEnd',this); //console.log('onSlideChangeEnd',this);
// vm.ifadroind('','',this.realIndex); // vm.ifadroind('','',this.realIndex);
vm.useraindex=this.realIndex; vm.useraindex=this.realIndex;
}, },
tap() { tap() {
console.log('onTap', this); //console.log('onTap', this);
} }
// slideChange() { // slideChange() {
// console.log('onSlideChangeEnd', this); // console.log('onSlideChangeEnd', this);
@ -1090,20 +1083,14 @@ activeInde3:0,
}, },
created(){ created(){
vm=this; vm=this;
}, },
watch:{ watch:{
}, },
mounted(){ mounted(){
const that = this const that = this
this.ifAdoid() this.ifAdoid();
// window.onresize = () => {
// setTimeout(() => {
// this.ifAdoid()
// }, 500);
// }
this.usermessage= JSON.parse(localStorage.getItem("userInfo")); this.usermessage= JSON.parse(localStorage.getItem("userInfo"));
if(this.usermessage==null ||this.usermessage==undefined){ if(this.usermessage==null ||this.usermessage==undefined){
this.userunlogin=true this.userunlogin=true
} }
@ -1111,19 +1098,13 @@ vm=this;
this.userchufang();// this.userchufang();//
this.catmessage();// this.catmessage();//
this.dogmessage();// this.dogmessage();//
// this.usershi();//
// this.userhot();
}, },
destroyed () { destroyed () {
window.removeEventListener('scroll', this.scrollToTop); window.removeEventListener('scroll', this.scrollToTop);
}, },
methods:{ methods:{
ifAdoid(item,index){ ifAdoid(item,index){
console.log(index); //console.log(index);
this.userindex=index; this.userindex=index;
var sUserAgent = navigator.userAgent.toLowerCase(); var sUserAgent = navigator.userAgent.toLowerCase();
var bIsIpad = sUserAgent.match(/ipad/i) == "ipad"; var bIsIpad = sUserAgent.match(/ipad/i) == "ipad";
@ -1136,13 +1117,10 @@ vm=this;
var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile"; var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile";
if (!(bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM)) { if (!(bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM)) {
console.log("当前是电脑打开") //console.log("")
this.stypechange=false; this.stypechange=false;
console.log(this.usertitle) //console.log(this.usertitle)
// let catshiid=document.querySelectorAll('.selectionswitch');
// catshiid[this.userindex].style.display='none';
// catshiid[this.userindex].style.display='none';
this.catproduct=true; this.catproduct=true;
this.onemao=false; this.onemao=false;
this.twomao=false; this.twomao=false;
@ -1151,9 +1129,12 @@ vm=this;
this.fivemao=false; this.fivemao=false;
this.sixmao=false; this.sixmao=false;
this.dogshow=false this.dogshow=false
// console.log(catshiid); this.showingBanners=this.banners.pc;
}else{ }
console.log("当前是手机打开") else
{
//console.log("")
this.showingBanners=this.banners.mobile;
this.stypechange=true; this.stypechange=true;
this.onemao=true; this.onemao=true;
this.twomao=true; this.twomao=true;
@ -1168,7 +1149,7 @@ vm=this;
}, },
ifadroind(item,index,order){ ifadroind(item,index,order){
console.log(item,index,order); //console.log(item,index,order);
var sUserAgent = navigator.userAgent.toLowerCase(); var sUserAgent = navigator.userAgent.toLowerCase();
@ -1182,7 +1163,7 @@ vm=this;
var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile"; var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile";
if (!(bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM)) { if (!(bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM)) {
console.log("当前是电脑打开啊啊啊") //console.log("")
if(item.title=='明星猫粮'){ if(item.title=='明星猫粮'){
this.catproduct=true; this.catproduct=true;
this.twomao=false; this.twomao=false;
@ -1191,12 +1172,14 @@ vm=this;
this.fivemao=false; this.fivemao=false;
this.dogshow=false; this.dogshow=false;
this.sixmao=false; this.sixmao=false;
this.onemao=false; this.onemao=false;
} }
if(item.title=='猫湿粮'){ if(item.title=='猫湿粮'){
this.onemao=true; this.onemao=true;
this.dogshow=false; this.dogshow=false;
console.log(this.onemao); //console.log(this.onemao);
this.twomao=false; this.twomao=false;
this.threemao=false; this.threemao=false;
this.fourmao=false; this.fourmao=false;
@ -1260,11 +1243,11 @@ vm=this;
this.catfood=true; this.catfood=true;
// this.catproduct=false; // this.catproduct=false;
let userindex=index let userindex=index
console.log(item,index); //console.log(item,index);
let mingxin=document.querySelector('.pageFullScreen'); let mingxin=document.querySelector('.pageFullScreen');
let dogtop=document.querySelector('.oc-top'); let dogtop=document.querySelector('.oc-top');
console.log(dogtop); //console.log(dogtop);
console.log(mingxin.offsetTop); //console.log(mingxin.offsetTop);
if(item.title=='犬湿粮'||item.title=='犬干粮'||item.title=='处方用粮'){ if(item.title=='犬湿粮'||item.title=='犬干粮'||item.title=='处方用粮'){
userindex=userindex-2 userindex=userindex-2
}else{ }else{
@ -1286,8 +1269,7 @@ dogtop.scrollIntoView(true);
// this.catfood=false; // this.catfood=false;
// } // }
console.log("当前是手机打开") //console.log("")
} }
}, },
userdog(item,index){ userdog(item,index){
@ -1299,7 +1281,7 @@ dogtop.scrollIntoView(true);
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)){
this.userserachlist.push(petType) this.userserachlist.push(petType)
} }W
} }
this.dogmessage(this.userserachlist) this.dogmessage(this.userserachlist)
}, },
@ -1330,11 +1312,12 @@ dogtop.scrollIntoView(true);
}, },
handleScroll(e) handleScroll(e)
{ {
let fixedCatbarSeperator = document.getElementById("fixed-catbar-seperator");
if(!fixedCatbarSeperator)
{
return;
}
let scrolltop = document.documentElement.scrollTop || document.body.scrollTop; let scrolltop = document.documentElement.scrollTop || document.body.scrollTop;
let fixedCatbarSeperator = document.querySelector("#fixed-catbar-seperator");
// console.log(fixedCatbarSeperator.offsetTop,scrolltop);
if(fixedCatbarSeperator!=='null' &&fixedCatbarSeperator!=='underfined'){
console.log('-====');
if((scrolltop-fixedCatbarSeperator.offsetTop)>0) if((scrolltop-fixedCatbarSeperator.offsetTop)>0)
{ {
this.gotop = true this.gotop = true
@ -1493,18 +1476,17 @@ dogtop.scrollIntoView(true);
}, },
selectGoods(item,index){ selectGoods(item,index){
console.log(item,index); //console.log(item,index);
this.activeIndex=index; this.activeIndex=index;
console.log(item.title); //console.log(item.title);
this.ifadroind(item,index,this.useraindex) this.ifadroind(item,index,this.useraindex)
// this.ifAdoid(item,index); // this.ifAdoid(item,index);
}, },
quanshi(item,index){ quanshi(item,index){
console.log(item,index); //console.log(item,index);
this.activeIndex5=index this.activeIndex5=index
console.log(this.activeIndex5); //console.log(this.activeIndex5);
}, },
userdoghot(item,index){ userdoghot(item,index){
this.activeIndex6=index this.activeIndex6=index
@ -1514,7 +1496,6 @@ selectGo(item,index){
this.activeInde2=index; this.activeInde2=index;
}, },
selectGoo(item,index){ selectGoo(item,index){
this.activeInde3=index; this.activeInde3=index;
} }
}, },

View File

@ -1,7 +1,8 @@
<template> <template>
<div> <div>
<Myheader></Myheader> <Myheader></Myheader>
<div class="rc-top"></div>
<div class="rc-main rc-layout-container rc-max-width--lg">
<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">
@ -9,29 +10,23 @@
</li> </li>
</ul> </ul>
<ol> <ol>
<li v-for="(item,index) in usermessage" :key="index"> <li v-for="(item,index) in usermessage" :key="index">
<span>{{item.startDate}}</span> <span>{{item.startDate}}</span>
<em>{{item.changeValue}}</em> <em>{{item.changeValue}}</em>
<i>{{item.remark}}</i> <i>{{item.remark}}</i>
</li> </li>
</ol> </ol>
</div> </div>
<div class="rc-button">
<div class="rc-order">
<span>积分兑换</span>
</div>
</div> </div>
<Myfooter v-on:litentop='showmesg'></Myfooter>
</div> </div>
</template> </template>
<script> <script>
import Myheader from '~/components/header.vue' import Myheader from '~/components/header.vue'
import Myfooter from '~/components/rc-footer.vue'
import { memberAccount } from "../../ajax/getData"; import { memberAccount } from "../../ajax/getData";
export default { export default {
data(){ data(){
@ -108,6 +103,7 @@ export default {
}, },
components:{ components:{
Myheader, Myheader,
Myfooter
}, },
} }
@ -115,6 +111,4 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
@import url("../../assets/css/integral.less"); @import url("../../assets/css/integral.less");
</style> </style>

View File

@ -1,8 +1,8 @@
<template> <template>
<div> <div>
<Myheader></Myheader> <Myheader></Myheader>
<!-- <tabs></tabs> -->
<div class="rc-top"></div> <div class="rc-top"></div>
<tabs></tabs>
<div class="rc-layout-container rc-one-column rc-full-width ts-mypersonal"> <div class="rc-layout-container rc-one-column rc-full-width ts-mypersonal">
<div class="rc-column"> <div class="rc-column">
<!-- <div class="rc-title"> <!-- <div class="rc-title">
@ -47,9 +47,8 @@
<div class="rc-cordd"> <div class="rc-cordd">
<span>距离升级还差:</span> <span class="lackOfPoint">{{ rcvalue }}</span> <span>距离升级还差:</span> <span class="lackOfPoint">{{ rcvalue }}</span>
<div class="block"> <div class="block">
<div class="ts-point-tag rc-md-up"></div>
<div class="r-block" ref="userblock"></div> <div class="r-block" ref="userblock"></div>
<!-- <el-slider v-model="value" range show-stops :max="10"> </el-slider> -->
</div> </div>
<div class="rc-value"> <div class="rc-value">
<span>0</span> <span>0</span>
@ -129,7 +128,7 @@
<MyFooter></MyFooter>
</div> </div>
@ -138,6 +137,7 @@
<script> <script>
import Myheader from '~/components/header.vue' import Myheader from '~/components/header.vue'
import MyFooter from '~/components/rc-footer.vue'
import tabs from "@/components/tabs.vue"; import tabs from "@/components/tabs.vue";
export default { export default {
middleware: 'metaTitle', middleware: 'metaTitle',
@ -201,6 +201,7 @@ export default {
}, },
components: { components: {
Myheader, Myheader,
MyFooter,
tabs, tabs,
}, },
watch:{ watch:{
@ -312,7 +313,7 @@ obligation(item,index){
var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile"; var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile";
if (!(bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM)) { if (!(bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM)) {
console.log("当前是电脑打开") //console.log("")
if(this.userlog==true){ if(this.userlog==true){
this.usermessage='关注皇家爱宠荟,修改个人资料', this.usermessage='关注皇家爱宠荟,修改个人资料',
this.dialogInfo1=true; this.dialogInfo1=true;
@ -322,7 +323,7 @@ obligation(item,index){
} }
}else{ }else{
console.log("当前是手机打开") //console.log("")
this.dialogInfo1=false; this.dialogInfo1=false;
} }
}, },
@ -342,8 +343,7 @@ obligation(item,index){
this.$router.push({ this.$router.push({
path: `/useraddress/openaddress/` path: `/useraddress/openaddress/`
}) })
console.log('这是地址的跳转'); //console.log('');
} }
if(index==0){ if(index==0){
this.userlog=true this.userlog=true
@ -368,20 +368,18 @@ this.$router.push({
} }
}, },
mounted() { mounted() {
console.log(this.islogin) //console.log(this.islogin)
console.log(this.userid); //console.log(this.userid);
let userwidth=0; let userwidth=0;
this.ifadroind(); this.ifadroind();
let user= JSON.parse(localStorage.getItem("userInfo")); let user= JSON.parse(localStorage.getItem("userInfo"));
console.log(user) //console.log(user)
if(user!==null){ if(user!==null){
console.log('11') //console.log('11')
this.userid=user.data; this.userid=user.data;
console.log(this.userid); console.log(this.userid);
this.usertitle=this.userid.memberName; this.usertitle=this.userid.memberName;
this.rcrcord=this.userid.availiblePoint; this.rcrcord=this.userid.availiblePoint;
if(this.userid.memberLevel==1){ if(this.userid.memberLevel==1){
let userlength=this.userid.availiblePoint.toString().length; let userlength=this.userid.availiblePoint.toString().length;
this.userimage=require('../../assets/image/rc-new.png'); this.userimage=require('../../assets/image/rc-new.png');
@ -390,7 +388,7 @@ this.$router.push({
this.rcvalue=this.uservalue-this.userid.availiblePoint; // this.rcvalue=this.uservalue-this.userid.availiblePoint; //
if(userlength==1||userlength==2||userlength==3||userlength==4){ if(userlength==1||userlength==2||userlength==3||userlength==4){
userwidth=this.userid.availiblePoint/100 userwidth=this.userid.availiblePoint/100
console.log(userwidth); //console.log(userwidth);
} }
} }
else if(this.userid.memberLevel==2){ else if(this.userid.memberLevel==2){
@ -406,8 +404,15 @@ this.$router.push({
userwidth=100 userwidth=100
} }
this.$refs.userblock.style.width=userwidth+'%' this.$refs.userblock.style.width=userwidth+'%'
let tagEle=document.querySelector('.ts-point-tag');
if(tagEle){
tagEle.innerText=this.userid.availiblePoint;
let tagEleLeft=userwidth-1;
if(tagEleLeft<=0)
tagEleLeft=0;
tagEle.style.left=tagEleLeft+"%";
}
} else{ } else{
console.log('---');
this.userid=[]; this.userid=[];
} }
@ -415,8 +420,6 @@ this.$router.push({
console.log(this.userid) console.log(this.userid)
this.islogin=true; this.islogin=true;
} }
}, },

View File

@ -1,7 +1,6 @@
<template> <template>
<div> <div>
<Myheader></Myheader> <Myheader></Myheader>
<tabs></tabs>
<div class="online"></div> <div class="online"></div>
<div class="rc-main" v-for="(item,index) in goldmedal" :key="index" > <div class="rc-main" v-for="(item,index) in goldmedal" :key="index" >
<div class="rc-border"></div> <div class="rc-border"></div>
@ -105,10 +104,7 @@
<script> <script>
import Myheader from "~/components/header.vue"; import Myheader from "~/components/header.vue";
import { userin} from "../../ajax/getData"; import { userin} from "../../ajax/getData";
import tabs from "@/components/tabs.vue";
export default { export default {
middleware: 'metaTitle',
meta: {title: '订单结算'},
data() { data() {
return { return {
goldmedal:[], goldmedal:[],
@ -191,7 +187,6 @@ jiesuan(){
}, },
components: { components: {
Myheader, Myheader,
tabs
}, },
}; };
</script> </script>

View File

@ -1,7 +1,8 @@
<template> <template>
<div> <div>
<Myheader></Myheader> <Myheader></Myheader>
<div class="rc-header"> <div class="rc-top"></div>
<div class="rc-full-width rc-layout-container">
<div class="rc-main"> <div class="rc-main">
<div class="rc-headera"> <div class="rc-headera">
<span <span
@ -126,18 +127,30 @@ export default {
buttontitle:'立即支付', buttontitle:'立即支付',
userprice: "167.00", userprice: "167.00",
catimage: require("../../assets/image/rc-win.png"), catimage: require("../../assets/image/rc-win.png"),
orderDetailList:{
userlist:{
num:10,
pcs:10,
ecprice:167
}
}
}, },
{ {
ordernumber: "1111111111111111111", ordernumber: "1111111111111111111",
usereat: "每年4次免积分产品试吃", usereat: "每年4次免积分产品试吃",
ordernum: 0, ordernum: 0,
buttontitle:'再次购买', buttontitle:'再次购买',
catimage: require("../../assets/image/usereat.png"), catimage: require("../../assets/image/usereat.png"),
orderstype: 2, orderstype: 2,
userprice: "167.00", userprice: "167.00",
orderDetailList:{
userlist:{
num:10,
pcs:10,
ecprice:167
}
}
}, },
{ {
ordernumber: "1111111111111111111", ordernumber: "1111111111111111111",
@ -147,6 +160,13 @@ export default {
catimage: require("../../assets/image/usercar.png"), catimage: require("../../assets/image/usercar.png"),
orderstype: 3, orderstype: 3,
userprice: "167.00", userprice: "167.00",
orderDetailList:{
userlist:{
num:10,
pcs:10,
ecprice:167
}
}
}, },
{ {
ordernumber: "1111111111111111111", ordernumber: "1111111111111111111",
@ -163,6 +183,13 @@ export default {
catimage: require("../../assets/image/consult.png"), catimage: require("../../assets/image/consult.png"),
orderstype: 2, orderstype: 2,
userprice: "167.00", userprice: "167.00",
orderDetailList:{
userlist:{
num:10,
pcs:10,
ecprice:167
}
}
}, },
{ {
ordernumber: "1111111111111111111", ordernumber: "1111111111111111111",
@ -171,6 +198,13 @@ export default {
catimage: require("../../assets/image/rc-book.png"), catimage: require("../../assets/image/rc-book.png"),
orderstype: 3, orderstype: 3,
userprice: "167.00", userprice: "167.00",
orderDetailList:{
userlist:{
num:10,
pcs:10,
ecprice:100
}
}
}, },
{ {
ordernumber: "1111111111111111111", ordernumber: "1111111111111111111",
@ -179,6 +213,13 @@ export default {
catimage: require("../../assets/image/userself.png"), catimage: require("../../assets/image/userself.png"),
orderstype: 3, orderstype: 3,
userprice: "167.00", userprice: "167.00",
orderDetailList:{
userlist:{
num:10,
pcs:10,
ecprice:100
}
}
}, },
{ {
usereat: "每年积分兑换1次价值288元的免费体检及100元医院绝育券", usereat: "每年积分兑换1次价值288元的免费体检及100元医院绝育券",
@ -186,6 +227,13 @@ export default {
catimage: require("../../assets/image/rc-health.png"), catimage: require("../../assets/image/rc-health.png"),
orderstype: 3, orderstype: 3,
userprice: "167.00", userprice: "167.00",
orderDetailList:{
userlist:{
num:10,
pcs:10,
ecprice:100
}
}
}, },
], ],
}; };
@ -195,7 +243,6 @@ export default {
let user= JSON.parse(localStorage.getItem("userInfo")); let user= JSON.parse(localStorage.getItem("userInfo"));
this.userdata=user; this.userdata=user;
let stype=this.$route.query.stype let stype=this.$route.query.stype
if(user=='' ||user==null){ if(user=='' ||user==null){
this.$message({ this.$message({
type: 'warning', type: 'warning',
@ -205,8 +252,6 @@ export default {
}else{ }else{
this.indet(user.data.mobile,stype); this.indet(user.data.mobile,stype);
} }
}, },
components: { components: {
Myheader, Myheader,
@ -215,13 +260,12 @@ export default {
async indet(mobile,stype){ async indet(mobile,stype){
let data=await userindent(mobile,); let data=await userindent(mobile,);
this.activeIndex=stype; this.activeIndex=stype;
this.goldmedal=data; //this.goldmedal=data;
let list=[]; let list=[];
let fahuolist=[]; let fahuolist=[];
console.log(this.goldmedal); console.log(this.goldmedal);
for(let i=0;i<this.goldmedal.length;i++){ for(let i=0;i<this.goldmedal.length;i++){
list.push(this.goldmedal[i].orderDetailList); list.push(this.goldmedal[i].orderDetailList);
} }
}, },
@ -236,14 +280,12 @@ async canceldanhao(orderNumber){
}); });
this.indet(this.userdata.data.mobile); this.indet(this.userdata.data.mobile);
} }
}, },
userpay(item,index){ userpay(item,index){
console.log(item); console.log(item);
if(item.status==0){ if(item.status==0){
this.canceldanhao(item.orderNumber); this.canceldanhao(item.orderNumber);
} }
console.log(item.buttontitle); console.log(item.buttontitle);
if(item.buttontitle=='立即支付'){ if(item.buttontitle=='立即支付'){
@ -261,8 +303,6 @@ async canceldanhao(orderNumber){
}, },
}); });
} }
}, },
selectGoods(item, index) { selectGoods(item, index) {
this.activeIndex = index; this.activeIndex = index;
@ -299,360 +339,6 @@ async canceldanhao(orderNumber){
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import url("../../assets/css/global.less");
// @import url("../../assets/css/useraddress.less");
@media screen and(min-width: 320px) and(max-width:768px) {
.active {
font-size: 14px;
color: #e2001a;
cursor: pointer;
}
.unactive {
font-size: 14px;
color: #444444;
cursor: pointer;
}
.rc-header {
width: 100%;
.rc-main {
width: 92%;
margin: 0 auto;
.rc-usermaina{
width: 100%;
height: 100%;
}
.rc-headera {
display: flex;
justify-content: space-between;
height: 64px;
align-items: center;
}
.rc-userheader{
display: none;
}
.rc-center {
width: 100%;
height: 245px;
margin-top: 8px;
.rc-usermain {
.pc-bottom{
display: none;
}
display: flex;
.rc-image {
border: 1px solid #D8D8D8;
margin-top: 17px;
;
img {
width: 96px;
height: 96px;
display: block;
}
}
.rc-right {
.rc-userbottomm{
display: none;
}
display: flex;
flex-direction: column;
width: 100%;
margin-left: 16px;
justify-content: center;
em
{
font-style: normal;
display: block;
font-size: 16px;
margin-top: 18px;
font-weight: bold;
color: #E1001A;
}
}
.rc-userright {
display: flex;
flex-direction: column;
color: #666666;
font-size: 14px;
span{
display: block;
margin-top: 16px;
}
}
.rc-userbottom {
display: flex;
justify-content: space-between;
margin-top: 8px;
span{
color: #666666;
font-size: 14px;
}
i{
font-style: normal;
color: #E1001A;
font-size: 18px;
font-weight: bold;
}
}
}
.rc-bottom {
display: flex;
align-items: center;
justify-content: center;
margin-top: 24px;
span {
display: block;
width: 130px;
display: flex;
align-items: center;
line-height: 40px;
text-align: center;
color: #e2001a;
height: 40px;
border: 2px solid #e2001a;
justify-content: center;
border-radius: 30px;
font-weight: bold;
}
span:last-child{
margin-left: 15px;
}
}
}
.rc-title {
height: 52px;
display: flex;
align-items: center;
border-bottom: 1px solid #d8d8d8;
justify-content: space-between;
span{
font-size: 14px;
color: #999999;
margin-left: 8px;
}
em{
font-style: normal;
font-size: 14px;
color: #333333;
}
i{
font-style: normal;
font-size: 14px;
color: #333333;
}
.rc-usertitle strong{
display: none;
}
}
}
}
}
// /* 768px1920 *pc/
@media screen and (min-width: 768px) and (max-width: 1920px) {
.active {
font-size: 18px;
color: #e2001a;
cursor: pointer;
// margin-left: 40px;
}
.unactive {
font-size: 18px;
color: #444444;
cursor: pointer;
// margin-left: 80px;
}
.rc-header {
.rc-main {
width: 92%;
margin: 0 auto;
.rc-headera {
display: flex;
height: 64px;
align-items: center;
border: 1px solid #D7D7D7;
border-radius: 3px 3px 0px 0px;
font-size: 18px;
span:first-child{
margin-left: 40px;
}
span{
margin-left: 80px;
}
}
.rc-userheader{
width: 100%;
height: 64px;
background: #F6F6F6;
border: 1px solid #D7D7D7;
display: flex;
align-items: center;
justify-content: space-between;
font-size: 18px;
span:first-child{
margin-left: 173px;
}
span:last-child{
margin-right: 87px;
}
}
.rc-center {
width: 100%;
height: 220px;
border: 1px solid #D7D7D7;
.rc-usermain {
display: flex;
justify-content: space-between;
align-items: center;
height: 164px;
.rc-usercenter{
width: 25%;
em{
font-size: 18px;
}
}
.rc-image {
border: 1px solid #D8D8D8;
margin-left: 40px;
img {
width: 96px;
height: 96px;
display: block;
}
}
.rc-right {
.rc-userbottom{
display: none;
}
display: flex;
width: 100%;
margin-left: 16px;
em
{
font-style: normal;
font-weight: bold;
font-size: 16px;
margin-top: 18px;
color: #E1001A;
}
}
.rc-userright {
display: flex;
flex-direction: column;
color: #666666;
font-size: 16px;
span{
display: block;
margin-top: 6px;
}
}
.rc-userbottomm {
display: flex;
justify-content: space-between;
align-items: center;
width: 58%;
font-size: 20px;
color: #E1001A;
font-weight: bold;
i{
font-style: normal;
}
}
.pc-bottom {
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
margin-right: 40px;
span {
display: block;
width: 130px;
cursor: pointer;
display: flex;
align-items: center;
line-height: 40px;
font-weight: bold;
text-align: center;
color: #e2001a;
height: 40px;
border: 2px solid #e2001a;
justify-content: center;
border-radius: 30px;
}
span:last-child{
margin-top: 15px;
}
}
}
.rc-bottom {
display: none;
}
}
.rc-title {
height: 55px;
display: flex;
align-items: center;
border-bottom: 1px solid #d8d8d8;
justify-content: space-between;
span{
font-size: 16px;
color: #999999;
margin-left: 8px;
}
strong{
font-style: normal;
font-size: 16px;
color: #444444;
}
em{
font-style: normal;
font-size: 16px;
color: #333333;
}
i{
font-style: normal;
font-size: 16px;
margin-left: 40px;
color: #333333;
}
.rc-usertitle{
margin-right: 73px;
display: flex;
align-items: center;
em{
display: block;
margin-left: 8px;
}
}
}
}
}
}
</style> </style>

View File

@ -2,14 +2,11 @@
<div> <div>
<div class="user" v-for="(item,index) in newlist" :key="index"> <div class="user" v-for="(item,index) in newlist" :key="index">
<Myheader></Myheader> <Myheader></Myheader>
<div class="rc-top"></div>
<unlogin></unlogin> <unlogin></unlogin>
<tabs></tabs> <tabs></tabs>
<div class="online" id="fixed-catbar-seperator"></div> <div class="online" ></div>
<div class="rc-top"></div>
<div class="rc-usermain ts-product-detail rc-max-width--xl rc-layout-container rc-two-column rc-border-bottom rc-border-colour--brand4"> <div class="rc-usermain ts-product-detail rc-max-width--xl rc-layout-container rc-two-column rc-border-bottom rc-border-colour--brand4">
<!--
<magnifier v-bind:parentmsg="msg" ></magnifier>
-->
<div class="rc-column"> <div class="rc-column">
<div data-js-carousel="" data-image-gallery="true"> <div data-js-carousel="" data-image-gallery="true">
<div class="rc-carousel rc-carousel__gallery-image" data-zoom-container="328b2e5f-6904-4cac-9709-51ed18d2500f" data-zoom-factor="2"> <div class="rc-carousel rc-carousel__gallery-image" data-zoom-container="328b2e5f-6904-4cac-9709-51ed18d2500f" data-zoom-factor="2">
@ -47,14 +44,14 @@
</div> </div>
<div class="ts-product-header rc-column" id="328b2e5f-6904-4cac-9709-51ed18d2500f"> <div class="ts-product-header rc-column" id="328b2e5f-6904-4cac-9709-51ed18d2500f">
<div class="usermain"> <div class="usermain fixed-catbar-seperator">
<div class="online bold rc-md-down"></div> <div class="online bold rc-md-down"></div>
<div class="rc-main"> <div class="rc-main">
<div class="rc-title"> <div class="rc-title">
<h2>{{ item.productName }}</h2> <h2>{{ item.productName }}</h2>
</div> </div>
</div> </div>
<div class="online rc-md-down"></div> <div class="online rc-md-down" id="fixed-catbar-seperator"></div>
<div class="rc-main"> <div class="rc-main">
<div class="productdetails"> <div class="productdetails">
<div class="rc-productdetail"> <div class="rc-productdetail">
@ -223,7 +220,6 @@
<script> <script>
import Myheader from "~/components/header.vue"; import Myheader from "~/components/header.vue";
import magnifier from "@/components/magnifier.vue";
import tabs from "@/components/tabs.vue"; import tabs from "@/components/tabs.vue";
import unlogin from "~/components/unlogin.vue"; import unlogin from "~/components/unlogin.vue";
import { mapMutations } from "vuex"; import { mapMutations } from "vuex";
@ -320,7 +316,6 @@ export default {
components: { components: {
Myheader, Myheader,
tabs, tabs,
magnifier,
unlogin, unlogin,
Myfooter Myfooter
@ -334,19 +329,14 @@ this.usermessage= JSON.parse(localStorage.getItem("userInfo"));
console.log(this.productCode) console.log(this.productCode)
this.userquery(this.productCode); this.userquery(this.productCode);
console.log(this.userlistmenu) console.log(this.userlistmenu)
this.$nextTick(()=>{ this.$nextTick(()=>{})
})
if(stype==1){ if(stype==1){
this.userbuy=true; this.userbuy=true;
}else if(stype==2){ }else if(stype==2){
console.log('这是要消失的') console.log('这是要消失的')
this.$nextTick(() => { this.$nextTick(() => {
this.userbuy=false; this.userbuy=false;
}) })
} }
} }
@ -356,7 +346,11 @@ this.usermessage= JSON.parse(localStorage.getItem("userInfo"));
...mapMutations(["changemessage"]), ...mapMutations(["changemessage"]),
handleScroll(e) handleScroll(e)
{ {
let fixedCatbarSeperator = document.querySelector("#fixed-catbar-seperator"); let fixedCatbarSeperator = document.getElementById("fixed-catbar-seperator");
if(!fixedCatbarSeperator)
{
return;
}
let scrolltop = document.documentElement.scrollTop || document.body.scrollTop; let scrolltop = document.documentElement.scrollTop || document.body.scrollTop;
if(fixedCatbarSeperator!=='null' ){ if(fixedCatbarSeperator!=='null' ){
if((scrolltop-fixedCatbarSeperator.offsetTop)) if((scrolltop-fixedCatbarSeperator.offsetTop))
@ -552,13 +546,11 @@ if(this.usermessage.data!==''||this.usermessage.data!==undefined){
console.log(data); console.log(data);
}, },
usertanchu(item,orderm){ usertanchu(item,orderm){
let user= localStorage.getItem("userInfo"); let user= localStorage.getItem("userInfo");
if(user==undefined||user==null||user==''){ if(user==undefined||user==null||user==''){
this.dialogInfo2=true; this.dialogInfo2=true;
return return
}else{ }else{
this.courseId(item); this.courseId(item);
if(orderm==0){ if(orderm==0){
this.$message({ this.$message({
@ -572,12 +564,7 @@ usertanchu(item,orderm){
}); });
} }
} }
}, },
userget(){ userget(){

View File

@ -466,13 +466,27 @@ export default {
openclose(){ openclose(){
this.dialogInfo1=false; this.dialogInfo1=false;
}, },
selectproduce(){ selectproduce(item){
if(item.productList[0]==undefined){
item.productlist[0].productCode=0;
}
if(item.productList[0]==undefined){
item.productlist[0]=[];
}
this.$router.push({ this.$router.push({
path: "/productdetails/producted", path: "/productdetails/producted",
query: { query: {
stype: 1, stype: 1,
productCode:item.productList[0].productCode
}, },
}); });
// this.$router.push({
// path: "/productdetails/producted",
// query: {
// stype: 1,
// }
// });
}, },
ifadroind(){ ifadroind(){
var sUserAgent = navigator.userAgent.toLowerCase(); var sUserAgent = navigator.userAgent.toLowerCase();
@ -486,7 +500,7 @@ this.dialogInfo1=false;
var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile"; var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile";
if (!(bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM)) { if (!(bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM)) {
console.log("当前是电脑打开") //console.log("")
this.$nextTick(() => { this.$nextTick(() => {
this.isadrond=false; this.isadrond=false;
@ -498,7 +512,7 @@ this.dialogInfo1=false;
}else{ }else{
console.log("当前是手机打开") //console.log("")
this.$nextTick(() => { this.$nextTick(() => {
this.isadrond=true; this.isadrond=true;
@ -600,7 +614,6 @@ this.dialogInfo1=false;
this.userserachlist.push(categoryName) this.userserachlist.push(categoryName)
} }
} }
this.usersearch(this.userserachlist) this.usersearch(this.userserachlist)
}, },

View File

@ -1,8 +1,7 @@
// <!-- -->
<template> <template>
<div class="container rc-full-width"> <div class="container rc-full-width">
<Myheader></Myheader> <Myheader></Myheader>
<div class="rc-top"></div>
<div class="content ts-max-width--460"> <div class="content ts-max-width--460">
<h2 class="rc-beta rc-text--center">账号注册</h2> <h2 class="rc-beta rc-text--center">账号注册</h2>
@ -117,12 +116,12 @@ export default {
loading:false, loading:false,
usertitle:true, usertitle:true,
gender: '', gender: '',
inRank:false inRank:false,
ifpassword:false
}; };
}, },
components: { components: {
// Myheader, Myheader,
}, },
computed: { computed: {
usertel () { usertel () {
@ -143,19 +142,6 @@ export default {
return '' return ''
} }
}, },
// test () {
// if (this.sms === ""){
// return ''
// }else if(this.sms.length !== 5){
// return ''
// }else {
// return ''
// }
// }
},
components: {
}, },
mounted(){ mounted(){
}, },
@ -165,32 +151,26 @@ export default {
// //
async usermsg() { async usermsg() {
console.log("-----"); //console.log("-----");
let data = await sendMsg(this.tel); let data = await sendMsg(this.tel);
if(data){ if(data){
console.log(data); //console.log(data);
this.captchadata=data.msgNum; //this.captchadata=data.msgNum;
this.tamp=data.tamp; this.tamp=data.tamp;
this.hash=data.hash; this.hash=data.hash;
} }
}, },
//
async vadmsg() { async vadmsg() {
console.log("-----"); //console.log("-----");
let data = await vadatnmsg(this.captchadata,this.hash,this.tamp); let data = await vadatnmsg(this.sms,this.hash,this.tamp);
if(data){ if(data){
console.log(data); return data;
if(!data.code==1){
return false
} }
}
}, },
checkBox(){ checkBox(){
console.log(event.target.checked) //console.log(event.target.checked)
this.usercheckbox=event.target.checked this.usercheckbox=event.target.checked
}, },
@ -201,7 +181,7 @@ export default {
if(data){ if(data){
console.log(data); console.log(data);
} }
console.log(data); //console.log(data);
}, },
// //
sendCode () { sendCode () {
@ -242,13 +222,13 @@ export default {
return return
} }
if(this.sms!==this.captchadata){ // if(this.sms!==this.captchadata){
this.$message({ // this.$message({
type: 'warning', // type: 'warning',
message: '验证码输入有误请重新输入' // message: ''
}); // });
return // return
} // }
if(this.sms==''){ if(this.sms==''){
this.$message({ this.$message({
type: 'warning', type: 'warning',
@ -261,7 +241,7 @@ export default {
console.log('----'); console.log('----');
this.$message({ this.$message({
type: 'warning', type: 'warning',
message: '请先勾选' message: '请先同意隐私声明和账号使用协议'
}); });
if (!/^[1][3,4,5,7,8][0-9]{9}$/.test(this.tel) || this.tel === "") { if (!/^[1][3,4,5,7,8][0-9]{9}$/.test(this.tel) || this.tel === "") {
this.$message({ this.$message({
@ -273,30 +253,31 @@ export default {
} }
} }
else{ else{
//let user= JSON.parse(localStorage.getItem("userInfo"));
let data = await this.vadmsg();
let user= JSON.parse(localStorage.getItem("userInfo")); if(data.code=="1")
console.log(this.tel); {
let data=await useredit(this.tel); data=await useredit(this.tel);
this.vadmsg(); if(data.code=='1'){
let couponId='0000000123';
this.serdiscount(this.tel,couponId);
setTimeout(() => {
this.serdiscount(this.tel,"0000000140");
}, 100);
setTimeout(() => {
this.serdiscount(this.tel,"0000000122");
}, 500);
this.$router.push({
path: "/",
});
return;
}
}
this.$message({ this.$message({
type: 'warning', type: 'warning',
message: data.msg message: data.msg
}); });
if(data){
let couponId='0000000123';
this.serdiscount(user.data.mobile,couponId);
setTimeout(() => {
this.serdiscount(user.data.mobile,"0000000140");
}, 100);
setTimeout(() => {
this.serdiscount(user.data.mobile,"0000000122");
}, 500);
}
return return
} }

View File

@ -1,7 +1,7 @@
<template> <template>
<div class="container rc-full-width"> <div class="container rc-full-width">
<Myheader></Myheader> <Myheader></Myheader>
<div class="rc-top"></div>
<div class="content ts-max-width--460"> <div class="content ts-max-width--460">
<h2 class="rc-beta rc-text--center">{{ usertitle ? "账号登录" : "" }}</h2> <h2 class="rc-beta rc-text--center">{{ usertitle ? "账号登录" : "" }}</h2>
<!-- Deprecated : No tab switching as no password <!-- Deprecated : No tab switching as no password
@ -15,7 +15,6 @@
> >
</div> </div>
--> -->
<div class="rc-layout-container rc-one-column"> <div class="rc-layout-container rc-one-column">
<div class="rc-column"> <div class="rc-column">
<input <input
@ -146,7 +145,7 @@ export default {
swiperData: [ swiperData: [
// { index: 1 ,title:''}, // { index: 1 ,title:''},
// { index: 2 ,title:''}, // { index: 2 ,title:''},
], ]
}; };
}, },
components: { components: {
@ -181,10 +180,8 @@ export default {
} }
}, },
}, },
components: {},
mounted() { mounted() {
console.log(this.$route.params); //console.log(this.$route.params);
}, },
// watch: function () { // watch: function () {
// console.log(this.inRank); // console.log(this.inRank);
@ -195,16 +192,15 @@ export default {
checkBox(){ checkBox(){
console.log(event.target.checked) console.log(event.target.checked)
this.usercheckbox=event.target.checked this.usercheckbox=event.target.checked
}, },
// //
async usermsg() { async usermsg() {
console.log("-----"); //console.log("-----");
let data = await sendMsg(this.tel); let data = await sendMsg(this.tel);
if(data){ if(data){
console.log(data); console.log(data);
this.captchadata=data.msgNum; //this.captchadata=data.msgNum;
this.tamp=data.tamp; this.tamp=data.tamp;
this.hash=data.hash; this.hash=data.hash;
} }
@ -213,16 +209,11 @@ export default {
// //
async vadmsg() { async vadmsg() {
console.log("-----"); //console.log("-----");
let data = await vadatnmsg(this.captchadata,this.hash,this.tamp); let data = await vadatnmsg(this.sms,this.hash,this.tamp);
if(data){ if(data){
console.log(data.code); return data;
if(!data.code==1){
return false
} }
}
}, },
onClickHander(e) { onClickHander(e) {
console.log(e); console.log(e);
@ -239,7 +230,7 @@ export default {
}, },
// //
useredd() { useredd() {
console.log("---注册账户"); //console.log("---");
this.usertitle = false; this.usertitle = false;
}, },
@ -287,15 +278,6 @@ export default {
message: '手机号码输入有误' message: '手机号码输入有误'
}); });
return return
}
if(this.sms!==this.captchadata){
this.$message({
type: 'warning',
message: '验证码输入有误请重新输入'
});
return
} }
if(this.sms==''){ if(this.sms==''){
this.$message({ this.$message({
@ -304,12 +286,11 @@ export default {
}); });
return return
} }
console.log(this.usercheckbox);
if(this.usercheckbox==false){ if(this.usercheckbox==false){
console.log('----'); //console.log('----');
this.$message({ this.$message({
type: 'warning', type: 'warning',
message: '请先勾选' message: '请先同意隐私声明和账号使用协议'
}); });
if (!/^[1][3,4,5,7,8][0-9]{9}$/.test(this.tel) || this.tel === "") { if (!/^[1][3,4,5,7,8][0-9]{9}$/.test(this.tel) || this.tel === "") {
this.$message({ this.$message({
@ -321,61 +302,33 @@ export default {
} }
} }
else{ else{
console.log(this.tel); let data=await this.vadmsg();
let data = await userLongin(this.tel); if(data.code=="1")
console.log(data); {
this.vadmsg(); data = await userLongin(this.tel);
if(data.msg=='SUCCESS'){
this.$message({ this.$message({
type: 'warning', type: 'warning',
message: '登录成功' message: '登录成功'
}); });
if(data.msg=='SUCCESS'){
this.$router.push({ this.$router.push({
path: "/", path: "/",
}); });
let token=JSON.stringify(data); let token=JSON.stringify(data);
this.changeClod({ cloud: token }); this.changeClod({ cloud: token });
}else{ return;
}
}
this.$message({ this.$message({
type: 'warning', type: 'warning',
message: data.msg message: data.msg
}); });
}
return return
}},
}
},
// reallR () {
// this.zhud=true
// this.loading=true
// axios.post('https://www.daxunxun.com/users/register', {
// username: this.tel,
// password: this.password
// }).then(res=>{
// this.zhud=false
// this.loading=false
// if (res.data === 2) {
// Toast('')
// } else if (res.data === 0) {
// Toast('')
// } else {
// Toast('')
// }
// })
// }
}, },
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import url("../../assets/css/global.less");
@import url("../../assets/css/login.less"); @import url("../../assets/css/login.less");
</style> </style>

View File

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 85 KiB

View File

Before

Width:  |  Height:  |  Size: 170 KiB

After

Width:  |  Height:  |  Size: 170 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 117 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 136 KiB

View File

Before

Width:  |  Height:  |  Size: 1.0 MiB

After

Width:  |  Height:  |  Size: 1.0 MiB

View File

Before

Width:  |  Height:  |  Size: 286 KiB

After

Width:  |  Height:  |  Size: 286 KiB

View File

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

View File

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

View File

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 33 KiB

View File

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

View File

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

View File

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

View File

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 33 KiB

View File

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

View File

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

View File

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

View File

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View File

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

View File

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

View File

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

View File

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 33 KiB

View File

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB