diff --git a/rc-busness/ajax/getData.js b/rc-busness/ajax/getData.js index 2efb2607..c5b9404b 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 689de33e..a5cdbf3a 100644 --- a/rc-busness/assets/css/openaddress.less +++ b/rc-busness/assets/css/openaddress.less @@ -1,11 +1,238 @@ + + +.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: 0px 20px 24px 20px; + min-height: 60vh; + .rc-cat{ + margin-top: 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; + } + } + + +} + + } -@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; +} + + .usercontend{ + margin-top: 40px; + } + .online{ + display: none; + } + .rc-button{ + display: none; + } + .useredit{ + width: 640px; +height: 166px; +background: #FFFFFF; +border: 1px solid #D7D7D7; +border-radius: 3px; +display: flex; +align-items: center; +justify-content: center; +display:inline-block; +margin-left: 35px; + +img{ + width: 31px; + height: 31px; + +} +span{ + color: #333333; + font-size: 18px; + +} +.alledit{ + display: flex; + align-items: center; + justify-content: center; + height: 100%; +} + + } + .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; + cursor: pointer; + } + 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 { + display: none; + } + .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; } \ No newline at end of file diff --git a/rc-busness/assets/css/orderquantity.less b/rc-busness/assets/css/orderquantity.less new file mode 100644 index 00000000..0698f7a2 --- /dev/null +++ b/rc-busness/assets/css/orderquantity.less @@ -0,0 +1,366 @@ + + + + +@media screen and (max-width:768px){ + .active { + font-size: 14px; + color: #e2001a; + cursor: pointer; + } + .unactive { + font-size: 14px; + color: #444444; + cursor: pointer; + } + + + .usercontshow{ + padding: 0 1.5rem; + .online{ + margin: 0; + &.bold{ + height: 0.5rem; + } + } + .rc-usermaina{ + width: 100%; + height: 100%; + } + .rc-headera { + display: flex; + justify-content: space-between; + height: 64px; + align-items: center; + } + .rc-userheader{ + display: none; + } + + .rc-center { + width: 100%; + height: 245px; + margin-top: 8px; + .rc-usermain { + .pc-bottom{ + display: none; + } + + display: flex; + .rc-image { + border: 1px solid #D8D8D8; + margin-top: 17px; + ; + img { + width: 96px; + height: 96px; + display: block; + + } + } + + .rc-right { + + .rc-userbottomm{ + display: none; + } + display: flex; + flex-direction: column; + width: 100%; + margin-left: 16px; + justify-content: center; + em + { + font-style: normal; + display: block; + font-size: 16px; + margin-top: 18px; + font-weight: bold; + + color: #E1001A; + } + } + .rc-userright { + display: flex; + flex-direction: column; + color: #666666; + font-size: 14px; + span{ + display: block; + margin-top: 16px; + } + } + .rc-userbottom { + display: flex; + justify-content: space-between; + margin-top: 8px; + span{ + color: #666666; + font-size: 14px; + } + i{ + font-style: normal; + color: #E1001A; + font-size: 18px; + font-weight: bold; + } + } + } + + .rc-bottom { + display: flex; + align-items: center; + justify-content: center; + margin-top: 24px; + span { + display: block; + width: 130px; + display: flex; + align-items: center; + line-height: 40px; + text-align: center; + color: #e2001a; + height: 40px; + border: 2px solid #e2001a; + justify-content: center; + border-radius: 30px; + font-weight: bold; + } + span:last-child{ + margin-left: 15px; + } + } + } + + .rc-title { + height: 52px; + display: flex; + align-items: center; + border-bottom: 1px solid #d8d8d8; + justify-content: space-between; + span{ + font-size: 14px; + color: #999999; + margin-left: 8px; + } + em{ + font-style: normal; + font-size: 14px; + + color: #333333; + } + i{ + font-style: normal; + font-size: 14px; + + color: #333333; + } + .rc-usertitle strong{ + display: none; + } + } + + } + + + +} +@media screen and (min-width: 769px) +{ + .active { + font-size: 18px; + color: #e2001a; + cursor: pointer; + // margin-left: 40px; + } + .unactive { + font-size: 18px; + color: #444444; + cursor: pointer; + // margin-left: 80px; + } + .usercontshow{ + .rc-headera { + display: flex; + height: 64px; + align-items: center; + border: 1px solid #D7D7D7; + border-radius: 3px 3px 0px 0px; + font-size: 18px; + span:first-child{ + margin-left: 40px; + } + span{ + margin-left: 80px; + } + } + + .rc-userheader{ + width: 100%; + height: 64px; + background: #F6F6F6; + border: 1px solid #D7D7D7; + display: flex; + align-items: center; + justify-content: space-between; + font-size: 18px; + span:first-child{ + margin-left: 173px; + } + span:last-child{ + margin-right: 87px; + } + } + + .rc-center { + width: 100%; + height: 220px; + border: 1px solid #D7D7D7; + .rc-usermain { + display: flex; + justify-content: space-between; + align-items: center; + height: 164px; + .rc-usercenter{ + width: 25%; + em{ + font-size: 18px; + } + } + .rc-image { + border: 1px solid #D8D8D8; + margin-left: 40px; + + img { + width: 96px; + height: 96px; + display: block; + + } + } + + .rc-right { + .rc-userbottom{ + display: none; + } + display: flex; + + width: 100%; + margin-left: 16px; + + em + { + font-style: normal; + font-weight: bold; + font-size: 16px; + margin-top: 18px; + + color: #E1001A; + } + } + .rc-userright { + display: flex; + flex-direction: column; + color: #666666; + font-size: 16px; + span{ + display: block; + margin-top: 6px; + } + } + .rc-userbottomm { + display: flex; + justify-content: space-between; + align-items: center; + width: 58%; + font-size: 20px; + color: #E1001A; + font-weight: bold; + i{ + font-style: normal; + + + } + } + + .pc-bottom { + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; + margin-right: 40px; + + span { + display: block; + width: 130px; + cursor: pointer; + display: flex; + align-items: center; + line-height: 40px; + font-weight: bold; + text-align: center; + color: #e2001a; + height: 40px; + border: 2px solid #e2001a; + justify-content: center; + border-radius: 30px; + } + span:last-child{ + margin-top: 15px; + } + } + } + + .rc-bottom { + display: none; + } + } + + .rc-title { + height: 55px; + display: flex; + align-items: center; + border-bottom: 1px solid #d8d8d8; + justify-content: space-between; + span{ + font-size: 16px; + color: #999999; + margin-left: 8px; + } + strong{ + font-style: normal; + font-size: 16px; + color: #444444; + } + em{ + font-style: normal; + font-size: 16px; + + color: #333333; + } + i{ + font-style: normal; + font-size: 16px; + margin-left: 40px; + + color: #333333; + } + .rc-usertitle{ + margin-right: 73px; + display: flex; + align-items: center; + em{ + display: block; + margin-left: 8px; + } + } + } + + + } + + + + + +} \ No newline at end of file diff --git a/rc-busness/components/addressInput.vue b/rc-busness/components/addressInput.vue index a60768aa..98337ec5 100644 --- a/rc-busness/components/addressInput.vue +++ b/rc-busness/components/addressInput.vue @@ -458,6 +458,17 @@ export default { .ts-area-picker-desktop{ display:none; } + .ts-area-picker-value-displayer{ + width: 258px; + height: 34px; + border: none; + border-bottom: 1px + solid #808285; + color: #999999; + font-size: 16px; + margin-left: 2px; + padding-left: 0; + } } @media screen and (min-width:769px) { diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue index c9a878dc..3bbf2525 100644 --- a/rc-busness/pages/personal/useraddress.vue +++ b/rc-busness/pages/personal/useraddress.vue @@ -2,8 +2,8 @@
-
-
+
+
+
{{item.title}} @@ -22,7 +23,7 @@
-
+
订单编号:{{ item.orderNumber }} @@ -41,15 +42,13 @@
{{ item.usereat }}
- 规格:{{ userlist.num }} + 规格:{{ item.num }}
- 数量:{{ userlist.pcs}}件 - ¥{{ userlist.ecPrice }} + 数量:{{ item.pcs}}件 + ¥{{ item.ecPrice }}
- -
¥{{ item.userprice }} {{item.orderstype}} @@ -62,14 +61,13 @@ 查看订单
- +
-
@@ -300,360 +298,6 @@ async canceldanhao(orderNumber){ \ No newline at end of file diff --git a/rc-busness/pages/useraddress/addaddress.vue b/rc-busness/pages/useraddress/addaddress.vue index 2984e5f1..2e787f4f 100644 --- a/rc-busness/pages/useraddress/addaddress.vue +++ b/rc-busness/pages/useraddress/addaddress.vue @@ -7,33 +7,31 @@

新增收货地址

收货人: - +
手机号码: - +
所在地区: - - + +
详细地址: - +
- - - + +
+
取消 - 确认 + 确认
- -
+ + +
+
取消 - 确认 + 确认
- - + @@ -40,13 +42,22 @@ import Myheader from '~/components/header.vue' import MyFooter from '~/components/rc-footer.vue' + import { editupdate} from "../../ajax/getData"; + import addressInput from '~/components/addressInput.vue' export default { data() { return { chosenAddressId: "1", checked: true, userid: null, + dialogInfo1:false, usermessage:null, + useradrname:[], + detailAddress:'', + recipientPhone:'', + recipient:'', + addressid:'', + defaultValues:[], list: [ { id: 1, @@ -71,26 +82,63 @@ export default { }; }, methods: { - onEdit(item, index) { - // let userid = item.id; - console.log(item); - this.$router.push({ - path: "/useraddress/editaddress", - query: { - id: item, - }, - }); + onGetMenu(values){ + console.log(values,+'111111'); }, - onAdd(item, index) { - // let userid = item.id; - // console.log(item); - this.$router.push({ - path: "/useraddress/addaddress", - // query: { - // id: userid, - // }, - }); + handleClose1(){ + this.dialogInfo1 = false }, + + register(){ + console.log(this.tel) + if (!/^[1][3,4,5,7,8][0-9]{9}$/.test(this.recipientPhone) || this.recipientPhone === "") { + this.$message({ + type: 'warning', + message: '手机号码输入有误' + }); + return + }else if(this.alladdress===''){ + this.$message({ + type: 'warning', + message: '请输入详细地址' + }); + return + } + else if(this.userpeople===''){ + this.$message({ + type: 'warning', + message: '请输入姓名' + }); + return + } + + else{ + this.editaddress(); + } +}, + + //更改 + async editaddress(item) { + let useradd={ + memberId:this.userid, + id:this.id, + provinceId:'',//省份id, + cityId:'',//城市id, + districtId:'',//区域id, + detailAddress:this.detailAddress, //详细地址 + recipient:this.recipient, //收件人姓名 + recipientPhone:this.recipientPhone, //收件人电话 + } + let data = await editupdate(useradd); + if(data){ + this.$message({ + type: 'warning', + message: '地址修改成功' + }); + } + + }, + @@ -114,13 +162,37 @@ export default { components: { Myheader, MyFooter, + addressInput }, + created(){ + let provinceName=this.$route.query.provinceName; + let districtName=this.$route.query.districtName; + let cityName=this.$route.query.cityName + let provinceId=this.$route.query.provinceId; + let districtNameid=this.$route.query.districtId; + let cityId=this.$route.query.cityId; + this.defaultValues=[ + { + id:provinceId, + name:provinceName + }, + { + id:cityId, + name:cityName + }, + { + id:districtNameid, + name:districtName + } + ]; + }, mounted() { - //地址的查询 - // this.usermessage = JSON.parse(localStorage.getItem("userInfo")); - // this.editaddress(this.usermessage); - // this.userid = this.usermessage.data.id; + this.userid = JSON.parse(localStorage.getItem("userInfo")).data.id; + this.recipient=this.$route.query.recipient + this.recipientPhone=this.$route.query.recipientPhone + this.detailAddress=this.$route.query.detailAddress + this.id=this.$route.query.id; }, }; diff --git a/rc-busness/pages/useraddress/openaddress.vue b/rc-busness/pages/useraddress/openaddress.vue index 7a038389..32f36894 100644 --- a/rc-busness/pages/useraddress/openaddress.vue +++ b/rc-busness/pages/useraddress/openaddress.vue @@ -6,15 +6,15 @@
- {{ item.name }} + {{ item.recipient }} - {{ item.tel }} + {{ item.recipientPhone }}
- {{ item.address }} + {{item.provinceName}}{{ item.districtName }}{{item.detailAddress}}
-
+
+ + +
+ +
+
+ + 添加收货地址 +
+
+ + + +
新增收货地址
- + + diff --git a/rc-busness/static/images/adddress.png b/rc-busness/static/images/adddress.png new file mode 100644 index 00000000..5eebb39c Binary files /dev/null and b/rc-busness/static/images/adddress.png differ