diff --git a/rc-busness/assets/css/integral.less b/rc-busness/assets/css/integral.less new file mode 100644 index 00000000..e461175d --- /dev/null +++ b/rc-busness/assets/css/integral.less @@ -0,0 +1,195 @@ +@media screen and (max-width:768px){ + .rc-button{ + width: 100%; + height: 80px; + background: #FFFFFF; +box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1); + display: flex; + align-items: center; + justify-content: center; + margin-top: 12px; + +.rc-order{ +width: 164px; + height: 48px; + border: 2px solid #E2001A; + border-radius: 30px; + background: #E2001A; + text-align: center; + align-items: center; + line-height: 48px; +span{ + font-size: 16px; + display: block; + color: #FFFFFF; + +} +} + } +.rc-usermain{ + width: 92%; + margin: 0 auto; + + ul{ + height: 70px; + display: block; + border-bottom: 1px solid #D8D8D8; + display: flex; + align-items: center; + justify-content: center; + text-align: center; + font-size: 16px; + color: #444444; + li{ + float: left; + width: 30%; + + + } + li:after{ + // height: 2px; + // border: 1px solid red; + // display: block; + content:"|"; + color: #707070; + margin-left: 5px; + + } + li:last-child:after{ + content:""; + + } + } + + ol{ + li{ + font-style: normal; + display: block; + height: 32px; + margin-top: 16px; + display: flex; + // justify-content: space-between; + align-items: center; + color: #666666; + font-size: 14px; + text-align: center; + i{ + font-style: normal; + display: block; + width: 40%; + } + span{ + font-style: normal; + display: block; + width: 36%; + } + em{ + font-style: normal; + display: block; + width: 23%; + } + + + } + } + + +} + +} + +@media screen and (min-width: 769px) +{ + + .rc-button{ + width: 100%; + height: 80px; + background: #FFFFFF; +box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1); + display: flex; + align-items: center; + justify-content: center; + margin-top: 12px; + display: none; + +.rc-order{ +width: 164px; + height: 48px; + border: 2px solid #E2001A; + border-radius: 30px; + background: #E2001A; + text-align: center; + align-items: center; + line-height: 48px; +span{ + font-size: 16px; + display: block; + color: #FFFFFF; + +} +} + } +.rc-usermain{ + width: 92%; + margin: 0 auto; + margin-top: 60px; + + ul{ + height: 64px; +background: #F6F6F6; +border: 1px solid #D7D7D7; +opacity: 1; +border-radius: 3px 3px 0px 0px; + display: block; + display: flex; + align-items: center; + justify-content: center; + text-align: center; + font-size: 16px; + color: #444444; + li{ + float: left; + width: 42%; + + + } + + } + + ol{ + li{ + font-style: normal; + display: block; + height: 48px; + margin-top: 16px; + display: flex; + border: 1px solid #D7D7D7; + // justify-content: space-between; + align-items: center; + color: #666666; + font-size: 14px; + text-align: center; + i{ + font-style: normal; + display: block; + width: 34%; + } + span{ + font-style: normal; + display: block; + width: 34%; + } + em{ + font-style: normal; + display: block; + width: 34%; + } + + + } + } + + +} + +} \ No newline at end of file diff --git a/rc-busness/assets/css/openaddress.less b/rc-busness/assets/css/openaddress.less new file mode 100644 index 00000000..689de33e --- /dev/null +++ b/rc-busness/assets/css/openaddress.less @@ -0,0 +1,11 @@ +@media screen and (max-width:768px){ + + +} + +@media screen and (min-width: 769px) +{ + + + +} \ No newline at end of file diff --git a/rc-busness/pages/personal/discount.vue b/rc-busness/pages/personal/discount.vue new file mode 100644 index 00000000..046a7327 --- /dev/null +++ b/rc-busness/pages/personal/discount.vue @@ -0,0 +1,512 @@ + + + + + + + + {{ item.title }} + + + + + + + + + + ¥{{ item.couponAmount }} + + {{ item.couponName }} + + + + {{ item.couponDesc }} + + + 有效期{{item.validFrom}}至 + {{ item.validTo }} + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/rc-busness/pages/personal/integral.vue b/rc-busness/pages/personal/integral.vue new file mode 100644 index 00000000..dd1a63ce --- /dev/null +++ b/rc-busness/pages/personal/integral.vue @@ -0,0 +1,120 @@ + + + + + + + + {{item.title}} + + + + + + {{item.startDate}} + {{item.changeValue}} + {{item.remark}} + + + + + + + + + 积分兑换 + + + + + + + + + + \ No newline at end of file diff --git a/rc-busness/pages/personal/mypersonal.vue b/rc-busness/pages/personal/mypersonal.vue index a1967cae..e2e4c5b2 100644 --- a/rc-busness/pages/personal/mypersonal.vue +++ b/rc-busness/pages/personal/mypersonal.vue @@ -332,9 +332,9 @@ obligation(item,index){ return }else{ - if(index==2){ + if(item.title=='收货地址'){ this.$router.push({ - path: `/personal/useraddress/` + path: `/useraddress/openaddress/` }) console.log('这是地址的跳转'); diff --git a/rc-busness/pages/useraddress/addaddress.vue b/rc-busness/pages/useraddress/addaddress.vue new file mode 100644 index 00000000..c422c2f5 --- /dev/null +++ b/rc-busness/pages/useraddress/addaddress.vue @@ -0,0 +1,81 @@ + + + + + + + \ No newline at end of file diff --git a/rc-busness/pages/useraddress/editaddress.vue b/rc-busness/pages/useraddress/editaddress.vue new file mode 100644 index 00000000..c0ce8fa5 --- /dev/null +++ b/rc-busness/pages/useraddress/editaddress.vue @@ -0,0 +1,99 @@ + + + + + + + + + + \ No newline at end of file diff --git a/rc-busness/pages/useraddress/openaddress.vue b/rc-busness/pages/useraddress/openaddress.vue new file mode 100644 index 00000000..1482ff52 --- /dev/null +++ b/rc-busness/pages/useraddress/openaddress.vue @@ -0,0 +1,295 @@ + + + + + + + + + {{ item.recipient }} + + + {{ item.recipientPhone }} + + + + + {{ item.detailAddress }} + + + + + + + + + + + 新增收货地址 + + + + + + + +