From 8c993da2cddec6c070e137cfc2c9b07bf23d01fd Mon Sep 17 00:00:00 2001 From: ghusermoon <2673031505@qq.com> Date: Tue, 23 Jun 2020 17:21:01 +0800 Subject: [PATCH] address api --- common/api/user.js | 69 +++++++ components/mine/address-active/index.vue | 185 ++++++++++++++++-- .../mine/address-block/address-item.vue | 41 +++- package-lock.json | 6 +- package.json | 2 +- pageE/mine/MemberServe.vue | 23 ++- pageE/more/AddAddress.vue | 1 - pageE/more/Address.vue | 27 ++- pageE/more/EditAddress.vue | 33 +++- pageE/tool/Manicure.vue | 23 ++- pageE/tool/ManicureOrder.vue | 35 +++- static/image/mine/24.png | Bin 0 -> 4379 bytes 12 files changed, 390 insertions(+), 55 deletions(-) create mode 100644 static/image/mine/24.png diff --git a/common/api/user.js b/common/api/user.js index 5fae7e1..e75f644 100644 --- a/common/api/user.js +++ b/common/api/user.js @@ -78,10 +78,75 @@ export default { pid: pid }); }, + getArea() { + return vm.$u.post('Area/getAreaTree') + }, // 用户收货地址列表 getAddressList() { return vm.$u.post('MemberAddress/addressList'); }, + // 添加收货地址 + addressAdd({ + area_id, + city_id, + is_default, + area_info, + address, + true_name, + mobile_phone, + // longitude, + // latitude, + }) { + return vm.$u.post('memberAddress/addressAdd', { + area_id: area_id, + city_id: city_id, + is_default: is_default, + area_info: area_info, + address: address, + true_name: true_name, + mobile_phone: mobile_phone, + // longitude: longitude, + // latitude: latitude, + }); + }, + // 修改收货地址 + addressEdit({ + address_id, + area_id, + city_id, + is_default, + area_info, + address, + true_name, + mobile_phone, + // longitude, + // latitude, + }) { + return vm.$u.post('memberAddress/addressEdit', { + address_id: address_id, + area_id: area_id, + city_id: city_id, + is_default: is_default, + area_info: area_info, + address: address, + true_name: true_name, + mobile_phone: mobile_phone, + // longitude: longitude, + // latitude: latitude, + }); + }, + // 删除地址 + deleteAddress({ address_id }) { + return vm.$u.post('memberAddress/addressDel', { + address_id: address_id + }); + }, + // 设默认地址 + setDefaultAddress({ address_id }) { + return vm.$u.post('memberAddress/addressSetDefault', { + address_id: address_id + }); + }, // 美甲 getManicureList({ page }) { return vm.$u.post('MemberManicure/getManicureList', { @@ -95,6 +160,10 @@ export default { time: time }); }, + // 会员服务-积分列表 + getPointslogList() { + return vm.$u.post('member/pointslogList'); + }, } } } \ No newline at end of file diff --git a/components/mine/address-active/index.vue b/components/mine/address-active/index.vue index df3052b..4d96406 100644 --- a/components/mine/address-active/index.vue +++ b/components/mine/address-active/index.vue @@ -2,16 +2,20 @@ - + - + - + + + + 定位 + - + 设为默认地址 @@ -20,34 +24,158 @@ - 保存地址 - - + 保存地址 + + + @@ -71,6 +199,29 @@ export default { font-size: 30rpx; color: rgba(51,51,51,1); } + .area { + padding: 0 30rpx; + display: flex; + > input { + padding: 30rpx 0; + flex: 1; + } + > view { + margin-left: 30rpx; + width: 50rpx; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + font-size: 22rpx; + color: rgba(255,120,15,1); + > image { + width: 26rpx; + height: 32rpx; + margin-bottom: 10rpx; + } + } + } } .edit-btn { margin: 122rpx auto 0; diff --git a/components/mine/address-block/address-item.vue b/components/mine/address-block/address-item.vue index 082b162..7cb8bbe 100644 --- a/components/mine/address-block/address-item.vue +++ b/components/mine/address-block/address-item.vue @@ -3,7 +3,7 @@ {{ $u.trim(item.area_info + item.address_detail, 'all') }} @@ -13,6 +13,7 @@ :name="item.address_id" shape="circle" label-size="22" + :disabled="false" > {{ item.address_is_default == '0' ? '设为默认' : '已设为默认' }} @@ -24,11 +25,12 @@ 编辑 - + 删除 + @@ -42,13 +44,40 @@ export default { }, props: ['item', 'current'], mounted() { - console.log(this.item); + // console.log(this.item); + }, + filters: { + phoneFormat(value) { + return value.replace(/^(\d{3})\d*(\d{4})$/, '$1****$2'); + } }, methods: { editAddress() { - uni.navigateTo({ - url: '/pageE/more/EditAddress' - }); + this.$u.route({ + url: '/pageE/more/EditAddress', + params: { + item: JSON.stringify(this.item) + } + }) + }, + deleteAddress() { + // console.log(this.item.address_id); + this.$u.api.deleteAddress({ + address_id: this.item.address_id + }).then((res)=>{ + if(res.errCode == 0) { + this.showToast(res.message, 'success'); + this.$emit('getAddressList'); + } else { + this.showToast(res.message, 'warning'); + } + }) + }, + showToast(message, type) { + this.$refs.uToast.show({ + title: message, + type: type, + }) }, }, } diff --git a/package-lock.json b/package-lock.json index 6318c8b..9cc3ff0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "uview-ui": { - "version": "1.2.9", - "resolved": "https://registry.npm.taobao.org/uview-ui/download/uview-ui-1.2.9.tgz", - "integrity": "sha1-PwC6ziaB/LXyMacGRkMfPrZfF2c=" + "version": "1.3.68", + "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.3.68.tgz", + "integrity": "sha512-fwszoohFC1HLvIqwwnXPRytT52qGy0viGEzyJtVwemNBAu5z6Ddjwe9ORqsrlQQo7PSvHdyCNHWrSLGzoyKKoQ==" } } } diff --git a/package.json b/package.json index 314bcc3..8089796 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,6 @@ "author": "", "license": "ISC", "dependencies": { - "uview-ui": "^1.2.9" + "uview-ui": "^1.3.68" } } diff --git a/pageE/mine/MemberServe.vue b/pageE/mine/MemberServe.vue index 9ab2f45..699c4c6 100644 --- a/pageE/mine/MemberServe.vue +++ b/pageE/mine/MemberServe.vue @@ -43,13 +43,13 @@ - + - 积分商城兑换礼品 - 2020-03-11 + {{ item.pl_desc }} + {{ item.pl_addtime }} - - {{ index&1 ? '-' + 10.00 : '+' + 10.00 }} + + {{ item.pl_addtime > 0 ? item.pl_addtime : '+' + 10.00 }} @@ -70,9 +70,13 @@ export default { }], current: 0, swiperCurrent: 0, - nodes: '

