From ef1120ec7c67354d42c7c04928ae8a6506b39d6c Mon Sep 17 00:00:00 2001 From: "952108534@qq.com" <952108534@qq.com> Date: Wed, 19 Jan 2022 21:55:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/assets/css/addaddress.less | 212 +++++++++++++++ rc-busness/assets/css/discount.less | 1 - rc-busness/assets/css/editaddress.less | 89 +++++++ rc-busness/assets/css/integral.less | 5 +- rc-busness/pages/personal/integral.vue | 9 +- rc-busness/pages/personal/mypersonal.vue | 6 +- rc-busness/pages/useraddress/addaddress.vue | 186 +++++++++----- rc-busness/pages/useraddress/editaddress.vue | 204 ++++++++------- rc-busness/pages/useraddress/openaddress.vue | 256 ++++--------------- 9 files changed, 601 insertions(+), 367 deletions(-) create mode 100644 rc-busness/assets/css/addaddress.less create mode 100644 rc-busness/assets/css/editaddress.less diff --git a/rc-busness/assets/css/addaddress.less b/rc-busness/assets/css/addaddress.less new file mode 100644 index 00000000..471c5f6f --- /dev/null +++ b/rc-busness/assets/css/addaddress.less @@ -0,0 +1,212 @@ + + + +@media screen and (max-width:768px){ + .usercontend{ + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; + .rc-useaddress{ + textarea{ + display: none; + } + } + .rc-button{ + display: flex; + justify-content: center; + font-size: 14px; + width: 100%; + box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1); + height: 80px; + align-items: center; + padding:0 20px 0 20px; + span + { + width: 160px; + height: 48px; + border: 2px solid #E2001A; + border-radius: 30px; + display: flex; + align-items: center; + justify-content: center; + color: #E2001A; + } + em{ + font-style: normal; + width: 164px; + height: 48px; + background: #E2001A; + cursor: pointer; + border-radius: 30px; + display: flex; + align-items: center; + justify-content: center; + color: #FFFFFF; + margin-left: 40px; + } + } + .rc-max-width--xl{ + h2{ + display: none; + } + } + + } + +.rc-max-width--xl{ + margin-top: 16px; + input{ + width: 258px; + height: 34px; + border: none; + border-bottom: 1px solid #808285; + color: #999999; + font-size: 16px; + margin-left: 2px; + } + span{ + font-size: 16px; + font-weight: bold; + width: 22%; + text-align: center; + color: #333333; + margin-top: 2px; + } + .rc-people{ + width: 100%; + display: flex; + align-items: center; + span{ + text-align: left; + } + } +// .rc-phone{ + +// } +// .rc-address{ + +// } +// .rc-useaddress{ + +// } + + + +} + + +} + +@media screen and (min-width: 769px) +{ + .usercontend{ + display: flex; + align-items: center; + justify-content: center; + position: relative; + flex-direction: column; + .rc-button{ + display: flex; + justify-content: center; + font-size: 14px; + width: 100%; + box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1); + height: 80px; + align-items: center; + + padding:0 20px 0 20px; + span + { + width: 160px; + height: 48px; + border: 2px solid #E2001A; + border-radius: 30px; + display: flex; + align-items: center; + justify-content: center; + color: #E2001A; + } + em{ + font-style: normal; + width: 164px; + height: 48px; + background: #E2001A; + cursor: pointer; + border-radius: 30px; + display: flex; + align-items: center; + justify-content: center; + color: #FFFFFF; + margin-left: 40px; + } + } + h2{ + font-size: 26px; + color: #333333; + text-align: center; + font-weight: bold; + } + .rc-useaddress{ + display: flex; + align-items: center; + textarea{ + width: 680px; + height: 118px; + background: #FFFFFF; + border: 1px solid #808285; + opacity: 1; + border-radius: 0px; + padding-top: 12px; + padding-left: 16px; + } + +.userinput{ + display: none; +} + } + } + + +.rc-max-width--xl{ + margin-top: 16px; + input{ + width: 680px; + height: 45px; + border: 1px solid #808285; + color: #999999; + font-size: 16px; + margin-left: 2px; + padding-left: 16px; + } + span{ + font-size: 16px; + font-weight: bold; + width: 10%; + text-align: center; + color: #333333; + margin-top: 2px; + } + .rc-people{ + width: 100%; + display: flex; + align-items: center; + + } + +// .rc-phone{ + +// } +// .rc-address{ + +// } +// .rc-useaddress{ + +// } + + + +} + + +} \ No newline at end of file diff --git a/rc-busness/assets/css/discount.less b/rc-busness/assets/css/discount.less index 46279cb7..0179576e 100644 --- a/rc-busness/assets/css/discount.less +++ b/rc-busness/assets/css/discount.less @@ -276,7 +276,6 @@ margin-top: 8px; padding-right: 17px; margin-bottom: 8px; float: right; - } .ts-standard-btn{ diff --git a/rc-busness/assets/css/editaddress.less b/rc-busness/assets/css/editaddress.less new file mode 100644 index 00000000..269b6de2 --- /dev/null +++ b/rc-busness/assets/css/editaddress.less @@ -0,0 +1,89 @@ +@media screen and (max-width:768px){ + .rc-button{ + display: flex; + justify-content: center; + font-size: 14px; + width: 100%; + box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1); + height: 80px; + align-items: center; + position: absolute; + bottom: 0; + padding:0 20px 0 20px; + span + { + width: 160px; + height: 48px; + border: 2px solid #E2001A; + border-radius: 30px; + display: flex; + align-items: center; + justify-content: center; + color: #E2001A; + } + em{ + font-style: normal; + width: 164px; + height: 48px; + background: #E2001A; + cursor: pointer; + border-radius: 30px; + display: flex; + align-items: center; + justify-content: center; + color: #FFFFFF; + margin-left: 40px; + } + } +.rc-max-width--xl{ + margin-top: 16px; + input{ + width: 258px; + height: 34px; + border: none; + border-bottom: 1px solid #808285; + color: #999999; + font-size: 16px; + margin-left: 2px; + } + span{ + font-size: 16px; + font-weight: bold; + width: 22%; + text-align: center; + color: #333333; + margin-top: 2px; + } + .rc-people{ + width: 100%; + display: flex; + align-items: center; + span{ + text-align: left; + } + + + } +// .rc-phone{ + +// } +// .rc-address{ + +// } +// .rc-useaddress{ + +// } + + + +} + + +} + +@media screen and (min-width: 769px) +{ + + + +} \ No newline at end of file diff --git a/rc-busness/assets/css/integral.less b/rc-busness/assets/css/integral.less index e461175d..cf1c9309 100644 --- a/rc-busness/assets/css/integral.less +++ b/rc-busness/assets/css/integral.less @@ -26,10 +26,7 @@ span{ } } } -.rc-usermain{ - width: 92%; - margin: 0 auto; - +.rc-max-width--xl{ ul{ height: 70px; display: block; diff --git a/rc-busness/pages/personal/integral.vue b/rc-busness/pages/personal/integral.vue index dd1a63ce..6aac580c 100644 --- a/rc-busness/pages/personal/integral.vue +++ b/rc-busness/pages/personal/integral.vue @@ -1,8 +1,8 @@ @@ -115,6 +115,7 @@ export default { \ No newline at end of file diff --git a/rc-busness/pages/personal/mypersonal.vue b/rc-busness/pages/personal/mypersonal.vue index 9c9fb4e0..77d0b5c9 100644 --- a/rc-busness/pages/personal/mypersonal.vue +++ b/rc-busness/pages/personal/mypersonal.vue @@ -342,9 +342,7 @@ obligation(item,index){ }else{ if(item.title=='收货地址'){ -this.$router.push({ - path: `/useraddress/openaddress/` - }) +this.$router.push({ name: "useraddress-openaddress",}) console.log('这是地址的跳转'); } @@ -357,7 +355,7 @@ this.$router.push({ this.$router.push({ path: `/personal/discount/` }) - console.log('这是地址的跳转'); + } diff --git a/rc-busness/pages/useraddress/addaddress.vue b/rc-busness/pages/useraddress/addaddress.vue index c422c2f5..0bb677c6 100644 --- a/rc-busness/pages/useraddress/addaddress.vue +++ b/rc-busness/pages/useraddress/addaddress.vue @@ -1,81 +1,137 @@ - \ No newline at end of file + diff --git a/rc-busness/pages/useraddress/editaddress.vue b/rc-busness/pages/useraddress/editaddress.vue index c0ce8fa5..bd7e2e7d 100644 --- a/rc-busness/pages/useraddress/editaddress.vue +++ b/rc-busness/pages/useraddress/editaddress.vue @@ -1,99 +1,131 @@ - \ No newline at end of file + diff --git a/rc-busness/pages/useraddress/openaddress.vue b/rc-busness/pages/useraddress/openaddress.vue index 4f776954..fc17013c 100644 --- a/rc-busness/pages/useraddress/openaddress.vue +++ b/rc-busness/pages/useraddress/openaddress.vue @@ -1,27 +1,29 @@