diff --git a/rc-busness/assets/css/index.less b/rc-busness/assets/css/index.less index 063e45a2..77f4b563 100644 --- a/rc-busness/assets/css/index.less +++ b/rc-busness/assets/css/index.less @@ -5,10 +5,29 @@ /deep/.van-swipe__indicator--active{ background-color: #E1001A; } -.rc-ma{ - .ul-zhuan{ - li{ - background: unset;; + +.ts-carousel-indicator{ + /deep/.swiper-pagination-bullet{ + margin-left:.5rem; + } + /deep/.swiper-pagination-bullet-active{ + background:#E2001A; + } + &.center{ + width:100%; + text-align: center; + } +} +.ts-position-identifier{ + +} +.ul-zhuan,.ul-dog{ + li{ + background: unset; + img{ + border-radius: 50%; + } + &.active { img{ border: 3px solid #E2001A; } @@ -31,6 +50,30 @@ width:auto; } } +.ul-dog{ + width: 100%; + display: flex; + justify-content: center; + flex-wrap: wrap; + flex-direction: row; + + span{ + margin-top: .5rem; + display: block; + } + img{ + width: 9.5rem; + height: auto; + display: block; + } + li{ + cursor: pointer; + font-size: 16px; + text-align: center; + margin-top:3rem; + margin-left:3rem; + } +} @media screen and (max-width:768px){ .ul-dog{ justify-content: space-evenly; @@ -174,7 +217,6 @@ .uservideo{ width: 100%; height:auto; - max-height: 15.68rem; display: block; video{ max-width:100%; @@ -222,6 +264,10 @@ -webkit-box-orient: vertical; max-width: 60%; text-align: center; + word-break: keep-all; + height: 2.625rem; + display: flex; + align-items: center; } em{ font-style: normal; @@ -327,14 +373,21 @@ .rc-selection{ display: none; } - .sw-center{ - display: none; - } -.useraimg{ -width: 100%; -// height: 29.31rem; -object-fit: cover; -} + .sw-center{ + display: none; + } + .useraimg{ + width: 100%; + // height: 29.31rem; + object-fit: cover; + } + .ts-banner-swiper-container{ + position:relative; + .ts-carousel-indicator{ + position:absolute; + bottom:.4rem; + } + } .van-swipe-item { color: #fff; height: 100%; diff --git a/rc-busness/assets/css/openaddress.less b/rc-busness/assets/css/openaddress.less index 689de33e..08aa9e24 100644 --- a/rc-busness/assets/css/openaddress.less +++ b/rc-busness/assets/css/openaddress.less @@ -1,11 +1,310 @@ -@media screen and (max-width:768px){ +.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 diff --git a/rc-busness/assets/image/Forms-Switch-On@3x.png b/rc-busness/assets/image/userred.png similarity index 100% rename from rc-busness/assets/image/Forms-Switch-On@3x.png rename to rc-busness/assets/image/userred.png diff --git a/rc-busness/components/addressInput.vue b/rc-busness/components/addressInput.vue index 931ccb23..32c553a7 100644 --- a/rc-busness/components/addressInput.vue +++ b/rc-busness/components/addressInput.vue @@ -90,6 +90,7 @@ export default { }, pickValue(pickId,pickName){ let areaObj={id:pickId,name:pickName}; + console.log(pickId,pickName); this.returnValueArr[this.curDisplayingColIndex]=areaObj; this.validatePickedValues(); @@ -114,6 +115,9 @@ export default { onChange(picker,values) { //values = [{id:this.columns[0].id, name:this.columns[0].name},{id:this.columns[1].id, name:this.columns[1].name},{id:this.columns[3].id, name:this.columns[3].name}]; //Support single choice only , index = 0 province, index = 1 city, index = 2 area let curSelection={'province':'','city':'','area':''}; + // console.log(picker,values); + this.$emit('getmenu',values) + this.$emit("closeDialog"); if(!values) return; let _self=this; @@ -202,7 +206,7 @@ export default { this.hideAddress(); }, onCancel() { - + }, fitlerValuesInArray(stringStartWith,dataColArea){ let result=[]; diff --git a/rc-busness/pages/personal/mypersonal.vue b/rc-busness/pages/personal/mypersonal.vue index 9c9fb4e0..43a70c62 100644 --- a/rc-busness/pages/personal/mypersonal.vue +++ b/rc-busness/pages/personal/mypersonal.vue @@ -342,6 +342,7 @@ obligation(item,index){ }else{ if(item.title=='收货地址'){ + this.$router.push({ path: `/useraddress/openaddress/` }) diff --git a/rc-busness/pages/useraddress/addaddress.vue b/rc-busness/pages/useraddress/addaddress.vue index 0bb677c6..97ac548f 100644 --- a/rc-busness/pages/useraddress/addaddress.vue +++ b/rc-busness/pages/useraddress/addaddress.vue @@ -24,6 +24,8 @@ + +
@@ -38,6 +40,8 @@
--> + + @@ -46,6 +50,7 @@ import Myheader from '~/components/header.vue' import MyFooter from '~/components/rc-footer.vue' +import addressInput from '~/components/addressInput.vue' export default { data() { return { @@ -53,6 +58,7 @@ export default { checked: true, userid: null, usermessage:null, + dialogInfo1:false, list: [ { id: 1, @@ -77,6 +83,12 @@ export default { }; }, methods: { + onGetMenu(values){ + console.log(values,+'111111'); + }, + handleClose1(){ + this.dialogInfo1 = false + }, onEdit(item, index) { // let userid = item.id; console.log(item); @@ -119,7 +131,8 @@ export default { }, components: { Myheader, - MyFooter + MyFooter, + addressInput }, mounted() { diff --git a/rc-busness/pages/useraddress/openaddress.vue b/rc-busness/pages/useraddress/openaddress.vue index 7c619a0a..e618473d 100644 --- a/rc-busness/pages/useraddress/openaddress.vue +++ b/rc-busness/pages/useraddress/openaddress.vue @@ -1,8 +1,12 @@