2

2

2

2

2

2

2

2

2

2

2

2

2

2

2

2

2

2

' + nodes: '

2

2

2

2

2

2

2

2

2

2

2

2

2

2

2

2

2

2

', + pointslogList: [] } }, + onShow() { + this.getPointslogList(); + }, methods: { tabsChange(index) { this.swiperCurrent = index; @@ -81,6 +85,13 @@ export default { let current = e.detail.current; this.swiperCurrent = current; this.current = current; + }, + getPointslogList() { + this.$u.api.getPointslogList().then((res)=>{ + if (res.errCode == 0) { + this.pointslogList = res.data; + } + }) } }, } diff --git a/pageE/more/AddAddress.vue b/pageE/more/AddAddress.vue index ad1546f..76a285c 100644 --- a/pageE/more/AddAddress.vue +++ b/pageE/more/AddAddress.vue @@ -17,7 +17,6 @@ export default { onLoad() { }, methods: { - }, } diff --git a/pageE/more/Address.vue b/pageE/more/Address.vue index 8836540..1822694 100644 --- a/pageE/more/Address.vue +++ b/pageE/more/Address.vue @@ -2,10 +2,11 @@ - + 添加地址 + diff --git a/pageE/tool/Manicure.vue b/pageE/tool/Manicure.vue index 5100701..ddcc108 100644 --- a/pageE/tool/Manicure.vue +++ b/pageE/tool/Manicure.vue @@ -10,10 +10,10 @@ 订单 - 已预约 + {{ item.status }} - 美甲人姓名：xxx - 时间：2020-04-12 + 美甲人姓名：{{ item.manicure_name }} + 时间：{{ item.manicure_time | dateFormat }} @@ -39,20 +39,33 @@ export default { current: 0, swiperCurrent: 0, page: 1, - orderList: 5, + orderList: [], loadStatus: 'loadmore', } }, onShow() { this.current = 0; this.swiperCurrent = 0; + this.getManicureList(); + }, + filters: { + dateFormat(value) { + let date = new Date(value * 1000); + let year, month, day; + year = date.getFullYear(); + month = date.getMonth() + 1; + day = date.getDate(); + return year + "-" + month + "-" + day; + } }, methods: { getManicureList() { this.$u.api.getManicureList({ page: this.page }).then((res)=>{ - if (res.errCode == 0) {} + if (res.errCode == 0) { + this.orderList = res.data.list; + } }) }, reachBottom() { diff --git a/pageE/tool/ManicureOrder.vue b/pageE/tool/ManicureOrder.vue index 50471cc..ae2f1b3 100644 --- a/pageE/tool/ManicureOrder.vue +++ b/pageE/tool/ManicureOrder.vue @@ -11,8 +11,9 @@ {{ time }} - 确认订单 + 确认订单 + diff --git a/static/image/mine/24.png b/static/image/mine/24.png new file mode 100644 index 0000000000000000000000000000000000000000..c1b912526b0f1a996a1101f20ee70c49f8bc51c0 GIT binary patch literal 4379 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 VZu7|N6mkFn002ovPDHLkV1h+-Z?pga literal 0 HcmV?d00001