From c1c14f02fab8518c39bb9d65c382c697bb94e1e6 Mon Sep 17 00:00:00 2001
From: Eratosici <ZL769@163.com>
Date: Tue, 6 Jul 2021 15:26:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8B=E5=8D=95=E9=A1=B5?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=9C=B0=E5=9D=80=E8=BF=94=E5=9B=9E=E4=B8=8D?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E3=80=81=E4=BF=AE=E5=A4=8D=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6=E7=BB=93=E7=AE=97=E6=A0=8F=E6=A0=B7=E5=BC=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/basket/basket.css                     |  3 ++-
 pages/delivery-address/delivery-address.vue | 12 +++++-------
 pages/submit-order/submit-order.vue         | 17 ++++++++---------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/pages/basket/basket.css b/pages/basket/basket.css
index aae0913..3ae5cad 100644
--- a/pages/basket/basket.css
+++ b/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/pages/delivery-address/delivery-address.vue b/pages/delivery-address/delivery-address.vue
index 8739d92..c251945 100644
--- a/pages/delivery-address/delivery-address.vue
+++ b/pages/delivery-address/delivery-address.vue
@@ -11,7 +11,7 @@
     <radio-group class="radio-group" @change="radioChange">
       <block v-for="(item, index) in addressList" :key="index">
         <view class="address">
-          <view class="personal" @tap="selAddrToOrder" :data-item="item">
+          <view class="personal" @tap="selAddrToOrder(item)">
             <view class="info-tit">
               <text class="name">{{item.receiver}}</text>
               <text class="tel">{{item.mobile}}</text>
@@ -120,17 +120,15 @@ 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
diff --git a/pages/submit-order/submit-order.vue b/pages/submit-order/submit-order.vue
index b429ce7..fc343a2 100644
--- a/pages/submit-order/submit-order.vue
+++ b/pages/submit-order/submit-order.vue
@@ -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();
   },