diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less index 4d52e87b..063f0b72 100644 --- a/rc-busness/assets/css/global.less +++ b/rc-busness/assets/css/global.less @@ -155,6 +155,7 @@ img, picture { } li{ border-radius: 100px; + flex-shrink: 0; } } .active{ @@ -280,7 +281,7 @@ img, picture { width:100%; } .rc-top{ - margin-top: 74px; + margin-top: 90px; } .rc-list__header { background: none; @@ -361,7 +362,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..17f52c16 100644 --- a/rc-busness/assets/css/index.less +++ b/rc-busness/assets/css/index.less @@ -290,9 +290,11 @@ color: #444444; border: 1px solid #D7D7D7; } + // .usermain{ // display: none; // } + } diff --git a/rc-busness/assets/css/login.less b/rc-busness/assets/css/login.less index 8ba135c4..c5fe6b07 100644 --- a/rc-busness/assets/css/login.less +++ b/rc-busness/assets/css/login.less @@ -139,7 +139,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/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/pc-banner1.png b/rc-busness/assets/image/pc-banner1.png new file mode 100644 index 00000000..0930e107 Binary files /dev/null and b/rc-busness/assets/image/pc-banner1.png differ diff --git a/rc-busness/assets/image/pc-banner2.png b/rc-busness/assets/image/pc-banner2.png new file mode 100644 index 00000000..eb453954 Binary files /dev/null and b/rc-busness/assets/image/pc-banner2.png differ diff --git a/rc-busness/pages/index.vue b/rc-busness/pages/index.vue index ab51102d..21d002a6 100644 --- a/rc-busness/pages/index.vue +++ b/rc-busness/pages/index.vue @@ -324,10 +324,12 @@ +
+

全价犬湿粮

@@ -1103,6 +1105,7 @@ vm=this; // }, 500); // } + this.usermessage= JSON.parse(localStorage.getItem("userInfo")); if(this.usermessage==null ||this.usermessage==undefined){ @@ -1192,7 +1195,9 @@ vm=this; this.fivemao=false; this.dogshow=false; this.sixmao=false; + this.onemao=false; + } if(item.title=='猫湿粮'){ this.onemao=true; diff --git a/rc-busness/pages/personal/settlement.vue b/rc-busness/pages/personal/settlement.vue index 06daeb55..d75514ee 100644 --- a/rc-busness/pages/personal/settlement.vue +++ b/rc-busness/pages/personal/settlement.vue @@ -1,7 +1,6 @@