mirror of
https://gitee.com/lab1024/smart-admin.git
synced 2025-10-02 02:06:38 +08:00
Login / Register flow done , index resources move to static
This commit is contained in:
Vion
parent
c5cabaa65f
commit
d15130723a
@ -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' )
|
||||||
|
|||||||
@ -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;
|
||||||
@ -235,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{
|
||||||
|
|||||||
@ -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%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -485,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;
|
||||||
|
|
||||||
|
|||||||
@ -1,13 +1,21 @@
|
|||||||
|
.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%;
|
||||||
height: 80px;
|
height: 80px;
|
||||||
background: #FFFFFF;
|
background: #FFFFFF;
|
||||||
box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1);
|
box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1);
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
margin-top: 12px;
|
margin-top: 12px;
|
||||||
|
|
||||||
.rc-order{
|
.rc-order{
|
||||||
width: 164px;
|
width: 164px;
|
||||||
@ -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;
|
content:"|";
|
||||||
// border: 1px solid red;
|
color: #707070;
|
||||||
// display: block;
|
position:absolute;
|
||||||
content:"|";
|
top:0;
|
||||||
color: #707070;
|
right:0;
|
||||||
margin-left: 5px;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
li:last-child:after{
|
li:last-child:after{
|
||||||
content:"";
|
content:"";
|
||||||
@ -62,31 +64,29 @@ 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;
|
||||||
display: block;
|
display: block;
|
||||||
width: 40%;
|
width: 40%;
|
||||||
}
|
}
|
||||||
span{
|
span{
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
display: block;
|
display: block;
|
||||||
width: 36%;
|
width: 36%;
|
||||||
}
|
}
|
||||||
em{
|
em{
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
display: block;
|
display: block;
|
||||||
width: 23%;
|
width: 23%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -130,16 +130,13 @@ 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;
|
||||||
border: 1px solid #D7D7D7;
|
border: 1px solid #D7D7D7;
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
border-radius: 3px 3px 0px 0px;
|
border-radius: 3px 3px 0px 0px;
|
||||||
display: block;
|
display: block;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
@ -150,21 +147,20 @@ 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;
|
||||||
// justify-content: space-between;
|
border-top:0;
|
||||||
|
//justify-content: space-between;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
color: #666666;
|
color: #666666;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
|
|||||||
@ -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;
|
||||||
|
|||||||
@ -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;
|
||||||
}
|
}
|
||||||
@ -362,17 +375,29 @@ ul li ol li em strong i {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
.block{
|
.block{
|
||||||
height: 8px;
|
height: 8px;
|
||||||
background: #D7D7D7;
|
background: #D7D7D7;
|
||||||
margin-top: 16px;
|
margin-top: 16px;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
.r-block{
|
position:relative;
|
||||||
width: 0%;
|
margin-top:3.32rem;
|
||||||
height: 100%;
|
.r-block{
|
||||||
background: #008900;
|
width: 0%;
|
||||||
}
|
height: 100%;
|
||||||
|
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;
|
||||||
|
|||||||
BIN
rc-busness/assets/image/ico-bilibili.png
Normal file
BIN
rc-busness/assets/image/ico-bilibili.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
BIN
rc-busness/assets/image/ico-weibo.png
Normal file
BIN
rc-busness/assets/image/ico-weibo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
BIN
rc-busness/assets/image/ico-zhihu.png
Normal file
BIN
rc-busness/assets/image/ico-zhihu.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
BIN
rc-busness/assets/image/img-pointBg.png
Normal file
BIN
rc-busness/assets/image/img-pointBg.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
@ -392,7 +392,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
|
||||||
@ -400,21 +400,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(){
|
||||||
|
|||||||
@ -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>
|
|
||||||
@ -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='#profiles/custom/royal_canin_profile/themes/royal_canin/images/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='#profiles/custom/royal_canin_profile/themes/royal_canin/images/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='#profiles/custom/royal_canin_profile/themes/royal_canin/images/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="#profiles/custom/royal_canin_profile/themes/royal_canin/images/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="#profiles/custom/royal_canin_profile/themes/royal_canin/images/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="#profiles/custom/royal_canin_profile/themes/royal_canin/images/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="#profiles/custom/royal_canin_profile/themes/royal_canin/images/qrcode-douyin.jpg">
|
<img src="/images/qrcode-douyin.jpg">
|
||||||
<span>
|
<span>
|
||||||
皇家宠物食品抖音官方账号
|
皇家宠物食品抖音官方账号
|
||||||
</span>
|
</span>
|
||||||
|
|||||||
@ -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,7 +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');
|
||||||
|
}
|
||||||
},
|
},
|
||||||
// axios: {
|
// axios: {
|
||||||
// proxy: true,
|
// proxy: true,
|
||||||
|
|||||||
28614
rc-busness/package-lock.json
generated
28614
rc-busness/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -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",
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -1,38 +1,33 @@
|
|||||||
<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">
|
||||||
|
<ul>
|
||||||
|
<li v-for="(item,index) in userrecord" :key="index">
|
||||||
|
{{item.title}}
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<ol>
|
||||||
|
<li v-for="(item,index) in usermessage" :key="index">
|
||||||
|
<span>{{item.startDate}}</span>
|
||||||
|
<em>{{item.changeValue}}</em>
|
||||||
|
<i>{{item.remark}}</i>
|
||||||
|
</li>
|
||||||
|
</ol>
|
||||||
|
|
||||||
<div class="rc-usermain ">
|
</div>
|
||||||
<ul>
|
|
||||||
<li v-for="(item,index) in userrecord" :key="index">
|
|
||||||
{{item.title}}
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
<ol>
|
|
||||||
|
|
||||||
<li v-for="(item,index) in usermessage" :key="index">
|
</div>
|
||||||
<span>{{item.startDate}}</span>
|
<Myfooter v-on:litentop='showmesg'></Myfooter>
|
||||||
<em>{{item.changeValue}}</em>
|
</div>
|
||||||
<i>{{item.remark}}</i>
|
|
||||||
|
|
||||||
</li>
|
|
||||||
</ol>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rc-button">
|
|
||||||
<div class="rc-order">
|
|
||||||
<span>积分兑换</span>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import Myheader from '~/components/header.vue'
|
import Myheader from '~/components/header.vue'
|
||||||
import { memberAccount } from "../../ajax/getData";
|
import Myfooter from '~/components/rc-footer.vue'
|
||||||
|
import { memberAccount } from "../../ajax/getData";
|
||||||
export default {
|
export default {
|
||||||
data(){
|
data(){
|
||||||
return{
|
return{
|
||||||
@ -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>
|
||||||
@ -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="r-block" ref="userblock"></div>
|
<div class="ts-point-tag rc-md-up"></div>
|
||||||
<!-- <el-slider v-model="value" range show-stops :max="10"> </el-slider> -->
|
<div class="r-block" ref="userblock"></div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="rc-value">
|
<div class="rc-value">
|
||||||
<span>0</span>
|
<span>0</span>
|
||||||
@ -129,7 +128,7 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<MyFooter></MyFooter>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
@ -137,7 +136,8 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<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',
|
||||||
@ -145,16 +145,16 @@ export default {
|
|||||||
meta: {title: '个人中心'},
|
meta: {title: '个人中心'},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
userlog:false,
|
userlog:false,
|
||||||
islogin:false,
|
islogin:false,
|
||||||
dialogInfo1:false,
|
dialogInfo1:false,
|
||||||
userid:null,
|
userid:null,
|
||||||
usertitle:'',
|
usertitle:'',
|
||||||
rcvalue:5000,
|
rcvalue:5000,
|
||||||
usermessage:'关注皇家爱宠荟，修改个人资料',
|
usermessage:'关注皇家爱宠荟，修改个人资料',
|
||||||
userimage:require("../../assets/image/rc-new.png"),
|
userimage:require("../../assets/image/rc-new.png"),
|
||||||
userlogin:'登录注册',
|
userlogin:'登录注册',
|
||||||
userorder: "新手铲屎官",
|
userorder: "新手铲屎官",
|
||||||
prefecture: [
|
prefecture: [
|
||||||
{
|
{
|
||||||
title: "待付款",
|
title: "待付款",
|
||||||
@ -199,10 +199,11 @@ export default {
|
|||||||
};
|
};
|
||||||
|
|
||||||
},
|
},
|
||||||
components: {
|
components: {
|
||||||
Myheader,
|
Myheader,
|
||||||
tabs,
|
MyFooter,
|
||||||
},
|
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;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -338,13 +339,12 @@ obligation(item,index){
|
|||||||
return
|
return
|
||||||
|
|
||||||
}else{
|
}else{
|
||||||
if(item.title=='收货地址'){
|
if(item.title=='收货地址'){
|
||||||
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
|
||||||
this.ifadroind();
|
this.ifadroind();
|
||||||
@ -368,55 +368,58 @@ 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){
|
||||||
|
let userlength=this.userid.availiblePoint.toString().length;
|
||||||
if(this.userid.memberLevel==1){
|
this.userimage=require('../../assets/image/rc-new.png');
|
||||||
let userlength=this.userid.availiblePoint.toString().length;
|
this.userorder='新手铲屎官';
|
||||||
this.userimage=require('../../assets/image/rc-new.png');
|
this.uservalue=5000; //新手总积分
|
||||||
this.userorder='新手铲屎官';
|
this.rcvalue=this.uservalue-this.userid.availiblePoint; //新手总积分减去本身的积分
|
||||||
this.uservalue=5000; //新手总积分
|
if(userlength==1||userlength==2||userlength==3||userlength==4){
|
||||||
this.rcvalue=this.uservalue-this.userid.availiblePoint; //新手总积分减去本身的积分
|
userwidth=this.userid.availiblePoint/100
|
||||||
if(userlength==1||userlength==2||userlength==3||userlength==4){
|
//console.log(userwidth);
|
||||||
userwidth=this.userid.availiblePoint/100
|
}
|
||||||
console.log(userwidth);
|
}
|
||||||
}
|
else if(this.userid.memberLevel==2){
|
||||||
}
|
this.userimage=require('../../assets/image/rc-new2.png');
|
||||||
else if(this.userid.memberLevel==2){
|
this.userorder='资深铲屎官';
|
||||||
this.userimage=require('../../assets/image/rc-new2.png');
|
this.uservalue=10000;
|
||||||
this.userorder='资深铲屎官';
|
this.rcvalue=this.uservalue-this.userid.availiblePoint;
|
||||||
this.uservalue=10000;
|
userwidth=this.userid.availiblePoint/100
|
||||||
this.rcvalue=this.uservalue-this.userid.availiblePoint;
|
}else if( this.userid.memberLevel==3){
|
||||||
userwidth=this.userid.availiblePoint/100
|
this.userimage=require('../../assets/image/rc-new1.png');
|
||||||
}else if( this.userid.memberLevel==3){
|
this.userorder='金牌铲屎官';
|
||||||
this.userimage=require('../../assets/image/rc-new1.png');
|
this.usrnewlist=this.goldmedal;
|
||||||
this.userorder='金牌铲屎官';
|
userwidth=100
|
||||||
this.usrnewlist=this.goldmedal;
|
}
|
||||||
userwidth=100
|
this.$refs.userblock.style.width=userwidth+'%'
|
||||||
}
|
let tagEle=document.querySelector('.ts-point-tag');
|
||||||
this.$refs.userblock.style.width=userwidth+'%'
|
if(tagEle){
|
||||||
} else{
|
tagEle.innerText=this.userid.availiblePoint;
|
||||||
console.log('---');
|
let tagEleLeft=userwidth-1;
|
||||||
|
if(tagEleLeft<=0)
|
||||||
|
tagEleLeft=0;
|
||||||
|
tagEle.style.left=tagEleLeft+"%";
|
||||||
|
}
|
||||||
|
} else{
|
||||||
this.userid=[];
|
this.userid=[];
|
||||||
}
|
}
|
||||||
|
|
||||||
if(this.userid==undefined ||this.userid==''||this.userid==null){
|
if(this.userid==undefined ||this.userid==''||this.userid==null){
|
||||||
console.log(this.userid)
|
console.log(this.userid)
|
||||||
this.islogin=true;
|
this.islogin=true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -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" ></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";
|
||||||
@ -236,24 +232,24 @@ export default {
|
|||||||
meta: {title: '产品详情'},
|
meta: {title: '产品详情'},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
tableLabelTest:[],
|
tableLabelTest:[],
|
||||||
userimage: require("../../assets/image/unused.png"),
|
userimage: require("../../assets/image/unused.png"),
|
||||||
activeIndexa:0,
|
activeIndexa:0,
|
||||||
gotop: false,
|
gotop: false,
|
||||||
dialogInfo1:false,
|
dialogInfo1:false,
|
||||||
name: [],
|
name: [],
|
||||||
userlist:[],
|
userlist:[],
|
||||||
drawlist:[],//用户可以领取的优惠券
|
drawlist:[],//用户可以领取的优惠券
|
||||||
alldraw:[],
|
alldraw:[],
|
||||||
userlistmenu:[],
|
userlistmenu:[],
|
||||||
msg:['11111111'],
|
msg:['11111111'],
|
||||||
parent_msg:['111'],
|
parent_msg:['111'],
|
||||||
usermessage:[],
|
usermessage:[],
|
||||||
dialogInfo2:false,
|
dialogInfo2:false,
|
||||||
productCode:'',//商品code
|
productCode:'',//商品code
|
||||||
productlist:[],
|
productlist:[],
|
||||||
userbuy:true,
|
userbuy:true,
|
||||||
sales_num:1,
|
sales_num:1,
|
||||||
usernewlist: [
|
usernewlist: [
|
||||||
{
|
{
|
||||||
price: "30",
|
price: "30",
|
||||||
@ -320,43 +316,41 @@ export default {
|
|||||||
components: {
|
components: {
|
||||||
Myheader,
|
Myheader,
|
||||||
tabs,
|
tabs,
|
||||||
magnifier,
|
|
||||||
unlogin,
|
unlogin,
|
||||||
Myfooter
|
Myfooter
|
||||||
|
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
window.addEventListener("scroll", this.handleScroll, true);
|
window.addEventListener("scroll", this.handleScroll, true);
|
||||||
if(this.usermessage!=='' ||this.usermessage.data!==undefined){
|
if(this.usermessage!=='' ||this.usermessage.data!==undefined){
|
||||||
this.usermessage= JSON.parse(localStorage.getItem("userInfo"));
|
this.usermessage= JSON.parse(localStorage.getItem("userInfo"));
|
||||||
let stype=this.$route.query.stype;
|
let stype=this.$route.query.stype;
|
||||||
this.productCode=this.$route.query.productCode;
|
this.productCode=this.$route.query.productCode;
|
||||||
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){
|
||||||
})
|
this.userbuy=true;
|
||||||
if(stype==1){
|
}else if(stype==2){
|
||||||
this.userbuy=true;
|
console.log('这是要消失的')
|
||||||
}else if(stype==2){
|
this.$nextTick(() => {
|
||||||
console.log('这是要消失的')
|
this.userbuy=false;
|
||||||
this.$nextTick(() => {
|
})
|
||||||
this.userbuy=false;
|
}
|
||||||
|
}
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
...mapMutations(["changemessage"]),
|
...mapMutations(["changemessage"]),
|
||||||
handleScroll(e)
|
handleScroll(e)
|
||||||
{
|
{
|
||||||
let fixedCatbarSeperator = document.getElementById("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((scrolltop-fixedCatbarSeperator.offsetTop))
|
if((scrolltop-fixedCatbarSeperator.offsetTop))
|
||||||
{
|
{
|
||||||
@ -549,32 +543,25 @@ 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");
|
||||||
|
if(user==undefined||user==null||user==''){
|
||||||
|
this.dialogInfo2=true;
|
||||||
|
return
|
||||||
|
}else{
|
||||||
|
this.courseId(item);
|
||||||
|
if(orderm==0){
|
||||||
|
this.$message({
|
||||||
|
type: 'warning',
|
||||||
|
message: '加入购物车成功'
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if(orderm==1){
|
||||||
|
this.$router.push({
|
||||||
|
path: "/myorder/userrecord",
|
||||||
|
|
||||||
let user= localStorage.getItem("userInfo");
|
});
|
||||||
if(user==undefined||user==null||user==''){
|
}
|
||||||
this.dialogInfo2=true;
|
}
|
||||||
return
|
|
||||||
}else{
|
|
||||||
|
|
||||||
this.courseId(item);
|
|
||||||
if(orderm==0){
|
|
||||||
this.$message({
|
|
||||||
type: 'warning',
|
|
||||||
message: '加入购物车成功'
|
|
||||||
});
|
|
||||||
}
|
|
||||||
if(orderm==1){
|
|
||||||
this.$router.push({
|
|
||||||
path: "/myorder/userrecord",
|
|
||||||
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
},
|
},
|
||||||
userget(){
|
userget(){
|
||||||
|
|
||||||
|
|||||||
@ -464,15 +464,29 @@ export default {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
openclose(){
|
openclose(){
|
||||||
this.dialogInfo1=false;
|
this.dialogInfo1=false;
|
||||||
},
|
},
|
||||||
selectproduce(){
|
selectproduce(item){
|
||||||
this.$router.push({
|
if(item.productList[0]==undefined){
|
||||||
path: "/productdetails/producted",
|
item.productlist[0].productCode=0;
|
||||||
query: {
|
}
|
||||||
stype: 1,
|
if(item.productList[0]==undefined){
|
||||||
},
|
item.productlist[0]=[];
|
||||||
});
|
}
|
||||||
|
this.$router.push({
|
||||||
|
path: "/productdetails/producted",
|
||||||
|
query: {
|
||||||
|
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;
|
||||||
@ -590,18 +604,17 @@ this.dialogInfo1=false;
|
|||||||
this.activeIndexe=index;
|
this.activeIndexe=index;
|
||||||
},
|
},
|
||||||
selectproduct(item, index){
|
selectproduct(item, index){
|
||||||
this.activeIndexb=index;
|
this.activeIndexb=index;
|
||||||
let categoryName={
|
let categoryName={
|
||||||
petType:this.activeIndex1,
|
petType:this.activeIndex1,
|
||||||
categoryName:item.tagName,
|
categoryName:item.tagName,
|
||||||
}
|
}
|
||||||
for(let i =0;i<this.userserachlist.length;i++){
|
for(let i =0;i<this.userserachlist.length;i++){
|
||||||
if(!this.userserachlist.includes(categoryName)){
|
if(!this.userserachlist.includes(categoryName)){
|
||||||
this.userserachlist.push(categoryName)
|
this.userserachlist.push(categoryName)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
this.usersearch(this.userserachlist)
|
||||||
this.usersearch(this.userserachlist)
|
|
||||||
},
|
},
|
||||||
|
|
||||||
//弹框的显示隐藏
|
//弹框的显示隐藏
|
||||||
|
|||||||
@ -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>
|
||||||
@ -50,7 +49,7 @@
|
|||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="rc-layout-container rc-one-column">
|
<div class="rc-layout-container rc-one-column">
|
||||||
<div class="usecheck rc-column rc-text--left">
|
<div class="usecheck rc-column rc-text--left">
|
||||||
<label>
|
<label>
|
||||||
@ -101,28 +100,28 @@ import Myheader from '~/components/header.vue' //引用头部公共组件
|
|||||||
export default {
|
export default {
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
phone:'',
|
phone:'',
|
||||||
layerMSg:'手机格式不对',
|
layerMSg:'手机格式不对',
|
||||||
tel:'',
|
tel:'',
|
||||||
password:'',
|
password:'',
|
||||||
captchadata:'',
|
captchadata:'',
|
||||||
tamp:'',
|
tamp:'',
|
||||||
hash:'',
|
hash:'',
|
||||||
sms:'',
|
sms:'',
|
||||||
buttonmsg:'获取验证码',
|
buttonmsg:'获取验证码',
|
||||||
flag:false,
|
flag:false,
|
||||||
adminCode:'',
|
adminCode:'',
|
||||||
zhud:false,
|
zhud:false,
|
||||||
usercheckbox:false,
|
usercheckbox:false,
|
||||||
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,20 +142,7 @@ export default {
|
|||||||
return ''
|
return ''
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// test () {
|
|
||||||
// if (this.sms === ""){
|
|
||||||
// return ''
|
|
||||||
// }else if(this.sms.length !== 5){
|
|
||||||
// return '验证码格式错误'
|
|
||||||
// }else {
|
|
||||||
// return ''
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
},
|
},
|
||||||
|
|
||||||
components: {
|
|
||||||
|
|
||||||
},
|
|
||||||
mounted(){
|
mounted(){
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -164,44 +150,38 @@ 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.sms,this.hash,this.tamp);
|
||||||
let data = await vadatnmsg(this.captchadata,this.hash,this.tamp);
|
if(data){
|
||||||
if(data){
|
return data;
|
||||||
console.log(data);
|
}
|
||||||
if(!data.code==1){
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
},
|
},
|
||||||
checkBox(){
|
|
||||||
console.log(event.target.checked)
|
checkBox(){
|
||||||
this.usercheckbox=event.target.checked
|
//console.log(event.target.checked)
|
||||||
|
this.usercheckbox=event.target.checked
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
//添加优惠券
|
//添加优惠券
|
||||||
async serdiscount (mobile,couponId) {
|
async serdiscount (mobile,couponId) {
|
||||||
let data = await inserdiscount(mobile,couponId);
|
let data = await inserdiscount(mobile,couponId);
|
||||||
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'){
|
||||||
this.$message({
|
let couponId='0000000123';
|
||||||
type: 'warning',
|
this.serdiscount(this.tel,couponId);
|
||||||
message: data.msg
|
setTimeout(() => {
|
||||||
});
|
this.serdiscount(this.tel,"0000000140");
|
||||||
if(data){
|
}, 100);
|
||||||
let couponId='0000000123';
|
setTimeout(() => {
|
||||||
this.serdiscount(user.data.mobile,couponId);
|
this.serdiscount(this.tel,"0000000122");
|
||||||
setTimeout(() => {
|
}, 500);
|
||||||
this.serdiscount(user.data.mobile,"0000000140");
|
this.$router.push({
|
||||||
}, 100);
|
path: "/",
|
||||||
setTimeout(() => {
|
});
|
||||||
this.serdiscount(user.data.mobile,"0000000122");
|
return;
|
||||||
}, 500);
|
}
|
||||||
|
}
|
||||||
}
|
this.$message({
|
||||||
|
type: 'warning',
|
||||||
return
|
message: data.msg
|
||||||
|
});
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
<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
|
||||||
<div class="rc-header">
|
<div class="rc-header">
|
||||||
@ -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
|
||||||
@ -29,23 +28,23 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- Deprecated : No tab switching as no password
|
<!-- Deprecated : No tab switching as no password
|
||||||
<input
|
<input
|
||||||
v-model="text"
|
v-model="text"
|
||||||
class="ts-standard-input ts-standard-input--two"
|
class="ts-standard-input ts-standard-input--two"
|
||||||
placeholder="请输入账号"
|
placeholder="请输入账号"
|
||||||
|
|
||||||
v-if="ifpassword"
|
v-if="ifpassword"
|
||||||
clearable
|
clearable
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<van-field
|
<van-field
|
||||||
v-model="password"
|
v-model="password"
|
||||||
type="password"
|
type="password"
|
||||||
placeholder="请输入密码"
|
placeholder="请输入密码"
|
||||||
|
|
||||||
v-if="ifpassword"
|
v-if="ifpassword"
|
||||||
clearable
|
clearable
|
||||||
/>
|
/>
|
||||||
-->
|
-->
|
||||||
<div class="rc-layout-container rc-two-column">
|
<div class="rc-layout-container rc-two-column">
|
||||||
<div class="rc-column">
|
<div class="rc-column">
|
||||||
@ -110,7 +109,7 @@
|
|||||||
<!-- <van-divider @click="toLogin">注册账户</van-divider> -->
|
<!-- <van-divider @click="toLogin">注册账户</van-divider> -->
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@ -146,11 +145,11 @@ export default {
|
|||||||
swiperData: [
|
swiperData: [
|
||||||
// { index: 1 ,title:'短信验证码登录'},
|
// { index: 1 ,title:'短信验证码登录'},
|
||||||
// { index: 2 ,title:'密码登录'},
|
// { index: 2 ,title:'密码登录'},
|
||||||
],
|
]
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
components: {
|
components: {
|
||||||
Myheader
|
Myheader
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
usertel() {
|
usertel() {
|
||||||
@ -181,48 +180,40 @@ 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);
|
||||||
// },
|
// },
|
||||||
methods: {
|
methods: {
|
||||||
|
|
||||||
...mapMutations(["changeClod"]),
|
...mapMutations(["changeClod"]),
|
||||||
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
//发送验证码数据
|
//发送验证码数据
|
||||||
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;
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -281,101 +272,63 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
async register() {
|
async register() {
|
||||||
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({
|
||||||
type: 'warning',
|
type: 'warning',
|
||||||
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({
|
||||||
type: 'warning',
|
type: 'warning',
|
||||||
message: '请输入验证码'
|
message: '请输入验证码'
|
||||||
});
|
});
|
||||||
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({
|
||||||
type: 'warning',
|
type: 'warning',
|
||||||
message: '手机号码输入有误'
|
message: '手机号码输入有误'
|
||||||
});
|
});
|
||||||
return
|
return
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else{
|
|
||||||
console.log(this.tel);
|
|
||||||
let data = await userLongin(this.tel);
|
|
||||||
console.log(data);
|
|
||||||
this.vadmsg();
|
|
||||||
|
|
||||||
|
|
||||||
this.$message({
|
}
|
||||||
type: 'warning',
|
|
||||||
message: '登录成功'
|
|
||||||
});
|
|
||||||
if(data.msg=='SUCCESS'){
|
|
||||||
this.$router.push({
|
|
||||||
path: "/",
|
|
||||||
|
|
||||||
});
|
|
||||||
let token=JSON.stringify(data);
|
|
||||||
this.changeClod({ cloud: token });
|
|
||||||
}else{
|
|
||||||
this.$message({
|
|
||||||
type: 'warning',
|
|
||||||
message: data.msg
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
else{
|
||||||
|
let data=await this.vadmsg();
|
||||||
|
if(data.code=="1")
|
||||||
|
{
|
||||||
|
data = await userLongin(this.tel);
|
||||||
|
if(data.msg=='SUCCESS'){
|
||||||
|
this.$message({
|
||||||
|
type: 'warning',
|
||||||
|
message: '登录成功'
|
||||||
|
});
|
||||||
|
this.$router.push({
|
||||||
|
path: "/",
|
||||||
|
});
|
||||||
|
let token=JSON.stringify(data);
|
||||||
|
this.changeClod({ cloud: token });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this.$message({
|
||||||
|
type: 'warning',
|
||||||
|
message: data.msg
|
||||||
|
});
|
||||||
|
|
||||||
|
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>
|
||||||
@ -210,7 +210,7 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import Myheader from '~/components/header.vue'
|
import Myheader from '~/components/header.vue'
|
||||||
import { biaome,userstype,searchchanpin } from "../../ajax/getData";
|
import { biaome,userstype,searchchanpin } from "../../ajax/getData";
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 85 KiB After Width: | Height: | Size: 85 KiB |
|
Before Width: | Height: | Size: 170 KiB After Width: | Height: | Size: 170 KiB |
|
Before Width: | Height: | Size: 117 KiB After Width: | Height: | Size: 117 KiB |
|
Before Width: | Height: | Size: 136 KiB After Width: | Height: | Size: 136 KiB |
|
Before Width: | Height: | Size: 1.0 MiB After Width: | Height: | Size: 1.0 MiB |
|
Before Width: | Height: | Size: 286 KiB After Width: | Height: | Size: 286 KiB |
|
Before Width: | Height: | Size: 39 KiB After Width: | Height: | Size: 39 KiB |
|
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 31 KiB |
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 33 KiB |
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 31 KiB |
|
Before Width: | Height: | Size: 39 KiB After Width: | Height: | Size: 39 KiB |
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 33 KiB |
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 39 KiB After Width: | Height: | Size: 39 KiB |
|
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 31 KiB |
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 33 KiB |
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB |
Loading…
Reference in New Issue
Block a user