diff --git a/src/manifest.json b/src/manifest.json index 85cad30..83873c7 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -66,7 +66,11 @@ "scope.userLocation" : { "desc" : "请求获取您的位置信息" } - } + }, + "requiredPrivateInfos": [ + "chooseAddress", + "chooseLocation" + ] }, "mp-alipay" : { "usingComponents" : true diff --git a/src/pages/address/address.vue b/src/pages/address/address.vue index 296d004..19b2070 100644 --- a/src/pages/address/address.vue +++ b/src/pages/address/address.vue @@ -11,7 +11,11 @@ v-for="(item, index) in list" :key="index" > - + { - console.log(d); - }, - fail: (error) => { - console.log(error); - }, + success: (data) => { + wechatAddress.address = + data.provinceName + data.cityName + data.countyName; + wechatAddress.detail = data.detailInfo; + wechatAddress.mobile = data.telNumber; + wechatAddress.name = data.userName; + wechatAddress.gender = 1; + wechatAddress.isDefault = false; + console.log(wechatAddress); + } }); + // #endif }, addAddress() { uni.navigateTo({ @@ -141,6 +151,17 @@ export default { url: "/pages/address/edit?id=" + id, }); }, + deleteAddress(id, index) { + uni.showModal({ + title: "删除地址?", + content: "数据删除后不可恢复,请谨慎操作!", + complete: (res) => { + if (res.confirm) { + this.list.splice(index, 1); + } + }, + }); + }, }, }; @@ -149,7 +170,7 @@ export default { .address-group { width: 100%; box-sizing: border-box; - padding: 0 18rpx; + padding: 0 18rpx 120rpx 18rpx; .address-item { display: flex; align-items: center; @@ -239,7 +260,7 @@ export default { } } .btn.add-address { - background: rgba(139, 155, 235, 0); + background: #f6f6f6; border: 1px solid #4b65ed; box-sizing: border-box; .text { diff --git a/src/pages/address/edit.vue b/src/pages/address/edit.vue index 1b67dfe..af6e9ef 100644 --- a/src/pages/address/edit.vue +++ b/src/pages/address/edit.vue @@ -200,6 +200,8 @@ export default { } .input-box.map { .address-text { + z-index: 10; + position: relative; font-size: 28rpx; color: #c9c9c9; box-sizing: border-box; diff --git a/src/pages/order/create.vue b/src/pages/order/create.vue index 809eff6..2443ed4 100644 --- a/src/pages/order/create.vue +++ b/src/pages/order/create.vue @@ -176,6 +176,7 @@ export default { .form-container { width: 100%; margin-top: 16rpx; + padding-bottom: 120rpx; } .select-group { width: 100%; diff --git a/src/pages/service/detail.vue b/src/pages/service/detail.vue index 23aaf06..5c00a02 100644 --- a/src/pages/service/detail.vue +++ b/src/pages/service/detail.vue @@ -128,7 +128,7 @@ export default { require("@/static/temp/cate/5.png"), require("@/static/temp/cate/5.png"), ], - content: "

这是服务内容

", + content: "

这是服务内容这是服务内容这是服务内容这是服务内容这是服务内容这是服务内容这是服务内容这是服务内容这是服务内容这是服务内容这是服务内容这是服务内容这是服务内容这是服务内容这是服务内容这是服务内容这是服务内容这是服务内容这是服务内容这是服务内容这是服务内容这是服务内容这是服务内容这是服务内容这是服务内容这是服务内容这是服务内容这是服务内容这是服务内容这是服务内容这是服务内容

", }, }; }, @@ -288,7 +288,7 @@ export default { } } .service-section.detail-box { - padding-bottom: 205rpx; + padding-bottom: 100rpx; .detail { position: relative; width: 670rpx;