diff --git a/rc-busness/assets/css/discount.less b/rc-busness/assets/css/discount.less index 0179576e..d32ef056 100644 --- a/rc-busness/assets/css/discount.less +++ b/rc-busness/assets/css/discount.less @@ -19,10 +19,9 @@ } .rc { - height: 64px; display: flex; align-items: center; - margin-left: 23px; + margin-left: 1rem; span { display: block; margin-left: 32px; @@ -184,7 +183,6 @@ margin-top: 8px; height: 96px; display: flex; align-items: center; - margin-left: 23px; justify-content: center; span { display: block; diff --git a/rc-busness/assets/css/integral.less b/rc-busness/assets/css/integral.less index cf1c9309..230809c2 100644 --- a/rc-busness/assets/css/integral.less +++ b/rc-busness/assets/css/integral.less @@ -40,8 +40,7 @@ span{ li{ float: left; width: 30%; - - + position:relative; } li:after{ // height: 2px; @@ -49,8 +48,9 @@ span{ // display: block; content:"|"; color: #707070; - margin-left: 5px; - + position:absolute; + top:0; + right:0; } li:last-child:after{ content:""; @@ -126,10 +126,7 @@ span{ } } } -.rc-usermain{ - width: 92%; - margin: 0 auto; - margin-top: 60px; +.rc-max-width--xl{ ul{ height: 64px; @@ -158,9 +155,9 @@ border-radius: 3px 3px 0px 0px; font-style: normal; display: block; height: 48px; - margin-top: 16px; display: flex; border: 1px solid #D7D7D7; + border-top:0; // justify-content: space-between; align-items: center; color: #666666; diff --git a/rc-busness/assets/css/mypersonal.less b/rc-busness/assets/css/mypersonal.less index 7ce18230..0fcd7e58 100644 --- a/rc-busness/assets/css/mypersonal.less +++ b/rc-busness/assets/css/mypersonal.less @@ -2,12 +2,22 @@ ul li ol li em strong i { list-style: none; font-style: normal; } -.rc-header { - width: 100%; -} .rc-center{ overflow:hidden; } +.rc-title{ + img{ + width: 96px; + height: 96px; + margin:0 auto; + } +} +.userer{ + img{ + margin-left:auto; + margin-right:auto; + } +} //手机端 @media screen and (max-width: 768px) { .ts-mypersonal{ @@ -45,13 +55,6 @@ ul li ol li em strong i { color:#333333; font-size: 26px; } - .rc-title{ - img{ - width: 96px; - height: 96px; - - } - } .userer{ img{ width: 210px; @@ -246,10 +249,10 @@ ul li ol li em strong i { //pc端 @media screen and (min-width: 769px) { - /deep/.el-dialog { - width: 440px; - height: 652px; -} + /deep/.el-dialog { + width: 440px; + height: 652px; + } .ts-mypersonal{ margin-left:0; .rc-column{ diff --git a/rc-busness/assets/css/usermember.less b/rc-busness/assets/css/usermember.less new file mode 100644 index 00000000..5f708efa --- /dev/null +++ b/rc-busness/assets/css/usermember.less @@ -0,0 +1,211 @@ +ul li ol li em strong i { + list-style: none; + font-style: normal; +} +/deep/.van-swipe__indicator--active{ + background:#E2001A; +} + //手机端 +@media screen and (max-width: 768px) { + .rc-main { + margin: 0 auto; + overflow: hidden; + .rc-center { + width: 100%; + height: 180px; + img { + width: 100%; + height: 100%; + display: block; + } + + } + .rc-userorder{ + display: flex; + align-items: center; + height: 100%; + + } + + .rc-order{ + padding: 16px 0 16px 0 ; + width: 100%; + display: flex; + align-items: center; + font-size: 14px; + color: #333333; + font-weight: 500; + border-bottom: 1px solid #D8D8D8; + margin-top: 22px; + + } + + .rc-cordd{ + color:#666666; + font-size: 14px; + margin-top: 16px; + span{ + display: block; + margin-top: 16px; + } + .block{ + height: 8px; + background: #D7D7D7; + margin-top: 16px; + border-radius: 4px; + .r-block{ + width: 0%; + height: 100%; + background: #008900; + } + + + } + .rc-value{ + display: flex; + justify-content: space-between; + } + } + + .usermember{ + width: 100%; + height: 80px; + border-bottom: 1px solid #D8D8D8; + display: flex; + align-items: center; + .rc-image{ + height: 100%; + display: flex; + align-items: center; + } + img{ + width: 3rem; + height: 3rem; + display: block; + object-fit: contain; + } + em{ + font-style: normal; + font-size: 16px; + display: block; + margin-left:3vw; + font-weight: bold; + color: #531c1c; + width:4.25rem; + } + span{ + color: #666666; + font-size: 14px; + margin-left: 3vw; + width: 51vw; + } + } +} +} + +@media screen and (min-width: 769px) { + + .rc-main { + width: 92%; + margin: 0 auto; + overflow: hidden; + .rc-center { + width: 100%; + height: 180px; + display: none; + img { + width: 100%; + height: 100%; + display: block; + } + + } + + .rc-order{ + padding: 16px 0 16px 0 ; + width: 100%; + display: flex; + align-items: center; + font-size: 26px; + color: #333333; + font-weight: 500; + + + } + .rc-cordd{ + color:#666666; + margin-top: 16px; + span{ + display: block; + margin-top: 16px; + font-size: 16px; + } + .block{ + height: 8px; + background: #D7D7D7; + margin-top: 16px; + border-radius: 4px; + .r-block{ + width: 0%; + height: 100%; + background: #008900; + } + + + } + .rc-value{ + display: flex; + justify-content: space-between; + } + } + + .usermember{ + width: 23%; + float: left; + height: 160px; + border: 1px solid #D7D7D7; + margin-top: 80px; + margin-left: 19px; + .rc-image{ + float: right; + overflow: hidden; + height: 100%; + display: flex; + align-items: center; + margin-right:20px; + + } + img{ + width: 80px; + height: 80px; + display: block; + } + em{ + font-style: normal; + font-size: 20px; + display: block; + + font-weight: 500; + color: #333333; + } + span{ + color: #999999; + font-size: 14px; + + } + } + .rc-userorder{ + width: 60%; + height: 100%; + display: flex; + flex-direction: column; + justify-content: center; + align-items: flex-start; + padding-left:2.5rem; + span{ + margin-top: 8px; + } + } +} + +} \ No newline at end of file diff --git a/rc-busness/components/fixed-right.vue b/rc-busness/components/fixed-right.vue new file mode 100644 index 00000000..d22ea92a --- /dev/null +++ b/rc-busness/components/fixed-right.vue @@ -0,0 +1,106 @@ + + + + + \ No newline at end of file diff --git a/rc-busness/components/header.vue b/rc-busness/components/header.vue index 60906613..d07684e4 100644 --- a/rc-busness/components/header.vue +++ b/rc-busness/components/header.vue @@ -434,6 +434,5 @@ export default { \ No newline at end of file diff --git a/rc-busness/pages/index.vue b/rc-busness/pages/index.vue index b68e88eb..9c917dc2 100644 --- a/rc-busness/pages/index.vue +++ b/rc-busness/pages/index.vue @@ -93,7 +93,7 @@ {{item.title}}

{{item.detail}}

{{item.price}} - 立即购买 + 立即购买
@@ -110,7 +110,7 @@ {{item.price}}
- 立即购买 + 立即购买
@@ -327,7 +327,7 @@ {{item.title}}

{{item.detail}}

{{item.price}} - 立即购买 + 立即购买
@@ -344,7 +344,7 @@ {{item.price}}
- 立即购买 + 立即购买
@@ -726,29 +726,19 @@ --> -
- -
- - 回到顶部 -
-
+
数据加载中
- + \ No newline at end of file diff --git a/rc-busness/pages/productdetails/productlist.vue b/rc-busness/pages/productdetails/productlist.vue index b7d8e122..58e26ffd 100644 --- a/rc-busness/pages/productdetails/productlist.vue +++ b/rc-busness/pages/productdetails/productlist.vue @@ -118,7 +118,7 @@ rc-margin-y--md center " - @click="userbuy()" + @click="selectproduce(item)" >立即购买 @@ -296,6 +296,7 @@ 确认 +
@@ -308,6 +309,7 @@