diff --git a/mall4uni/pages/basket/basket.css b/mall4uni/pages/basket/basket.css index aae0913..3ae5cad 100644 --- a/mall4uni/pages/basket/basket.css +++ b/mall4uni/pages/basket/basket.css @@ -317,7 +317,8 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before { .cart-footer { position: fixed; - bottom: 100rpx; + /* bottom: 100rpx; */ + bottom: calc(90rpx + env(safe-area-inset-bottom)); left: 0; width: 100%; display: flex; diff --git a/mall4uni/pages/delivery-address/delivery-address.vue b/mall4uni/pages/delivery-address/delivery-address.vue index 8739d92..55a03b9 100644 --- a/mall4uni/pages/delivery-address/delivery-address.vue +++ b/mall4uni/pages/delivery-address/delivery-address.vue @@ -11,7 +11,7 @@ - + {{item.receiver}} {{item.mobile}} @@ -109,7 +109,7 @@ export default { }; http.request(params); }, - // 修改地址 + // 修改地址 toEditAddress: function (e) { var addrId = e.currentTarget.dataset.addrid; uni.navigateTo({ @@ -120,17 +120,14 @@ export default { /** * 选择地址 跳转回提交订单页 */ - selAddrToOrder: function (e) { + selAddrToOrder: function (item) { if (this.order == 0) { var pages = getCurrentPages(); //当前页面 var prevPage = pages[pages.length - 2]; //上一页面 - - prevPage.setData({ - //直接给上移页面赋值 - item: e.currentTarget.dataset.item, - selAddress: 'yes' - }); + //直接给上一页面赋值 + prevPage.item = item + prevPage.selAddress = 'yes' uni.navigateBack({ //返回 delta: 1 @@ -142,4 +139,4 @@ export default { \ No newline at end of file + diff --git a/mall4uni/pages/prod-classify/prod-classify.vue b/mall4uni/pages/prod-classify/prod-classify.vue index cca8b0d..1047f48 100644 --- a/mall4uni/pages/prod-classify/prod-classify.vue +++ b/mall4uni/pages/prod-classify/prod-classify.vue @@ -225,7 +225,6 @@ export default { prodList: list, pages: res.pages }); - console.log('我的收藏prodList:', this.prodList) uni.hideLoading(); } }; diff --git a/mall4uni/pages/submit-order/submit-order.vue b/mall4uni/pages/submit-order/submit-order.vue index c527bbe..8846b6c 100644 --- a/mall4uni/pages/submit-order/submit-order.vue +++ b/mall4uni/pages/submit-order/submit-order.vue @@ -87,7 +87,7 @@ 买家留言: - + @@ -208,7 +208,9 @@ export default { remarks: "", couponIds: [], coupons: {}, - shopReduce: "" + shopReduce: "", + item: {}, + selAddress: '' }; }, @@ -237,15 +239,12 @@ export default { onShow: function () { var pages = getCurrentPages(); var currPage = pages[pages.length - 1]; + if (currPage.selAddress == "yes") { + //将携带的参数赋值 + this.userAddr = currPage.item + } - // if (currPage.data.selAddress == "yes") { - // this.setData({ - // //将携带的参数赋值 - // userAddr: currPage.data.item - // }); - // } //获取订单数据 - - + //获取订单数据 this.loadOrderData(); },