From b6787145e41fc68919ab884a9016aec9eab32ba2 Mon Sep 17 00:00:00 2001
From: Admin <376654749@qq.com>
Date: Thu, 20 Jan 2022 02:45:55 +0000
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!43=20:?=
=?UTF-8?q?=202022-1-19=20=20Leung'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
rc-busness/assets/css/global.less | 22 +-
rc-busness/assets/css/index.less | 100 +++---
rc-busness/assets/css/login.less | 2 -
rc-busness/components/addressInput.vue | 357 --------------------
rc-busness/components/header.vue | 12 +-
rc-busness/components/rc-footer.vue | 2 +-
rc-busness/nuxt.config.js | 22 +-
rc-busness/pages/index.vue | 124 +++----
rc-busness/pages/personal/discount.vue | 97 +++++-
rc-busness/pages/personal/integral.vue | 2 +-
rc-busness/pages/useraddress/addaddress.vue | 30 +-
rc-busness/pages/userlogin/edit.vue | 3 +-
rc-busness/pages/userlogin/login.vue | 3 +-
rc-busness/static/images/banner/four.jpg | Bin 51476 -> 87134 bytes
rc-busness/static/images/banner/one.jpg | Bin 91903 -> 174140 bytes
rc-busness/static/images/banner/three.jpg | Bin 61753 -> 1066841 bytes
rc-busness/static/images/banner/two.jpg | Bin 67946 -> 293133 bytes
17 files changed, 225 insertions(+), 551 deletions(-)
delete mode 100644 rc-busness/components/addressInput.vue
diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less
index 5b9540d2..c0f8706f 100644
--- a/rc-busness/assets/css/global.less
+++ b/rc-busness/assets/css/global.less
@@ -8,10 +8,7 @@ body{
.fade-leave-active {
opacity: 0;
}
-.ts-no-data{
- text-align: center;
- margin:3rem 0;
-}
+
.ts-mask{
width:100%;
height:100%;
@@ -69,6 +66,8 @@ body{
}
//用户光点
.rc-screen-reader{
+ width: 0.81rem;
+ height: 0.81rem;
border-radius: 50%;
position: absolute;
background-color: red;
@@ -78,13 +77,6 @@ body{
width: 0.37rem;
height: 0.37rem;
}
-.rc-menu--xs .rc-screen-reader{
- left: 30%;
-}
-.rc-list__link.ts-login--xs .rc-screen-reader{
- left:16%;
-}
-
img, picture {
display: block;
max-width: 100%;
@@ -111,8 +103,7 @@ img, picture {
li{
border: 1px solid #D7D7D7;
display: inline-flex;
- border-bottom-left-radius: 4px;
- border-bottom-right-radius: 4px;
+ border-radius: 4px;
flex-direction: column;
max-width:10rem;
.rc-column
@@ -144,7 +135,7 @@ img, picture {
}
img{
width:10rem;
- min-height:10rem;
+ height:10rem;
object-fit: contain;
display: flex;
margin: 0 auto;
@@ -339,9 +330,6 @@ img, picture {
html {
//font-size:100px;
}
- .rc-list__link.ts-login--xs .rc-screen-reader{
- left:7%;
- }
.rc-md-up {
display: none!important;
}
diff --git a/rc-busness/assets/css/index.less b/rc-busness/assets/css/index.less
index 24dc4cef..4463c181 100644
--- a/rc-busness/assets/css/index.less
+++ b/rc-busness/assets/css/index.less
@@ -27,9 +27,6 @@
img{
border-radius: 50%;
}
- &:first-child{
- margin-left:0;
- }
&.active {
img{
border: 3px solid #E2001A;
@@ -49,8 +46,8 @@
.uservideo{
overflow: hidden;
video{
- width:100%;
- height:auto;
+ height:100%;
+ width:auto;
}
}
.ul-dog{
@@ -182,44 +179,51 @@
display: none;
}
#xxxFullScreen {
- background-color: white;
- margin-top: 0.40rem;
- .swiper-container{
- height: 6.45rem;
- }
- .swiper-container {
- width: 100%;
- height: 100%;
- position: relative;
- }
- .swiper-container .swiper-wrapper .swiper-slide {
- width: 17.25rem;
- //height: 6.45rem !important; //Auto adaption
- }
+ background-color: white;
+ margin-top: 0.40rem;
+ #swiper1 {
+ overflow: hidden;
+ }
+ .swiper-container{
+ height: 6.45rem;
+ }
+ .swiper-container, .swiper-container2 {
+ width: 100%;
+ // overflow: visible !important;
+ height: 100%;
+ position: relative;
+ }
+ #swiper1 .swiper-container .swiper-wrapper .swiper-slide {
+ width: 17.25rem;
+ //height: 6.45rem !important; //Auto adaption
+ }
- /* 上一张 */
- swiper-container .swiper-wrapper .swiper-slide-prev {
- margin-top: 0.05rem;
- height: 100%;
- }
- /* 下一张 */
- .swiper-container .swiper-wrapper .swiper-slide-next {
- margin-top: 0.05rem;
- height: 100%;
- }
- .swiper-container .swiper-wrapper .swiper-slide-active {
- height: 100%;
- }
- .uservideo{
- width: 100%;
- height:auto;
- display: block;
- video{
- max-width:100%;
- max-height:100%;
- }
+ /* 上一张 */
+ #swiper1 .swiper-container .swiper-wrapper .swiper-slide-prev {
+ margin-top: 0.05rem;
+ height: 100%;
+
+ }
+ /* 下一张 */
+ #swiper1 .swiper-container .swiper-wrapper .swiper-slide-next {
+ margin-top: 0.05rem;
+ height: 100%;
+
+ }
+ .swiper-container .swiper-wrapper .swiper-slide-active {
+ height: 100%;
+
+ }
+ .uservideo{
+ width: 100%;
+ height:auto;
+ display: block;
+ video{
+ max-width:100%;
+ max-height:100%;
}
}
+ }
.sw-center{
width: 100%;
display: flex;
@@ -234,7 +238,6 @@
flex-direction: column;
justify-content: flex-start;
align-items: center;
- vertical-align: top;
}
img{
width: 10rem;
@@ -273,14 +276,16 @@
/* 中间的图片 */
.swiper-container .swiper-wrapper .swiper-slide-active {
-
+ height: 165px !important;
}
.swiperWrap{
- height: 469px;
- width: 100%;
+ height: 469px;
+ width: 100%;
img{
- height: 469px;
- width: 100%;
+ height: 469px;
+ width: 100%;
+
+
}
/deep/.swiper-pagination-bullet-active{
background: red;
@@ -374,9 +379,6 @@
}
.ts-banner-swiper-container{
position:relative;
- img{
- margin:0 auto;
- }
.ts-carousel-indicator{
position:absolute;
bottom:.4rem;
diff --git a/rc-busness/assets/css/login.less b/rc-busness/assets/css/login.less
index f302c4a0..f166c777 100644
--- a/rc-busness/assets/css/login.less
+++ b/rc-busness/assets/css/login.less
@@ -55,13 +55,11 @@
}
.container {
font-size: 0.1rem;
- background-color:#fff;
.van-field__body {
border-bottom: 1px solid red;
}
.content {
margin-top: 24px;
- box-shadow: unset;
}
.userfoget {
font-size: 14px;
diff --git a/rc-busness/components/addressInput.vue b/rc-busness/components/addressInput.vue
deleted file mode 100644
index 8da3f31f..00000000
--- a/rc-busness/components/addressInput.vue
+++ /dev/null
@@ -1,357 +0,0 @@
-
-
-
-
-
-
-
-
- - {{ returnValueArr[0]?returnValueArr[0].name:'请选择' }}
- - {{ returnValueArr[1]?returnValueArr[1].name:'请选择' }}
- - {{ returnValueArr[2]?returnValueArr[2].name:'请选择' }}
-
-
-
-
-
-
-