From 01854f3022a27c198cf67659b84bf535027bac5e Mon Sep 17 00:00:00 2001 From: Admin <376654749@qq.com> Date: Thu, 20 Jan 2022 04:37:57 +0000 Subject: [PATCH 01/12] update rc-busness/assets/css/index.less. --- rc-busness/assets/css/index.less | 144 +++++++++++++------------------ 1 file changed, 61 insertions(+), 83 deletions(-) diff --git a/rc-busness/assets/css/index.less b/rc-busness/assets/css/index.less index 67008c80..77f4b563 100644 --- a/rc-busness/assets/css/index.less +++ b/rc-busness/assets/css/index.less @@ -29,24 +29,20 @@ } &.active { img{ - border-radius: 50%; + border: 3px solid #E2001A; } - &.active { - img{ - border: 3px solid #E2001A; - } - color: #E2001A; - - } - &.unactive { - color: #444444; - img{ - border: 3px solid #D7D7D7; - } + color: #E2001A; + + } + &.unactive { + color: #444444; + img{ + border: 3px solid #D7D7D7; } } } } + .uservideo{ overflow: hidden; video{ @@ -80,15 +76,24 @@ } @media screen and (max-width:768px){ .ul-dog{ - display: none; + justify-content: space-evenly; + img{ + width:4rem; + height:auto; + } + li{ + margin-top:1.875rem; + } } - .searchBara{ - position: fixed; + .ts-banner-swiper-container{ + margin-bottom:2.5rem; + } + .searchBara{ width: 100%; position: fixed; - top:66px; + top:3.75rem; background: white; - z-index: 9999; + z-index: 60; overflow-x: auto; white-space: nowrap; overflow-y:hidden; @@ -105,16 +110,14 @@ display: inline-block; margin-left: 0.20rem; text-align: center; - background: #F6F6F6; border-radius: 50%; opacity: 1; } - } - - .rc-login{ - width: 92%; - margin:0 auto; - } + } + .rc-login{ + width: 92%; + margin:0 auto; + } .userunlogin{ width: 100%; height: 0.60rem; @@ -144,9 +147,6 @@ } } - .van-swipe{ - z-index: 2; - } .rc-usermessage{ span{ font-size: 1rem; @@ -162,10 +162,12 @@ height: auto; object-fit: cover; } - + + .van-swipe{ + z-index: 2; + } .van-swipe-item { color: #fff; - height: 26.31rem; width: 100%; font-size: 0.20px; text-align: center; @@ -234,7 +236,7 @@ width: 100%; display: flex; flex-direction: column; - justify-content: center; + justify-content: flex-start; align-items: center; } img{ @@ -251,6 +253,7 @@ margin-top: 1.25rem; } p{ + color: #666666; font-size: .875rem; text-overflow: -o-ellipsis-lastline; overflow: hidden; @@ -347,22 +350,22 @@ } } - .active { - font-size: 0.14rem; - img{ - border-width: 1px; - } - } - .unactive { - font-size: 0.14rem; - img{ - border-width: 1px; - } - } // .usermain{ // display: none; // } } +.active { + font-size: 0.14rem; + img{ + border-width: 1px; + } +} +.unactive { + font-size: 0.14rem; + img{ + border-width: 1px; + } +} @media screen and (min-width: 769px) @@ -403,15 +406,12 @@ #xxxFullScreen { background-color: white; // margin-top: 100px; - #swiper1 { - width: 100%; + #swiper1,#swiper2 { overflow: hidden; margin-top: 2.31rem; - - h2{ - padding-bottom: 5rem; - } - + } + h2{ + padding-bottom: 5rem; } .swiper-container2 { @@ -420,10 +420,10 @@ // overflow: visible !important; position: relative; } -#swiper1 .swiper-container .swiper-wrapper .swiper-slide { - width: 100%; - //height: 6.18rem; -} + #swiper1 .swiper-container .swiper-wrapper .swiper-slide { + width: 100%; + //height: 6.18rem; + } /* 上一张 */ #swiper1 .swiper-container .swiper-wrapper .swiper-slide-prev { @@ -571,14 +571,18 @@ img{ display: block; } img{ - width: 10vw; - height: 10vw; + width:100%; + height: auto; + object-fit: contain; display: block; } li{ + width: 10vw; + max-width:11rem; cursor: pointer; font-size: 16px; text-align: center; + overflow:hidden; } } @@ -593,33 +597,7 @@ img{ } .usermain{ - .ul-dog{ - width: 100%; - display: flex; - justify-content: center; - flex-wrap: wrap; - flex-direction: row; - - span{ - margin-top: 2.5rem; - display: block; - } - img{ - width: 9.5rem; - height: 9.5rem; - display: block; - } - li{ - cursor: pointer; - font-size: 16px; - width: 9.875rem; - text-align: center; - height: 9.875rem; - background: #F6F6F6; - border-radius: 50%; - margin-left:3rem; - } - } + } .rc-main{ width: 100%; From 7d7f4e9e273f77088068875c58eb80de3745bf68 Mon Sep 17 00:00:00 2001 From: Admin <376654749@qq.com> Date: Thu, 20 Jan 2022 04:39:34 +0000 Subject: [PATCH 02/12] update rc-busness/assets/css/global.less. --- rc-busness/assets/css/global.less | 53 ++++++++++++++++--------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less index 8a669da3..c0f8706f 100644 --- a/rc-busness/assets/css/global.less +++ b/rc-busness/assets/css/global.less @@ -33,16 +33,10 @@ body{ } } .userloding { - position: fixed; - left: 50%; - margin-left: -1.56rem; - top: 50%; - margin-top: -3.75rem; background: url(../image/onloading.png) center center no-repeat; width: 3.12rem; background-size: contain; - height: 7.5rem; - z-index: 1000; + height: 3.12rem; animation: rolling 4s infinite; -webkit-animation:rolling 4s infinite; } @@ -253,13 +247,12 @@ img, picture { right: 0; top: 30%; background: #FFFFFF; - box-shadow: 0px 0px .62rem rgba(0, 0, 0, 0.16); + box-shadow: 0 0 10px rgba(0, 0, 0, 0.16); border-radius: .25rem; z-index:3; ul{ width: 60px; height: 181px; - box-shadow: 0px 0px 6px rgb(0 0 0 / 10%); background-color: white; display: flex; flex-direction: column; @@ -347,9 +340,7 @@ img, picture { margin-top: 90px; } .rc-list__header { - background: none; - padding: .5rem 0; - border-bottom: none; + } .ts-right-arr { border-bottom:1px solid #E1001A; @@ -436,8 +427,13 @@ img, picture { display:block; li{ max-width:20rem; + min-width:18.75rem; + width:22.8vw; //margin-right:.875rem; - margin-left:2.2vw; + margin-left:2vw; + padding-left:1px; + padding-right:1px; + box-sizing: border-box; .rc-column{ span{ font-size:1.875rem; @@ -452,7 +448,7 @@ img, picture { } } img{ - width:21.7vw; + width:100%; max-width:320px; min-width:160px; } @@ -559,35 +555,40 @@ img, picture { } h2{ font-size:20px; + padding-bottom:1rem; } .ts-scrollable { + padding-bottom:1rem; + scrollbar-width: thin; li { margin-left: 30px; width: 8.125rem; height: 2.5rem; - line-height: 40px; + //line-height: 40px; font-size: .875rem; + padding:.375rem; } - /* + &::-webkit-scrollbar{ - background:unset; - height:4px; + height: 6px; + width:50%; + background:transparent; } &::-webkit-scrollbar-thumb{ background-color:#d7d7d7; - height:2px; + border-radius:10px; + width:50%; } &::-webkit-scrollbar-track{ - background-color:ddd; - - height:2px; + //background-color:#ddd; + background-color:transparent; } &::-webkit-scrollbar-button{ background:unset; } - */ + /* */ } } @@ -609,10 +610,10 @@ img, picture { { .ts-product-list { display:flex; - justify-content: space-between; + //justify-content: space-between; li{ - margin-left:0; - margin-right:0; + //margin-left:0; + //margin-right:0; } } } \ No newline at end of file From 0268fb9a5ee336aaba0928663e64cc1afe0de0b3 Mon Sep 17 00:00:00 2001 From: Admin <376654749@qq.com> Date: Thu, 20 Jan 2022 04:39:50 +0000 Subject: [PATCH 03/12] update rc-busness/assets/css/login.less. --- rc-busness/assets/css/login.less | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rc-busness/assets/css/login.less b/rc-busness/assets/css/login.less index 8ba135c4..f166c777 100644 --- a/rc-busness/assets/css/login.less +++ b/rc-busness/assets/css/login.less @@ -1,7 +1,9 @@ .container{ - min-height:80vh; + min-height:100vh; height:100%; background-color:#f6f6f6; + display: flex; + flex-direction: column; } .ts-max-width--460{ border-radius: 3px; From dc67785fcbaa73c59bdeacedfd3db975312f4790 Mon Sep 17 00:00:00 2001 From: Admin <376654749@qq.com> Date: Thu, 20 Jan 2022 04:40:32 +0000 Subject: [PATCH 04/12] update rc-busness/assets/css/openaddress.less. --- rc-busness/assets/css/openaddress.less | 299 ------------------------- 1 file changed, 299 deletions(-) diff --git a/rc-busness/assets/css/openaddress.less b/rc-busness/assets/css/openaddress.less index 265696d3..689de33e 100644 --- a/rc-busness/assets/css/openaddress.less +++ b/rc-busness/assets/css/openaddress.less @@ -1,310 +1,11 @@ - - -.rc-margin-bottom--lg{ - margin: 0; -} - - @media screen and (max-width:768px){ - .online{ - width:100%; - background:#d7d7d7; - margin-top:1.5rem; - height:.06rem; - &.bold{ - height:8px; - background:#f6f6f6; - } - } - .useredit{ - display: none; - } - .rc-button{ - display: flex; - align-items: center; - justify-content: center; - width: 375px; -height: 80px; -background: #FFFFFF; -box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1); -opacity: 1; -border-radius: 0px; - } - .rc-footbutton { - width: 164px; -height: 48px; -border: 2px solid #E2001A; -opacity: 1; -border-radius: 30px; -background: #E2001A; -display: flex; -justify-content: center; -align-items: center; -font-size: 16px; -color: #FFFFFF; - - - } -.rc-max-width--xl{ - padding: 24px 20px 24px 20px; - .rc-title { - display: flex; - align-items: center; - color: #333333; - font-size: 14px; - em { - font-style: normal; - font-size: 14px; - } - span { - display: block; - margin-left: 8px; - } - } - .rc-center{ - padding-top: 24px; - } - -} - - .rc-address { - margin-top: 8px; - text-overflow: -o-ellipsis-lastline; - overflow: hidden; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-line-clamp: 2; - line-clamp: 2; - -webkit-box-orient: vertical; - font-size: 14px; - color: #333333; - } - .rc-footer { - display: flex; - justify-content: space-between; - align-items: center; - margin-top: 20px; - display: flex; - align-items: center; - .rc-right { - span { - border-bottom: 1px solid #666666; - } - span:first-child { - margin-right: 16px; - } - } - img{ - width: 43px; - } - .rc-foot{ - display: flex; - align-items: center; - color: #333333; - font-size: 14px; - span{ - margin-left: 8px; - } - } - } - } @media screen and (min-width: 769px) - { - .usercontend { - display:inline-block; -} - .usercontshow{ - .rc-button{ - display: none; - } - } - - .usercontend{ - margin-top: 40px; - } - .online{ - display: none; - } - .rc-button{ - display: none; - } - .useredit{ - width: 680px; -height: 164px; -background: #FFFFFF; -border: 1px solid #D7D7D7; -opacity: 1; -border-radius: 3px; -display: flex; -align-items: center; -justify-content: center; -img{ - width: 31px; - height: 31px; -} -span{ - color: #333333; - font-size: 18px; -} - } - .usercontend{ - .useradd{ - width: 680px; -height: 164px; -background: #FFFFFF; -border-radius: 3px; -img{ - width: 31px; - height: 31px; - display: block; -} - } - -} - .rc-max-width--xl{ - - .rc-center{ - margin-top: 24px; - margin-left: 24px; - } - .rc-cat{ - width: 640px; - border: 1px solid #D7D7D7; - border-radius: 3px; - position: relative; - margin-left: 40px; - height: 164px; - } - .rc-title { - display: flex; - align-items: center; - color: #333333; - font-size: 20px; - em { - font-style: normal; - } - span { - display: block; - margin-left: 32px; - font-size: 20px; - } - } - .rc-footer { - display: flex; - justify-content: space-between; - align-items: center; - margin-top: 20px; - display: flex; - align-items: center; - .rc-right { - position: absolute; - right: 24px; - top: 24px; - span { - border-bottom: 1px solid #666666; - } - span:first-child { - margin-right: 16px; - } - } - img{ - width: 43px; - } - .rc-foot{ - display: flex; - align-items: center; - color: #333333; - font-size: 16px; - margin-top: 16px; - span{ - margin-left: 8px; - } - } - } - - } - .rc-max-width--xl{ - - - .rc-button { - height: 80px; - background: #ffffff; - box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1); - opacity: 1; - display: flex; - align-items: center; - justify-content: center; - display: block; - - .rc-footbutton { - width: 164px; - height: 48px; - border: 2px solid #e2001a; - opacity: 1; - border-radius: 30px; - display: flex; - align-items: center; - background: #e2001a; - span { - display: block; - text-align: center; - color: white; - font-size: 16px; - width: 100%; - } - } - } - .rc-header { - display: flex; - align-items: center; - color: #333333; - em { - font-style: normal; - font-size: 14px; - } - span { - display: block; - margin-left: 8px; - } - } - .rc-address { - margin-top: 16px; - text-overflow: -o-ellipsis-lastline; - overflow: hidden; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-line-clamp: 2; - line-clamp: 2; - -webkit-box-orient: vertical; - font-size: 20px; - color: #333333; - - } - .rc-footer { - display: flex; - justify-content: space-between; - align-items: center; - padding-bottom: 20px; - margin-top: 8px; - .rc-right { - span { - border-bottom: 1px solid #666666; - } - span:first-child { - margin-right: 16px; - } - } - } - - - } - } \ No newline at end of file From f21b1e530c36886f6184165450ce76b7b09af1be Mon Sep 17 00:00:00 2001 From: Admin <376654749@qq.com> Date: Thu, 20 Jan 2022 04:42:51 +0000 Subject: [PATCH 05/12] update rc-busness/components/header.vue. --- rc-busness/components/header.vue | 124 +++++++++++-------------------- 1 file changed, 42 insertions(+), 82 deletions(-) diff --git a/rc-busness/components/header.vue b/rc-busness/components/header.vue index 7c10461f..3c121957 100644 --- a/rc-busness/components/header.vue +++ b/rc-busness/components/header.vue @@ -58,11 +58,6 @@ --> - - - translations.feature.headerbar.pin - - @@ -75,16 +70,16 @@
@@ -94,49 +89,49 @@
  • - 猫 + 猫
  • - 犬 + 犬
  • - 定制营养方案 + 定制营养方案
    • +