diff --git a/rc-busness/ajax/getData.js b/rc-busness/ajax/getData.js
index 9960ffe7..b1cfa7e2 100644
--- a/rc-busness/ajax/getData.js
+++ b/rc-busness/ajax/getData.js
@@ -165,7 +165,6 @@ export const useredit = (mobile, pet,address) => {
storeCode:'',
remark:'',
memberMark:'',
-
remark:''
}
return fetch('member?type=add', data, 'POST' )
diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less
index 4d52e87b..08663b1b 100644
--- a/rc-busness/assets/css/global.less
+++ b/rc-busness/assets/css/global.less
@@ -1,4 +1,5 @@
/*Body*/
+html,body{height:100%;}
body{
font-family: DINPro,'PingFang SC',miui,'Hiragino Sans GB','Microsoft Yahei',sans-serif;
line-height: 1.5;
@@ -155,6 +156,7 @@ img, picture {
}
li{
border-radius: 100px;
+ flex-shrink: 0;
}
}
.active{
@@ -234,6 +236,7 @@ img, picture {
max-width: 460px;
margin-left: auto!important;
margin-right: auto!important;
+ box-shadow:unset;
}
.ts-standard-input{
@@ -280,7 +283,7 @@ img, picture {
width:100%;
}
.rc-top{
- margin-top: 74px;
+ margin-top: 90px;
}
.rc-list__header {
background: none;
@@ -361,7 +364,7 @@ img, picture {
font-size:16px;
}
.rc-top{
- margin-top: 124px;
+ margin-top: 150px;
}
.ts-product-list{
text-align: left;
diff --git a/rc-busness/assets/css/index.less b/rc-busness/assets/css/index.less
index b4d1b764..89728579 100644
--- a/rc-busness/assets/css/index.less
+++ b/rc-busness/assets/css/index.less
@@ -147,9 +147,10 @@
height:auto;
max-height: 15.68rem;
display: block;
+ overflow:hidden;
video{
- max-width:100%;
- max-height:100%;
+ width:100%;
+ height:100%;
}
}
}
@@ -290,9 +291,11 @@
color: #444444;
border: 1px solid #D7D7D7;
}
+
// .usermain{
// display: none;
// }
+
}
@@ -483,7 +486,7 @@ img{
.rc-ma
{
.rc-margin-y--xl{
- margin-bottom: 1.88rem;
+ //margin-bottom: 1.88rem;
}
// padding:60px 0;
diff --git a/rc-busness/assets/css/integral.less b/rc-busness/assets/css/integral.less
index e461175d..6f85a29b 100644
--- a/rc-busness/assets/css/integral.less
+++ b/rc-busness/assets/css/integral.less
@@ -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){
.rc-button{
- width: 100%;
- height: 80px;
- background: #FFFFFF;
-box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1);
- display: flex;
- align-items: center;
- justify-content: center;
- margin-top: 12px;
+ width: 100%;
+ height: 80px;
+ background: #FFFFFF;
+ box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-top: 12px;
.rc-order{
width: 164px;
@@ -27,12 +35,8 @@ span{
}
}
.rc-usermain{
- width: 92%;
- margin: 0 auto;
-
ul{
- height: 70px;
- display: block;
+ height: 4.375rem;
border-bottom: 1px solid #D8D8D8;
display: flex;
align-items: center;
@@ -43,17 +47,15 @@ span{
li{
float: left;
width: 30%;
-
-
+ position:relative;
+ padding-right:.625rem;
}
li:after{
- // height: 2px;
- // border: 1px solid red;
- // display: block;
- content:"|";
- color: #707070;
- margin-left: 5px;
-
+ content:"|";
+ color: #707070;
+ position:absolute;
+ top:0;
+ right:0;
}
li:last-child:after{
content:"";
@@ -62,31 +64,29 @@ span{
}
ol{
+ margin-top:1rem;
+ max-height:70vh;
li{
font-style: normal;
- display: block;
- height: 32px;
- margin-top: 16px;
+ height: 2rem;
display: flex;
- // justify-content: space-between;
align-items: center;
- color: #666666;
- font-size: 14px;
+ font-size: .875rem;
text-align: center;
i{
- font-style: normal;
- display: block;
- width: 40%;
+ font-style: normal;
+ display: block;
+ width: 40%;
}
span{
- font-style: normal;
- display: block;
- width: 36%;
+ font-style: normal;
+ display: block;
+ width: 36%;
}
em{
- font-style: normal;
- display: block;
- width: 23%;
+ font-style: normal;
+ display: block;
+ width: 23%;
}
@@ -130,16 +130,13 @@ span{
}
}
.rc-usermain{
- width: 92%;
- margin: 0 auto;
margin-top: 60px;
-
ul{
height: 64px;
-background: #F6F6F6;
-border: 1px solid #D7D7D7;
-opacity: 1;
-border-radius: 3px 3px 0px 0px;
+ background: #F6F6F6;
+ border: 1px solid #D7D7D7;
+ opacity: 1;
+ border-radius: 3px 3px 0px 0px;
display: block;
display: flex;
align-items: center;
@@ -150,21 +147,20 @@ border-radius: 3px 3px 0px 0px;
li{
float: left;
width: 42%;
-
-
}
}
ol{
+ max-height:37.5rem;
li{
font-style: normal;
display: block;
height: 48px;
- margin-top: 16px;
display: flex;
border: 1px solid #D7D7D7;
- // justify-content: space-between;
+ border-top:0;
+ //justify-content: space-between;
align-items: center;
color: #666666;
font-size: 14px;
diff --git a/rc-busness/assets/css/login.less b/rc-busness/assets/css/login.less
index 8ba135c4..ff06a645 100644
--- a/rc-busness/assets/css/login.less
+++ b/rc-busness/assets/css/login.less
@@ -1,7 +1,9 @@
.container{
- min-height:80vh;
height:100%;
- background-color:#f6f6f6;
+ display:flex;
+ flex-direction: column;
+ align-items: center;
+ //background-color:#f6f6f6;
}
.ts-max-width--460{
border-radius: 3px;
@@ -139,7 +141,7 @@
}
}
// /* 最小768px最大1920 *pc端/
-@media screen and (min-width: 768px) and (max-width: 1920px) {
+@media screen and (min-width: 769px) {
.usecheck{
display: flex;
text-align: left;
diff --git a/rc-busness/assets/css/mypersonal.less b/rc-busness/assets/css/mypersonal.less
index d96f6826..c6b24d05 100644
--- a/rc-busness/assets/css/mypersonal.less
+++ b/rc-busness/assets/css/mypersonal.less
@@ -8,6 +8,9 @@ ul li ol li em strong i {
.rc-center{
overflow:hidden;
}
+.r-block{
+ border-radius:.25rem;
+}
//手机端
@media screen and (max-width: 768px) {
.ts-mypersonal{
@@ -140,6 +143,7 @@ ul li ol li em strong i {
}
.rc-cordd{
color:#666666;
+ position:relative;
span{
display: inline-block;
margin-top: 16px;
@@ -249,6 +253,15 @@ ul li ol li em strong i {
width: 440px;
height: 652px;
}
+
+.ts-mypersonal{
+ margin-left:0;
+ .rc-column{
+ padding-left:0;
+ padding-right:0;
+ }
+}
+
.online{
margin:40px auto;
}
@@ -362,17 +375,29 @@ ul li ol li em strong i {
}
}
.block{
- height: 8px;
- background: #D7D7D7;
- margin-top: 16px;
- border-radius: 4px;
- .r-block{
- width: 0%;
- height: 100%;
- background: #008900;
- }
-
-
+ height: 8px;
+ background: #D7D7D7;
+ margin-top: 16px;
+ border-radius: 4px;
+ position:relative;
+ margin-top:3.32rem;
+ .r-block{
+ 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{
display: flex;
diff --git a/rc-busness/assets/css/settlement.less b/rc-busness/assets/css/settlement.less
index 12826929..99e0c647 100644
--- a/rc-busness/assets/css/settlement.less
+++ b/rc-busness/assets/css/settlement.less
@@ -41,8 +41,7 @@ color: #333333;
}
}
.rc-main {
- width: 92%;
- margin: 0 auto;
+
.rc-userbottom{
display: none;
}
@@ -304,8 +303,6 @@ color: #333333;
@media screen and (min-width: 768px) and (max-width: 1920px) {
.rc-main {
- width: 92%;
- margin: 0 auto;
.rc-userbottomm{
display: none;
}
diff --git a/rc-busness/assets/css/useraddress.less b/rc-busness/assets/css/useraddress.less
new file mode 100644
index 00000000..851f74d6
--- /dev/null
+++ b/rc-busness/assets/css/useraddress.less
@@ -0,0 +1,351 @@
+
+// 手机端
+@media screen and(min-width: 320px) and(max-width:768px) {
+ .active {
+ font-size: 14px;
+ color: #e2001a;
+ cursor: pointer;
+}
+.unactive {
+ font-size: 14px;
+ color: #444444;
+ cursor: pointer;
+}
+ .rc-layout-container {
+
+
+ width: 100%;
+ .rc-main {
+ .rc-usermaina{
+ width: 100%;
+ height: 100%;
+ }
+ .rc-headera {
+ display: flex;
+ justify-content: space-between;
+ height: 64px;
+ align-items: center;
+ }
+ .rc-userheader{
+ display: none;
+ }
+
+ .rc-center {
+ width: 100%;
+ height: 245px;
+ margin-top: 8px;
+ .rc-usermain {
+ .pc-bottom{
+ display: none;
+ }
+
+ display: flex;
+ .rc-image {
+ border: 1px solid #D8D8D8;
+ margin-top: 17px;
+;
+ img {
+ width: 96px;
+ height: 96px;
+ display: block;
+
+ }
+ }
+
+ .rc-right {
+
+ .rc-userbottomm{
+ display: none;
+ }
+ display: flex;
+ flex-direction: column;
+ width: 100%;
+ margin-left: 16px;
+ justify-content: center;
+ em
+ {
+ font-style: normal;
+ display: block;
+ font-size: 16px;
+ margin-top: 18px;
+ font-weight: bold;
+
+color: #E1001A;
+ }
+ }
+ .rc-userright {
+ display: flex;
+ flex-direction: column;
+ color: #666666;
+ font-size: 14px;
+ span{
+ display: block;
+ margin-top: 16px;
+ }
+ }
+ .rc-userbottom {
+ display: flex;
+ justify-content: space-between;
+ margin-top: 8px;
+ span{
+ color: #666666;
+ font-size: 14px;
+ }
+ i{
+ font-style: normal;
+ color: #E1001A;
+ font-size: 18px;
+ font-weight: bold;
+ }
+ }
+ }
+
+ .rc-bottom {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-top: 24px;
+ span {
+ display: block;
+ width: 130px;
+ display: flex;
+ align-items: center;
+ line-height: 40px;
+ text-align: center;
+ color: #e2001a;
+ height: 40px;
+ border: 2px solid #e2001a;
+ justify-content: center;
+ border-radius: 30px;
+ font-weight: bold;
+ }
+ span:last-child{
+ margin-left: 15px;
+ }
+ }
+ }
+
+ .rc-title {
+ height: 52px;
+ display: flex;
+ align-items: center;
+ border-bottom: 1px solid #d8d8d8;
+ justify-content: space-between;
+ span{
+ font-size: 14px;
+ color: #999999;
+ margin-left: 8px;
+ }
+ em{
+ font-style: normal;
+ font-size: 14px;
+
+color: #333333;
+ }
+ i{
+ font-style: normal;
+ font-size: 14px;
+
+color: #333333;
+ }
+ .rc-usertitle strong{
+ display: none;
+ }
+ }
+ }
+ }
+}
+// /* 最小768px最大1920 *pc端/
+@media screen and (min-width: 768px) and (max-width: 1920px) {
+ .active {
+ font-size: 18px;
+ color: #e2001a;
+ cursor: pointer;
+ // margin-left: 40px;
+}
+.unactive {
+ font-size: 18px;
+ color: #444444;
+ cursor: pointer;
+ // margin-left: 80px;
+}
+ .rc-layout-container {
+ .rc-main {
+ .rc-headera {
+ display: flex;
+ height: 64px;
+ align-items: center;
+ border: 1px solid #D7D7D7;
+ border-radius: 3px 3px 0px 0px;
+ font-size: 18px;
+ span:first-child{
+ margin-left: 40px;
+ }
+ span{
+ margin-left: 80px;
+ }
+ }
+
+ .rc-userheader{
+ width: 100%;
+ height: 64px;
+ background: #F6F6F6;
+ border: 1px solid #D7D7D7;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ font-size: 18px;
+ span:first-child{
+ margin-left: 173px;
+ }
+ span:last-child{
+ margin-right: 87px;
+ }
+ }
+
+ .rc-center {
+ width: 100%;
+ height: 220px;
+ border: 1px solid #D7D7D7;
+ .rc-usermain {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ height: 164px;
+ .rc-usercenter{
+ width: 25%;
+ em{
+ font-size: 18px;
+ }
+ }
+ .rc-image {
+ border: 1px solid #D8D8D8;
+ margin-left: 40px;
+
+ img {
+ width: 96px;
+ height: 96px;
+ display: block;
+
+ }
+ }
+
+ .rc-right {
+ .rc-userbottom{
+ display: none;
+ }
+ display: flex;
+
+ width: 100%;
+ margin-left: 16px;
+
+ em
+ {
+ font-style: normal;
+ font-weight: bold;
+ font-size: 16px;
+ margin-top: 18px;
+
+color: #E1001A;
+ }
+ }
+ .rc-userright {
+ display: flex;
+ flex-direction: column;
+ color: #666666;
+ font-size: 16px;
+ span{
+ display: block;
+ margin-top: 6px;
+ }
+ }
+ .rc-userbottomm {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ width: 58%;
+ font-size: 20px;
+ color: #E1001A;
+ font-weight: bold;
+ i{
+ font-style: normal;
+
+
+ }
+ }
+
+ .pc-bottom {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-direction: column;
+ margin-right: 40px;
+
+ span {
+ display: block;
+ width: 130px;
+ cursor: pointer;
+ display: flex;
+ align-items: center;
+ line-height: 40px;
+ font-weight: bold;
+ text-align: center;
+ color: #e2001a;
+ height: 40px;
+ border: 2px solid #e2001a;
+ justify-content: center;
+ border-radius: 30px;
+ }
+ span:last-child{
+ margin-top: 15px;
+ }
+ }
+ }
+
+ .rc-bottom {
+ display: none;
+ }
+ }
+
+ .rc-title {
+ height: 55px;
+ display: flex;
+ align-items: center;
+ border-bottom: 1px solid #d8d8d8;
+ justify-content: space-between;
+ span{
+ font-size: 16px;
+ color: #999999;
+ margin-left: 8px;
+ }
+ strong{
+ font-style: normal;
+ font-size: 16px;
+ color: #444444;
+ }
+ em{
+ font-style: normal;
+ font-size: 16px;
+
+color: #333333;
+ }
+ i{
+ font-style: normal;
+ font-size: 16px;
+ margin-left: 40px;
+
+color: #333333;
+ }
+ .rc-usertitle{
+ margin-right: 73px;
+ display: flex;
+ align-items: center;
+ em{
+ display: block;
+ margin-left: 8px;
+ }
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/rc-busness/assets/image/ico-bilibili.png b/rc-busness/assets/image/ico-bilibili.png
new file mode 100644
index 00000000..6f640fa5
Binary files /dev/null and b/rc-busness/assets/image/ico-bilibili.png differ
diff --git a/rc-busness/assets/image/ico-weibo.png b/rc-busness/assets/image/ico-weibo.png
new file mode 100644
index 00000000..0aa2108b
Binary files /dev/null and b/rc-busness/assets/image/ico-weibo.png differ
diff --git a/rc-busness/assets/image/ico-zhihu.png b/rc-busness/assets/image/ico-zhihu.png
new file mode 100644
index 00000000..c5045369
Binary files /dev/null and b/rc-busness/assets/image/ico-zhihu.png differ
diff --git a/rc-busness/assets/image/img-pointBg.png b/rc-busness/assets/image/img-pointBg.png
new file mode 100644
index 00000000..beffc900
Binary files /dev/null and b/rc-busness/assets/image/img-pointBg.png differ
diff --git a/rc-busness/components/header.vue b/rc-busness/components/header.vue
index 0cbbca9e..14ef436a 100644
--- a/rc-busness/components/header.vue
+++ b/rc-busness/components/header.vue
@@ -393,7 +393,7 @@ export default {
mounted() {
//判断用户有无登录显示红点
let usernot=JSON.parse(localStorage.getItem("userInfo"));
- console.log(usernot);
+ //console.log(usernot);
if(usernot==null ||usernot==undefined){
console.log(usernot);
this.loginornot=true
@@ -401,21 +401,19 @@ export default {
this.loginornot=false
this.usermessage=usernot;
}
- console.log(this.loginornot);
+ //console.log(this.loginornot);
},
methods: {
bindTracking: function(){
- console.log('bindTracking');
+ //console.log('bindTracking');
},
//
//跳转搜索
searchturn(){
- this.$router.push({ name: "usersearch-search",
-
- })
+ this.$router.push({ name: "usersearch-search",})
},
//判断有无登录跳转不同页面
turnlogin(){
diff --git a/rc-busness/components/magnifier.vue b/rc-busness/components/magnifier.vue
deleted file mode 100644
index 55930d32..00000000
--- a/rc-busness/components/magnifier.vue
+++ /dev/null
@@ -1,288 +0,0 @@
-
-
-
-
-
-
-
-
-
-