From 8ecc85a21cc8258ea25cb5d96e1664184c83271c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Thu, 1 Jul 2021 15:46:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8A=E4=B8=AA=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E4=B8=ADapp=E4=BB=A5=E5=8F=8A=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=20=E7=9A=84=E6=A0=B7=E5=BC=8F=20=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/fillorder.vue    | 23 +++++++++++++----------
 pages/passport/codeLogin.vue |  5 ++---
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/pages/order/fillorder.vue b/pages/order/fillorder.vue
index 6fa340e..6a89011 100644
--- a/pages/order/fillorder.vue
+++ b/pages/order/fillorder.vue
@@ -182,7 +182,7 @@
 
     <!-- 配送地区没有提示 -->
     <div class="notSupportFreight">
-      <u-notice-bar :volume-icon="false" mode="horizontal" :list="notSupportFreightGoodsList"></u-notice-bar>
+      <u-notice-bar style="width:100%" :volume-icon="false" mode="horizontal" :list="notSupportFreightGoodsList"></u-notice-bar>
     </div>
 
     <!-- 结账 -->
@@ -255,7 +255,7 @@ export default {
       masterWay: "", //团长信息
       pintuanFlage: true, //是开团还是拼团
       notSupportFreight: [], //不支持运费
-      notSupportFreightGoodsList:['以下商品超出配送范围：'],
+      notSupportFreightGoodsList: ["以下商品超出配送范围："],
     };
   },
   filters: {
@@ -532,11 +532,10 @@ export default {
 
         if (res.data.result.notSupportFreight.length != 0) {
           this.notSupportFreight = res.data.result.notSupportFreight;
-           
-           res.data.result.notSupportFreight.forEach(item=>{
-             this.notSupportFreightGoodsList[0]+=(item.goodsSku.goodsName)
-           })
-       
+
+          res.data.result.notSupportFreight.forEach((item) => {
+            this.notSupportFreightGoodsList[0] += item.goodsSku.goodsName;
+          });
         }
       });
     },
@@ -676,7 +675,11 @@ export default {
 }
 .notSupportFreight {
   position: fixed;
+
+  bottom: calc(100rpx + env(safe-area-inset-bottom)) ;
+  // #ifdef H5
   bottom: 100rpx;
+  // #endif
   display: flex;
   align-items: center;
   left: 0;
@@ -684,13 +687,13 @@ export default {
   height: 100rpx;
   width: 100%;
   transition: 0.35s;
- 
+
   > .tips {
     margin: 0 32rpx;
   }
 }
-/deep/ .u-notice-bar-wrap{
-  width: 100%;
+/deep/ .u-notice-bar-wrap {
+  width: 100% !important;
 }
 
 .userClass {
diff --git a/pages/passport/codeLogin.vue b/pages/passport/codeLogin.vue
index dbe2797..9c3d524 100644
--- a/pages/passport/codeLogin.vue
+++ b/pages/passport/codeLogin.vue
@@ -102,8 +102,7 @@ export default {
                   duration: 2000,
                   icon: "none",
                 });
-                this.flage = false;
-                 this.codeFlag = true;
+                uni.navigateBack();
               }
             })
             .catch((e) => {
@@ -212,7 +211,7 @@ export default {
           uni.hideLoading();
         }, 2000);
       }
-     
+
       if (!this.$u.test.mobile(this.codeForm.mobile)) {
         uni.showToast({
           title: "请输入正确手机号",