Merge branch 'sit-Leung' of https://gitee.com/carl_Ming_1/smart-admin into sit-Leung

# Conflicts:
#	rc-busness/components/header.vue
#	rc-busness/pages/index.vue
This commit is contained in:
Vion 2022-01-17 18:18:25 +08:00
commit bea3c5faf7
59 changed files with 29582 additions and 951 deletions

View File

@ -165,6 +165,7 @@ 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,5 +1,4 @@
/*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,7 +154,6 @@ img, picture {
} }
li{ li{
border-radius: 100px; border-radius: 100px;
flex-shrink: 0;
} }
} }
.active{ .active{
@ -235,7 +233,6 @@ 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{
@ -282,7 +279,7 @@ img, picture {
width:100%; width:100%;
} }
.rc-top{ .rc-top{
margin-top: 90px; margin-top: 74px;
} }
.ts-right-arr { .ts-right-arr {
border-bottom:1px solid #E1001A; border-bottom:1px solid #E1001A;
@ -358,7 +355,7 @@ img, picture {
font-size:16px; font-size:16px;
} }
.rc-top{ .rc-top{
margin-top: 150px; margin-top: 124px;
} }
.ts-product-list{ .ts-product-list{
text-align: left; text-align: left;

View File

@ -175,10 +175,9 @@
height:auto; height:auto;
max-height: 15.68rem; max-height: 15.68rem;
display: block; display: block;
overflow:hidden;
video{ video{
width:100%; max-width:100%;
height:100%; max-height:100%;
} }
} }
} }
@ -315,11 +314,9 @@
border-width: 1px; border-width: 1px;
} }
} }
// .usermain{ // .usermain{
// display: none; // display: none;
// } // }
} }
@ -506,7 +503,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,17 +1,9 @@
.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;
@ -35,8 +27,12 @@ span{
} }
} }
.rc-usermain{ .rc-usermain{
width: 92%;
margin: 0 auto;
ul{ ul{
height: 4.375rem; height: 70px;
display: block;
border-bottom: 1px solid #D8D8D8; border-bottom: 1px solid #D8D8D8;
display: flex; display: flex;
align-items: center; align-items: center;
@ -47,15 +43,17 @@ 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;
position:absolute; margin-left: 5px;
top:0;
right:0;
} }
li:last-child:after{ li:last-child:after{
content:""; content:"";
@ -64,14 +62,16 @@ span{
} }
ol{ ol{
margin-top:1rem;
max-height:70vh;
li{ li{
font-style: normal; font-style: normal;
height: 2rem; display: block;
height: 32px;
margin-top: 16px;
display: flex; display: flex;
// justify-content: space-between;
align-items: center; align-items: center;
font-size: .875rem; color: #666666;
font-size: 14px;
text-align: center; text-align: center;
i{ i{
font-style: normal; font-style: normal;
@ -130,13 +130,16 @@ 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;
@ -147,20 +150,21 @@ span{
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;
font-size: 14px; font-size: 14px;

View File

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

View File

@ -8,9 +8,6 @@ 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{
@ -143,7 +140,6 @@ 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;
@ -253,15 +249,6 @@ 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;
} }
@ -379,25 +366,13 @@ 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,7 +41,8 @@ color: #333333;
} }
} }
.rc-main { .rc-main {
width: 92%;
margin: 0 auto;
.rc-userbottom{ .rc-userbottom{
display: none; display: none;
} }
@ -303,6 +304,8 @@ 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

@ -1,351 +0,0 @@
// 手机端
@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.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

View File

@ -101,6 +101,11 @@
<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>
@ -144,15 +149,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='/images/ico-weibo.png'> <img src="../assets/showimage/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='/images/ico-zhihu.png'> <img src="../assets/showimage/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='/images/ico-bilibili.png'> <img src="../assets/showimage/ico-bilibili.png">
</a> </a>
</p> </p>
</div> </div>
@ -171,7 +176,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="/images/qrcode-chanpin.jpg"> <img src="../assets/showimage/qrcode-chanpin.jpg">
<span> <span>
产品验证 产品验证
</span> </span>
@ -180,7 +185,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="/images/qrcode-aichong.jpg"> <img src="../assets/showimage/qrcode-aichong.jpg">
<span> <span>
皇家爱宠荟会员中心 皇家爱宠荟会员中心
</span> </span>
@ -188,7 +193,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="/images/qrcode-royal-elite.jpg"> <img src="../assets/showimage/qrcode-royal-elite.jpg">
<span class='rc-text-center'> <span class='rc-text-center'>
皇家兽医精英荟 皇家兽医精英荟
</span> </span>
@ -196,7 +201,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="/images/qrcode-douyin.jpg"> <img src="../assets/showimage/qrcode-douyin.jpg">
<span> <span>
皇家宠物食品抖音官方账号 皇家宠物食品抖音官方账号
</span> </span>

View File

@ -38,7 +38,6 @@ 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" }
@ -77,10 +76,8 @@ export default {
}, },
// Build Configuration: https://go.nuxtjs.dev/config-build // Build Configuration: https://go.nuxtjs.dev/config-build
build: { build: {
analyze: true, analyze: true, assetFilter: function(assetFilename) { return assetFilename.endsWith('.js'); }
assetFilter: function(assetFilename) {
return assetFilename.endsWith('.js');
}
}, },
// axios: { // axios: {
// proxy: true, // proxy: true,

28614
rc-busness/package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -16,17 +16,20 @@
}, },
"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",
"vuex-persistedstate": "^4.1.0", "vue-awesome-swiper": "^4.1.1",
"vue-awesome-swiper": "^4.1.1" "vuex-persistedstate": "^4.1.0"
}, },
"devDependencies": { "devDependencies": {
"@vant/area-data": "^1.1.5", "@vant/area-data": "^1.1.5",

View File

@ -1,33 +1,38 @@
<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">
{{item.title}} {{item.title}}
</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> </div>
<Myfooter v-on:litentop='showmesg'></Myfooter>
</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(){
return{ return{
@ -103,7 +108,6 @@ export default {
}, },
components:{ components:{
Myheader, Myheader,
Myfooter
}, },
} }
@ -111,4 +115,6 @@ 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,8 +47,9 @@
<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>
@ -128,7 +129,7 @@
<MyFooter></MyFooter>
</div> </div>
@ -137,7 +138,6 @@
<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,7 +201,6 @@ export default {
}, },
components: { components: {
Myheader, Myheader,
MyFooter,
tabs, tabs,
}, },
watch:{ watch:{
@ -313,7 +312,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;
@ -323,7 +322,7 @@ obligation(item,index){
} }
}else{ }else{
//console.log("") console.log("当前是手机打开")
this.dialogInfo1=false; this.dialogInfo1=false;
} }
}, },
@ -340,10 +339,11 @@ obligation(item,index){
}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
@ -368,18 +368,20 @@ obligation(item,index){
} }
}, },
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');
@ -388,7 +390,7 @@ obligation(item,index){
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){
@ -404,15 +406,8 @@ obligation(item,index){
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=[];
} }
@ -420,6 +415,8 @@ obligation(item,index){
console.log(this.userid) console.log(this.userid)
this.islogin=true; this.islogin=true;
} }
}, },

View File

@ -1,6 +1,7 @@
<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>
@ -103,8 +104,11 @@
<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:[],
@ -187,6 +191,7 @@ jiesuan(){
}, },
components: { components: {
Myheader, Myheader,
tabs
}, },
}; };
</script> </script>

View File

@ -1,8 +1,7 @@
<template> <template>
<div> <div>
<Myheader></Myheader> <Myheader></Myheader>
<div class="rc-top"></div> <div class="rc-header">
<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
@ -127,30 +126,18 @@ 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",
@ -160,13 +147,6 @@ 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",
@ -183,13 +163,6 @@ 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",
@ -198,13 +171,6 @@ 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",
@ -213,13 +179,6 @@ 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元医院绝育券",
@ -227,13 +186,6 @@ 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
}
}
}, },
], ],
}; };
@ -243,6 +195,7 @@ 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',
@ -252,25 +205,28 @@ export default {
}else{ }else{
this.indet(user.data.mobile,stype); this.indet(user.data.mobile,stype);
} }
}, },
components: { components: {
Myheader, Myheader,
}, },
methods: { methods: {
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);
} }
}, },
async canceldanhao(orderNumber){ async canceldanhao(orderNumber){
let data=await canceldanhao(orderNumber); let data=await canceldanhao(orderNumber);
console.log(data); console.log(data);
if(data){ if(data){
@ -280,12 +236,14 @@ export default {
}); });
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=='立即支付'){
@ -303,6 +261,8 @@ export default {
}, },
}); });
} }
}, },
selectGoods(item, index) { selectGoods(item, index) {
this.activeIndex = index; this.activeIndex = index;
@ -339,6 +299,360 @@ export default {
</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,11 +2,14 @@
<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" id="fixed-catbar-seperator"></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">
@ -44,14 +47,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 fixed-catbar-seperator"> <div class="usermain">
<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" id="fixed-catbar-seperator"></div> <div class="online rc-md-down"></div>
<div class="rc-main"> <div class="rc-main">
<div class="productdetails"> <div class="productdetails">
<div class="rc-productdetail"> <div class="rc-productdetail">
@ -220,6 +223,7 @@
<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";
@ -316,6 +320,7 @@ export default {
components: { components: {
Myheader, Myheader,
tabs, tabs,
magnifier,
unlogin, unlogin,
Myfooter Myfooter
@ -323,20 +328,25 @@ export default {
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){ 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;
}) })
} }
} }
@ -346,11 +356,7 @@ export default {
...mapMutations(["changemessage"]), ...mapMutations(["changemessage"]),
handleScroll(e) handleScroll(e)
{ {
let fixedCatbarSeperator = document.getElementById("fixed-catbar-seperator"); let fixedCatbarSeperator = document.querySelector("#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))
@ -546,11 +552,13 @@ 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({
@ -564,7 +572,12 @@ usertanchu(item,orderm){
}); });
} }
} }
}, },
userget(){ userget(){

View File

@ -464,29 +464,15 @@ export default {
}); });
}, },
openclose(){ openclose(){
this.dialogInfo1=false; this.dialogInfo1=false;
}, },
selectproduce(item){ selectproduce(){
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();
@ -500,7 +486,7 @@ export default {
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;
@ -512,7 +498,7 @@ export default {
}else{ }else{
//console.log("") console.log("当前是手机打开")
this.$nextTick(() => { this.$nextTick(() => {
this.isadrond=true; this.isadrond=true;
@ -614,6 +600,7 @@ export default {
this.userserachlist.push(categoryName) this.userserachlist.push(categoryName)
} }
} }
this.usersearch(this.userserachlist) this.usersearch(this.userserachlist)
}, },

View File

@ -1,7 +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">账号注册</h2> <h2 class="rc-beta rc-text--center">账号注册</h2>
@ -116,12 +117,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 () {
@ -142,6 +143,19 @@ export default {
return '' return ''
} }
}, },
// test () {
// if (this.sms === ""){
// return ''
// }else if(this.sms.length !== 5){
// return ''
// }else {
// return ''
// }
// }
},
components: {
}, },
mounted(){ mounted(){
}, },
@ -151,26 +165,32 @@ 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(){ checkBox(){
//console.log(event.target.checked) console.log(event.target.checked)
this.usercheckbox=event.target.checked this.usercheckbox=event.target.checked
}, },
@ -181,7 +201,7 @@ export default {
if(data){ if(data){
console.log(data); console.log(data);
} }
//console.log(data); console.log(data);
}, },
// //
sendCode () { sendCode () {
@ -222,13 +242,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',
@ -241,7 +261,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({
@ -253,31 +273,30 @@ export default {
} }
} }
else{ else{
//let user= JSON.parse(localStorage.getItem("userInfo"));
let data = await this.vadmsg();
if(data.code=="1") let user= JSON.parse(localStorage.getItem("userInfo"));
{ console.log(this.tel);
data=await useredit(this.tel); let data=await useredit(this.tel);
if(data.code=='1'){ this.vadmsg();
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,6 +15,7 @@
> >
</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
@ -145,7 +146,7 @@ export default {
swiperData: [ swiperData: [
// { index: 1 ,title:''}, // { index: 1 ,title:''},
// { index: 2 ,title:''}, // { index: 2 ,title:''},
] ],
}; };
}, },
components: { components: {
@ -180,8 +181,10 @@ 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);
@ -192,15 +195,16 @@ 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;
} }
@ -209,11 +213,16 @@ export default {
// //
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.code);
if(!data.code==1){
return false
} }
}
}, },
onClickHander(e) { onClickHander(e) {
console.log(e); console.log(e);
@ -230,7 +239,7 @@ export default {
}, },
// //
useredd() { useredd() {
//console.log("---"); console.log("---注册账户");
this.usertitle = false; this.usertitle = false;
}, },
@ -278,6 +287,15 @@ 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({
@ -286,11 +304,12 @@ 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({
@ -302,33 +321,61 @@ export default {
} }
} }
else{ else{
let data=await this.vadmsg(); console.log(this.tel);
if(data.code=="1") let data = await userLongin(this.tel);
{ console.log(data);
data = await userLongin(this.tel); this.vadmsg();
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 });
return; }else{
}
}
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

@ -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 {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 85 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 170 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 117 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 136 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 286 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB