diff --git a/rc-busness/ajax/getData.js b/rc-busness/ajax/getData.js index 0c1a5e5d..9805de0b 100644 --- a/rc-busness/ajax/getData.js +++ b/rc-busness/ajax/getData.js @@ -517,6 +517,7 @@ export const goodsmessage = (productCode) => { //地址的添加 //id/详细地址/ 收货人姓名/收货人电话号码/省份id/城市id/区域编码 export const editaddress = (memberId, detailAddress,recipient,tel,provinceId,cityId,districtId) => { + var data = { memberId:844350, provinceId:25, @@ -528,7 +529,7 @@ export const goodsmessage = (productCode) => { zipCode:'214423', default:false, } - return fetch('memberAddress?type=add', data, 'POST' ) + return fetch('memberAddress?type=add', memberId, 'POST' ) } //删除 @@ -541,21 +542,13 @@ export const goodsmessage = (productCode) => { } //地址的编辑 - export const editupdate = (mobile, pet,address) => { - var data = { - - memberId:'3242', - id:'620111', - provinceId:'', - cityId:'', - districtId:'', - detailAddress:'江西省萍乡市', - recipient:'刘佳敏', - recipientPhone:'13407998521', - zipCode:'', - isDefault:'', - } - return fetch('memberAddress?type=update', data, 'POST' ) + export const editupdate = (userid,) => { + // var data = { + // memberId:userid, + // id:id, + // isDefault:isDefault, + // } + return fetch('memberAddress?type=update', userid, 'POST' ) } //修改密码 diff --git a/rc-busness/assets/css/addaddress.less b/rc-busness/assets/css/addaddress.less index 471c5f6f..53b349ee 100644 --- a/rc-busness/assets/css/addaddress.less +++ b/rc-busness/assets/css/addaddress.less @@ -2,50 +2,51 @@ @media screen and (max-width:768px){ - .usercontend{ + .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; + } + } + .usercontend{ align-items: center; justify-content: center; flex-direction: column; + min-height: 70vh; .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; @@ -55,7 +56,7 @@ } .rc-max-width--xl{ - margin-top: 16px; + padding: 24px 20px 0 20px; input{ width: 258px; height: 34px; @@ -100,6 +101,40 @@ @media screen and (min-width: 769px) { + .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; + } + } .usercontend{ display: flex; align-items: center; @@ -197,12 +232,11 @@ // .rc-phone{ // } -// .rc-address{ + .rc-address{ + position: relative; -// } -// .rc-useaddress{ - -// } + } + diff --git a/rc-busness/assets/css/editaddress.less b/rc-busness/assets/css/editaddress.less index 269b6de2..53b349ee 100644 --- a/rc-busness/assets/css/editaddress.less +++ b/rc-busness/assets/css/editaddress.less @@ -1,3 +1,6 @@ + + + @media screen and (max-width:768px){ .rc-button{ display: flex; @@ -7,8 +10,6 @@ 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 { @@ -35,8 +36,27 @@ margin-left: 40px; } } + .usercontend{ + align-items: center; + justify-content: center; + flex-direction: column; + min-height: 70vh; + .rc-useaddress{ + textarea{ + display: none; + } + } + + .rc-max-width--xl{ + h2{ + display: none; + } + } + + } + .rc-max-width--xl{ - margin-top: 16px; + padding: 24px 20px 0 20px; input{ width: 258px; height: 34px; @@ -61,8 +81,6 @@ span{ text-align: left; } - - } // .rc-phone{ @@ -82,8 +100,147 @@ } @media screen and (min-width: 769px) -{ +{ + .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; + } + } + .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{ + position: relative; + + } + + + + +} } \ No newline at end of file diff --git a/rc-busness/assets/css/openaddress.less b/rc-busness/assets/css/openaddress.less index 08aa9e24..c7cee213 100644 --- a/rc-busness/assets/css/openaddress.less +++ b/rc-busness/assets/css/openaddress.less @@ -3,8 +3,6 @@ .rc-margin-bottom--lg{ margin: 0; } - - @media screen and (max-width:768px){ .online{ width:100%; @@ -61,9 +59,7 @@ color: #FFFFFF; margin-left: 8px; } } - .rc-center{ - padding-top: 24px; - } + } @@ -112,17 +108,19 @@ color: #FFFFFF; } -@media screen and (min-width: 769px) +@media screen and (min-width: 768px) { + .rc-max-width--xl{ + margin-bottom: 80px; + } + .rc-button{ + +display: none; +} .usercontend { display:inline-block; } - .usercontshow{ - .rc-button{ - display: none; - } - } .usercontend{ margin-top: 40px; @@ -134,15 +132,17 @@ color: #FFFFFF; display: none; } .useredit{ - width: 680px; -height: 164px; + width: 640px; +height: 166px; background: #FFFFFF; border: 1px solid #D7D7D7; -opacity: 1; border-radius: 3px; display: flex; align-items: center; justify-content: center; +display:inline-block; +margin-left: 35px; + img{ width: 31px; height: 31px; @@ -153,6 +153,13 @@ span{ font-size: 18px; } +.alledit{ + display: flex; + align-items: center; + justify-content: center; + height: 100%; +} + } .usercontend{ .useradd{ @@ -210,6 +217,7 @@ img{ top: 24px; span { border-bottom: 1px solid #666666; + cursor: pointer; } span:first-child { margin-right: 16px; @@ -235,32 +243,7 @@ img{ .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%; - } - } + display: none; } .rc-header { display: flex; diff --git a/rc-busness/components/addressInput.vue b/rc-busness/components/addressInput.vue index 32c553a7..e470adce 100644 --- a/rc-busness/components/addressInput.vue +++ b/rc-busness/components/addressInput.vue @@ -1,6 +1,6 @@